aboutsummaryrefslogtreecommitdiff
path: root/src/json/json_spirit_utils.h
diff options
context:
space:
mode:
authorconstantined <nobody@constantined.com>2013-07-23 04:48:14 +0300
committerconstantined <nobody@constantined.com>2013-07-23 04:48:14 +0300
commit2227389fa8fa1b9ff19234838fc7b641e935125b (patch)
tree8c8459f756467a2310ea0f386c22c059d3831b75 /src/json/json_spirit_utils.h
parentc83d4d2170bf00863bd5c21c6eaea91b00390e72 (diff)
downloadbitcoin-2227389fa8fa1b9ff19234838fc7b641e935125b.tar.xz
JSON Spirit updated to v4.06
Diffstat (limited to 'src/json/json_spirit_utils.h')
-rw-r--r--src/json/json_spirit_utils.h8
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