3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-08 23:29:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed "no-" from Wno-global-constructors when disabling

Browse Source
This commit is contained in:
Phil Nash 2012-10-30 09:09:30 +00:00
parent 5efa4bcb8a
commit 778f9c4fc7
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/catch.hpp
View File

@ -10,7 +10,7 @@
#define TWOBLUECUBES_CATCH_HPP_INCLUDED #define TWOBLUECUBES_CATCH_HPP_INCLUDED
#ifdef __clang__ #ifdef __clang__
#pragma clang diagnostic ignored "-Wno-global-constructors" #pragma clang diagnostic ignored "-Wglobal-constructors"
#pragma clang diagnostic push #pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wpadded" #pragma clang diagnostic ignored "-Wpadded"

2
projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj
View File

@ -555,7 +555,6 @@
WARNING_CFLAGS = ( WARNING_CFLAGS = (
"-Weverything", "-Weverything",
"-Wno-disabled-macro-expansion", "-Wno-disabled-macro-expansion",
"-Wno-global-constructors",
); );
}; };
name = Debug; name = Debug;
@ -569,7 +568,6 @@
WARNING_CFLAGS = ( WARNING_CFLAGS = (
"-Weverything", "-Weverything",
"-Wno-disabled-macro-expansion", "-Wno-disabled-macro-expansion",
"-Wno-global-constructors",
); );
}; };
name = Release; name = Release;

4
single_include/catch.hpp
View File

@ -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 * This file has been merged from multiple headers. Please don't edit it directly
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@ -13,7 +13,7 @@
#define TWOBLUECUBES_CATCH_HPP_INCLUDED #define TWOBLUECUBES_CATCH_HPP_INCLUDED
#ifdef __clang__ #ifdef __clang__
#pragma clang diagnostic ignored "-Wno-global-constructors" #pragma clang diagnostic ignored "-Wglobal-constructors"
#pragma clang diagnostic push #pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wpadded" #pragma clang diagnostic ignored "-Wpadded"