diff options
author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-10-19 13:30:13 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-19 13:30:13 -0700 |
commit | c955e33497965a90c936a221610bdfb7fad3ca49 (patch) | |
tree | 803c4727654f51b8e70071f54498903a93ecb724 /googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump | |
parent | 3149e0e88bf09841009851a478dd835fc557aaa1 (diff) | |
parent | f410177a8b54705bb5efaa7be4ef322153349187 (diff) | |
download | googletest-c955e33497965a90c936a221610bdfb7fad3ca49.tar.gz googletest-c955e33497965a90c936a221610bdfb7fad3ca49.tar.bz2 googletest-c955e33497965a90c936a221610bdfb7fad3ca49.zip |
Merge branch 'master' into python3-tests
Diffstat (limited to 'googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump')
-rw-r--r-- | googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump b/googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump index c1032798..9962f6b3 100644 --- a/googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump +++ b/googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump @@ -78,8 +78,8 @@ $var typename_As = [[$for j, [[typename A$j]]]] $var As = [[$for j, [[A$j]]]] $var matcher_As = [[$for j, [[Matcher<A$j>]]]] template <$typename_As> -struct MatcherTuple< ::testing::tuple<$As> > { - typedef ::testing::tuple<$matcher_As > type; +struct MatcherTuple< ::std::tuple<$As> > { + typedef ::std::tuple<$matcher_As > type; }; @@ -103,7 +103,7 @@ struct Function; template <typename R> struct Function<R()> { typedef R Result; - typedef ::testing::tuple<> ArgumentTuple; + typedef ::std::tuple<> ArgumentTuple; typedef typename MatcherTuple<ArgumentTuple>::type ArgumentMatcherTuple; typedef void MakeResultVoid(); typedef IgnoredValue MakeResultIgnoredValue(); @@ -122,7 +122,7 @@ template <typename R$typename_As> struct Function<R($As)> : Function<R($prev_As)> { typedef A$i Argument$i; - typedef ::testing::tuple<$As> ArgumentTuple; + typedef ::std::tuple<$As> ArgumentTuple; typedef typename MatcherTuple<ArgumentTuple>::type ArgumentMatcherTuple; typedef void MakeResultVoid($As); typedef IgnoredValue MakeResultIgnoredValue($As); |