diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-30 02:57:12 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-30 02:57:12 (GMT) |
| commit | b8e2562086ef326a4a88089f85b29ce7b6f9464b (patch) | |
| tree | fe224846be47cb3240729c7b967a11d211ce707c /googlemock | |
| parent | 3dbba3b072b1e67c5dc6793741da4b5408f8a552 (diff) | |
| parent | 9ad739833e16daa0f2909da7daee19a9dd608f29 (diff) | |
| download | googletest-b8e2562086ef326a4a88089f85b29ce7b6f9464b.zip googletest-b8e2562086ef326a4a88089f85b29ce7b6f9464b.tar.gz googletest-b8e2562086ef326a4a88089f85b29ce7b6f9464b.tar.bz2 | |
Merge pull request #1790 from google/9A681768AABE08D1EFA5CA77528236A4
Googletest export
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/include/gmock/gmock-generated-matchers.h | 4 | ||||
| -rw-r--r-- | googlemock/include/gmock/gmock-generated-matchers.h.pump | 3 | ||||
| -rw-r--r-- | googlemock/include/gmock/gmock-matchers.h | 7 |
3 files changed, 8 insertions, 6 deletions
diff --git a/googlemock/include/gmock/gmock-generated-matchers.h b/googlemock/include/gmock/gmock-generated-matchers.h index 0d46d23..41d5304 100644 --- a/googlemock/include/gmock/gmock-generated-matchers.h +++ b/googlemock/include/gmock/gmock-generated-matchers.h @@ -1381,8 +1381,8 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) { // ================ // // To learn more about using these macros, please search for 'MATCHER' -// on https://github.com/google/googletest/blob/master/googlemock/docs/ -// CookBook.md +// on +// https://github.com/google/googletest/blob/master/googlemock/docs/CookBook.md #define MATCHER(name, description)\ class name##Matcher {\ diff --git a/googlemock/include/gmock/gmock-generated-matchers.h.pump b/googlemock/include/gmock/gmock-generated-matchers.h.pump index 9fe0fd7..1a59fed 100644 --- a/googlemock/include/gmock/gmock-generated-matchers.h.pump +++ b/googlemock/include/gmock/gmock-generated-matchers.h.pump @@ -592,7 +592,8 @@ $$ // show up in the generated code. // ================ // // To learn more about using these macros, please search for 'MATCHER' -// on https://github.com/google/googletest/blob/master/googlemock/docs/CookBook.md +// on +// https://github.com/google/googletest/blob/master/googlemock/docs/CookBook.md $range i 0..n $for i diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index 3975cd0..9cd1a06 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -56,8 +56,9 @@ # include <initializer_list> // NOLINT -- must be after gtest.h #endif -GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \ -/* class A needs to have dll-interface to be used by clients of class B */) +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 { @@ -5270,7 +5271,7 @@ PolymorphicMatcher<internal::variant_matcher::VariantMatcher<T> > VariantWith( } // namespace testing -GTEST_DISABLE_MSC_WARNINGS_POP_() // 4251 +GTEST_DISABLE_MSC_WARNINGS_POP_() // 4251 5046 // Include any custom callback matchers added by the local installation. // We must include this header at the end to make sure it can use the |