diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-04-17 14:02:20 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-04-17 14:02:20 +0200 |
| commit | 18c3b18a3fa1c2cfc14a321884744e5985383991 (patch) | |
| tree | 3b7144011ff62e75dd4d074db18fd139827d3a3f | |
| parent | Implemented weighted pressure plates (diff) | |
| download | cuberite-18c3b18a3fa1c2cfc14a321884744e5985383991.tar cuberite-18c3b18a3fa1c2cfc14a321884744e5985383991.tar.gz cuberite-18c3b18a3fa1c2cfc14a321884744e5985383991.tar.bz2 cuberite-18c3b18a3fa1c2cfc14a321884744e5985383991.tar.lz cuberite-18c3b18a3fa1c2cfc14a321884744e5985383991.tar.xz cuberite-18c3b18a3fa1c2cfc14a321884744e5985383991.tar.zst cuberite-18c3b18a3fa1c2cfc14a321884744e5985383991.zip | |
| -rw-r--r-- | SetFlags.cmake | 8 | ||||
| -rw-r--r-- | src/Simulator/IncrementalRedstoneSimulator.h | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/SetFlags.cmake b/SetFlags.cmake index c5a3a0697..6c974ea94 100644 --- a/SetFlags.cmake +++ b/SetFlags.cmake @@ -46,6 +46,10 @@ macro(set_flags) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++11") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++11") else() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++0x") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++0x") + add_flags_cxx("-pthread") endif() @@ -56,6 +60,10 @@ macro(set_flags) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++11") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++11") + else() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++0x") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++0x") endif() # We use a signed char (fixes #640 on RasPi) diff --git a/src/Simulator/IncrementalRedstoneSimulator.h b/src/Simulator/IncrementalRedstoneSimulator.h index f52c50f9c..a42cce79a 100644 --- a/src/Simulator/IncrementalRedstoneSimulator.h +++ b/src/Simulator/IncrementalRedstoneSimulator.h @@ -168,9 +168,9 @@ private: /** Returns if lever metadata marks it as emitting power */ - inline bool IsLeverOn(NIBBLETYPE a_BlockMeta); + bool IsLeverOn(NIBBLETYPE a_BlockMeta); /** Returns if button metadata marks it as emitting power */ - inline bool IsButtonOn(NIBBLETYPE a_BlockMeta) { return IsLeverOn(a_BlockMeta); } + bool IsButtonOn(NIBBLETYPE a_BlockMeta) { return IsLeverOn(a_BlockMeta); } /* ============================== */ /* ====== Misc Functions ====== */ |