feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Fixed template instantiation warning (issue #35)

Browse Source
This commit is contained in:
Benoit Blanchon
2014-12-09 20:35:01 +01:00
parent 85ebc8a1ec
commit 8082185ac4
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/CMakeLists.txt
View File

@ -2,7 +2,7 @@ file(GLOB_RECURSE INC_FILES ../include/*.hpp)
file(GLOB_RECURSE SRC_FILES *.cpp) file(GLOB_RECURSE SRC_FILES *.cpp)
if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
add_definitions( add_compile_options(
-fno-exceptions -fno-exceptions
-pedantic -pedantic
-Wall -Wall
@ -31,12 +31,17 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
endif() endif()
if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU)") if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU)")
add_definitions( add_compile_options(
-Wlogical-op -Wlogical-op
-Wnoexcept -Wnoexcept
-Wstrict-null-sentinel -Wstrict-null-sentinel
) )
endif() endif()
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_compile_options(
-Wc++11-compat
)
endif()
add_library(ArduinoJson ${SRC_FILES} ${INC_FILES}) add_library(ArduinoJson ${SRC_FILES} ${INC_FILES})

4
src/Internals/List.cpp
View File

@ -31,5 +31,5 @@ void List<T>::removeNode(node_type *nodeToRemove) {
} }
} }
template class List<JsonPair>; template class ArduinoJson::Internals::List<JsonPair>;
template class List<JsonVariant>; template class ArduinoJson::Internals::List<JsonVariant>;