From 92f700075fa0d7c2b31989edb7acd3e22d9a6591 Mon Sep 17 00:00:00 2001 From: Adam Strzelecki Date: Fri, 19 Oct 2012 01:14:35 +0200 Subject: [PATCH] -Wglobal-constructors should be ignored after push Actually it is -Wglobal-constructors which is supposed to be ignored, not -Wno-global-constructors. Moreover we should ignore it after push, otherwise we will ruin user settings. --- include/catch.hpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/catch.hpp b/include/catch.hpp index dc66cf00..b613df73 100644 --- a/include/catch.hpp +++ b/include/catch.hpp @@ -10,9 +10,8 @@ #define TWOBLUECUBES_CATCH_HPP_INCLUDED #ifdef __clang__ -#pragma clang diagnostic ignored "-Wno-global-constructors" - #pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wglobal-constructors" #pragma clang diagnostic ignored "-Wpadded" #endif