From a0ada2e935324db5c951571c52c9b07307ea422f Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Tue, 25 Apr 2017 14:23:06 +0000 Subject: [PATCH] v1.9.3 --- README.md | 2 +- docs/release-notes.md | 5 +++++ include/internal/catch_version.hpp | 2 +- single_include/catch.hpp | 16 ++++++++-------- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index f4f30fd3..3f93d794 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![Build Status](https://travis-ci.org/philsquared/Catch.svg?branch=master)](https://travis-ci.org/philsquared/Catch) [![Build status](https://ci.appveyor.com/api/projects/status/hrtk60hv6tw6fght/branch/master?svg=true)](https://ci.appveyor.com/project/philsquared/catch/branch/master) -The latest, single header, version can be downloaded directly using this link +The latest, single header, version can be downloaded directly using this link ## What's the Catch? diff --git a/docs/release-notes.md b/docs/release-notes.md index 99445eb5..8b12188b 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -1,3 +1,8 @@ +# 1.9.3 + +### Fixes +* Completed the fix for (lack of) uint64_t in earlier Visual Studios + # 1.9.2 ### Improvements and minor changes diff --git a/include/internal/catch_version.hpp b/include/internal/catch_version.hpp index fdf3be6e..7092f7b7 100644 --- a/include/internal/catch_version.hpp +++ b/include/internal/catch_version.hpp @@ -38,7 +38,7 @@ namespace Catch { } inline Version libraryVersion() { - static Version version( 1, 9, 2, "", 0 ); + static Version version( 1, 9, 3, "", 0 ); return version; } diff --git a/single_include/catch.hpp b/single_include/catch.hpp index f0d5e756..599eee90 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -1,6 +1,6 @@ /* - * Catch v1.9.2 - * Generated: 2017-04-25 10:41:53.040184 + * Catch v1.9.3 + * Generated: 2017-04-25 14:16:29.434734 * ---------------------------------------------------------- * This file has been merged from multiple headers. Please don't edit it directly * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. @@ -8282,7 +8282,7 @@ namespace Catch { } inline Version libraryVersion() { - static Version version( 1, 9, 2, "", 0 ); + static Version version( 1, 9, 3, "", 0 ); return version; } @@ -8468,21 +8468,21 @@ namespace Catch { namespace { #ifdef CATCH_PLATFORM_WINDOWS - uint64_t getCurrentTicks() { - static uint64_t hz=0, hzo=0; + UInt64 getCurrentTicks() { + static UInt64 hz=0, hzo=0; if (!hz) { QueryPerformanceFrequency( reinterpret_cast( &hz ) ); QueryPerformanceCounter( reinterpret_cast( &hzo ) ); } - uint64_t t; + UInt64 t; QueryPerformanceCounter( reinterpret_cast( &t ) ); return ((t-hzo)*1000000)/hz; } #else - uint64_t getCurrentTicks() { + UInt64 getCurrentTicks() { timeval t; gettimeofday(&t,CATCH_NULL); - return static_cast( t.tv_sec ) * 1000000ull + static_cast( t.tv_usec ); + return static_cast( t.tv_sec ) * 1000000ull + static_cast( t.tv_usec ); } #endif }