From c1ca0fdabe8def3e67d42b275d51ac383fd5819f Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Fri, 3 Jul 2015 18:30:25 +0100 Subject: [PATCH] dev build 3 --- README.md | 2 +- include/internal/catch_version.hpp | 2 +- single_include/catch.hpp | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 4fee77e6..32ef40df 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![catch logo](catch-logo-small.png) -*v1.2.1-develop.2* +*v1.2.1-develop.3* 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 fbd96d49..879b671d 100644 --- a/include/internal/catch_version.hpp +++ b/include/internal/catch_version.hpp @@ -37,7 +37,7 @@ namespace Catch { return os; } - Version libraryVersion( 1, 2, 1, "develop", 2 ); + Version libraryVersion( 1, 2, 1, "develop", 3 ); } diff --git a/single_include/catch.hpp b/single_include/catch.hpp index 713dc02b..d5811f84 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -1,6 +1,6 @@ /* - * Catch v1.2.1-develop.2 - * Generated: 2015-07-02 23:02:49.715552 + * Catch v1.2.1-develop.3 + * Generated: 2015-07-03 18:29:49.753953 * ---------------------------------------------------------- * This file has been merged from multiple headers. Please don't edit it directly * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. @@ -5213,7 +5213,7 @@ namespace Catch { virtual ~RunContext() { m_reporter->testRunEnded( TestRunStats( m_runInfo, m_totals, aborting() ) ); m_context.setRunner( m_prevRunner ); - m_context.setConfig( CATCH_NULL ); + m_context.setConfig( Ptr() ); m_context.setResultCapture( m_prevResultCapture ); m_context.setConfig( m_prevConfig ); } @@ -5618,7 +5618,7 @@ namespace Catch { std::set tags = test.tags; std::string filename = test.lineInfo.file; - std::string::size_type lastSlash = filename.find_last_of( "\//" ); + std::string::size_type lastSlash = filename.find_last_of( "\\/" ); if( lastSlash != std::string::npos ) filename = filename.substr( lastSlash+1 ); @@ -6821,7 +6821,7 @@ namespace Catch { return os; } - Version libraryVersion( 1, 2, 1, "develop", 2 ); + Version libraryVersion( 1, 2, 1, "develop", 3 ); }