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 /samples | |
| 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 'samples')
| -rw-r--r-- | samples/sample8_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/samples/sample8_unittest.cc b/samples/sample8_unittest.cc index 5ad2e2c..7274334 100644 --- a/samples/sample8_unittest.cc +++ b/samples/sample8_unittest.cc @@ -90,7 +90,7 @@ using ::testing::Combine; // PreCalculatedPrimeTable disabled. We do this by defining fixture which will // accept different combinations of parameters for instantiating a // HybridPrimeTable instance. -class PrimeTableTest : public TestWithParam< ::std::tr1::tuple<bool, int> > { +class PrimeTableTest : public TestWithParam< ::testing::tuple<bool, int> > { protected: virtual void SetUp() { // This can be written as @@ -101,8 +101,8 @@ class PrimeTableTest : public TestWithParam< ::std::tr1::tuple<bool, int> > { // // once the Google C++ Style Guide allows use of ::std::tr1::tie. // - bool force_on_the_fly = ::std::tr1::get<0>(GetParam()); - int max_precalculated = ::std::tr1::get<1>(GetParam()); + bool force_on_the_fly = ::testing::get<0>(GetParam()); + int max_precalculated = ::testing::get<1>(GetParam()); table_ = new HybridPrimeTable(force_on_the_fly, max_precalculated); } virtual void TearDown() { |