From 86a8fdf3fe0e4f21d49053acf29410346f247fab Mon Sep 17 00:00:00 2001 From: peterbell10 Date: Fri, 27 Apr 2018 22:22:41 +0100 Subject: [PATCH] tolua++ bindings use nullptr. (#4219) Fixes compilation with -Wzero-as-null-pointer-constant. --- lib/tolua++ | 2 +- src/Bindings/CMakeLists.txt | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/tolua++ b/lib/tolua++ index 988cab37e..4a814cf17 160000 --- a/lib/tolua++ +++ b/lib/tolua++ @@ -1 +1 @@ -Subproject commit 988cab37e47a9efd7366d0d43babc58e068968d0 +Subproject commit 4a814cf1759c8a1d0917344397a84c917c74de97 diff --git a/src/Bindings/CMakeLists.txt b/src/Bindings/CMakeLists.txt index 7aaa5f3a6..2d1d4d57c 100644 --- a/src/Bindings/CMakeLists.txt +++ b/src/Bindings/CMakeLists.txt @@ -168,10 +168,7 @@ set_source_files_properties(${BINDING_OUTPUTS} PROPERTIES GENERATED TRUE) set_source_files_properties(${CMAKE_SOURCE_DIR}/src/Bindings/Bindings.cpp PROPERTIES COMPILE_FLAGS -Wno-error) if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - if(NOT APPLE AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5) # Workaround for VERSION_GREATER_EQUAL, which is only supported on CMake 3.7+ - set(ADDITIONAL_FLAGS "-Wno-zero-as-null-pointer-constant") - endif() - set_source_files_properties(Bindings.cpp PROPERTIES COMPILE_FLAGS "-Wno-old-style-cast -Wno-missing-prototypes ${ADDITIONAL_FLAGS}") + set_source_files_properties(Bindings.cpp PROPERTIES COMPILE_FLAGS "-Wno-old-style-cast -Wno-missing-prototypes") endif() if(NOT MSVC)