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

Regenerated single include following merge

Browse Source
This commit is contained in:
Phil Nash 2012-11-01 08:28:26 +00:00
parent ce612bf656
commit e0a40e2ced
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
single_include/catch.hpp
View File

@ -1,5 +1,5 @@
/* /*
* Generated: 2012-10-31 18:04:01.157950 * Generated: 2012-11-01 08:27:51.720005
* ---------------------------------------------------------- * ----------------------------------------------------------
* This file has been merged from multiple headers. Please don't edit it directly * This file has been merged from multiple headers. Please don't edit it directly
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@ -1369,6 +1369,8 @@ namespace Catch {
m_remainder += c; m_remainder += c;
} }
TagExtracter& operator=(const TagExtracter&);
std::set<std::string>& m_tags; std::set<std::string>& m_tags;
std::string m_remainder; std::string m_remainder;
}; };
@ -1472,6 +1474,8 @@ namespace Catch {
m_exp.m_tagSets.push_back( m_currentTagSet ); m_exp.m_tagSets.push_back( m_currentTagSet );
} }
TagExpressionParser& operator=(const TagExpressionParser&);
bool m_isNegated; bool m_isNegated;
TagSet m_currentTagSet; TagSet m_currentTagSet;
TagExpression& m_exp; TagExpression& m_exp;
@ -4883,7 +4887,7 @@ namespace Catch {
if( isatty( fileno(stdout) ) ) { if( isatty( fileno(stdout) ) ) {
switch( colour ) { switch( colour ) {
case TextColour::FileName: case TextColour::FileName:
std::cout << colourEscape << "[0m"; // white std::cout << colourEscape << "[0m"; // white/ normal
break; break;
case TextColour::ResultError: case TextColour::ResultError:
std::cout << colourEscape << "[1;31m"; // bold red std::cout << colourEscape << "[1;31m"; // bold red
@ -4904,7 +4908,7 @@ namespace Catch {
std::cout << colourEscape << "[0;33m"; // yellow std::cout << colourEscape << "[0;33m"; // yellow
break; break;
case TextColour::None: case TextColour::None:
std::cout << colourEscape << "[0m"; // reset to white std::cout << colourEscape << "[0m"; // reset
} }
} }
} }