Merge lp:~thomas-voss/mir/lp-1238312 into lp:~mir-team/mir/trunk

[Thomas Voß]

Clean up duplicate instances of the valid connections set. Remove the static instances from the header file.

Clean up duplicate instances of the valid connections set. Remove the static instances from the header file.

[Daniel van Vugt (vanvugt)]

Yes! I should have thought of that.

review: Approve

[Daniel van Vugt (vanvugt)]

Except, wrong target branch. Please aim for development-branch.

review: Needs Resubmitting

=== 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 05:37:57 +0000
@@ -35,9 +35,6 @@
 
 namespace mcl = mir::client;
 
-std::mutex MirConnection::connection_guard;
-std::unordered_set<MirConnection*> MirConnection::valid_connections;
-
 namespace
 {
 class ConnectionList

=== modified file 'src/client/mir_connection.cpp'
--- src/client/mir_connection.cpp	2013-10-07 09:27:32 +0000
+++ src/client/mir_connection.cpp	2013-10-11 05:37:57 +0000
@@ -62,6 +62,8 @@
     MirDisplayConfiguration* const config;
 };
 
+std::mutex connection_guard;
+std::unordered_set<MirConnection*> valid_connections;
 }
 
 MirConnection::MirConnection() :

=== modified file 'src/client/mir_connection.h'
--- src/client/mir_connection.h	2013-08-28 03:41:48 +0000
+++ src/client/mir_connection.h	2013-10-11 05:37:57 +0000
@@ -156,8 +156,6 @@
     std::shared_ptr<mir::client::LifecycleControl> const lifecycle_control;
 
     std::shared_ptr<mir::client::SurfaceMap> surface_map;
-    static std::mutex connection_guard;
-    static std::unordered_set<MirConnection*> valid_connections;
 
     struct SurfaceRelease;