gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Export tuple and friends in the ::testing namespace.

Browse Source
This commit is contained in:
kosak
2014-04-02 20:30:00 +00:00
parent 15d61e42bd
commit bd0188320d
19 changed files with 306 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/gmock/gmock-actions.h
View File

@@ -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: