Unconditionally include <string> and <iostream> in json_reader.cpp

third_party/jsoncpp/overrides/src/lib_json/json_reader.cpp

 // Copyright 2007-2011 Baptiste Lepilleur
 // Distributed under MIT license, or public domain if desired and
 // recognized in your jurisdiction.
 // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
 
 #if !defined(JSON_IS_AMALGAMATION)
 # include <json/assertions.h>
 # include <json/reader.h>
 # include <json/value.h>
 # include "json_tool.h"
 #endif // if !defined(JSON_IS_AMALGAMATION)
 #include <utility>
 #include <cstdio>
 #include <cassert>
 #include <cstring>
 #include <stdexcept>
-#ifdef __pnacl__
 // This file uses the following headers (at least in Reader::parse), but
 // the upstream version doesn't include them because iostream pulls in
-// static initializers.  This breaks the PNaCl build because it uses
-// libc++ which declares getline in <string> (as per the C++ standard)
+// static initializers.  This breaks builds that use libc++ (including PNaCl),
+// because libc++ declares getline in <string> (as per the C++ standard)
 // but defines it in <iostream>. The code therefore fails linking, which

[Nico, 2014/05/19 19:23:04]

As iostream causes static initializers, that seems like a bug in libc++. It
should be defined in some other stream header probably.

 // these includes fix.
 #include <string>
 #include <iostream>
-#endif
 
 #if _MSC_VER >= 1400 // VC++ 8.0
 #pragma warning( disable : 4996 )   // disable warning about strdup being deprecated.
 #endif
 
 namespace Json {
 
 // Implementation of class Features
 // ////////////////////////////////
 
@@ skipping 882 matching lines @@
           "Error from reader: %s",
           reader.getFormattedErrorMessages().c_str());
 
       JSON_FAIL_MESSAGE("reader error");
     }
     return sin;
 }
 
 
 } // namespace Json