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

summaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorPhil Nash2013-03-25 08:46:48 +0000
committerPhil Nash2013-03-25 08:46:48 +0000
commit2e3c5fa2ade56f7468d02a1ad2d083b15dde4d65 (patch)
tree19dafc687d9ba38c44528f11da0e67340f6ee23b /include
parent6ba2057abd69beb47f74625b3cc28fb77a32c9af (diff)
downloadcatch3-2e3c5fa2ade56f7468d02a1ad2d083b15dde4d65.tar.gz
Addressed some warnings (mostly MSVC)
Diffstat (limited to 'include')
-rw-r--r--include/internal/catch_evaluate.hpp12
-rw-r--r--include/internal/catch_running_test.hpp3
-rw-r--r--include/internal/catch_test_spec.h2
-rw-r--r--include/internal/catch_version.h3
-rw-r--r--include/reporters/catch_reporter_console.hpp1
5 files changed, 19 insertions, 2 deletions
diff --git a/include/internal/catch_evaluate.hpp b/include/internal/catch_evaluate.hpp
index 7e9d57d0..5971022a 100644
--- a/include/internal/catch_evaluate.hpp
+++ b/include/internal/catch_evaluate.hpp
@@ -8,6 +8,11 @@
#ifndef TWOBLUECUBES_CATCH_EVALUATE_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_EVALUATE_HPP_INCLUDED
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4389) // '==' : signed/unsigned mismatch
+#endif
+
namespace Catch {
namespace Internal {
@@ -28,6 +33,7 @@ namespace Internal {
template<> struct OperatorTraits<IsLessThanOrEqualTo> { static const char* getName(){ return "<="; } };
template<> struct OperatorTraits<IsGreaterThanOrEqualTo>{ static const char* getName(){ return ">="; } };
+
// So the compare overloads can be operator agnostic we convey the operator as a template
// enum, which is used to specialise an Evaluator for doing the comparison.
template<typename T1, typename T2, Operator Op>
@@ -143,8 +149,12 @@ namespace Internal {
template<Operator Op, typename T> bool compare( T* lhs, int rhs ) {
return Evaluator<T*, T*, Op>::evaluate( lhs, reinterpret_cast<T*>( rhs ) );
}
-
+
} // end of namespace Internal
} // end of namespace Catch
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
#endif // TWOBLUECUBES_CATCH_EVALUATE_HPP_INCLUDED
diff --git a/include/internal/catch_running_test.hpp b/include/internal/catch_running_test.hpp
index 88ac27d8..8787f8e8 100644
--- a/include/internal/catch_running_test.hpp
+++ b/include/internal/catch_running_test.hpp
@@ -102,6 +102,9 @@ namespace Catch {
}
private:
+ RunningTest( RunningTest const& );
+ void operator=( RunningTest const& );
+
const TestCase& m_info;
RunStatus m_runStatus;
RunningSection m_rootSection;
diff --git a/include/internal/catch_test_spec.h b/include/internal/catch_test_spec.h
index 4250637b..66839705 100644
--- a/include/internal/catch_test_spec.h
+++ b/include/internal/catch_test_spec.h
@@ -30,7 +30,7 @@ namespace Catch {
WildcardAtEnd = 2,
WildcardAtBothEnds = WildcardAtStart | WildcardAtEnd
};
-
+
public:
TestCaseFilter( const std::string& testSpec, IfFilterMatches::DoWhat matchBehaviour = IfFilterMatches::AutoDetectBehaviour )
: m_stringToMatch( toLower( testSpec ) ),
diff --git a/include/internal/catch_version.h b/include/internal/catch_version.h
index 75b6c8f0..fed5d6b6 100644
--- a/include/internal/catch_version.h
+++ b/include/internal/catch_version.h
@@ -26,6 +26,9 @@ namespace Catch {
const unsigned int minorVersion;
const unsigned int buildNumber;
const std::string branchName;
+
+ private:
+ void operator=( Version const& );
};
extern Version libraryVersion;
diff --git a/include/reporters/catch_reporter_console.hpp b/include/reporters/catch_reporter_console.hpp
index ea3ea47a..042dbacc 100644
--- a/include/reporters/catch_reporter_console.hpp
+++ b/include/reporters/catch_reporter_console.hpp
@@ -97,6 +97,7 @@ namespace Catch {
private:
class AssertionPrinter {
+ void operator= ( AssertionPrinter const& );
public:
AssertionPrinter( std::ostream& _stream, AssertionStats const& _stats )
: stream( _stream ),