diff options
| author | Mattes D <github@xoft.cz> | 2014-03-14 16:16:33 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-03-14 16:16:33 +0100 |
| commit | 763ea2840b9403b2c515b026189eaaab560048b5 (patch) | |
| tree | 91a1ab3710a58e8996345f0de21ccb9ee9cbaa63 | |
| parent | Merge pull request #805 from worktycho/undef (diff) | |
| parent | Merge branch 'master' into noreturn (diff) | |
| download | cuberite-763ea2840b9403b2c515b026189eaaab560048b5.tar cuberite-763ea2840b9403b2c515b026189eaaab560048b5.tar.gz cuberite-763ea2840b9403b2c515b026189eaaab560048b5.tar.bz2 cuberite-763ea2840b9403b2c515b026189eaaab560048b5.tar.lz cuberite-763ea2840b9403b2c515b026189eaaab560048b5.tar.xz cuberite-763ea2840b9403b2c515b026189eaaab560048b5.tar.zst cuberite-763ea2840b9403b2c515b026189eaaab560048b5.zip | |
| -rw-r--r-- | SetFlags.cmake | 2 | ||||
| -rw-r--r-- | src/Bindings/LuaState.h | 2 | ||||
| -rw-r--r-- | src/DeadlockDetect.h | 2 | ||||
| -rw-r--r-- | src/Globals.h | 11 |
4 files changed, 14 insertions, 3 deletions
diff --git a/SetFlags.cmake b/SetFlags.cmake index cdafcaa83..b786da0d0 100644 --- a/SetFlags.cmake +++ b/SetFlags.cmake @@ -198,7 +198,7 @@ macro(set_exe_flags) add_flags_cxx("-Wno-error=covered-switch-default -Wno-error=shadow") add_flags_cxx("-Wno-error=exit-time-destructors -Wno-error=missing-variable-declarations") add_flags_cxx("-Wno-error=global-constructors -Wno-implicit-fallthrough") - add_flags_cxx("-Wno-missing-noreturn -Wno-error=unreachable-code") + add_flags_cxx("-Wno-error=unreachable-code") endif() endif() diff --git a/src/Bindings/LuaState.h b/src/Bindings/LuaState.h index 73f9629cb..f5cb8379d 100644 --- a/src/Bindings/LuaState.h +++ b/src/Bindings/LuaState.h @@ -200,7 +200,7 @@ public: void Push(const HTTPTemplateRequest * a_Request); void Push(cTNTEntity * a_TNTEntity); void Push(Vector3i * a_Vector); - void Push(void * a_Ptr); + NORETURNDEBUG void Push(void * a_Ptr); void Push(cHopperEntity * a_Hopper); void Push(cBlockEntity * a_BlockEntity); diff --git a/src/DeadlockDetect.h b/src/DeadlockDetect.h index cb2309169..6aa98acbb 100644 --- a/src/DeadlockDetect.h +++ b/src/DeadlockDetect.h @@ -60,7 +60,7 @@ protected: void CheckWorldAge(const AString & a_WorldName, Int64 a_Age); /// Called when a deadlock is detected. Aborts the server. - void DeadlockDetected(void); + NORETURN void DeadlockDetected(void); } ; diff --git a/src/Globals.h b/src/Globals.h index c2542f0d8..3e62832b7 100644 --- a/src/Globals.h +++ b/src/Globals.h @@ -45,6 +45,8 @@ #define SIZE_T_FMT "%Iu" #define SIZE_T_FMT_PRECISION(x) "%" #x "Iu" #define SIZE_T_FMT_HEX "%Ix" + + #define NORETURN __declspec(noreturn) #elif defined(__GNUC__) @@ -69,6 +71,8 @@ #define SIZE_T_FMT "%zu" #define SIZE_T_FMT_PRECISION(x) "%" #x "zu" #define SIZE_T_FMT_HEX "%zx" + + #define NORETURN __attribute((__noreturn__)) #else @@ -94,6 +98,13 @@ #endif +#ifdef _DEBUG + #define NORETURNDEBUG NORETURN +#else + #define NORETURNDEBUG +#endif + + #include <stddef.h> |