From f1cafb6ded2d76392c6bffe71c4d06990a018f27 Mon Sep 17 00:00:00 2001 From: Gaurav Date: Sat, 4 Jul 2015 12:30:24 +0530 Subject: [PATCH 1/2] GCC warning removal for long long MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (was #300) I got below warning message on x86 linux machine : ``` "jsoncpp-0.10.2-p1/include/json/config.h:100: warning: ISO C++ 1998 does not support ‘long long’" gcc version 4.4.7 20120313 (Red Hat 4.4.7-4) (GCC) ``` In reference to * https://github.com/open-source-parsers/jsoncpp/pull/292 **long long** is supported in c++-11; for old compilers i.e `0.y.z` branch this patch should be merged. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b266b4..29ab19e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -99,7 +99,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") # using GCC - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wno-long-long") endif() IF(JSONCPP_WITH_WARNING_AS_ERROR) From ef38374e993747f53130191b5bf5ca5d1737a053 Mon Sep 17 00:00:00 2001 From: Gaurav Date: Sun, 5 Jul 2015 14:24:35 +0530 Subject: [PATCH 2/2] Gcc warning unused "tokenStart" (was #301) In `0.y.z` branch, `tokenStart` is not used. Comment it as done in other cases. --- src/lib_json/json_reader.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib_json/json_reader.cpp b/src/lib_json/json_reader.cpp index 9f9d4de..15e0304 100644 --- a/src/lib_json/json_reader.cpp +++ b/src/lib_json/json_reader.cpp @@ -1265,7 +1265,7 @@ bool OurReader::readStringSingleQuote() { return c == '\''; } -bool OurReader::readObject(Token& tokenStart) { +bool OurReader::readObject(Token& /*tokenStart*/) { Token tokenName; std::string name; Value init(objectValue); @@ -1326,7 +1326,7 @@ bool OurReader::readObject(Token& tokenStart) { "Missing '}' or object member name", tokenName, tokenObjectEnd); } -bool OurReader::readArray(Token& tokenStart) { +bool OurReader::readArray(Token& /*tokenStart*/) { Value init(arrayValue); currentValue().swapPayload(init); skipSpaces();