Revert "gmock actions 2"

This commit is contained in:
Gennadiy Civil
2018-04-09 22:10:12 -04:00
committed by GitHub
parent 7f03f7ceae
commit ca54b67303
13 changed files with 27 additions and 303 deletions

View File

@@ -82,15 +82,6 @@
namespace testing {
// Silence C4100 (unreferenced formal parameter) and 4805
// unsafe mix of type 'const int' and type 'const bool'
#ifdef _MSC_VER
# pragma warning(push)
# pragma warning(disable:4805)
# pragma warning(disable:4100)
#endif
// Declares the flags.
// This flag temporary enables the disabled tests.
@@ -2307,10 +2298,6 @@ bool StaticAssertTypeEq() {
// Tries to determine an appropriate directory for the platform.
GTEST_API_ std::string TempDir();
#ifdef _MSC_VER
# pragma warning(pop)
#endif
} // namespace testing
// Use this function in main() to run all tests. It returns 0 if all