Progmasoft Git

catch3

Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.

Clonegit clone https://git.progmasoft.com/catch3

Use (locally defined) UInt64 instead of uint64_t

- typedefs long long for MSVC
- typedefs uint64_t otherwise

Should probably do finer grained compiler checking - but this should at least be better than what was there before
Commit
2bf30e9e5ab6555bc78e708687842a920d65f4b9
Author
Phil Nash ·
Parents
b591cb9a0384

Files · Download .tar.gz

Changes

 include/internal/catch_timer.h | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/include/internal/catch_timer.h b/include/internal/catch_timer.h
index 22e9e635..fb61846c 100644
--- a/include/internal/catch_timer.h
+++ b/include/internal/catch_timer.h
@@ -10,13 +10,14 @@
 
 #include "catch_platform.h"
 
-#ifdef CATCH_PLATFORM_WINDOWS
-typedef unsigned long long uint64_t;
-#else
 #include <stdint.h>
-#endif
 
 namespace Catch {
+#ifdef _MSC_VER
+    typedef unsigned long long UInt64;
+#else
+    typedef uint64_t UInt64;
+#endif
 
     class Timer {
     public:
@@ -27,7 +28,7 @@ namespace Catch {
         double getElapsedSeconds() const;
 
     private:
-        uint64_t m_ticks;
+        UInt64 m_ticks;
     };
 
 } // namespace Catch