partially revert 'Added features that allow the reader to accept common non-standard JSON.'

revert '642befc836ac5093b528e7d8b4fd66b66735a98c', but keep the *added* methods for `decodedNumber()` and `decodedDouble()`.
partially revert 'fix bug for static init'
2025-10-14 15:05:34 +02:00 · 2015-03-15 14:25:04 -05:00 · 2015-03-15 14:25:04 -05:00 · 2015-03-15 14:25:04 -05:00 · 2015-03-15 14:25:04 -05:00 · 2015-03-15 14:25:04 -05:00
5 changed files with 7 additions and 7 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,7 +60,7 @@ ENDMACRO(jsoncpp_parse_version)
 #SET( JSONCPP_VERSION_MAJOR X )
 #SET( JSONCPP_VERSION_MINOR Y )
 #SET( JSONCPP_VERSION_PATCH Z )
-SET( JSONCPP_VERSION 0.10.1 )
+SET( JSONCPP_VERSION 1.10.0 )
 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/doxybuild.py
+++ b/doxybuild.py
@@ -31,7 +31,7 @@ def find_program(*filenames):
    paths = os.environ.get('PATH', '').split(os.pathsep)
    suffixes = ('win32' in sys.platform) and '.exe .com .bat .cmd' or ''
    for filename in filenames:
-        for name in [filename+ext for ext in suffixes.split(' ')]:
+        for name in [filename+ext for ext in suffixes.split()]:
            for directory in paths:
                full_path = os.path.join(directory, name)
                if os.path.isfile(full_path):
--- a/include/json/version.h
+++ b/include/json/version.h
@@ -4,10 +4,10 @@
 #ifndef JSON_VERSION_H_INCLUDED
 # define JSON_VERSION_H_INCLUDED

-# define JSONCPP_VERSION_STRING "0.10.1"
-# define JSONCPP_VERSION_MAJOR 0
+# define JSONCPP_VERSION_STRING "1.10.0"
+# define JSONCPP_VERSION_MAJOR 1
 # define JSONCPP_VERSION_MINOR 10
-# define JSONCPP_VERSION_PATCH 1
+# define JSONCPP_VERSION_PATCH 0
 # 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_writer.cpp
+++ b/src/lib_json/json_writer.cpp
@@ -29,7 +29,7 @@

 #if defined(_MSC_VER) && _MSC_VER < 1500 // VC++ 8.0 and below
 #define snprintf _snprintf
-#elif __cplusplus >= 201103L
+#else
 #define snprintf std::snprintf
 #endif

--- a/2
+++ b/2
@@ -1 +1 @@
-0.10.1
+1.10.0
Author	SHA1	Message	Date
Christopher Dunn	1021ff66d3	partially revert 'Added features that allow the reader to accept common non-standard JSON.' revert '642befc836ac5093b528e7d8b4fd66b66735a98c', but keep the added methods for `decodedNumber()` and `decodedDouble()`.	2015-03-15 14:25:04 -05:00
Christopher Dunn	f3aa9c1201	partially revert 'fix bug for static init' re: `28836b8acc` A global instance of a Value (viz. 'null') was a mistake, but dropping it breaks binary-compatibility. So we will keep it everywhere except the one platform where it was crashing, ARM.	2015-03-15 14:25:04 -05:00
Christopher Dunn	b0879b2ab8	revert 'Made it possible to drop null placeholders from array output.' revert `ae3c7a7aab`	2015-03-15 14:25:04 -05:00
Christopher Dunn	3feaf29075	Revert "added option to FastWriter which omits the trailing new line character" This reverts commit `5bf16105b5`.	2015-03-15 14:25:04 -05:00
Christopher Dunn	360153687d	revert 'Added structured error reporting to Reader.' revert `68db655347` issue #147	2015-03-15 14:25:04 -05:00
Christopher Dunn	a67d378236	revert 'Add public semantic error reporting' for binary-compatibility with 0.6.0 issue #147 was #57	2015-03-15 14:25:04 -05:00
Christopher Dunn	e7f6e91381	partially revert "Switch to copy-and-swap idiom for operator=." This partially reverts commit `45cd9490cd`. Ignored ValueInternal* changes, since those did not produce symbols for Debian build. (They must not have used the INTERNAL stuff.) Ignored CZString changes since those are private (and sizeof struct did not change). https://github.com/open-source-parsers/jsoncpp/issues/78 Conflicts: include/json/value.h src/lib_json/json_internalarray.inl src/lib_json/json_internalmap.inl src/lib_json/json_value.cpp	2015-03-15 14:25:04 -05:00
Christopher Dunn	f025d8d225	NOT C++11	2015-03-15 14:25:04 -05:00
Christopher Dunn	a3007ee301	0.10.z (based on 1.6.z, but binary-compat w/ 0.6.0-rc2)	2015-03-15 14:24:50 -05:00
Christopher Dunn	c2040ec371	prefer std::string for setComment() in case of embedded nulls	2015-03-15 13:50:00 -05:00
@@ -1 +1 @@
 .10.1
 .10.0