diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-31 10:57:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-31 10:57:16 -0400 |
| commit | d615eebd9f056ca32c65b6971116a964f1e86230 (patch) | |
| tree | b3d198082be63f1de097a2ab503aeb51db019706 /googlemock/include/gmock/gmock-matchers.h | |
| parent | 13c5230bbf2bd3404e48b7aee33a9af2514d1b9a (diff) | |
| parent | 4005388b3b48e29e91ccd648addaa10ded1b5bf0 (diff) | |
| download | googletest-d615eebd9f056ca32c65b6971116a964f1e86230.tar.gz googletest-d615eebd9f056ca32c65b6971116a964f1e86230.tar.bz2 googletest-d615eebd9f056ca32c65b6971116a964f1e86230.zip | |
Merge branch 'master' into fix-clang-warnings
Diffstat (limited to 'googlemock/include/gmock/gmock-matchers.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-matchers.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index 9cd1a065..a7bcfc83 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -56,9 +56,10 @@ # include <initializer_list> // NOLINT -- must be after gtest.h #endif -GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 5046 \ -/* class A needs to have dll-interface to be used by clients of class B */ \ -/* Symbol involving type with internal linkage not defined */) +GTEST_DISABLE_MSC_WARNINGS_PUSH_( + 4251 5046 /* class A needs to have dll-interface to be used by clients of + class B */ + /* Symbol involving type with internal linkage not defined */) namespace testing { |