diff options
| author | Abseil Team <absl-team@google.com> | 2018-10-16 19:29:37 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-10-18 15:32:16 (GMT) |
| commit | 29b47e45cfd0b30f8e7efd93e7ea34c8343012b3 (patch) | |
| tree | 49018da5c8f0a81eb644dbbfcf0af5ed565b7063 /googlemock/include/gmock/gmock-generated-actions.h.pump | |
| parent | a651a4d44e65b749467fa3dddf93819a22f0cc4a (diff) | |
| download | googletest-29b47e45cfd0b30f8e7efd93e7ea34c8343012b3.zip googletest-29b47e45cfd0b30f8e7efd93e7ea34c8343012b3.tar.gz googletest-29b47e45cfd0b30f8e7efd93e7ea34c8343012b3.tar.bz2 | |
Googletest export
C++11 code cleanup.
PiperOrigin-RevId: 217364243
Diffstat (limited to 'googlemock/include/gmock/gmock-generated-actions.h.pump')
| -rw-r--r-- | googlemock/include/gmock/gmock-generated-actions.h.pump | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/googlemock/include/gmock/gmock-generated-actions.h.pump b/googlemock/include/gmock/gmock-generated-actions.h.pump index 2794ebb..bc22be8 100644 --- a/googlemock/include/gmock/gmock-generated-actions.h.pump +++ b/googlemock/include/gmock/gmock-generated-actions.h.pump @@ -43,6 +43,8 @@ $$}} This meta comment fixes auto-indentation in editors. #ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_ #define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_ +#include <utility> + #include "gmock/gmock-actions.h" #include "gmock/internal/gmock-port.h" @@ -525,7 +527,7 @@ _VALUE_PARAMS($for j, [[p$j]]) $for j [[, typename p$j##_type]] $for i [[ $range j 0..i-1 #define GMOCK_INTERNAL_INIT_AND_$i[[]]_VALUE_PARAMS($for j, [[p$j]])\ - ($for j, [[p$j##_type gmock_p$j]])$if i>0 [[ : ]]$for j, [[p$j(::testing::internal::move(gmock_p$j))]] + ($for j, [[p$j##_type gmock_p$j]])$if i>0 [[ : ]]$for j, [[p$j(::std::move(gmock_p$j))]] ]] @@ -658,7 +660,7 @@ $var class_name = [[name##Action[[$if i==0 [[]] $elif i==1 [[P]] $range j 0..i-1 $var ctor_param_list = [[$for j, [[p$j##_type gmock_p$j]]]] $var param_types_and_names = [[$for j, [[p$j##_type p$j]]]] -$var inits = [[$if i==0 [[]] $else [[ : $for j, [[p$j(::testing::internal::forward<p$j##_type>(gmock_p$j))]]]]]] +$var inits = [[$if i==0 [[]] $else [[ : $for j, [[p$j(::std::forward<p$j##_type>(gmock_p$j))]]]]]] $var param_field_decls = [[$for j [[ |