diff options
| author | Abseil Team <absl-team@google.com> | 2018-10-09 18:50:26 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-10-09 20:25:58 (GMT) |
| commit | 7d3b73c85a42811309eac26e5cbe054c40b64785 (patch) | |
| tree | 589142a210a7bf1ccfd51180586a35c4a6f73b68 /googlemock/include/gmock/gmock-generated-function-mockers.h.pump | |
| parent | 5434989dbd8a15f14f33cbeb9d94801247031c95 (diff) | |
| download | googletest-7d3b73c85a42811309eac26e5cbe054c40b64785.zip googletest-7d3b73c85a42811309eac26e5cbe054c40b64785.tar.gz googletest-7d3b73c85a42811309eac26e5cbe054c40b64785.tar.bz2 | |
Unconditionally use std::tuple.
Remove all mention of TR1 tuple and our own implementation of tuple.
PiperOrigin-RevId: 216395043
Diffstat (limited to 'googlemock/include/gmock/gmock-generated-function-mockers.h.pump')
| -rw-r--r-- | googlemock/include/gmock/gmock-generated-function-mockers.h.pump | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googlemock/include/gmock/gmock-generated-function-mockers.h.pump b/googlemock/include/gmock/gmock-generated-function-mockers.h.pump index 106abe8..e05b18d 100644 --- a/googlemock/include/gmock/gmock-generated-function-mockers.h.pump +++ b/googlemock/include/gmock/gmock-generated-function-mockers.h.pump @@ -81,7 +81,7 @@ class FunctionMocker<R($As)> : public typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple; MockSpec<F> With($matchers) { - return MockSpec<F>(this, ::testing::make_tuple($ms)); + return MockSpec<F>(this, ::std::make_tuple($ms)); } R Invoke($Aas) { @@ -194,7 +194,7 @@ $var anything_matchers = [[$for j, \ #define GMOCK_METHOD$i[[]]_(tn, constness, ct, Method, ...) \ GMOCK_RESULT_(tn, __VA_ARGS__) ct Method( \ $arg_as) constness { \ - GTEST_COMPILE_ASSERT_((::testing::tuple_size< \ + GTEST_COMPILE_ASSERT_((::std::tuple_size< \ tn ::testing::internal::Function<__VA_ARGS__>::ArgumentTuple>::value == $i), \ this_method_does_not_take_$i[[]]_argument[[$if i != 1 [[s]]]]); \ GMOCK_MOCKER_($i, constness, Method).SetOwnerAndName(this, #Method); \ |