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-actions.h | |
| 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-actions.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-actions.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/googlemock/include/gmock/gmock-actions.h b/googlemock/include/gmock/gmock-actions.h index e3b3f094..8e7e0e7b 100644 --- a/googlemock/include/gmock/gmock-actions.h +++ b/googlemock/include/gmock/gmock-actions.h @@ -439,7 +439,7 @@ class Action { // template <typename Result, typename ArgumentTuple> // Result Perform(const ArgumentTuple& args) const { // // Processes the arguments and returns a result, using -// // tr1::get<N>(args) to get the N-th (0-based) argument in the tuple. +// // std::get<N>(args) to get the N-th (0-based) argument in the tuple. // } // ... // }; @@ -838,7 +838,7 @@ class SetArgumentPointeeAction { template <typename Result, typename ArgumentTuple> void Perform(const ArgumentTuple& args) const { CompileAssertTypesEqual<void, Result>(); - *::testing::get<N>(args) = value_; + *::std::get<N>(args) = value_; } private: @@ -861,7 +861,7 @@ class SetArgumentPointeeAction<N, Proto, true> { template <typename Result, typename ArgumentTuple> void Perform(const ArgumentTuple& args) const { CompileAssertTypesEqual<void, Result>(); - ::testing::get<N>(args)->CopyFrom(*proto_); + ::std::get<N>(args)->CopyFrom(*proto_); } private: |