JSONCPP_OSTRINGSTREAM

cdunn2001 · cdunn2001 · commit 38bb491400ec · 2016-03-06T11:56:38.000-06:00
diff --git a/include/json/assertions.h b/include/json/assertions.h
@@ -25,7 +25,7 @@
 
 # define JSON_FAIL_MESSAGE(message)                                            \
   {                                                                            \
-    std::ostringstream oss; oss << message;                                    \
+    JSONCPP_OSTRINGSTREAM oss; oss << message;                                    \
     Json::throwLogicError(oss.str());                                          \
     abort();                                                                   \
   }
@@ -38,7 +38,7 @@
 // release builds we abort, for a core-dump or debugger.
 # define JSON_FAIL_MESSAGE(message)                                            \
   {                                                                            \
-    std::ostringstream oss; oss << message;                                    \
+    JSONCPP_OSTRINGSTREAM oss; oss << message;                                    \
     assert(false && oss.str().c_str());                                        \
     abort();                                                                   \
   }
diff --git a/src/jsontestrunner/main.cpp b/src/jsontestrunner/main.cpp
@@ -178,7 +178,7 @@ static std::string useStyledStreamWriter(
     Json::Value const& root)
 {
   Json::StyledStreamWriter writer;
-  std::ostringstream sout;
+  JSONCPP_OSTRINGSTREAM sout;
   writer.write(sout, root);
   return sout.str();
 }
diff --git a/src/lib_json/json_reader.cpp b/src/lib_json/json_reader.cpp
@@ -2010,7 +2010,7 @@ bool parseFromStream(
     CharReader::Factory const& fact, std::istream& sin,
     Value* root, std::string* errs)
 {
-  std::ostringstream ssin;
+  JSONCPP_OSTRINGSTREAM ssin;
   ssin << sin.rdbuf();
   std::string doc = ssin.str();
   char const* begin = doc.data();
diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp
@@ -217,7 +217,7 @@ std::string valueToQuotedString(const char* value) {
     // sequence from occurring.
     default:
       if (isControlCharacter(*c)) {
-        std::ostringstream oss;
+        JSONCPP_OSTRINGSTREAM oss;
         oss << "\\u" << std::hex << std::uppercase << std::setfill('0')
             << std::setw(4) << static_cast<int>(*c);
         result += oss.str();
@@ -295,7 +295,7 @@ static std::string valueToQuotedStringN(const char* value, unsigned length) {
     // sequence from occurring.
     default:
       if ((isControlCharacter(*c)) || (*c == 0)) {
-        std::ostringstream oss;
+        JSONCPP_OSTRINGSTREAM oss;
         oss << "\\u" << std::hex << std::uppercase << std::setfill('0')
             << std::setw(4) << static_cast<int>(*c);
         result += oss.str();
@@ -1200,7 +1200,7 @@ void StreamWriterBuilder::setDefaults(Json::Value* settings)
 }
 
 std::string writeString(StreamWriter::Factory const& builder, Value const& root) {
-  std::ostringstream sout;
+  JSONCPP_OSTRINGSTREAM sout;
   StreamWriterPtr const writer(builder.newStreamWriter());
   writer->write(root, &sout);
   return sout.str();
diff --git a/src/test_lib_json/jsontest.h b/src/test_lib_json/jsontest.h
@@ -82,7 +82,7 @@ class TestResult {
 
   // Generic operator that will work with anything ostream can deal with.
   template <typename T> TestResult& operator<<(const T& value) {
-    std::ostringstream oss;
+    JSONCPP_OSTRINGSTREAM oss;
     oss.precision(16);
     oss.setf(std::ios_base::floatfield);
     oss << value;
diff --git a/src/test_lib_json/main.cpp b/src/test_lib_json/main.cpp
@@ -2480,13 +2480,13 @@ JSONTEST_FIXTURE(IteratorTest, const) {
 
   for(int i = 9; i < 12; ++i)
   {
-    std::ostringstream out;
+    JSONCPP_OSTRINGSTREAM out;
     out << std::setw(2) << i;
     std::string str = out.str();
     value[str] = str;
   }
 
-  std::ostringstream out;
+  JSONCPP_OSTRINGSTREAM out;
   //in old code, this will get a compile error
   Json::Value::const_iterator iter = value.begin();
   for(; iter != value.end(); ++iter)

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ static std::string useStyledStreamWriter(`
`178`	`178`	`Json::Value const& root)`
`179`	`179`	`{`
`180`	`180`	`Json::StyledStreamWriter writer;`
`181`		`- std::ostringstream sout;`
	`181`	`+ JSONCPP_OSTRINGSTREAM sout;`
`182`	`182`	`writer.write(sout, root);`
`183`	`183`	`return sout.str();`
`184`	`184`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2010,7 +2010,7 @@ bool parseFromStream(`
`2010`	`2010`	`CharReader::Factory const& fact, std::istream& sin,`
`2011`	`2011`	`Value* root, std::string* errs)`
`2012`	`2012`	`{`
`2013`		`- std::ostringstream ssin;`
	`2013`	`+ JSONCPP_OSTRINGSTREAM ssin;`
`2014`	`2014`	`ssin << sin.rdbuf();`
`2015`	`2015`	`std::string doc = ssin.str();`
`2016`	`2016`	`char const* begin = doc.data();`
Original file line number	Diff line number	Diff line change
`@@ -2480,13 +2480,13 @@ JSONTEST_FIXTURE(IteratorTest, const) {`
`2480`	`2480`
`2481`	`2481`	`for(int i = 9; i < 12; ++i)`
`2482`	`2482`	`{`
`2483`		`- std::ostringstream out;`
	`2483`	`+ JSONCPP_OSTRINGSTREAM out;`
`2484`	`2484`	`out << std::setw(2) << i;`
`2485`	`2485`	`std::string str = out.str();`
`2486`	`2486`	`value[str] = str;`
`2487`	`2487`	`}`
`2488`	`2488`
`2489`		`- std::ostringstream out;`
	`2489`	`+ JSONCPP_OSTRINGSTREAM out;`
`2490`	`2490`	`//in old code, this will get a compile error`
`2491`	`2491`	`Json::Value::const_iterator iter = value.begin();`
`2492`	`2492`	`for(; iter != value.end(); ++iter)`