3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-09-24 13:35:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix -Wshadow warnings produced by GCC.

Browse Source
This commit is contained in:
Vaclav Zeman
2015-01-17 13:33:58 +01:00
parent b9ec8a10ed
commit fef76b23e6
6 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/internal/catch_config.hpp
View File

@@ -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; }

6
include/internal/catch_runner_impl.hpp
View File

@@ -58,11 +58,11 @@ namespace Catch {
public:
explicit RunContext( Ptr<IConfig const> const& config, Ptr<IStreamingReporter> const& reporter )
: m_runInfo( config->name() ),
explicit RunContext( Ptr<IConfig const> const& cfg, Ptr<IStreamingReporter> 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() ),

2
include/internal/catch_version.hpp
View File

@@ -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