1.4.3 <- 1.4.2

fix typo: issue #177
Merge pull request #173 from cdunn2001/fix-include-amal
2025-10-15 07:14:45 +02:00 · 2015-02-18 09:20:28 -06:00 · 2015-02-18 09:17:06 -06:00 · 2015-02-15 13:11:38 -06:00 · 2015-02-15 13:06:48 -06:00 · 2015-02-15 13:06:48 -06:00
4 changed files with 13 additions and 8 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 intented to be used with #include <%s>" % header_include_path)
+    header.add_text('/// It is intended 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 intented to be used with #include <%s>" % forward_header_include_path)
+    header.add_text('/// It is intended 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,10 +105,15 @@ 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 intented to be used with #include <%s>" % header_include_path)
+    source.add_text('/// It is intended 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('#include "%s"' % header_include_path)
+    source.add_text("""
+#ifndef JSON_IS_AMALGAMATION
+#error "Compile with -I PATH_TO_JSON_DIRECTORY"
+#endif
+""")
    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)                                                 \
-  assert(condition); // @todo <= change this into an exception throw
+  if (!(condition)) {throw std::runtime_error( "assert json failed" );} // @todo <= add detail about condition in exception
 #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 "1.4.2"
+# define JSONCPP_VERSION_STRING "1.4.3"
 # define JSONCPP_VERSION_MAJOR 1
 # define JSONCPP_VERSION_MINOR 4
-# define JSONCPP_VERSION_PATCH 2
+# define JSONCPP_VERSION_PATCH 3
 # 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 @@
-1.4.2
+1.4.3
Author	SHA1	Message	Date
Christopher Dunn	30d923f155	1.4.3 <- 1.4.2	2015-02-18 09:20:28 -06:00
Christopher Dunn	2f4e40bc95	fix typo: issue #177	2015-02-18 09:17:06 -06:00
Christopher Dunn	505e086ebc	Merge pull request #173 from cdunn2001/fix-include-amal help use of amalgamated header Reviewed by "Lightness Races in Orbit" at StackOverflow.	2015-02-15 13:11:38 -06:00
Christopher Dunn	c6582415d8	fix typos	2015-02-15 13:06:48 -06:00
Christopher Dunn	0ee7e2426f	help use of amalgamated header * Include from same-directory first, so `-I DIR` is rarely needed. * Double-check that proper header has been included. http://stackoverflow.com/questions/28510109/linking-problems-with-jsoncpp	2015-02-15 13:06:48 -06:00
Christopher Dunn	1522e4dfb1	Merge pull request #174 from kobigurk/kobigurk-patch-asserts only throws exceptions JSON_USE_EXCEPTION	2015-02-15 12:05:28 -06:00
Kobi Gurkan	09b8670536	only throws exceptions JSON_USE_EXCEPTION JSON_ASSERT now throws a runtime_error	2015-02-15 18:00:31 +02:00
@@ -1 +1 @@
 .4.2
 .4.3