diff options
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 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() { |