From 67005d290cac91ddbbf53dbe7fc9f803fbec9629 Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Tue, 25 Apr 2017 12:13:16 +0100 Subject: [PATCH] Removed more redundant compatibility stuff from timer --- include/internal/catch_timer.h | 3 --- include/internal/catch_timer.hpp | 9 --------- 2 files changed, 12 deletions(-) diff --git a/include/internal/catch_timer.h b/include/internal/catch_timer.h index 1d690160..6e8cf089 100644 --- a/include/internal/catch_timer.h +++ b/include/internal/catch_timer.h @@ -8,11 +8,8 @@ #ifndef TWOBLUECUBES_CATCH_TIMER_H_INCLUDED #define TWOBLUECUBES_CATCH_TIMER_H_INCLUDED -#include "catch_platform.h" - #include - namespace Catch { class Timer { public: diff --git a/include/internal/catch_timer.hpp b/include/internal/catch_timer.hpp index d8bcfce9..52de3e83 100644 --- a/include/internal/catch_timer.hpp +++ b/include/internal/catch_timer.hpp @@ -9,11 +9,6 @@ #include "catch_timer.h" #include "catch_platform.h" -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wc++11-long-long" -#endif - #ifdef CATCH_PLATFORM_WINDOWS # include "catch_windows_h_proxy.h" @@ -61,7 +56,3 @@ namespace Catch { } } // namespace Catch - -#ifdef __clang__ -#pragma clang diagnostic pop -#endif