From 6aa601cd5127a7d1e2e0ecc7ec89dd1d86d4571a Mon Sep 17 00:00:00 2001 From: "Philipp A. Hartmann" Date: Tue, 8 Jul 2014 15:12:02 +0200 Subject: [PATCH] perftest.h/unittest.h: fix pragma ordering --- test/perftest/perftest.h | 2 +- test/unittest/unittest.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/perftest/perftest.h b/test/perftest/perftest.h index 86d53c6..0f42a6c 100644 --- a/test/perftest/perftest.h +++ b/test/perftest/perftest.h @@ -30,10 +30,10 @@ #endif #if defined(__clang__) || defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) -#pragma GCC diagnostic ignored "-Weffc++" #if defined(__clang__) || (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) #pragma GCC diagnostic push #endif +#pragma GCC diagnostic ignored "-Weffc++" #endif #include "gtest/gtest.h" diff --git a/test/unittest/unittest.h b/test/unittest/unittest.h index 0fbe568..75d2bc4 100644 --- a/test/unittest/unittest.h +++ b/test/unittest/unittest.h @@ -14,10 +14,10 @@ #endif #if defined(__clang__) || defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) -#pragma GCC diagnostic ignored "-Weffc++" #if defined(__clang__) || (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) #pragma GCC diagnostic push #endif +#pragma GCC diagnostic ignored "-Weffc++" #endif #include "gtest/gtest.h"