Merge unity:fix-std-tuple-use into unity:master

[Dmitry Shachnev]

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

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

std::tr1::get produces the following error:

tests/test_launcher_hide_machine.cpp:55:43: error: no matching function for call to ‘get<0>(const ParamType&)’
tests/test_launcher_hide_machine.cpp:55:43: note: ‘const ParamType’ {aka ‘const std::tuple<unity::launcher::LauncherHideMachine::HideQuirk, bool, bool>’} is not derived from ‘const std::tr1::tuple<_Elements ...>’

[Dmitry Shachnev (mitya57)]

Hi Marco!

With this fix, rebuilt compiz, and a patch in glewmx I am able to build Unity in https://launchpad.net/~ci-train-ppa-service/+archive/3336/+packages on all architectures except armhf.

Do you know what can cause the armhf failure? Can we disable tests on armhf temporarily to get the other fixes in?

[Khurshid Alam (khurshid-alam)]

This fixes the errors from include-fixes branch but armhf still fails. We should probably also check if it is still compiling against newer boost from proposed.

[Marco Trevisan (Treviño) (3v1n0)]

The change looks good, the problem with armhf looks more a crash inside launchpad.

I tried to debug that in a remote VM but I wasn't able to get much more infos... I see if I can find anything related.

Or we can probably try to publish without armhf.

[Dmitry Shachnev (mitya57)]

The current state is that it fails to build on *all* architectures again:

https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3336/+build/15741781

[Dmitry Shachnev (mitya57)]

The build I linked above is no longer actual, here is a fresh build with test failures:

https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3336/+build/16198941

[Alberts Muktupāvels (muktupavels)]

review: Approve

[Dmitry Shachnev (mitya57)]

With https://code.launchpad.net/~unity-team/unity/+git/unity/+merge/361372 the tests passed on all architectures, so I am approving and landing this.

diff --git a/tests/test_launcher_hide_machine.cpp b/tests/test_launcher_hide_machine.cpp
index 41adc7b..47a7c66 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 fb3939e..9484300 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);