aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/src
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2018-04-09 22:10:12 -0400
committerGitHub <noreply@github.com>2018-04-09 22:10:12 -0400
commitca54b673034f6f182ff22ac554efcd1176f5808c (patch)
tree5ee7b5cef61b4b0c0c2fb904ea62444ae7d71709 /googlemock/src
parent7f03f7ceae05d4d45fc4b12b81736c55a13d872c (diff)
downloadgoogletest-ca54b673034f6f182ff22ac554efcd1176f5808c.tar.gz
googletest-ca54b673034f6f182ff22ac554efcd1176f5808c.tar.bz2
googletest-ca54b673034f6f182ff22ac554efcd1176f5808c.zip
Revert "gmock actions 2"
Diffstat (limited to 'googlemock/src')
-rw-r--r--googlemock/src/gmock-internal-utils.cc2
-rw-r--r--googlemock/src/gmock-spec-builders.cc15
2 files changed, 1 insertions, 16 deletions
diff --git a/googlemock/src/gmock-internal-utils.cc b/googlemock/src/gmock-internal-utils.cc
index 3fca3f26..20c5a8db 100644
--- a/googlemock/src/gmock-internal-utils.cc
+++ b/googlemock/src/gmock-internal-utils.cc
@@ -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 "
diff --git a/googlemock/src/gmock-spec-builders.cc b/googlemock/src/gmock-spec-builders.cc
index 22d002fe..b97bad03 100644
--- a/googlemock/src/gmock-spec-builders.cc
+++ b/googlemock/src/gmock-spec-builders.cc
@@ -49,15 +49,6 @@
# include <unistd.h> // NOLINT
#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
-#endif
-
namespace testing {
namespace internal {
@@ -875,9 +866,3 @@ InSequence::~InSequence() {
}
} // namespace testing
-
-#ifdef _MSC_VER
-#if _MSC_VER <= 1900
-# pragma warning(pop)
-#endif
-#endif