Merge pull request open-source-parsers#367 from Dani-Hub/issue-350-unique_ptr-2

cdunn2001 · cdunn2001 · commit 6992831c1c35 · 2015-09-28T11:27:29.000-05:00
__cplusplus value should not be used to decide for std::unique_ptr resolves open-source-parsers#350
diff --git a/src/lib_json/json_reader.cpp b/src/lib_json/json_reader.cpp
@@ -43,7 +43,7 @@ static int       stackDepth_g = 0;  // see readValue()
 
 namespace Json {
 
-#if __cplusplus >= 201103L
+#if __cplusplus >= 201103L || (defined(_CPPLIB_VER) && _CPPLIB_VER >= 520)
 typedef std::unique_ptr<CharReader> CharReaderPtr;
 #else
 typedef std::auto_ptr<CharReader>   CharReaderPtr;
diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp
@@ -54,7 +54,7 @@
 
 namespace Json {
 
-#if __cplusplus >= 201103L
+#if __cplusplus >= 201103L || (defined(_CPPLIB_VER) && _CPPLIB_VER >= 520)
 typedef std::unique_ptr<StreamWriter> StreamWriterPtr;
 #else
 typedef std::auto_ptr<StreamWriter>   StreamWriterPtr;
