From bfa3f863d64b1eff3082c781c026a45a7c6938a3 Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Tue, 19 May 2015 18:23:52 +0100 Subject: [PATCH] Removed some more warnings --- projects/SelfTest/ToStringTuple.cpp | 9 +++++++++ .../CatchSelfTest.xcodeproj/project.pbxproj | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/projects/SelfTest/ToStringTuple.cpp b/projects/SelfTest/ToStringTuple.cpp index 012ee665..d1ab02f2 100644 --- a/projects/SelfTest/ToStringTuple.cpp +++ b/projects/SelfTest/ToStringTuple.cpp @@ -2,6 +2,11 @@ #ifdef CATCH_CPP11_OR_GREATER +#ifdef __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wc++98-compat" +#endif + TEST_CASE( "tuple<>", "[toString][tuple]" ) { typedef std::tuple<> type; @@ -44,5 +49,9 @@ TEST_CASE( "tuple", "[toString][tuple]" ) CHECK( "{ nullptr, 42, \"Catch me\" }" == Catch::toString(value) ); } +#ifdef __clang__ +#pragma clang diagnostic pop +#endif + #endif /* #ifdef CATCH_CPP11_OR_GREATER */ diff --git a/projects/XCode/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj b/projects/XCode/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj index 6658ca69..9afd9bdf 100644 --- a/projects/XCode/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj +++ b/projects/XCode/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj @@ -511,7 +511,7 @@ 4A6D0C17149B3D3B00DB3EAA /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0600; + LastUpgradeCheck = 0630; }; buildConfigurationList = 4A6D0C1A149B3D3B00DB3EAA /* Build configuration list for PBXProject "CatchSelfTest" */; compatibilityVersion = "Xcode 3.2"; @@ -596,6 +596,7 @@ GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -647,6 +648,7 @@ ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_NO_COMMON_BLOCKS = YES; GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES; GCC_VERSION = com.apple.compilers.llvm.clang.1_0;