summaryrefslogtreecommitdiff
path: root/json/json.h
diff options
context:
space:
mode:
Diffstat (limited to 'json/json.h')
-rw-r--r--json/json.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/json/json.h b/json/json.h
index 51a38e65..da91470a 100644
--- a/json/json.h
+++ b/json/json.h
@@ -308,7 +308,7 @@ typedef UInt64 LargestUInt;
std::basic_istringstream<char, std::char_traits<char>, \
Json::SecureAllocator<char> >
#define JSONCPP_ISTREAM std::istream
-#else
+#elif !defined(JSONCPP_STRING)
#define JSONCPP_STRING std::string
#define JSONCPP_OSTRINGSTREAM std::ostringstream
#define JSONCPP_OSTREAM std::ostream