This commit is contained in:
Martin Hořeňovský
2018-05-14 15:15:28 +02:00
parent 3255ee6312
commit 6860c8def0
6 changed files with 16 additions and 8 deletions

View File

@@ -1,6 +1,6 @@
/*
* Catch v1.12.1
* Generated: 2018-03-02 21:17:41.036711
* Catch v1.12.2
* Generated: 2018-05-14 15:10:01.112442
* ----------------------------------------------------------
* This file has been merged from multiple headers. Please don't edit it directly
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@@ -6599,6 +6599,7 @@ namespace Catch {
#endif // not Windows
#include <cassert>
#include <set>
#include <string>
@@ -8466,7 +8467,7 @@ namespace Catch {
}
inline Version libraryVersion() {
static Version version( 1, 12, 1, "", 0 );
static Version version( 1, 12, 2, "", 0 );
return version;
}
@@ -9171,6 +9172,8 @@ std::string toString( std::nullptr_t ) {
// #included from: catch_result_builder.hpp
#define TWOBLUECUBES_CATCH_RESULT_BUILDER_HPP_INCLUDED
#include <cassert>
namespace Catch {
ResultBuilder::ResultBuilder( char const* macroName,
@@ -10664,6 +10667,7 @@ namespace Catch {
// #included from: ../reporters/catch_reporter_console.hpp
#define TWOBLUECUBES_CATCH_REPORTER_CONSOLE_HPP_INCLUDED
#include <cassert>
#include <cfloat>
#include <cstdio>