From f666f5f0aef121c357a3705b0187e77920a3e0b5 Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Thu, 12 May 2016 19:18:04 +0100 Subject: [PATCH] v1.5.4 --- README.md | 2 +- include/internal/catch_version.hpp | 2 +- single_include/catch.hpp | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index db836831..9f4c2583 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![catch logo](catch-logo-small.png) -*v1.5.3* +*v1.5.4* Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch) diff --git a/include/internal/catch_version.hpp b/include/internal/catch_version.hpp index ac6701f1..35997681 100644 --- a/include/internal/catch_version.hpp +++ b/include/internal/catch_version.hpp @@ -37,7 +37,7 @@ namespace Catch { return os; } - Version libraryVersion( 1, 5, 3, "", 0 ); + Version libraryVersion( 1, 5, 4, "", 0 ); } diff --git a/single_include/catch.hpp b/single_include/catch.hpp index 9afe69a7..7df2fd09 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -1,6 +1,6 @@ /* - * Catch v1.5.3 - * Generated: 2016-05-10 19:09:28.805441 + * Catch v1.5.4 + * Generated: 2016-05-12 19:16:01.957320 * ---------------------------------------------------------- * This file has been merged from multiple headers. Please don't edit it directly * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. @@ -2065,7 +2065,7 @@ namespace Catch { __catchResult.useActiveException( Catch::ResultDisposition::Normal ); \ } \ INTERNAL_CATCH_REACT( __catchResult ) \ - } while( Catch::isTrue( false && static_cast(expr) ) ) // expr here is never evaluated at runtime but it forces the compiler to give it a look + } while( Catch::isTrue( false && !!(expr) ) ) // expr here is never evaluated at runtime but it forces the compiler to give it a look /////////////////////////////////////////////////////////////////////////////// #define INTERNAL_CATCH_IF( expr, resultDisposition, macroName ) \ @@ -7547,7 +7547,7 @@ namespace Catch { return os; } - Version libraryVersion( 1, 5, 3, "", 0 ); + Version libraryVersion( 1, 5, 4, "", 0 ); }