Permalink
Browse files

Got rid of several unnecessary includes of <iostream>.

Including <iostream> causes the file to be polluted with a static
initializer for the __ioinit symbol. This can harm binary startup time.
For more info, see here:

    http://neugierig.org/software/chromium/notes/2011/08/static-initializers.html

git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@247 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  • Loading branch information...
1 parent e3d1414 commit e7d82caf2c64a02fa1ac893c823d57600596f198 aaronjacobs committed with rjeczalik Dec 22, 2011
View
@@ -13,7 +13,6 @@
# include <deque>
# include <stack>
# include <string>
-# include <iostream>
namespace Json {
View
@@ -11,7 +11,6 @@
#endif // if !defined(JSON_IS_AMALGAMATION)
# include <vector>
# include <string>
-# include <iostream>
namespace Json {
@@ -7,7 +7,6 @@
# define CPPTL_JSON_ASSERTIONS_H_INCLUDED
#include <stdlib.h>
-#include <iostream>
#if !defined(JSON_IS_AMALGAMATION)
# include <json/config.h>
@@ -18,7 +17,13 @@
#define JSON_FAIL_MESSAGE( message ) throw std::runtime_error( message );
#else // JSON_USE_EXCEPTION
#define JSON_ASSERT( condition ) assert( condition );
-#define JSON_FAIL_MESSAGE( message ) { std::cerr << std::endl << message << std::endl; exit(123); }
+
+// The call to assert() will show the failure message in debug builds. In
+// release bugs we write to invalid memory in order to crash hard instead of
+// calling exit(), so that a debugger or crash reporter gets the chance to take
+// over.
+#define JSON_FAIL_MESSAGE( message ) { assert(false && message); strcpy(reinterpret_cast<char*>(666), message); }
+
#endif
#define JSON_ASSERT_MESSAGE( condition, message ) if (!( condition )) { JSON_FAIL_MESSAGE( message ) }
@@ -13,7 +13,6 @@
#include <cstdio>
#include <cassert>
#include <cstring>
-#include <iostream>
#include <stdexcept>
#if _MSC_VER >= 1400 // VC++ 8.0
@@ -904,7 +903,14 @@ std::istream& operator>>( std::istream &sin, Value &root )
{
Json::Reader reader;
bool ok = reader.parse(sin, root, true);
- if (!ok) JSON_FAIL_MESSAGE(reader.getFormattedErrorMessages());
+ if (!ok) {
+ fprintf(
+ stderr,
+ "Error from reader: %s",
+ reader.getFormattedErrorMessages().c_str());
+
+ JSON_FAIL_MESSAGE("reader error");
+ }
return sin;
}
@@ -12,7 +12,6 @@
# endif // #ifndef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
#endif // if !defined(JSON_IS_AMALGAMATION)
#include <math.h>
-#include <iostream>
#include <sstream>
#include <utility>
#include <stdexcept>
@@ -11,7 +11,6 @@
#include <assert.h>
#include <stdio.h>
#include <string.h>
-#include <iostream>
#include <sstream>
#include <iomanip>

0 comments on commit e7d82ca

Please sign in to comment.