3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-26 07:16:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Regenerated single header

Browse Source
This commit is contained in:
Phil Nash 2012-02-09 08:37:02 +00:00
parent 3fd7dc0218
commit 4a0a70a82e
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
single_include/catch.hpp
View File

@ -2706,7 +2706,7 @@ namespace Catch
) )
const const
{ {
return *m_test == *other.m_test && m_name == other.m_name && m_description == other.m_description; return *m_test == *other.m_test && m_name == other.m_name;
} }
/////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////
@ -2716,12 +2716,7 @@ namespace Catch
) )
const const
{ {
if( m_name < other.m_name ) return m_name < other.m_name;
return true;
if( m_name > other.m_name )
return false;
return *m_test < *other.m_test;
} }
private: private:
@ -3110,6 +3105,14 @@ namespace Catch
m_functions.insert( testInfo ); m_functions.insert( testInfo );
m_functionsInOrder.push_back( testInfo ); m_functionsInOrder.push_back( testInfo );
} }
else
{
const TestCaseInfo& prev = *m_functions.find( testInfo );
std::cerr << "error: TEST_CASE( \"" << testInfo.getName() << "\" ) already defined.\n"
<< "\tFirst seen at " << prev.getFilename() << ":" << prev.getLine() << "\n"
<< "\tRedefined at " << testInfo.getFilename() << ":" << testInfo.getLine() << std::endl;
exit(1);
}
} }
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////