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-15 07:14:45 +02:00 · 2015-02-15 03:03:47 -06:00 · 2015-02-15 03:03:47 -06:00 · 2015-02-15 03:03:47 -06:00 · 2015-02-15 03:03:29 -06:00 · 2015-02-15 03:03:28 -06:00
4 changed files with 8 additions and 13 deletions
--- a/amalgamate.py
+++ b/amalgamate.py
@@ -59,7 +59,7 @@ def amalgamate_source(source_top_dir=None,
    print("Amalgating header...")
    header = AmalgamationFile(source_top_dir)
    header.add_text("/// Json-cpp amalgated header (http://jsoncpp.sourceforge.net/).")
-    header.add_text('/// It is intended to be used with #include "%s"' % header_include_path)
+    header.add_text("/// It is intented to be used with #include <%s>" % header_include_path)
    header.add_file("LICENSE", wrap_in_comment=True)
    header.add_text("#ifndef JSON_AMALGATED_H_INCLUDED")
    header.add_text("# define JSON_AMALGATED_H_INCLUDED")
@@ -85,7 +85,7 @@ def amalgamate_source(source_top_dir=None,
    print("Amalgating forward header...")
    header = AmalgamationFile(source_top_dir)
    header.add_text("/// Json-cpp amalgated forward header (http://jsoncpp.sourceforge.net/).")
-    header.add_text('/// It is intended to be used with #include "%s"' % forward_header_include_path)
+    header.add_text("/// It is intented to be used with #include <%s>" % forward_header_include_path)
    header.add_text("/// This header provides forward declaration for all JsonCpp types.")
    header.add_file("LICENSE", wrap_in_comment=True)
    header.add_text("#ifndef JSON_FORWARD_AMALGATED_H_INCLUDED")
@@ -105,15 +105,10 @@ def amalgamate_source(source_top_dir=None,
    print("Amalgating source...")
    source = AmalgamationFile(source_top_dir)
    source.add_text("/// Json-cpp amalgated source (http://jsoncpp.sourceforge.net/).")
-    source.add_text('/// It is intended to be used with #include "%s"' % header_include_path)
+    source.add_text("/// It is intented to be used with #include <%s>" % header_include_path)
    source.add_file("LICENSE", wrap_in_comment=True)
    source.add_text("")
-    source.add_text('#include "%s"' % header_include_path)
-    source.add_text("""
-#ifndef JSON_IS_AMALGAMATION
-#error "Compile with -I PATH_TO_JSON_DIRECTORY"
-#endif
-""")
+    source.add_text("#include <%s>" % header_include_path)
    source.add_text("")
    lib_json = "src/lib_json"
    source.add_file(os.path.join(lib_json, "json_tool.h"))
--- a/include/json/assertions.h
+++ b/include/json/assertions.h
@@ -16,7 +16,7 @@
 #if JSON_USE_EXCEPTION
 #include <stdexcept>
 #define JSON_ASSERT(condition)                                                 \
-  if (!(condition)) {throw std::runtime_error( "assert json failed" );} // @todo <= add detail about condition in exception
+  assert(condition); // @todo <= change this into an exception throw
 #define JSON_FAIL_MESSAGE(message) do{std::ostringstream oss; oss << message; throw std::runtime_error(oss.str());}while(0)
 //#define JSON_FAIL_MESSAGE(message) throw std::runtime_error(message)
 #else // JSON_USE_EXCEPTION
--- 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.8.3"
+# define JSONCPP_VERSION_STRING "0.8.2"
 # define JSONCPP_VERSION_MAJOR 0
 # define JSONCPP_VERSION_MINOR 8
-# define JSONCPP_VERSION_PATCH 3
+# define JSONCPP_VERSION_PATCH 2
 # define JSONCPP_VERSION_QUALIFIER
 # define JSONCPP_VERSION_HEXA ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) | (JSONCPP_VERSION_PATCH << 8))

--- a/2
+++ b/2
@@ -1 +1 @@
-0.8.3
+0.8.2
Author	SHA1	Message	Date
Christopher Dunn	5b3e8a8984	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-02-15 03:03:47 -06:00
Christopher Dunn	4a6b5a33ed	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-02-15 03:03:47 -06:00
Christopher Dunn	37ea604585	revert 'Made it possible to drop null placeholders from array output.' revert `ae3c7a7aab`	2015-02-15 03:03:47 -06:00
Christopher Dunn	fd288c3750	Revert "added option to FastWriter which omits the trailing new line character" This reverts commit `5bf16105b5`.	2015-02-15 03:03:29 -06:00
Christopher Dunn	27c5762141	revert 'Added structured error reporting to Reader.' revert `68db655347` issue #147	2015-02-15 03:03:28 -06:00
Christopher Dunn	bc67af2210	revert 'Add public semantic error reporting' for binary-compatibility with 0.6.0 issue #147 was #57	2015-02-15 03:03:28 -06:00
Christopher Dunn	83f10358f8	Revert "Switch to copy-and-swap idiom for operator=." This reverts commit `45cd9490cd`. Ignored ValueInternal* changes, since those did not produce symbols for Debian build. (They must not have used the INTERNAL stuff.) 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-02-15 03:03:28 -06:00
Christopher Dunn	115f9b91cf	NOT C++11	2015-02-15 03:03:28 -06:00
Christopher Dunn	c56d73b9a2	0.8.z	2015-02-15 03:03:28 -06:00
@@ -1 +1 @@
 .8.3
 .8.2