From db7ad7579413b13cfe3e81b601427172fd72e377 Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Thu, 9 Apr 2015 17:45:35 -0700 Subject: [PATCH] Don't use unique_ptr on pre-c++11 branch Don't use C++11 unique_ptr in the 0.y.z branch. Although this usage is guarded with __cplusplus >= 201103 some build configurations (notably chromium) use a C++11-compliant compiler but a pre-11 library. pull #238 --- src/lib_json/json_reader.cpp | 4 ---- src/lib_json/json_writer.cpp | 4 ---- 2 files changed, 8 deletions(-) diff --git a/src/lib_json/json_reader.cpp b/src/lib_json/json_reader.cpp index 6e26794..590bb2a 100644 --- a/src/lib_json/json_reader.cpp +++ b/src/lib_json/json_reader.cpp @@ -32,11 +32,7 @@ static int stackDepth_g = 0; // see readValue() namespace Json { -#if __cplusplus >= 201103L -typedef std::unique_ptr CharReaderPtr; -#else typedef std::auto_ptr CharReaderPtr; -#endif // Implementation of class Features // //////////////////////////////// diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp index 5510eb1..6ec3820 100644 --- a/src/lib_json/json_writer.cpp +++ b/src/lib_json/json_writer.cpp @@ -40,11 +40,7 @@ namespace Json { -#if __cplusplus >= 201103L -typedef std::unique_ptr StreamWriterPtr; -#else typedef std::auto_ptr StreamWriterPtr; -#endif static bool containsControlCharacter(const char* str) { while (*str) {