Skip to content

Commit e105003

Browse files
committedFeb 6, 2016
gcc-6 lacks auto_ptr<>
1 parent dde8426 commit e105003

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed
 

‎src/lib_json/json_reader.cpp

+5-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,11 @@ static int stackDepth_g = 0; // see readValue()
4343

4444
namespace Json {
4545

46-
typedef std::auto_ptr<CharReader> CharReaderPtr;
46+
#if __GNUC__ >= 6
47+
typedef std::scoped_ptr<CharReader> const CharReaderPtr;
48+
#else
49+
typedef std::auto_ptr<CharReader> CharReaderPtr;
50+
#endif
4751

4852
// Implementation of class Features
4953
// ////////////////////////////////

‎src/lib_json/json_writer.cpp

+5-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,11 @@
5454

5555
namespace Json {
5656

57-
typedef std::auto_ptr<StreamWriter> StreamWriterPtr;
57+
#if __GNUC__ >= 6
58+
typedef std::scoped_ptr<StreamWriter> const StreamWriterPtr;
59+
#else
60+
typedef std::auto_ptr<StreamWriter> StreamWriterPtr;
61+
#endif
5862

5963
static bool containsControlCharacter(const char* str) {
6064
while (*str) {

0 commit comments

Comments
 (0)
Please sign in to comment.