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

summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorPhil Nash2017-04-25 14:23:06 +0000
committerPhil Nash2017-04-25 14:23:06 +0000
commita0ada2e935324db5c951571c52c9b07307ea422f (patch)
tree41f5563fa84dc0bc391668365beac8b6028ad43a
parente4694f58da1b1c1ae84cf213ceb5bdc6a38489e9 (diff)
downloadcatch3-1.9.3.tar.gz
v1.9.3v1.9.3
-rw-r--r--README.md2
-rw-r--r--docs/release-notes.md5
-rw-r--r--include/internal/catch_version.hpp2
-rw-r--r--single_include/catch.hpp16
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)
-<a href="https://github.com/philsquared/Catch/releases/download/v1.9.2/catch.hpp">The latest, single header, version can be downloaded directly using this link</a>
+<a href="https://github.com/philsquared/Catch/releases/download/v1.9.3/catch.hpp">The latest, single header, version can be downloaded directly using this link</a>
## 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<LARGE_INTEGER*>( &hz ) );
QueryPerformanceCounter( reinterpret_cast<LARGE_INTEGER*>( &hzo ) );
}
- uint64_t t;
+ UInt64 t;
QueryPerformanceCounter( reinterpret_cast<LARGE_INTEGER*>( &t ) );
return ((t-hzo)*1000000)/hz;
}
#else
- uint64_t getCurrentTicks() {
+ UInt64 getCurrentTicks() {
timeval t;
gettimeofday(&t,CATCH_NULL);
- return static_cast<uint64_t>( t.tv_sec ) * 1000000ull + static_cast<uint64_t>( t.tv_usec );
+ return static_cast<UInt64>( t.tv_sec ) * 1000000ull + static_cast<UInt64>( t.tv_usec );
}
#endif
}