From 7d21af8c9bcc64ec189b276399c840fc44b7957c Mon Sep 17 00:00:00 2001
From: Hieu Hoang <hieuhoang@gmail.com>
Date: Mon, 5 Oct 2015 11:54:29 +0100
Subject: [PATCH] use util::StringStream

---
 moses/ScoreComponentCollection.cpp | 3 ++-
 moses/Util.h                       | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/moses/ScoreComponentCollection.cpp b/moses/ScoreComponentCollection.cpp
index c3e55b5c7..d9810224e 100644
--- a/moses/ScoreComponentCollection.cpp
+++ b/moses/ScoreComponentCollection.cpp
@@ -4,6 +4,7 @@
 #include <boost/foreach.hpp>
 #include <boost/format.hpp>
 #include "util/exception.hh"
+#include "util/string_stream.hh"
 #include "ScoreComponentCollection.h"
 #include "StaticData.h"
 #include "moses/FF/StatelessFeatureFunction.h"
@@ -213,7 +214,7 @@ void ScoreComponentCollection::Save(const string& filename) const
 {
   ofstream out(filename.c_str());
   if (!out) {
-    ostringstream msg;
+    util::StringStream msg;
     msg << "Unable to open " << filename;
     throw runtime_error(msg.str());
   }
diff --git a/moses/Util.h b/moses/Util.h
index f726e89d2..4995ee7ea 100644
--- a/moses/Util.h
+++ b/moses/Util.h
@@ -33,6 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #include <cstdlib>
 #include <cstring>
 #include "util/exception.hh"
+#include "util/string_stream.hh"
 #include "TypeDef.h"
 
 namespace Moses
@@ -343,7 +344,7 @@ inline std::vector<std::string> TokenizeFirstOnly(const std::string& str,
 template <typename T>
 std::string Join(const std::string& delimiter, const std::vector<T>& items)
 {
-  std::ostringstream outstr;
+  util::StringStream outstr;
   if(items.size() == 0) return "";
   outstr << items[0];
   for(unsigned int i = 1; i < items.size(); i++)
@@ -357,7 +358,7 @@ std::string Join(const std::string& delimiter, const std::vector<T>& items)
 template<typename It>
 std::string Join(const std::string &delim, It begin, It end)
 {
-  std::ostringstream outstr;
+  util::StringStream outstr;
   if (begin != end)
     outstr << *begin++;
   for ( ; begin != end; ++begin)