diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-12-16 13:20:29 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-12-16 13:20:29 +0100 |
commit | 0a89edfda900b6322d0823a56f3d8241c90035a2 (patch) | |
tree | b9004a4e5ffa785f9b0bbcc9e27639e1f0d13259 /samples | |
parent | 42bfaf23fb67270261942ce8f6a0e9bc0416bf33 (diff) |
Google C++ Testing Framework 1.8.0
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() { |