From b20294604c5a64a39b3c5f4491b653e4cf2a3c20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matti=20H=C3=A4nninen?= Date: Wed, 5 Aug 2015 01:24:59 +0300 Subject: Fix old style casts and implicit conversions --- src/Bindings/CMakeLists.txt | 1 + src/Bindings/LuaFunctions.h | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'src/Bindings') diff --git a/src/Bindings/CMakeLists.txt b/src/Bindings/CMakeLists.txt index edcda273e..673109ffa 100644 --- a/src/Bindings/CMakeLists.txt +++ b/src/Bindings/CMakeLists.txt @@ -146,6 +146,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") + set_source_files_properties(${CMAKE_SOURCE_DIR}/src/Bindings/Bindings.cpp PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS} "-Wno-old-style-cast -Wno-missing-prototypes") set_source_files_properties(LuaWindow.cpp PROPERTIES COMPILE_FLAGS "-Wno-error=switch-enum") endif() diff --git a/src/Bindings/LuaFunctions.h b/src/Bindings/LuaFunctions.h index be1d9aaa9..929794893 100644 --- a/src/Bindings/LuaFunctions.h +++ b/src/Bindings/LuaFunctions.h @@ -2,11 +2,13 @@ #include "Logger.h" #include +#include // tolua_begin inline unsigned int GetTime() { - return (unsigned int)time(0); + // NB: For caveats, please see http://stackoverflow.com/a/14505248 + return static_cast(std::chrono::seconds(time(0)).count()); } inline std::string GetChar( std::string & a_Str, unsigned int a_Idx) -- cgit v1.2.3