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

Xcode 4, warnings and MinGW

Browse Source 
Added separate Xcode 4 project.
Fixed some warnings.
Fixed OutputDebugString decl for MinGW
This commit is contained in:
Phil Nash
2011-12-27 10:59:41 +00:00
parent f7e2777665
commit 458e5eec16
27 changed files with 559 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/SelfTest/GeneratorTests.cpp
View File

@@ -12,7 +12,7 @@
#include "catch.hpp"
size_t multiply( size_t a, size_t b )
inline size_t multiply( size_t a, size_t b )
{
return a*b;
}

2
projects/SelfTest/MiscTests.cpp
View File

@@ -103,7 +103,7 @@ TEST_CASE( "./succeeding/Misc/stdout,stderr", "Sends stuff to stdout and stderr"
std::cerr << "An error";
}
const char* makeString( bool makeNull )
inline const char* makeString( bool makeNull )
{
return makeNull ? NULL : "valid string";
}

2
projects/SelfTest/TestMain.cpp
View File

@@ -47,7 +47,7 @@ TEST_CASE( "selftest/main", "Runs all Catch self tests and checks their results"
"Number of 'succeeding' tests is fixed" )
{
runner.runMatching( "./succeeding/*" );
CHECK( runner.getSuccessCount() == 259 );
CHECK( runner.getSuccessCount() == 258 );
CHECK( runner.getFailureCount() == 0 );
}

9
projects/SelfTest/TrickyTests.cpp
View File

@@ -142,17 +142,20 @@ namespace B {
int c;
};
}
bool operator==(const A::X& lhs, const B::Y& rhs)
inline bool operator==(const A::X& lhs, const B::Y& rhs)
{
return (lhs.a == rhs.a);
}
bool operator==(const B::Y& lhs, const A::X& rhs)
inline bool operator==(const B::Y& lhs, const A::X& rhs)
{
return (lhs.a == rhs.a);
}
///////////////////////////////////////////////////////////////////////////////
/* This, currently, does not compile with LLVM
TEST_CASE
(
"./succeeding/koenig",
@@ -163,7 +166,7 @@ TEST_CASE
B::Y y;
REQUIRE( x == y );
}
*/
namespace ObjectWithConversions
{