diff options
| author | Phil Nash | 2013-12-14 22:53:28 +0000 |
|---|---|---|
| committer | Phil Nash | 2013-12-14 22:53:28 +0000 |
| commit | 9d7b77956c8165f1c5c95497beeaaa8e12f93dcb (patch) | |
| tree | 1c759b3a50c92122941dc32d996cefad31da7652 /include | |
| parent | 859760abb44f07d56a4c24b28673e0b7b11849a2 (diff) | |
| download | catch3-9d7b77956c8165f1c5c95497beeaaa8e12f93dcb.tar.gz | |
build 19
- fixes nullptr regression (I had accidentally left in some dev changes)
Diffstat (limited to 'include')
| -rw-r--r-- | include/internal/catch_compiler_capabilities.h | 1 | ||||
| -rw-r--r-- | include/internal/catch_version.hpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/internal/catch_compiler_capabilities.h b/include/internal/catch_compiler_capabilities.h index 0644f9c0..905d7317 100644 --- a/include/internal/catch_compiler_capabilities.h +++ b/include/internal/catch_compiler_capabilities.h @@ -11,7 +11,6 @@ // Much of the following code is based on Boost (1.53) #ifdef __clang__ -#define CATCH_CONFIG_CPP11_NULLPTR #if __has_feature(cxx_nullptr) diff --git a/include/internal/catch_version.hpp b/include/internal/catch_version.hpp index 1ce459cc..62ce4115 100644 --- a/include/internal/catch_version.hpp +++ b/include/internal/catch_version.hpp @@ -13,7 +13,7 @@ namespace Catch { // These numbers are maintained by a script - Version libraryVersion( 1, 0, 18, "master" ); + Version libraryVersion( 1, 0, 19, "master" ); } #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED |