From 832b39471512fa9543f981053573fb6b3342a396 Mon Sep 17 00:00:00 2001 From: peterbell10 Date: Fri, 22 Dec 2017 18:25:46 +0000 Subject: Fix Travis build (#4101) Stop using gdb on osx - was breaking the build Add clang 3.5 build as travis now defaults to 5.0 Fix unknown-warning-option errors on AppleClang ProtoProxy: Use nullptr UrlClientTest: add override to callback destructor Update jsoncpp to use nullptr --- src/main.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 5e6872a9a..e1ed078e0 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -73,10 +73,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 +#ifdef __clang__ #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wunknown-warning-option" + #pragma clang diagnostic ignored "-Wunknown-pragmas" #pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant" -#endif +#endif // __clang__ static void NonCtrlHandler(int a_Signal) { @@ -122,9 +124,9 @@ static void NonCtrlHandler(int a_Signal) } } -#if __clang_major__ >= 5 +#ifdef __clang__ #pragma clang diagnostic pop -#endif +#endif // __clang__ #endif // _DEBUG -- cgit v1.2.3