Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorPhil Nash2012-05-11 19:05:53 +0100
committerPhil Nash2012-05-11 19:05:53 +0100
commit8d69208a58e40a78cc56662cd460ef5b30ae0912 (patch)
tree13ba0890d2d1fba67941ba177b6629d506d250af /include
parent15140eacd7614ba6fc8d32cca98cb20cade5437e (diff)
downloadcatch3-8d69208a58e40a78cc56662cd460ef5b30ae0912.tar.gz
Fixed some warnings
As referenced in GitHub issue #83
Diffstat (limited to 'include')
-rw-r--r--include/internal/catch_common.h6
-rw-r--r--include/internal/catch_tostring.hpp2
-rw-r--r--include/reporters/catch_reporter_basic.hpp4
3 files changed, 6 insertions, 6 deletions
diff --git a/include/internal/catch_common.h b/include/internal/catch_common.h
index 3b69959f..a5aed1b9 100644
--- a/include/internal/catch_common.h
+++ b/include/internal/catch_common.h
@@ -67,9 +67,9 @@ namespace Catch
struct SourceLineInfo
{
SourceLineInfo() : line( 0 ){}
- SourceLineInfo( const std::string& file, std::size_t line )
- : file( file ),
- line( line )
+ SourceLineInfo( const std::string& _file, std::size_t _line )
+ : file( _file ),
+ line( _line )
{}
SourceLineInfo( const SourceLineInfo& other )
: file( other.file ),
diff --git a/include/internal/catch_tostring.hpp b/include/internal/catch_tostring.hpp
index bad0196c..98ed8191 100644
--- a/include/internal/catch_tostring.hpp
+++ b/include/internal/catch_tostring.hpp
@@ -103,7 +103,7 @@ inline std::string toString( unsigned long value ) {
}
inline std::string toString( unsigned int value ) {
- return toString( (unsigned long)value );
+ return toString( static_cast<unsigned long>( value ) );
}
inline std::string toString( const double value ) {
diff --git a/include/reporters/catch_reporter_basic.hpp b/include/reporters/catch_reporter_basic.hpp
index 7db72734..be631f13 100644
--- a/include/reporters/catch_reporter_basic.hpp
+++ b/include/reporters/catch_reporter_basic.hpp
@@ -247,12 +247,12 @@ namespace Catch
m_config.stream() << resultInfo.getExpression();
if( resultInfo.ok() )
{
- TextColour colour( TextColour::Success );
+ TextColour successColour( TextColour::Success );
m_config.stream() << " succeeded";
}
else
{
- TextColour colour( TextColour::Error );
+ TextColour errorColour( TextColour::Error );
m_config.stream() << " failed";
}
}