diff options
| author | constantined <nobody@constantined.com> | 2013-07-23 04:48:14 +0300 |
|---|---|---|
| committer | constantined <nobody@constantined.com> | 2013-07-23 04:48:14 +0300 |
| commit | 2227389fa8fa1b9ff19234838fc7b641e935125b (patch) | |
| tree | 8c8459f756467a2310ea0f386c22c059d3831b75 /src/json/json_spirit_reader.h | |
| parent | c83d4d2170bf00863bd5c21c6eaea91b00390e72 (diff) | |
| download | bitcoin-2227389fa8fa1b9ff19234838fc7b641e935125b.tar.xz | |
JSON Spirit updated to v4.06
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 96494a9789..f0dc5330f2 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 - 2009. +// Copyright John W. Wilkinson 2007 - 2013 // Distributed under the MIT License, see accompanying file LICENSE.txt -// json spirit version 4.03 +// json spirit version 4.06 #if defined(_MSC_VER) && (_MSC_VER >= 1020) # pragma once @@ -18,6 +18,7 @@ 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 ); @@ -25,9 +26,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 -#ifndef BOOST_NO_STD_WSTRING - +#if defined( JSON_SPIRIT_WVALUE_ENABLED ) && !defined( 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 ); @@ -35,9 +36,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 ); @@ -45,9 +46,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 -#ifndef BOOST_NO_STD_WSTRING - +#if defined( JSON_SPIRIT_WMVALUE_ENABLED ) && !defined( 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 ); @@ -55,7 +56,6 @@ 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 } |