From fef76b23e6745d7f7a97e1609adb748ce3c66ad2 Mon Sep 17 00:00:00 2001 From: Vaclav Zeman Date: Sat, 17 Jan 2015 13:33:58 +0100 Subject: [PATCH] Fix -Wshadow warnings produced by GCC. --- README.md | 2 +- include/external/clara.h | 10 ++++---- include/internal/catch_config.hpp | 6 ++--- include/internal/catch_runner_impl.hpp | 6 ++--- include/internal/catch_version.hpp | 2 +- single_include/catch.hpp | 32 +++++++++++++------------- 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 47d85c18..9029ab68 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![catch logo](catch-logo-small.png) -*v1.0 build 53 (master branch)* +*v1.0 build 58 (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/external/clara.h b/include/external/clara.h index d8e83ac5..92b8b3eb 100644 --- a/include/external/clara.h +++ b/include/external/clara.h @@ -585,8 +585,8 @@ namespace Clara { m_arg->description = description; return *this; } - ArgBuilder& detail( std::string const& detail ) { - m_arg->detail = detail; + ArgBuilder& detail( std::string const& d ) { + m_arg->detail = d; return *this; } @@ -670,14 +670,14 @@ namespace Clara { maxWidth = (std::max)( maxWidth, it->commands().size() ); for( it = itBegin; it != itEnd; ++it ) { - Detail::Text usage( it->commands(), Detail::TextAttributes() + Detail::Text usageText( it->commands(), Detail::TextAttributes() .setWidth( maxWidth+indent ) .setIndent( indent ) ); Detail::Text desc( it->description, Detail::TextAttributes() .setWidth( width - maxWidth - 3 ) ); - for( std::size_t i = 0; i < (std::max)( usage.size(), desc.size() ); ++i ) { - std::string usageCol = i < usage.size() ? usage[i] : ""; + for( std::size_t i = 0; i < (std::max)( usageText.size(), desc.size() ); ++i ) { + std::string usageCol = i < usageText.size() ? usageText[i] : ""; os << usageCol; if( i < desc.size() && !desc[i].empty() ) diff --git a/include/internal/catch_config.hpp b/include/internal/catch_config.hpp index 1217b9a9..ff701b97 100644 --- a/include/internal/catch_config.hpp +++ b/include/internal/catch_config.hpp @@ -118,10 +118,10 @@ namespace Catch { } void useStream( std::string const& streamName ) { - Stream stream = createStream( streamName ); - setStreamBuf( stream.streamBuf ); + Stream newStream = createStream( streamName ); + setStreamBuf( newStream.streamBuf ); m_stream.release(); - m_stream = stream; + m_stream = newStream; } std::string getReporterName() const { return m_data.reporterName; } diff --git a/include/internal/catch_runner_impl.hpp b/include/internal/catch_runner_impl.hpp index fa4f3193..88040325 100644 --- a/include/internal/catch_runner_impl.hpp +++ b/include/internal/catch_runner_impl.hpp @@ -58,11 +58,11 @@ namespace Catch { public: - explicit RunContext( Ptr const& config, Ptr const& reporter ) - : m_runInfo( config->name() ), + explicit RunContext( Ptr const& cfg, Ptr const& reporter ) + : m_runInfo( cfg->name() ), m_context( getCurrentMutableContext() ), m_activeTestCase( NULL ), - m_config( config ), + m_config( cfg ), m_reporter( reporter ), m_prevRunner( m_context.getRunner() ), m_prevResultCapture( m_context.getResultCapture() ), diff --git a/include/internal/catch_version.hpp b/include/internal/catch_version.hpp index db7a7ec8..f6397364 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, 53, "master" ); + Version libraryVersion( 1, 0, 58, "master" ); } #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED diff --git a/single_include/catch.hpp b/single_include/catch.hpp index 6b8dfb5e..c82b656c 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -1,6 +1,6 @@ /* - * CATCH v1.0 build 53 (master branch) - * Generated: 2014-08-20 08:08:19.533804 + * CATCH v1.0 build 58 (master branch) + * Generated: 2015-01-17 13:29:59.050735 * ---------------------------------------------------------- * This file has been merged from multiple headers. Please don't edit it directly * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. @@ -3110,10 +3110,10 @@ namespace Catch { } void useStream( std::string const& streamName ) { - Stream stream = createStream( streamName ); - setStreamBuf( stream.streamBuf ); + Stream newStream = createStream( streamName ); + setStreamBuf( newStream.streamBuf ); m_stream.release(); - m_stream = stream; + m_stream = newStream; } std::string getReporterName() const { return m_data.reporterName; } @@ -3725,8 +3725,8 @@ namespace Clara { m_arg->description = description; return *this; } - ArgBuilder& detail( std::string const& detail ) { - m_arg->detail = detail; + ArgBuilder& detail( std::string const& d ) { + m_arg->detail = d; return *this; } @@ -3809,14 +3809,14 @@ namespace Clara { maxWidth = (std::max)( maxWidth, it->commands().size() ); for( it = itBegin; it != itEnd; ++it ) { - Detail::Text usage( it->commands(), Detail::TextAttributes() + Detail::Text usageText( it->commands(), Detail::TextAttributes() .setWidth( maxWidth+indent ) .setIndent( indent ) ); Detail::Text desc( it->description, Detail::TextAttributes() .setWidth( width - maxWidth - 3 ) ); - for( std::size_t i = 0; i < (std::max)( usage.size(), desc.size() ); ++i ) { - std::string usageCol = i < usage.size() ? usage[i] : ""; + for( std::size_t i = 0; i < (std::max)( usageText.size(), desc.size() ); ++i ) { + std::string usageCol = i < usageText.size() ? usageText[i] : ""; os << usageCol; if( i < desc.size() && !desc[i].empty() ) @@ -4952,11 +4952,11 @@ namespace Catch { public: - explicit RunContext( Ptr const& config, Ptr const& reporter ) - : m_runInfo( config->name() ), + explicit RunContext( Ptr const& cfg, Ptr const& reporter ) + : m_runInfo( cfg->name() ), m_context( getCurrentMutableContext() ), m_activeTestCase( NULL ), - m_config( config ), + m_config( cfg ), m_reporter( reporter ), m_prevRunner( m_context.getRunner() ), m_prevResultCapture( m_context.getResultCapture() ), @@ -5253,7 +5253,7 @@ namespace Catch { Totals totals; - context.testGroupStarting( "", 1, 1 ); // deprecated? + context.testGroupStarting( "all tests", 1, 1 ); // deprecated? TestSpec testSpec = m_config->testSpec(); if( !testSpec.hasFilters() ) @@ -5276,7 +5276,7 @@ namespace Catch { m_testsAlreadyRun.insert( *it ); } } - context.testGroupEnded( "", totals, 1, 1 ); + context.testGroupEnded( "all tests", totals, 1, 1 ); return totals; } @@ -6417,7 +6417,7 @@ namespace Catch { namespace Catch { // These numbers are maintained by a script - Version libraryVersion( 1, 0, 53, "master" ); + Version libraryVersion( 1, 0, 58, "master" ); } // #included from: catch_message.hpp