diff options
| author | kosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925> | 2014-04-02 20:26:07 +0000 |
|---|---|---|
| committer | kosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925> | 2014-04-02 20:26:07 +0000 |
| commit | e735d74bc537869af877dfc90c171dc140495c11 (patch) | |
| tree | f98b39a800f0e172c1b0c04e458d89009b6e351f /test | |
| parent | d132283f055f07588d82ad43fbf501645cb39c9d (diff) | |
| download | googletest-e735d74bc537869af877dfc90c171dc140495c11.tar.gz | |
Export tuple and friends in the ::testing namespace.
git-svn-id: http://googletest.googlecode.com/svn/trunk@682 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'test')
| -rw-r--r-- | test/gtest-param-test_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/gtest-param-test_test.cc b/test/gtest-param-test_test.cc index f60cb8a..cc1dc65 100644 --- a/test/gtest-param-test_test.cc +++ b/test/gtest-param-test_test.cc @@ -64,9 +64,9 @@ using ::testing::ValuesIn; # if GTEST_HAS_COMBINE using ::testing::Combine; -using ::std::tr1::get; -using ::std::tr1::make_tuple; -using ::std::tr1::tuple; +using ::testing::get; +using ::testing::make_tuple; +using ::testing::tuple; # endif // GTEST_HAS_COMBINE using ::testing::internal::ParamGenerator; |