From 1335f70bbbaf618fd3989f6163da9fd499efdf61 Mon Sep 17 00:00:00 2001 From: AbigailBuccaneer Date: Fri, 21 Apr 2017 15:44:02 +0100 Subject: [PATCH] Use std::unique_ptr instead of std::scoped_ptr scoped_ptr has never been a part of the C++ standard - perhaps it's been confused with boost::scoped_ptr. Anyhow, std::unique_ptr is the replacement for the now-deprecated std::auto_ptr. --- src/lib_json/json_reader.cpp | 2 +- src/lib_json/json_writer.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib_json/json_reader.cpp b/src/lib_json/json_reader.cpp index 290e0b1..c133168 100644 --- a/src/lib_json/json_reader.cpp +++ b/src/lib_json/json_reader.cpp @@ -44,7 +44,7 @@ static int stackDepth_g = 0; // see readValue() namespace Json { #if __GNUC__ >= 6 -typedef std::scoped_ptr const CharReaderPtr; +typedef std::unique_ptr const CharReaderPtr; #else typedef std::auto_ptr CharReaderPtr; #endif diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp index f2eb200..a04c66b 100644 --- a/src/lib_json/json_writer.cpp +++ b/src/lib_json/json_writer.cpp @@ -55,7 +55,7 @@ namespace Json { #if __GNUC__ >= 6 -typedef std::scoped_ptr const StreamWriterPtr; +typedef std::unique_ptr const StreamWriterPtr; #else typedef std::auto_ptr StreamWriterPtr; #endif