Skip to content

Commit dbda2aa

Browse files
committed
Merge pull request #307 from cdunn2001/gaurav-fix-warnings
fix warnings (-Wno-long-long and unused tokenStart) * closes #300 * closes #301
2 parents a13303e + ef38374 commit dbda2aa

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
9999
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
100100
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
101101
# using GCC
102-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic")
102+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wno-long-long")
103103
endif()
104104

105105
IF(JSONCPP_WITH_WARNING_AS_ERROR)

src/lib_json/json_reader.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1265,7 +1265,7 @@ bool OurReader::readStringSingleQuote() {
12651265
return c == '\'';
12661266
}
12671267

1268-
bool OurReader::readObject(Token& tokenStart) {
1268+
bool OurReader::readObject(Token& /*tokenStart*/) {
12691269
Token tokenName;
12701270
std::string name;
12711271
Value init(objectValue);
@@ -1326,7 +1326,7 @@ bool OurReader::readObject(Token& tokenStart) {
13261326
"Missing '}' or object member name", tokenName, tokenObjectEnd);
13271327
}
13281328

1329-
bool OurReader::readArray(Token& tokenStart) {
1329+
bool OurReader::readArray(Token& /*tokenStart*/) {
13301330
Value init(arrayValue);
13311331
currentValue().swapPayload(init);
13321332
skipSpaces();

0 commit comments

Comments
 (0)