Merge lp:~albaguirre/mir/fix-1599867 into lp:mir

[Alberto Aguirre]

Avoid using std::call_once to work around possible TLS collisions in some android devices.

[Kevin DuBois (kdub)]

lgtm

review: Approve

[Cemil Azizoglu (cemil-azizoglu)]

ok

review: Approve

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3581
https://mir-jenkins.ubuntu.com/job/mir-ci/1244/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/1448
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1500
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1491
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1491
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1462
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1462/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1462
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1462/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1462
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1462/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1462
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1462/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1462
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1462/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/1244/rebuild

review: Approve (continuous-integration)

=== modified file 'src/client/error_connections.cpp'
--- src/client/error_connections.cpp	2014-03-31 14:36:08 +0000
+++ src/client/error_connections.cpp	2016-07-07 13:51:44 +0000
@@ -20,19 +20,9 @@
 
 namespace mcl = mir::client;
 
-namespace
-{
-std::once_flag error_connections_init;
-}
-
 mcl::ErrorConnections& mcl::ErrorConnections::instance()
 {
-    static ErrorConnections* error_connections = nullptr;
-
-    std::call_once(
-        error_connections_init,
-        [&] { error_connections = new ErrorConnections();});
-
+    static ErrorConnections* error_connections = new ErrorConnections();
     return *error_connections;
 }