From 778f9c4fc7fa66566679d9f1d8a721079d8589bf Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Tue, 30 Oct 2012 09:09:30 +0000 Subject: [PATCH] Removed "no-" from Wno-global-constructors when disabling --- include/catch.hpp | 2 +- .../CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj | 2 -- single_include/catch.hpp | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/include/catch.hpp b/include/catch.hpp index a045f123..219b6172 100644 --- a/include/catch.hpp +++ b/include/catch.hpp @@ -10,7 +10,7 @@ #define TWOBLUECUBES_CATCH_HPP_INCLUDED #ifdef __clang__ -#pragma clang diagnostic ignored "-Wno-global-constructors" +#pragma clang diagnostic ignored "-Wglobal-constructors" #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wpadded" diff --git a/projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj b/projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj index 94250631..63c8d5b2 100644 --- a/projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj +++ b/projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj @@ -555,7 +555,6 @@ WARNING_CFLAGS = ( "-Weverything", "-Wno-disabled-macro-expansion", - "-Wno-global-constructors", ); }; name = Debug; @@ -569,7 +568,6 @@ WARNING_CFLAGS = ( "-Weverything", "-Wno-disabled-macro-expansion", - "-Wno-global-constructors", ); }; name = Release; diff --git a/single_include/catch.hpp b/single_include/catch.hpp index 6f036e98..6d6b891e 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -1,5 +1,5 @@ /* - * Generated: 2012-10-29 20:48:55.345250 + * Generated: 2012-10-30 09:08:37.538907 * ---------------------------------------------------------- * This file has been merged from multiple headers. Please don't edit it directly * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. @@ -13,7 +13,7 @@ #define TWOBLUECUBES_CATCH_HPP_INCLUDED #ifdef __clang__ -#pragma clang diagnostic ignored "-Wno-global-constructors" +#pragma clang diagnostic ignored "-Wglobal-constructors" #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wpadded"