mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-08 23:29:53 +01:00
Removed more redundant compatibility stuff from timer
This commit is contained in:
parent
f57f96f190
commit
67005d290c
@ -8,11 +8,8 @@
|
|||||||
#ifndef TWOBLUECUBES_CATCH_TIMER_H_INCLUDED
|
#ifndef TWOBLUECUBES_CATCH_TIMER_H_INCLUDED
|
||||||
#define TWOBLUECUBES_CATCH_TIMER_H_INCLUDED
|
#define TWOBLUECUBES_CATCH_TIMER_H_INCLUDED
|
||||||
|
|
||||||
#include "catch_platform.h"
|
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
|
|
||||||
namespace Catch {
|
namespace Catch {
|
||||||
class Timer {
|
class Timer {
|
||||||
public:
|
public:
|
||||||
|
@ -9,11 +9,6 @@
|
|||||||
#include "catch_timer.h"
|
#include "catch_timer.h"
|
||||||
#include "catch_platform.h"
|
#include "catch_platform.h"
|
||||||
|
|
||||||
#ifdef __clang__
|
|
||||||
#pragma clang diagnostic push
|
|
||||||
#pragma clang diagnostic ignored "-Wc++11-long-long"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CATCH_PLATFORM_WINDOWS
|
#ifdef CATCH_PLATFORM_WINDOWS
|
||||||
|
|
||||||
# include "catch_windows_h_proxy.h"
|
# include "catch_windows_h_proxy.h"
|
||||||
@ -61,7 +56,3 @@ namespace Catch {
|
|||||||
}
|
}
|
||||||
|
|
||||||
} // namespace Catch
|
} // namespace Catch
|
||||||
|
|
||||||
#ifdef __clang__
|
|
||||||
#pragma clang diagnostic pop
|
|
||||||
#endif
|
|
||||||
|
Loading…
Reference in New Issue
Block a user