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

Random bits of clean-up

Browse Source
This commit is contained in:
Phil Nash
2012-10-03 18:12:57 +01:00
parent 9e7e63c687
commit 4104fb735e
5 changed files with 12 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/internal/catch_resultinfo.hpp
View File

@@ -40,7 +40,7 @@ namespace Catch {
m_isNot( isNot )
{
if( isNot )
m_expr = "!" + m_expr;
m_expr = "!(" + m_expr + ")";
}
ResultInfo::~ResultInfo() {}

10
include/internal/catch_resultinfo_builder.h
View File

@@ -38,16 +38,10 @@ public:
void setOp( const std::string& op );
template<typename RhsT>
STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator ||
(
const RhsT&
);
STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator || ( const RhsT& );
template<typename RhsT>
STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator &&
(
const RhsT&
);
STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator && ( const RhsT& );
private:
friend class ExpressionBuilder;

8
include/internal/catch_tags.hpp
View File

@@ -112,14 +112,6 @@ namespace Catch {
m_tags.insert( std::make_pair( tag.getName(), tag ) );
}
// needed?
Tag find( const std::string& name ) const {
TagMap::const_iterator it = m_tags.find( name );
if( it == m_tags.end() )
return Tag();
else
return it->second;
}
bool empty() const {
return m_tags.empty();
}