diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-31 10:50:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-31 10:50:06 -0400 |
| commit | 4005388b3b48e29e91ccd648addaa10ded1b5bf0 (patch) | |
| tree | 5fc045ddda62d1fad7ad91028d444c6047012061 /googlemock/include/gmock/gmock-matchers.h | |
| parent | b8e2562086ef326a4a88089f85b29ce7b6f9464b (diff) | |
| parent | 6dd60ec437e839b9fa5af2cebf2c1c62de08cdff (diff) | |
| download | googletest-4005388b3b48e29e91ccd648addaa10ded1b5bf0.tar.gz googletest-4005388b3b48e29e91ccd648addaa10ded1b5bf0.tar.bz2 googletest-4005388b3b48e29e91ccd648addaa10ded1b5bf0.zip | |
Merge pull request #1799 from google/9A681768AABE08D1EFA5CA77528236A4
Googletest export
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 { |