diff options
| author | Matti Hänninen <matti@mjhanninen.com> | 2015-08-05 00:24:59 +0200 |
|---|---|---|
| committer | Matti Hänninen <matti@mjhanninen.com> | 2015-08-12 15:51:38 +0200 |
| commit | b20294604c5a64a39b3c5f4491b653e4cf2a3c20 (patch) | |
| tree | ab1b84a09987f8ebe9d1e8450f36375c0f9bc5db /src/Bindings | |
| parent | Merge pull request #2425 from cuberite/APIDumpNameChange (diff) | |
| download | cuberite-b20294604c5a64a39b3c5f4491b653e4cf2a3c20.tar cuberite-b20294604c5a64a39b3c5f4491b653e4cf2a3c20.tar.gz cuberite-b20294604c5a64a39b3c5f4491b653e4cf2a3c20.tar.bz2 cuberite-b20294604c5a64a39b3c5f4491b653e4cf2a3c20.tar.lz cuberite-b20294604c5a64a39b3c5f4491b653e4cf2a3c20.tar.xz cuberite-b20294604c5a64a39b3c5f4491b653e4cf2a3c20.tar.zst cuberite-b20294604c5a64a39b3c5f4491b653e4cf2a3c20.zip | |
Diffstat (limited to 'src/Bindings')
| -rw-r--r-- | src/Bindings/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/Bindings/LuaFunctions.h | 4 |
2 files changed, 4 insertions, 1 deletions
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 <time.h> +#include <chrono> // tolua_begin inline unsigned int GetTime() { - return (unsigned int)time(0); + // NB: For caveats, please see http://stackoverflow.com/a/14505248 + return static_cast<unsigned int>(std::chrono::seconds(time(0)).count()); } inline std::string GetChar( std::string & a_Str, unsigned int a_Idx) |