Merge pull request #3127 from jgarzik/smells-like-json-spirit

Revert recent json-spirit changes

1 files changed, 124 insertions, 124 deletions

diff --git a/src/json/json_spirit_reader.cpp b/src/json/json_spirit_reader.cpp
index 7dea07473..aa4f63722 100644
--- a/src/json/json_spirit_reader.cpp
+++ b/src/json/json_spirit_reader.cpp
@@ -1,137 +1,137 @@
-//          Copyright John W. Wilkinson 2007 - 2013
+//          Copyright John W. Wilkinson 2007 - 2009.
 // Distributed under the MIT License, see accompanying file LICENSE.txt
 
-// json spirit version 4.06
+// json spirit version 4.03
 
 #include "json_spirit_reader.h"
 #include "json_spirit_reader_template.h"
 
 using namespace json_spirit;
 
-#ifdef JSON_SPIRIT_VALUE_ENABLED
-    bool json_spirit::read( const std::string& s, Value& value )
-    {
-        return read_string( s, value );
-    }
-    
-    void json_spirit::read_or_throw( const std::string& s, Value& value )
-    {
-        read_string_or_throw( s, value );
-    }
-
-    bool json_spirit::read( std::istream& is, Value& value )
-    {
-        return read_stream( is, value );
-    }
-
-    void json_spirit::read_or_throw( std::istream& is, Value& value )
-    {
-        read_stream_or_throw( is, value );
-    }
-
-    bool json_spirit::read( std::string::const_iterator& begin, std::string::const_iterator end, Value& value )
-    {
-        return read_range( begin, end, value );
-    }
-
-    void json_spirit::read_or_throw( std::string::const_iterator& begin, std::string::const_iterator end, Value& value )
-    {
-        begin = read_range_or_throw( begin, end, value );
-    }
-#endif
+bool json_spirit::read( const std::string& s, Value& value )
+{
+    return read_string( s, value );
+}
+
+void json_spirit::read_or_throw( const std::string& s, Value& value )
+{
+    read_string_or_throw( s, value );
+}
+
+bool json_spirit::read( std::istream& is, Value& value )
+{
+    return read_stream( is, value );
+}
+
+void json_spirit::read_or_throw( std::istream& is, Value& value )
+{
+    read_stream_or_throw( is, value );
+}
+
+bool json_spirit::read( std::string::const_iterator& begin, std::string::const_iterator end, Value& value )
+{
+    return read_range( begin, end, value );
+}
+
+void json_spirit::read_or_throw( std::string::const_iterator& begin, std::string::const_iterator end, Value& value )
+{
+    begin = read_range_or_throw( begin, end, value );
+}
+
+#ifndef BOOST_NO_STD_WSTRING
+
+bool json_spirit::read( const std::wstring& s, wValue& value )
+{
+    return read_string( s, value );
+}
+
+void json_spirit::read_or_throw( const std::wstring& s, wValue& value )
+{
+    read_string_or_throw( s, value );
+}
+
+bool json_spirit::read( std::wistream& is, wValue& value )
+{
+    return read_stream( is, value );
+}
+
+void json_spirit::read_or_throw( std::wistream& is, wValue& value )
+{
+    read_stream_or_throw( is, value );
+}
+
+bool json_spirit::read( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wValue& value )
+{
+    return read_range( begin, end, value );
+}
+
+void json_spirit::read_or_throw( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wValue& value )
+{
+    begin = read_range_or_throw( begin, end, value );
+}
 
-#if defined( JSON_SPIRIT_WVALUE_ENABLED ) && !defined( BOOST_NO_STD_WSTRING )
-    bool json_spirit::read( const std::wstring& s, wValue& value )
-    {
-        return read_string( s, value );
-    }
-
-    void json_spirit::read_or_throw( const std::wstring& s, wValue& value )
-    {
-        read_string_or_throw( s, value );
-    }
-
-    bool json_spirit::read( std::wistream& is, wValue& value )
-    {
-        return read_stream( is, value );
-    }
-
-    void json_spirit::read_or_throw( std::wistream& is, wValue& value )
-    {
-        read_stream_or_throw( is, value );
-    }
-
-    bool json_spirit::read( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wValue& value )
-    {
-        return read_range( begin, end, value );
-    }
-
-    void json_spirit::read_or_throw( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wValue& value )
-    {
-        begin = read_range_or_throw( begin, end, value );
-    }
 #endif
 
-#ifdef JSON_SPIRIT_MVALUE_ENABLED
-    bool json_spirit::read( const std::string& s, mValue& value )
-    {
-        return read_string( s, value );
-    }
-
-    void json_spirit::read_or_throw( const std::string& s, mValue& value )
-    {
-        read_string_or_throw( s, value );
-    }
-    
-    bool json_spirit::read( std::istream& is, mValue& value )
-    {
-        return read_stream( is, value );
-    }
-
-    void json_spirit::read_or_throw( std::istream& is, mValue& value )
-    {
-        read_stream_or_throw( is, value );
-    }
-
-    bool json_spirit::read( std::string::const_iterator& begin, std::string::const_iterator end, mValue& value )
-    {
-        return read_range( begin, end, value );
-    }
-
-    void json_spirit::read_or_throw( std::string::const_iterator& begin, std::string::const_iterator end, mValue& value )
-    {
-        begin = read_range_or_throw( begin, end, value );
-    }
-#endif
+bool json_spirit::read( const std::string& s, mValue& value )
+{
+    return read_string( s, value );
+}
+
+void json_spirit::read_or_throw( const std::string& s, mValue& value )
+{
+    read_string_or_throw( s, value );
+}
+
+bool json_spirit::read( std::istream& is, mValue& value )
+{
+    return read_stream( is, value );
+}
+
+void json_spirit::read_or_throw( std::istream& is, mValue& value )
+{
+    read_stream_or_throw( is, value );
+}
+
+bool json_spirit::read( std::string::const_iterator& begin, std::string::const_iterator end, mValue& value )
+{
+    return read_range( begin, end, value );
+}
+
+void json_spirit::read_or_throw( std::string::const_iterator& begin, std::string::const_iterator end, mValue& value )
+{
+    begin = read_range_or_throw( begin, end, value );
+}
+
+#ifndef BOOST_NO_STD_WSTRING
+
+bool json_spirit::read( const std::wstring& s, wmValue& value )
+{
+    return read_string( s, value );
+}
+
+void json_spirit::read_or_throw( const std::wstring& s, wmValue& value )
+{
+    read_string_or_throw( s, value );
+}
+
+bool json_spirit::read( std::wistream& is, wmValue& value )
+{
+    return read_stream( is, value );
+}
+
+void json_spirit::read_or_throw( std::wistream& is, wmValue& value )
+{
+    read_stream_or_throw( is, value );
+}
+
+bool json_spirit::read( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wmValue& value )
+{
+    return read_range( begin, end, value );
+}
+
+void json_spirit::read_or_throw( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wmValue& value )
+{
+    begin = read_range_or_throw( begin, end, value );
+}
 
-#if defined( JSON_SPIRIT_WMVALUE_ENABLED ) && !defined( BOOST_NO_STD_WSTRING )
-    bool json_spirit::read( const std::wstring& s, wmValue& value )
-    {
-        return read_string( s, value );
-    }
-
-    void json_spirit::read_or_throw( const std::wstring& s, wmValue& value )
-    {
-        read_string_or_throw( s, value );
-    }
-
-    bool json_spirit::read( std::wistream& is, wmValue& value )
-    {
-        return read_stream( is, value );
-    }
-
-    void json_spirit::read_or_throw( std::wistream& is, wmValue& value )
-    {
-        read_stream_or_throw( is, value );
-    }
-
-    bool json_spirit::read( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wmValue& value )
-    {
-        return read_range( begin, end, value );
-    }
-
-    void json_spirit::read_or_throw( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wmValue& value )
-    {
-        begin = read_range_or_throw( begin, end, value );
-    }
 #endif