diff options
| author | kosak <kosak@google.com> | 2014-04-02 20:30:00 +0000 |
|---|---|---|
| committer | kosak <kosak@google.com> | 2014-04-02 20:30:00 +0000 |
| commit | bd0188320de5aab1b09718e2c466387099d43cfb (patch) | |
| tree | b89ba1d8bbac289a5e83c5a4fd71e5b8b1b53bd4 /include/gmock/gmock-actions.h | |
| parent | 15d61e42bdd4182e7c4b50bcb3314b006ce578c7 (diff) | |
| download | googletest-bd0188320de5aab1b09718e2c466387099d43cfb.tar.gz googletest-bd0188320de5aab1b09718e2c466387099d43cfb.tar.bz2 googletest-bd0188320de5aab1b09718e2c466387099d43cfb.zip | |
Export tuple and friends in the ::testing namespace.
Diffstat (limited to 'include/gmock/gmock-actions.h')
| -rw-r--r-- | include/gmock/gmock-actions.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/gmock/gmock-actions.h b/include/gmock/gmock-actions.h index d08152a8..83143510 100644 --- a/include/gmock/gmock-actions.h +++ b/include/gmock/gmock-actions.h @@ -728,7 +728,7 @@ class SetArgumentPointeeAction { template <typename Result, typename ArgumentTuple> void Perform(const ArgumentTuple& args) const { CompileAssertTypesEqual<void, Result>(); - *::std::tr1::get<N>(args) = value_; + *::testing::get<N>(args) = value_; } private: @@ -751,7 +751,7 @@ class SetArgumentPointeeAction<N, Proto, true> { template <typename Result, typename ArgumentTuple> void Perform(const ArgumentTuple& args) const { CompileAssertTypesEqual<void, Result>(); - ::std::tr1::get<N>(args)->CopyFrom(*proto_); + ::testing::get<N>(args)->CopyFrom(*proto_); } private: |