fix version error from 0.10.6 to 0.10.7 (#1304 )

Co-authored-by: wei-liu <wei.liu@tusimple.ai>
fixed bug of version string 0.10.6->0.10.7 (#891 )
2025-10-14 15:05:34 +02:00 · 2021-12-14 18:10:08 -08:00 · 2019-02-28 22:20:09 -06:00 · 2018-06-22 11:32:58 -05:00 · 2017-04-23 01:12:31 -05:00 · 2017-04-21 15:50:11 +01:00
8 changed files with 32 additions and 10 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,7 +65,7 @@ ENDMACRO()
 #SET( JSONCPP_VERSION_MAJOR X )
 #SET( JSONCPP_VERSION_MINOR Y )
 #SET( JSONCPP_VERSION_PATCH Z )
-SET( JSONCPP_VERSION 0.10.6 )
+SET( JSONCPP_VERSION 0.10.7 )
 jsoncpp_parse_version( ${JSONCPP_VERSION} JSONCPP_VERSION )
 #IF(NOT JSONCPP_VERSION_FOUND)
 #    MESSAGE(FATAL_ERROR "Failed to parse version string properly. Expect X.Y.Z")
--- a/include/json/config.h
+++ b/include/json/config.h
@@ -51,6 +51,16 @@
 #define JSON_API
 #endif

+#if !defined(JSON_HAS_UNIQUE_PTR)
+#if __cplusplus >= 201103L
+#define JSON_HAS_UNIQUE_PTR (1)
+#elif _MSC_VER >= 1600
+#define JSON_HAS_UNIQUE_PTR (1)
+#else
+#define JSON_HAS_UNIQUE_PTR (0)
+#endif
+#endif
+
 // If JSON_NO_INT64 is defined, then Json only support C++ "int" type for
 // integer
 // Storages, and 64 bits integer support is disabled.
--- a/include/json/value.h
+++ b/include/json/value.h
@@ -216,7 +216,12 @@ public:
  static const UInt64 maxUInt64;
 #endif // defined(JSON_HAS_INT64)

+//MW: workaround for bug in NVIDIAs CUDA 7.5 nvcc compiler
+#ifdef  __NVCC__
+public:
+#else
 private:
+#endif //__NVCC__
 #ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
  class CZString {
  public:
--- a/include/json/version.h
+++ b/include/json/version.h
@@ -3,10 +3,10 @@
 #ifndef JSON_VERSION_H_INCLUDED
 # define JSON_VERSION_H_INCLUDED

-# define JSONCPP_VERSION_STRING "0.10.6"
+# define JSONCPP_VERSION_STRING "0.10.7"
 # define JSONCPP_VERSION_MAJOR 0
 # define JSONCPP_VERSION_MINOR 10
-# define JSONCPP_VERSION_PATCH 6
+# define JSONCPP_VERSION_PATCH 7
 # define JSONCPP_VERSION_QUALIFIER
 # define JSONCPP_VERSION_HEXA ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) | (JSONCPP_VERSION_PATCH << 8))

--- a/src/lib_json/json_reader.cpp
+++ b/src/lib_json/json_reader.cpp
@@ -18,7 +18,9 @@
 #include <memory>
 #include <set>
 #include <limits>
-
+#if defined(__BORLANDC__)
+#include <stdio.h>
+#endif
 #if defined(_MSC_VER)
 #if !defined(WINCE) && defined(__STDC_SECURE_LIB__) && _MSC_VER >= 1500 // VC++ 9.0 and above 
 #define snprintf sprintf_s
@@ -43,8 +45,8 @@ static int       stackDepth_g = 0;  // see readValue()

 namespace Json {

-#if __GNUC__ >= 6
-typedef std::scoped_ptr<CharReader> const  CharReaderPtr;
+#if JSON_HAS_UNIQUE_PTR
+typedef std::unique_ptr<CharReader> const  CharReaderPtr;
 #else
 typedef std::auto_ptr<CharReader>          CharReaderPtr;
 #endif
--- a/src/lib_json/json_value.cpp
+++ b/src/lib_json/json_value.cpp
@@ -18,7 +18,9 @@
 #endif
 #include <cstddef> // size_t
 #include <algorithm> // min()
-
+#if defined(__BORLANDC__)
+#include <mem.h>
+#endif
 #define JSON_ASSERT_UNREACHABLE assert(false)

 namespace Json {
--- a/src/lib_json/json_writer.cpp
+++ b/src/lib_json/json_writer.cpp
@@ -16,6 +16,9 @@
 #include <cstring>
 #include <cstdio>

+#if defined(__BORLANDC__)
+#include <stdio.h>
+#endif
 #if defined(_MSC_VER) && _MSC_VER >= 1200 && _MSC_VER < 1800 // Between VC++ 6.0 and VC++ 11.0
 #include <float.h>
 #define isfinite _finite
@@ -54,8 +57,8 @@

 namespace Json {

-#if __GNUC__ >= 6
-typedef std::scoped_ptr<StreamWriter> const  StreamWriterPtr;
+#if JSON_HAS_UNIQUE_PTR
+typedef std::unique_ptr<StreamWriter> const  StreamWriterPtr;
 #else
 typedef std::auto_ptr<StreamWriter>          StreamWriterPtr;
 #endif
--- a/2
+++ b/2
@@ -1 +1 @@
-0.10.6
+0.10.7
Author	SHA1	Message	Date
Wei Liu	6edfae4890	fix version error from 0.10.6 to 0.10.7 (#1304 ) Co-authored-by: wei-liu <wei.liu@tusimple.ai>	2021-12-14 18:10:08 -08:00
chliang	de95c1115a	fixed bug of version string 0.10.6->0.10.7 (#891 ) * fixed bug of version string 0.10.6->0.10.7 * fixed bug of CMakeLists.txt， 0.10.6->0.10.7 * fixed bug of CMakeLists.txt， 0.10.6->0.10.7	2019-02-28 22:20:09 -06:00
phy0292	ba3fd41292	BORLAND compatible	2018-06-22 11:32:58 -05:00
Christopher Dunn	3cde9a9912	Merge pull request #604 from AbigailBuccaneer/gcc6-unique-ptr Use std::unique_ptr correctly across compiler and language versions	2017-04-23 01:12:31 -05:00
AbigailBuccaneer	347e1ae46b	Use unique_ptr instead of auto_ptr when possible Previously we only used it on GCC 6 to avoid deprecated declaration warnings. Now we are proactive and use it whenever compiling as C++11 (or MSVC2010+). It also moves the logic for deciding between unique_ptr and auto_ptr into a single location in config.h. This fixes some use cases that were previously broken, including: * CXX=clang++ -std=c++11 -Werror=deprecated-declarations * CXX=g++-6 -std=c++03 -Werror=deprecated-declarations	2017-04-21 15:50:11 +01:00
AbigailBuccaneer	1335f70bbb	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.	2017-04-21 15:44:02 +01:00
Christopher Dunn	3eda8a63ca	Merge pull request #491 from mwiesenberger/0.y.z workaround for cuda 7.5 nvcc compiler	2016-06-27 18:44:51 -05:00
Matthias	0e3fffd242	workaround for cuda 7.5 nvcc compiler	2016-06-27 15:38:56 +02:00
@@ -1 +1 @@
 .10.6
 .10.7