diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-08 12:19:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-08 12:19:04 -0700 |
| commit | 11f5a2740aa8a55d620fba6957e53ad08721cf54 (patch) | |
| tree | 04f982e6158e57f68529ca47e37ec377574647dd /googlemock/include/gmock/internal/gmock-generated-internal-utils.h | |
| parent | 008e54c1dd407b6edd680fccf78cd194365e0507 (diff) | |
| parent | 66bd580b5bc054522f7fab13463a47aa156a2d4b (diff) | |
| download | googletest-11f5a2740aa8a55d620fba6957e53ad08721cf54.tar.gz googletest-11f5a2740aa8a55d620fba6957e53ad08721cf54.tar.bz2 googletest-11f5a2740aa8a55d620fba6957e53ad08721cf54.zip | |
Merge branch 'master' into cross-testing-patch-1
Diffstat (limited to 'googlemock/include/gmock/internal/gmock-generated-internal-utils.h')
| -rw-r--r-- | googlemock/include/gmock/internal/gmock-generated-internal-utils.h | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/googlemock/include/gmock/internal/gmock-generated-internal-utils.h b/googlemock/include/gmock/internal/gmock-generated-internal-utils.h index 7811e43f..c9bfbc8b 100644 --- a/googlemock/include/gmock/internal/gmock-generated-internal-utils.h +++ b/googlemock/include/gmock/internal/gmock-generated-internal-utils.h @@ -38,6 +38,8 @@ // This file contains template meta-programming utility classes needed // for implementing Google Mock. +// GOOGLETEST_CM0002 DO NOT DELETE + #ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_GENERATED_INTERNAL_UTILS_H_ #define GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_GENERATED_INTERNAL_UTILS_H_ @@ -90,42 +92,48 @@ struct MatcherTuple< ::testing::tuple<A1, A2, A3> > { template <typename A1, typename A2, typename A3, typename A4> struct MatcherTuple< ::testing::tuple<A1, A2, A3, A4> > { - typedef ::testing::tuple<Matcher<A1>, Matcher<A2>, Matcher<A3>, - Matcher<A4> > type; + typedef ::testing::tuple<Matcher<A1>, Matcher<A2>, Matcher<A3>, Matcher<A4> > + type; }; template <typename A1, typename A2, typename A3, typename A4, typename A5> struct MatcherTuple< ::testing::tuple<A1, A2, A3, A4, A5> > { typedef ::testing::tuple<Matcher<A1>, Matcher<A2>, Matcher<A3>, Matcher<A4>, - Matcher<A5> > type; + Matcher<A5> > + type; }; template <typename A1, typename A2, typename A3, typename A4, typename A5, typename A6> struct MatcherTuple< ::testing::tuple<A1, A2, A3, A4, A5, A6> > { typedef ::testing::tuple<Matcher<A1>, Matcher<A2>, Matcher<A3>, Matcher<A4>, - Matcher<A5>, Matcher<A6> > type; + Matcher<A5>, Matcher<A6> > + type; }; template <typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7> struct MatcherTuple< ::testing::tuple<A1, A2, A3, A4, A5, A6, A7> > { typedef ::testing::tuple<Matcher<A1>, Matcher<A2>, Matcher<A3>, Matcher<A4>, - Matcher<A5>, Matcher<A6>, Matcher<A7> > type; + Matcher<A5>, Matcher<A6>, Matcher<A7> > + type; }; template <typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8> struct MatcherTuple< ::testing::tuple<A1, A2, A3, A4, A5, A6, A7, A8> > { typedef ::testing::tuple<Matcher<A1>, Matcher<A2>, Matcher<A3>, Matcher<A4>, - Matcher<A5>, Matcher<A6>, Matcher<A7>, Matcher<A8> > type; + Matcher<A5>, Matcher<A6>, Matcher<A7>, Matcher<A8> > + type; }; template <typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9> struct MatcherTuple< ::testing::tuple<A1, A2, A3, A4, A5, A6, A7, A8, A9> > { typedef ::testing::tuple<Matcher<A1>, Matcher<A2>, Matcher<A3>, Matcher<A4>, - Matcher<A5>, Matcher<A6>, Matcher<A7>, Matcher<A8>, Matcher<A9> > type; + Matcher<A5>, Matcher<A6>, Matcher<A7>, Matcher<A8>, + Matcher<A9> > + type; }; template <typename A1, typename A2, typename A3, typename A4, typename A5, @@ -133,8 +141,9 @@ template <typename A1, typename A2, typename A3, typename A4, typename A5, struct MatcherTuple< ::testing::tuple<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10> > { typedef ::testing::tuple<Matcher<A1>, Matcher<A2>, Matcher<A3>, Matcher<A4>, - Matcher<A5>, Matcher<A6>, Matcher<A7>, Matcher<A8>, Matcher<A9>, - Matcher<A10> > type; + Matcher<A5>, Matcher<A6>, Matcher<A7>, Matcher<A8>, + Matcher<A9>, Matcher<A10> > + type; }; // Template struct Function<F>, where F must be a function type, contains |