Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/include/internal
diff options
context:
space:
mode:
authorPhil Nash2017-04-25 12:13:16 +0100
committerPhil Nash2017-04-25 12:13:16 +0100
commit67005d290cac91ddbbf53dbe7fc9f803fbec9629 (patch)
treefdd8ab6b4eef3823aded25d698586a6c5fda5108 /include/internal
parentf57f96f1901431c1d8db9cfa47198fce2326d8ef (diff)
downloadcatch3-67005d290cac91ddbbf53dbe7fc9f803fbec9629.tar.gz
Removed more redundant compatibility stuff from timer
Diffstat (limited to 'include/internal')
-rw-r--r--include/internal/catch_timer.h3
-rw-r--r--include/internal/catch_timer.hpp9
2 files changed, 0 insertions, 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 <stdint.h>
-
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