Release 1.24.3

- Add to_string(nullptr_t) for VC10 onwards - Fix std::tie for VC12
martinmoene · Nov 12, 2015 · 03b66a3 · 03b66a3
1 parent 920bf42
commit 03b66a3
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 14 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,6 +1,12 @@
 Changes for lest � lest errors escape testing
 
 
+version 1.24.3 2015-11-12
+
+- Add to_string(nullptr_t) for VC10 onwards.
+- Fix std::tie for VC12.
+
+
 version 1.24.2 2015-10-24
 
 - Fix version number for VC14 and higher.

diff --git a/lest.hpp b/lest.hpp
@@ -1,4 +1,4 @@
-// Copyright 2013, 2014 by Martin Moene
+// Copyright 2013, 2014, 2015 by Martin Moene
 //
 // lest is based on ideas by Kevlin Henney, see video at
 // http://skillsmatter.com/podcast/agile-testing/kevlin-henney-rethinking-unit-testing-in-c-plus-plus
@@ -41,7 +41,7 @@
 # pragma GCC   diagnostic ignored "-Wunused-value"
 #endif
 
-#define  lest_VERSION "1.24.2"
+#define  lest_VERSION "1.24.3"
 
 #ifndef  lest_FEATURE_AUTO_REGISTER
 # define lest_FEATURE_AUTO_REGISTER  0

diff --git a/lest_cpp03.hpp b/lest_cpp03.hpp
@@ -1,4 +1,4 @@
-// Copyright 2013, 2014 by Martin Moene
+// Copyright 2013, 2014, 2015 by Martin Moene
 //
 // lest is based on ideas by Kevlin Henney, see video at
 // http://skillsmatter.com/podcast/agile-testing/kevlin-henney-rethinking-unit-testing-in-c-plus-plus
@@ -36,7 +36,7 @@
 # pragma GCC   diagnostic ignored "-Wunused-value"
 #endif
 
-#define  lest_VERSION "1.24.2"
+#define  lest_VERSION "1.24.3"
 
 #ifndef  lest_FEATURE_COLOURISE
 # define lest_FEATURE_COLOURISE 0
@@ -83,14 +83,14 @@
 #endif
 
 #if lest_COMPILER_MSVC_VERSION == 6
-# define lest_COMPILER_IS_MSVC6
+# define lest_COMPILER_IS_MSVC6  1
 #endif
 
 #if ( __cplusplus >= 201103L ) || lest_COMPILER_MSVC_VERSION >= 12
-# define lest_CPP11_OR_GREATER
+# define lest_CPP11_OR_GREATER  1
 #endif
 
-#ifdef lest_CPP11_OR_GREATER
+#if lest_CPP11_OR_GREATER || lest_COMPILER_MSVC_VERSION >= 10
 
 # include <cstdint>
 # include <random>
@@ -502,7 +502,7 @@ inline void inform( location where, text expr )
 
 // Expression decomposition:
 
-#ifdef lest_CPP11_OR_GREATER
+#if lest_CPP11_OR_GREATER || lest_COMPILER_MSVC_VERSION >= 10
 inline std::string to_string( std::nullptr_t const &      ) { return "nullptr"; }
 #endif
 inline std::string to_string( std::string    const & text ) { return "\"" + text + "\"" ; }
@@ -528,7 +528,7 @@ std::string to_string( std::pair<T1,T2> const & pair )
     return oss.str();
 }
 
-#ifdef lest_CPP11_OR_GREATER
+#if lest_CPP11_OR_GREATER
 
 template<typename TU, std::size_t N>
 struct make_tuple_string
@@ -852,13 +852,13 @@ struct count : action
 #if lest_FEATURE_TIME
 
 #if lest_PLATFORM_IS_WINDOWS
-# ifdef lest_COMPILER_IS_MSVC6
+# if lest_COMPILER_IS_MSVC6
     typedef /*un*/signed __int64 uint64_t;
 # else
     typedef unsigned long long uint64_t;
 # endif
 #else
-# ifndef lest_CPP11_OR_GREATER
+# if ! lest_CPP11_OR_GREATER
     typedef unsigned long long uint64_t;
 # endif
 #endif
@@ -1018,7 +1018,7 @@ struct rng { int operator()( int n ) { return lest::rand() % n; } };
 
 inline void shuffle( tests & specification, options option )
 {
-#ifdef lest_CPP11_OR_GREATER
+#if lest_CPP11_OR_GREATER
     std::shuffle( specification.begin(), specification.end(), std::mt19937( option.seed ) );
 #else
     lest::srand( option.seed );

diff --git a/test/test_lest.cpp b/test/test_lest.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013, 2014 by Martin Moene
+// Copyright 2013, 2014, 2015 by Martin Moene
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/test/test_lest_cpp03.cpp b/test/test_lest_cpp03.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013, 2014 by Martin Moene
+// Copyright 2013, 2014, 2015 by Martin Moene
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)