From 532731e6f4c0d843d355ff8f2d9f63e4e7854e6a Mon Sep 17 00:00:00 2001 From: bibo38 Date: Thu, 21 Dec 2017 12:36:58 +0100 Subject: Fixed Clang 5.0 compile errors (#4085) * Fixed Clang 5.0 compile errors * Fixed wrong comment * Only disable warnings in Clang 5 or higher * Added a CMake condition for the Clang 5 no-zero-as-null-pointer-constant warning * Now using the use_nullptr branch of the Cuberite specific SQLiteCpp fork --- src/main.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index e3d4542dd..5e6872a9a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -72,6 +72,12 @@ bool cRoot::m_RunAsService = false; #ifndef _DEBUG +// Because SIG_DFL or SIG_IGN could be NULL instead of nullptr, we need to disable the Clang warning here +#if __clang_major__ >= 5 + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant" +#endif + static void NonCtrlHandler(int a_Signal) { LOGD("Terminate event raised from std::signal"); @@ -115,6 +121,10 @@ static void NonCtrlHandler(int a_Signal) default: break; } } + +#if __clang_major__ >= 5 + #pragma clang diagnostic pop +#endif #endif // _DEBUG -- cgit v1.2.3