diff options
| author | Jeff Garzik <jgarzik@bitpay.com> | 2013-10-22 05:43:46 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@bitpay.com> | 2013-10-22 05:43:46 -0400 |
| commit | 406b1f05f61a7bba7ef6860c031a7a7c3e019100 (patch) | |
| tree | d64672cb2dac9d7bd5a6eeaea21b4f336903cfed /src/json/json_spirit_reader.h | |
| parent | 0db9a805bde5050060913462299690020ff798a0 (diff) | |
| download | bitcoin-406b1f05f61a7bba7ef6860c031a7a7c3e019100.tar.xz | |
Revert "JSON Spirit updated to v4.06"
This reverts commit 2227389fa8fa1b9ff19234838fc7b641e935125b.
Diffstat (limited to 'src/json/json_spirit_reader.h')
| -rw-r--r-- | src/json/json_spirit_reader.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/json/json_spirit_reader.h b/src/json/json_spirit_reader.h index f0dc5330f2..96494a9789 100644 --- a/src/json/json_spirit_reader.h +++ b/src/json/json_spirit_reader.h @@ -1,10 +1,10 @@ #ifndef JSON_SPIRIT_READER #define JSON_SPIRIT_READER -// 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 #if defined(_MSC_VER) && (_MSC_VER >= 1020) # pragma once @@ -18,7 +18,6 @@ namespace json_spirit { // functions to reads a JSON values -#ifdef JSON_SPIRIT_VALUE_ENABLED bool read( const std::string& s, Value& value ); bool read( std::istream& is, Value& value ); bool read( std::string::const_iterator& begin, std::string::const_iterator end, Value& value ); @@ -26,9 +25,9 @@ namespace json_spirit void read_or_throw( const std::string& s, Value& value ); void read_or_throw( std::istream& is, Value& value ); void read_or_throw( std::string::const_iterator& begin, std::string::const_iterator end, Value& value ); -#endif -#if defined( JSON_SPIRIT_WVALUE_ENABLED ) && !defined( BOOST_NO_STD_WSTRING ) +#ifndef BOOST_NO_STD_WSTRING + bool read( const std::wstring& s, wValue& value ); bool read( std::wistream& is, wValue& value ); bool read( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wValue& value ); @@ -36,9 +35,9 @@ namespace json_spirit void read_or_throw( const std::wstring& s, wValue& value ); void read_or_throw( std::wistream& is, wValue& value ); void read_or_throw( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wValue& value ); + #endif -#ifdef JSON_SPIRIT_MVALUE_ENABLED bool read( const std::string& s, mValue& value ); bool read( std::istream& is, mValue& value ); bool read( std::string::const_iterator& begin, std::string::const_iterator end, mValue& value ); @@ -46,9 +45,9 @@ namespace json_spirit void read_or_throw( const std::string& s, mValue& value ); void read_or_throw( std::istream& is, mValue& value ); void read_or_throw( std::string::const_iterator& begin, std::string::const_iterator end, mValue& value ); -#endif -#if defined( JSON_SPIRIT_WMVALUE_ENABLED ) && !defined( BOOST_NO_STD_WSTRING ) +#ifndef BOOST_NO_STD_WSTRING + bool read( const std::wstring& s, wmValue& value ); bool read( std::wistream& is, wmValue& value ); bool read( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wmValue& value ); @@ -56,6 +55,7 @@ namespace json_spirit void read_or_throw( const std::wstring& s, wmValue& value ); void read_or_throw( std::wistream& is, wmValue& value ); void read_or_throw( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wmValue& value ); + #endif } |