diff options
| author | Phil Nash | 2013-03-25 08:46:48 +0000 |
|---|---|---|
| committer | Phil Nash | 2013-03-25 08:46:48 +0000 |
| commit | 2e3c5fa2ade56f7468d02a1ad2d083b15dde4d65 (patch) | |
| tree | 19dafc687d9ba38c44528f11da0e67340f6ee23b /include/internal | |
| parent | 6ba2057abd69beb47f74625b3cc28fb77a32c9af (diff) | |
| download | catch3-2e3c5fa2ade56f7468d02a1ad2d083b15dde4d65.tar.gz | |
Addressed some warnings (mostly MSVC)
Diffstat (limited to 'include/internal')
| -rw-r--r-- | include/internal/catch_evaluate.hpp | 12 | ||||
| -rw-r--r-- | include/internal/catch_running_test.hpp | 3 | ||||
| -rw-r--r-- | include/internal/catch_test_spec.h | 2 | ||||
| -rw-r--r-- | include/internal/catch_version.h | 3 |
4 files changed, 18 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; |