diff options
| author | Jerry Turcios <jerryturcios08@gmail.com> | 2018-10-09 20:47:38 -0400 |
|---|---|---|
| committer | Jerry Turcios <jerryturcios08@gmail.com> | 2018-10-09 20:47:38 -0400 |
| commit | 274b39bfa0b7108052e9019f896079713bd88d8d (patch) | |
| tree | 73491fccf4e7173a4d7afe0a7b191fb507222e17 /googlemock/include/gmock/gmock-generated-function-mockers.h.pump | |
| parent | a113467a4e7e03fe9ce54303263dd1facb852a23 (diff) | |
| parent | 78761b58fc9ae65acaebb6a9e34087e593c89c93 (diff) | |
| download | googletest-274b39bfa0b7108052e9019f896079713bd88d8d.tar.gz googletest-274b39bfa0b7108052e9019f896079713bd88d8d.tar.bz2 googletest-274b39bfa0b7108052e9019f896079713bd88d8d.zip | |
Merge branch 'master' of https://github.com/google/googletest
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 106abe84..e05b18db 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); \ |