diff --git a/CMakeLists.txt b/CMakeLists.txt index bf0e1e68d..0cfaf53d8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,12 +59,12 @@ ENDMACRO() #SET( JSONCPP_VERSION_MAJOR X ) #SET( JSONCPP_VERSION_MINOR Y ) #SET( JSONCPP_VERSION_PATCH Z ) -SET( JSONCPP_VERSION 1.8.2 ) +SET( JSONCPP_VERSION 1.8.3 ) 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") #ENDIF(NOT JSONCPP_VERSION_FOUND) -SET( JSONCPP_SOVERSION 11 ) +SET( JSONCPP_SOVERSION 19 ) SET( JSONCPP_USE_SECURE_MEMORY "0" CACHE STRING "-D...=1 to use memory-wiping allocator for STL" ) MESSAGE(STATUS "JsonCpp Version: ${JSONCPP_VERSION_MAJOR}.${JSONCPP_VERSION_MINOR}.${JSONCPP_VERSION_PATCH}") diff --git a/include/json/version.h b/include/json/version.h index d95396189..b1d2a5ff4 100644 --- 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 "1.8.2" +# define JSONCPP_VERSION_STRING "1.8.3" # define JSONCPP_VERSION_MAJOR 1 # define JSONCPP_VERSION_MINOR 8 -# 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)) diff --git a/meson.build b/meson.build index 010e06b27..f2a6800f8 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project( 'jsoncpp', 'cpp', - version : '1.8.2', + version : '1.8.3', default_options : [ 'buildtype=release', 'warning_level=1'], @@ -52,7 +52,7 @@ jsoncpp_lib = library( 'src/lib_json/json_reader.cpp', 'src/lib_json/json_value.cpp', 'src/lib_json/json_writer.cpp'], - soversion : 18, + soversion : 19, install : true, include_directories : jsoncpp_include_directories) diff --git a/src/jsontestrunner/main.cpp b/src/jsontestrunner/main.cpp index c4cfa05a5..d24d7cfb7 100644 --- a/src/jsontestrunner/main.cpp +++ b/src/jsontestrunner/main.cpp @@ -3,6 +3,9 @@ // recognized in your jurisdiction. // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + /* This executable is used for testing parser/writer using real JSON files. */ @@ -324,3 +327,5 @@ int main(int argc, const char* argv[]) { return 1; } } + +#pragma GCC diagnostic pop diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp index 02f1cb11b..802f96c1d 100644 --- a/src/lib_json/json_writer.cpp +++ b/src/lib_json/json_writer.cpp @@ -582,7 +582,7 @@ void StyledWriter::writeCommentBeforeValue(const Value& root) { while (iter != comment.end()) { document_ += *iter; if (*iter == '\n' && - (iter != comment.end() && *(iter + 1) == '/')) + ((iter+1) != comment.end() && *(iter + 1) == '/')) writeIndent(); ++iter; } @@ -798,7 +798,7 @@ void StyledStreamWriter::writeCommentBeforeValue(const Value& root) { while (iter != comment.end()) { *document_ << *iter; if (*iter == '\n' && - (iter != comment.end() && *(iter + 1) == '/')) + ((iter+1) != comment.end() && *(iter + 1) == '/')) // writeIndent(); // would include newline *document_ << indentString_; ++iter; @@ -1086,7 +1086,7 @@ void BuiltStyledStreamWriter::writeCommentBeforeValue(Value const& root) { while (iter != comment.end()) { *sout_ << *iter; if (*iter == '\n' && - (iter != comment.end() && *(iter + 1) == '/')) + ((iter+1) != comment.end() && *(iter + 1) == '/')) // writeIndent(); // would write extra newline *sout_ << indentString_; ++iter; diff --git a/src/test_lib_json/main.cpp b/src/test_lib_json/main.cpp index 44f6591ed..26e01cd05 100644 --- a/src/test_lib_json/main.cpp +++ b/src/test_lib_json/main.cpp @@ -3,6 +3,9 @@ // recognized in your jurisdiction. // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #include "jsontest.h" #include #include @@ -2587,3 +2590,5 @@ int main(int argc, const char* argv[]) { return runner.runCommandLine(argc, argv); } + +#pragma GCC diagnostic pop diff --git a/version b/version index 53adb84c8..a7ee35a3e 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.8.2 +1.8.3