diff options
| author | Abseil Team <absl-team@google.com> | 2018-10-16 15:29:37 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-10-18 11:32:16 -0400 |
| commit | 29b47e45cfd0b30f8e7efd93e7ea34c8343012b3 (patch) | |
| tree | 49018da5c8f0a81eb644dbbfcf0af5ed565b7063 /googlemock/include/gmock/gmock-generated-function-mockers.h.pump | |
| parent | a651a4d44e65b749467fa3dddf93819a22f0cc4a (diff) | |
| download | googletest-29b47e45cfd0b30f8e7efd93e7ea34c8343012b3.tar.gz googletest-29b47e45cfd0b30f8e7efd93e7ea34c8343012b3.tar.bz2 googletest-29b47e45cfd0b30f8e7efd93e7ea34c8343012b3.zip | |
Googletest export
C++11 code cleanup.
PiperOrigin-RevId: 217364243
Diffstat (limited to 'googlemock/include/gmock/gmock-generated-function-mockers.h.pump')
| -rw-r--r-- | googlemock/include/gmock/gmock-generated-function-mockers.h.pump | 6 |
1 files changed, 4 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 e05b18db..183e652c 100644 --- a/googlemock/include/gmock/gmock-generated-function-mockers.h.pump +++ b/googlemock/include/gmock/gmock-generated-function-mockers.h.pump @@ -42,6 +42,8 @@ $var n = 10 $$ The maximum arity we support. #ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_ #define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_ +#include <utility> + #include "gmock/gmock-spec-builders.h" #include "gmock/internal/gmock-internal-utils.h" @@ -69,7 +71,7 @@ $for i [[ $range j 1..i $var typename_As = [[$for j [[, typename A$j]]]] $var As = [[$for j, [[A$j]]]] -$var as = [[$for j, [[internal::forward<A$j>(a$j)]]]] +$var as = [[$for j, [[std::forward<A$j>(a$j)]]]] $var Aas = [[$for j, [[A$j a$j]]]] $var ms = [[$for j, [[m$j]]]] $var matchers = [[$for j, [[const Matcher<A$j>& m$j]]]] @@ -184,7 +186,7 @@ $for i [[ $range j 1..i $var arg_as = [[$for j, [[GMOCK_ARG_(tn, $j, __VA_ARGS__) gmock_a$j]]]] $var as = [[$for j, \ - [[::testing::internal::forward<GMOCK_ARG_(tn, $j, __VA_ARGS__)>(gmock_a$j)]]]] + [[::std::forward<GMOCK_ARG_(tn, $j, __VA_ARGS__)>(gmock_a$j)]]]] $var matcher_arg_as = [[$for j, \ [[GMOCK_MATCHER_(tn, $j, __VA_ARGS__) gmock_a$j]]]] $var matcher_as = [[$for j, [[gmock_a$j]]]] |