diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-10 16:10:34 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-10 16:10:34 -0400 |
| commit | 39c58da187c9cd54e54560601be4b7ceef320da4 (patch) | |
| tree | f74c36bfff352cf49eb110b3f2f6ff57d18dc37f /googlemock/include/gmock/internal | |
| parent | e1071eb9497304a38e69737e90a88b4877b8b736 (diff) | |
| parent | 8fbb4194709cc9fd3de3deb2b406461a173bab15 (diff) | |
| download | googletest-39c58da187c9cd54e54560601be4b7ceef320da4.tar.gz googletest-39c58da187c9cd54e54560601be4b7ceef320da4.tar.bz2 googletest-39c58da187c9cd54e54560601be4b7ceef320da4.zip | |
merge
Diffstat (limited to 'googlemock/include/gmock/internal')
| -rw-r--r-- | googlemock/include/gmock/internal/gmock-internal-utils.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/googlemock/include/gmock/internal/gmock-internal-utils.h b/googlemock/include/gmock/internal/gmock-internal-utils.h index 20c95c6a..37ceb549 100644 --- a/googlemock/include/gmock/internal/gmock-internal-utils.h +++ b/googlemock/include/gmock/internal/gmock-internal-utils.h @@ -48,14 +48,6 @@ namespace testing { namespace internal { -// Silence MSVC C4100 (unreferenced formal parameter) and -// C4805('==': unsafe mix of type 'const int' and type 'const bool') -#ifdef _MSC_VER -# pragma warning(push) -# pragma warning(disable:4100) -# pragma warning(disable:4805) -#endif - // Joins a vector of strings as if they are fields of a tuple; returns // the joined string. GTEST_API_ std::string JoinAsTuple(const Strings& fields); @@ -518,7 +510,7 @@ struct BooleanConstant {}; // Emit an assertion failure due to incorrect DoDefault() usage. Out-of-lined to // reduce code size. -GTEST_API_ void IllegalDoDefault(const char* file, int line); +void IllegalDoDefault(const char* file, int line); #if GTEST_LANG_CXX11 // Helper types for Apply() below. @@ -547,12 +539,6 @@ auto Apply(F&& f, Tuple&& args) make_int_pack<std::tuple_size<Tuple>::value>()); } #endif - - -#ifdef _MSC_VER -# pragma warning(pop) -#endif - } // namespace internal } // namespace testing |