diff options
author | kosak <kosak@google.com> | 2014-04-02 20:26:07 +0000 |
---|---|---|
committer | kosak <kosak@google.com> | 2014-04-02 20:26:07 +0000 |
commit | 5df87d70b64dd8080ab9e3f1b0250e74715e2a60 (patch) | |
tree | f98b39a800f0e172c1b0c04e458d89009b6e351f /samples/sample8_unittest.cc | |
parent | a6340420b9cee27f77c5b91bea807121914a5831 (diff) | |
download | googletest-5df87d70b64dd8080ab9e3f1b0250e74715e2a60.tar.gz googletest-5df87d70b64dd8080ab9e3f1b0250e74715e2a60.tar.bz2 googletest-5df87d70b64dd8080ab9e3f1b0250e74715e2a60.zip |
Export tuple and friends in the ::testing namespace.
Diffstat (limited to 'samples/sample8_unittest.cc')
-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 5ad2e2c9..72743340 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() { |