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

Fix MSVC compilation error

MSVC's `std::vector` requires its allocator to have copy constructor
from the same allocator kind, but templated over different type.
Commit
53864dee7b7571e6c18c1400b1792f1e4b875398
Author
Martin Hořeňovský ·
Parents
b245eaa7d1f0

Files · Download .tar.gz

Changes

 projects/SelfTest/ToStringVector.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/projects/SelfTest/ToStringVector.cpp b/projects/SelfTest/ToStringVector.cpp
index 002d8ef4..eafe886d 100644
--- a/projects/SelfTest/ToStringVector.cpp
+++ b/projects/SelfTest/ToStringVector.cpp
@@ -27,8 +27,14 @@ namespace {
     /* Minimal Allocator */
     template<typename T>
     struct minimal_allocator {
-        typedef T value_type;
-        typedef std::size_t size_type;
+        using value_type = T;
+        using size_type = std::size_t;
+
+        minimal_allocator() = default;
+        template <typename U>
+        minimal_allocator(const minimal_allocator<U>&) {}
+
+
         T *allocate( size_type n ) {
             return static_cast<T *>( ::operator new( n * sizeof(T) ) );
         }
@@ -52,8 +58,8 @@ TEST_CASE( "vector<int,allocator> -> toString", "[toString][vector,allocator][c+
 }
 
 TEST_CASE( "vec<vec<string,alloc>> -> toString", "[toString][vector,allocator][c++11][.]" ) {
-    typedef std::vector<std::string,minimal_allocator<std::string> > inner;
-    typedef std::vector<inner> vector;
+    using inner = std::vector<std::string, minimal_allocator<std::string>>;
+    using vector = std::vector<inner>;
     vector v;
     REQUIRE( Catch::toString(v) == "{  }" );
     v.push_back( inner { "hello" } );