Use std::get instead of std::tr1::get for std::tuple.

2 files changed, 12 insertions, 12 deletions

diff --git a/tests/test_launcher_hide_machine.cpp b/tests/test_launcher_hide_machine.cpp
index 41adc7b66..47a7c66a5 100644
--- a/tests/test_launcher_hide_machine.cpp
+++ b/tests/test_launcher_hide_machine.cpp
@@ -52,9 +52,9 @@ struct HideModeNever : public TestWithParam<std::tuple<ul::LauncherHideMachine::
 #pragma GCC diagnostic ignored "-Wunused-variable"
 
 TEST_P(HideModeNever, Bool2Bool) {
- auto quirk = std::tr1::get<0>(GetParam());
- bool initial_value = std::tr1::get<1>(GetParam());
- bool final_value = std::tr1::get<2>(GetParam());
+ auto quirk = std::get<0>(GetParam());
+ bool initial_value = std::get<1>(GetParam());
+ bool final_value = std::get<2>(GetParam());
 
 machine.SetMode(ul::LauncherHideMachine::HIDE_NEVER);
 machine.SetQuirk(quirk, initial_value);
diff --git a/tests/test_launcher_hover_machine.cpp b/tests/test_launcher_hover_machine.cpp
index fb3939e3e..94843008d 100644
--- a/tests/test_launcher_hover_machine.cpp
+++ b/tests/test_launcher_hover_machine.cpp
@@ -40,9 +40,9 @@ struct SingleQuirk : public TestWithParam<std::tuple<unity::LauncherHoverMachine
 };
 
 TEST_P(SingleQuirk, Bool2Bool) {
- auto quirk = std::tr1::get<0>(GetParam());
- bool initial_value = std::tr1::get<1>(GetParam());
- bool final_value = std::tr1::get<2>(GetParam());
+ auto quirk = std::get<0>(GetParam());
+ bool initial_value = std::get<1>(GetParam());
+ bool final_value = std::get<2>(GetParam());
 
 machine.SetQuirk(quirk, initial_value);
 Utils::WaitForTimeoutMSec(20); // ignore the first signal
@@ -79,16 +79,16 @@ struct MultipleQuirks : public TestWithParam<std::tuple<unity::LauncherHoverMach
 };
 
 TEST_P(MultipleQuirks, DoubleBool2Bool) {
- auto quirk1 = std::tr1::get<0>(GetParam());
- auto quirk2 = std::tr1::get<3>(GetParam());
+ auto quirk1 = std::get<0>(GetParam());
+ auto quirk2 = std::get<3>(GetParam());
 
 if (quirk1 == quirk2)
 return;
 
- bool initial_value1 = std::tr1::get<1>(GetParam());
- bool final_value1 = std::tr1::get<2>(GetParam());
- bool initial_value2 = std::tr1::get<4>(GetParam());
- bool final_value2 = std::tr1::get<5>(GetParam());
+ bool initial_value1 = std::get<1>(GetParam());
+ bool final_value1 = std::get<2>(GetParam());
+ bool initial_value2 = std::get<4>(GetParam());
+ bool final_value2 = std::get<5>(GetParam());
 
 machine.SetQuirk(quirk1, initial_value1);
 machine.SetQuirk(quirk2, initial_value2);