From e105003bb5cc6eea8b65d43386d0d6fd81657d5c Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Sat, 6 Feb 2016 08:24:20 -0600 Subject: [PATCH] gcc-6 lacks auto_ptr<> --- src/lib_json/json_reader.cpp | 6 +++++- src/lib_json/json_writer.cpp | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/lib_json/json_reader.cpp b/src/lib_json/json_reader.cpp index a32d184..290e0b1 100644 --- a/src/lib_json/json_reader.cpp +++ b/src/lib_json/json_reader.cpp @@ -43,7 +43,11 @@ static int stackDepth_g = 0; // see readValue() namespace Json { -typedef std::auto_ptr CharReaderPtr; +#if __GNUC__ >= 6 +typedef std::scoped_ptr const 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 892fb37..9b51e5a 100644 --- a/src/lib_json/json_writer.cpp +++ b/src/lib_json/json_writer.cpp @@ -54,7 +54,11 @@ namespace Json { -typedef std::auto_ptr StreamWriterPtr; +#if __GNUC__ >= 6 +typedef std::scoped_ptr const StreamWriterPtr; +#else +typedef std::auto_ptr StreamWriterPtr; +#endif static bool containsControlCharacter(const char* str) { while (*str) {