Revert "gmock actions 2"

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 "

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