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

Merge pull request #133 from vadz/msvc-warn-fix

Browse Source 
Fix harmless but annoying MSVC warnings.
This commit is contained in:
Phil Nash 2012-10-31 11:21:51 -07:00
commit b18d719f9d
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/internal/catch_tags.hpp
View File

@ -74,6 +74,10 @@ namespace Catch {
m_remainder += c; m_remainder += c;
} }
// Suppress assignment operator to avoid warnings from MSVC saying that
// it can't be implicitly synthesized.
TagExtracter& operator=(const TagExtracter&);
std::set<std::string>& m_tags; std::set<std::string>& m_tags;
std::string m_remainder; std::string m_remainder;
}; };
@ -177,6 +181,10 @@ namespace Catch {
m_exp.m_tagSets.push_back( m_currentTagSet ); m_exp.m_tagSets.push_back( m_currentTagSet );
} }
// Suppress assignment operator to avoid warnings from MSVC saying that
// it can't be implicitly synthesized.
TagExpressionParser& operator=(const TagExpressionParser&);
bool m_isNegated; bool m_isNegated;
TagSet m_currentTagSet; TagSet m_currentTagSet;
TagExpression& m_exp; TagExpression& m_exp;

10
single_include/catch.hpp
View File

@ -1,5 +1,5 @@
/* /*
* Generated: 2012-10-12 18:17:54.059305 * Generated: 2012-10-31 19:15:51.281013
* ---------------------------------------------------------- * ----------------------------------------------------------
* 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.
@ -1755,6 +1755,10 @@ namespace Catch {
m_remainder += c; m_remainder += c;
} }
// Suppress assignment operator to avoid warnings from MSVC saying that
// it can't be implicitly synthesized.
TagExtracter& operator=(const TagExtracter&);
std::set<std::string>& m_tags; std::set<std::string>& m_tags;
std::string m_remainder; std::string m_remainder;
}; };
@ -1858,6 +1862,10 @@ namespace Catch {
m_exp.m_tagSets.push_back( m_currentTagSet ); m_exp.m_tagSets.push_back( m_currentTagSet );
} }
// Suppress assignment operator to avoid warnings from MSVC saying that
// it can't be implicitly synthesized.
TagExpressionParser& operator=(const TagExpressionParser&);
bool m_isNegated; bool m_isNegated;
TagSet m_currentTagSet; TagSet m_currentTagSet;
TagExpression& m_exp; TagExpression& m_exp;