diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2013-10-22 01:20:02 -0700 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2013-10-22 01:20:02 -0700 |
| commit | 125bdead3e9be9a6ce23129409612a4d8501980b (patch) | |
| tree | 9b87499106f280a32edab404351c5b7e3835e046 /src/json/json_spirit_utils.h | |
| parent | 8435f7b8ee2521d11364f400cf63e9fb3f2c8a7d (diff) | |
| parent | 2ecb7555a9df1e843fd25f588819e4ca1d94b266 (diff) | |
Merge pull request #2740 from constantined/constantined
UTF-8 support for JSON-RPC
Diffstat (limited to 'src/json/json_spirit_utils.h')
| -rw-r--r-- | src/json/json_spirit_utils.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/json/json_spirit_utils.h b/src/json/json_spirit_utils.h index 553e3b96a4..a174ac3a98 100644 --- a/src/json/json_spirit_utils.h +++ b/src/json/json_spirit_utils.h @@ -1,10 +1,10 @@ #ifndef JSON_SPIRIT_UTILS #define JSON_SPIRIT_UTILS -// 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 @@ -37,9 +37,11 @@ namespace json_spirit } } +#ifdef JSON_SPIRIT_VALUE_ENABLED typedef std::map< std::string, Value > Mapped_obj; +#endif -#ifndef BOOST_NO_STD_WSTRING +#if defined( JSON_SPIRIT_WVALUE_ENABLED ) && !defined( BOOST_NO_STD_WSTRING ) typedef std::map< std::wstring, wValue > wMapped_obj; #endif |