Merge lp:~ricmm/mir/lp-1238312 into lp:~mir-team/mir/trunk

[Ricardo Mendoza]

Invert order of initialization to prevent a corruption issue when initializing the next unordered_set<>. Possible compiler issue.

[Daniel van Vugt (vanvugt)]

The implication is very scary. But the change theoretically harmless.

review: Approve

[Ricardo Salveti (rsalveti)]

Did test and indeed fixes the wrong behavior (at the compiler level, as the code was already correct it seems). Works fine when built with O2.

Let's merge the workaround as this is critical for touch (and harmless as well).

review: Approve

[Daniel van Vugt (vanvugt)]

Whoops, I just noticed it's targeted at the wrong branch.

Please retarget to: lp:~mir-team/mir/development-branch

All fixes need to go through that branch right now :P

review: Needs Resubmitting

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1097
http://jenkins.qa.ubuntu.com/job/mir-ci/1589/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2324/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/2209
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/833
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/833/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-armhf-ci/90
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-armhf-ci/90/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/mir-ci/1589/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'src/client/mir_client_library.cpp'
--- src/client/mir_client_library.cpp	2013-10-09 12:00:24 +0000
+++ src/client/mir_client_library.cpp	2013-10-11 03:24:20 +0000
@@ -35,8 +35,8 @@
 
 namespace mcl = mir::client;
 
+std::unordered_set<MirConnection*> MirConnection::valid_connections;
 std::mutex MirConnection::connection_guard;
-std::unordered_set<MirConnection*> MirConnection::valid_connections;
 
 namespace
 {