gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Gennadiy Civil
2018-04-10 16:10:34 -04:00
parent e1071eb949 8fbb419470
commit 39c58da187
9 changed files with 33 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
googlemock/src/gmock-internal-utils.cc
View File

@@ -188,7 +188,7 @@ GTEST_API_ void Log(LogSeverity severity, const std::string& message,
std::cout << ::std::flush;
}
GTEST_API_ void IllegalDoDefault(const char* file, int line) {
void IllegalDoDefault(const char* file, int line) {
internal::Assert(
false, file, line,
"You are using DoDefault() inside a composite action like "

17
googlemock/src/gmock-spec-builders.cc
View File

@@ -50,14 +50,13 @@
#endif
// Silence C4800 (C4800: 'int *const ': forcing value
// to bool 'true' or 'false') for MSVC 14,15
#ifdef _MSC_VER
#if _MSC_VER <= 1900
# pragma warning(push)
# pragma warning(disable:4800)
#endif
// to bool 'true' or 'false') for MSVC 14
#ifdef _MSC_VER && _MSC_VER == 1900
# pragma warning(push)
# pragma warning(disable:4800)
#endif
namespace testing {
namespace internal {
@@ -876,8 +875,6 @@ InSequence::~InSequence() {
} // namespace testing
#ifdef _MSC_VER
#if _MSC_VER <= 1900
# pragma warning(pop)
#endif
#ifdef _MSC_VER && _MSC_VER == 1900
# pragma warning(pop)
#endif