Merge branch 'develop' into feature/fastcov

This commit is contained in:
Niels Lohmann 2019-04-06 09:03:35 +02:00
commit cf6b6692aa
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
4 changed files with 72 additions and 14 deletions

View file

@ -69,9 +69,9 @@ TEST_CASE("bad_alloc")
namespace
{
static bool next_construct_fails = false;
static bool next_destroy_fails = false;
static bool next_deallocate_fails = false;
bool next_construct_fails = false;
bool next_destroy_fails = false;
bool next_deallocate_fails = false;
template<class T>
struct my_allocator : std::allocator<T>