From 4e044ed4b17eb7c691b757fc45ec071b1848b6e0 Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Sun, 4 May 2014 09:23:30 +0100 Subject: [PATCH] build 43 - removed some pragmas --- README.md | 2 +- include/internal/catch_version.hpp | 2 +- single_include/catch.hpp | 8 +++----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 5808abc7..34b5a727 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![catch logo](catch-logo-small.png) -*v1.0 build 42 (master branch)* +*v1.0 build 43 (master branch)* 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 dcb5ed56..3a886ef2 100644 --- a/include/internal/catch_version.hpp +++ b/include/internal/catch_version.hpp @@ -13,7 +13,7 @@ namespace Catch { // These numbers are maintained by a script - Version libraryVersion( 1, 0, 42, "master" ); + Version libraryVersion( 1, 0, 43, "master" ); } #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED diff --git a/single_include/catch.hpp b/single_include/catch.hpp index 6fbbd695..03665c43 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -1,6 +1,6 @@ /* - * CATCH v1.0 build 42 (master branch) - * Generated: 2014-05-01 19:04:10.193312 + * CATCH v1.0 build 43 (master branch) + * Generated: 2014-05-04 09:22:51.466832 * ---------------------------------------------------------- * This file has been merged from multiple headers. Please don't edit it directly * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. @@ -21,8 +21,6 @@ #pragma clang diagnostic ignored "-Wpadded" #pragma clang diagnostic ignored "-Wc++98-compat" #pragma clang diagnostic ignored "-Wc++98-compat-pedantic" -#pragma clang diagnostic ignored "-WGeneralized initializer lists are incompatible with C++98" -#pragma clang diagnostic ignored "-WRvalue references are incompatible with C++98" #endif #ifdef CATCH_CONFIG_MAIN @@ -6658,7 +6656,7 @@ namespace Catch { namespace Catch { // These numbers are maintained by a script - Version libraryVersion( 1, 0, 42, "master" ); + Version libraryVersion( 1, 0, 43, "master" ); } // #included from: catch_message.hpp