From 211b3303465e53baccf3c020276df4d2de02a65d Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Tue, 25 Apr 2017 08:43:14 +0100 Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20unconditionally=20#include=20=20(as=20earlier=20MSVC=20don=E2=80=99t=20have=20it)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/internal/catch_timer.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/include/internal/catch_timer.h b/include/internal/catch_timer.h index fb61846c..607aa6bb 100644 --- a/include/internal/catch_timer.h +++ b/include/internal/catch_timer.h @@ -10,15 +10,20 @@ #include "catch_platform.h" -#include +#ifdef _MSC_VER namespace Catch { -#ifdef _MSC_VER typedef unsigned long long UInt64; +} #else +#include +namespace Catch { typedef uint64_t UInt64; +} #endif + +namespace Catch { class Timer { public: Timer() : m_ticks( 0 ) {}