Merge lp:~3v1n0/mir/compilation-fixes-trusty into lp:mir

[Marco Trevisan (Treviño)]

Mir: Fix compilation when using clang/g++ on trusty

Mostly remove the curly brackets on initialization lists, and make sure we ignore deprecated-register errors when using clang.

This fixes compilation with both g++ and clang++ in trusty, but not the linking issue in g++ (as per bug #1418962)

[Daniel van Vugt (vanvugt)]

Thanks. I haven't checked trusty in a while.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2305
http://jenkins.qa.ubuntu.com/job/mir-ci/2928/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1237/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1236
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1194/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/925/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1194/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/2928/rebuild

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

If we intend to support trusty then there ought to be an automated build to pick these things up.

review: Approve

[Alexandros Frantzis (afrantzis)]

> If we intend to support trusty then there ought to be an automated build to pick these things up.

+1

review: Approve

[Alan Griffiths (alan-griffiths)]

Looks as though CI compiled a version of revision 2305 without the "#if defined(__clang__)" guards.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'examples/server_example_window_management.cpp'
--- examples/server_example_window_management.cpp	2015-02-04 18:10:25 +0000
+++ examples/server_example_window_management.cpp	2015-02-06 15:14:12 +0000
@@ -71,7 +71,7 @@
         std::shared_ptr<ms::PromptSessionManager> const& prompt_session_manager,
         std::shared_ptr<msh::DisplayLayout> const& display_layout) :
         AbstractShell(input_targeter, surface_coordinator, session_coordinator, prompt_session_manager),
-        FullscreenPlacementStrategy{display_layout}
+        FullscreenPlacementStrategy(display_layout)
     {
     }
 

=== modified file 'examples/server_example_window_management.h'
--- examples/server_example_window_management.h	2015-01-30 16:39:24 +0000
+++ examples/server_example_window_management.h	2015-02-06 15:14:12 +0000
@@ -55,7 +55,7 @@
 class WindowManagmentFactory
 {
 public:
-    explicit WindowManagmentFactory(Server& server) : server{server} {}
+    explicit WindowManagmentFactory(Server& server) : server(server) {}
 
     auto window_manager() -> std::shared_ptr<WindowManager>;
 

=== modified file 'src/include/server/mir/glib_main_loop_sources.h'
--- src/include/server/mir/glib_main_loop_sources.h	2015-01-21 07:34:50 +0000
+++ src/include/server/mir/glib_main_loop_sources.h	2015-02-06 15:14:12 +0000
@@ -29,8 +29,17 @@
 #include <memory>
 #include <unordered_map>
 
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-register"
+#endif
+
 #include <glib.h>
 
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+
 namespace mir
 {
 namespace detail

=== modified file 'src/server/compositor/default_display_buffer_compositor.cpp'
--- src/server/compositor/default_display_buffer_compositor.cpp	2015-01-21 09:03:53 +0000
+++ src/server/compositor/default_display_buffer_compositor.cpp	2015-02-06 15:14:12 +0000
@@ -38,9 +38,9 @@
     mg::DisplayBuffer& display_buffer,
     std::shared_ptr<mc::Renderer> const& renderer,
     std::shared_ptr<mc::CompositorReport> const& report) :
-    display_buffer{display_buffer},
-    renderer{renderer},
-    report{report}
+    display_buffer(display_buffer),
+    renderer(renderer),
+    report(report)
 {
 }
 

=== modified file 'src/server/glib_main_loop_sources.cpp'
--- src/server/glib_main_loop_sources.cpp	2015-01-21 07:34:50 +0000
+++ src/server/glib_main_loop_sources.cpp	2015-02-06 15:14:12 +0000
@@ -80,14 +80,14 @@
 md::GSourceHandle::GSourceHandle(
     GSource* gsource,
     std::function<void(GSource*)> const& pre_destruction_hook)
-    : gsource{gsource},
-      pre_destruction_hook{pre_destruction_hook}
+    : gsource(gsource),
+      pre_destruction_hook(pre_destruction_hook)
 {
 }
 
 md::GSourceHandle::GSourceHandle(GSourceHandle&& other)
-    : gsource{std::move(other.gsource)},
-      pre_destruction_hook{std::move(other.pre_destruction_hook)}
+    : gsource(std::move(other.gsource)),
+      pre_destruction_hook(std::move(other.pre_destruction_hook))
 {
     other.gsource = nullptr;
     other.pre_destruction_hook = [](GSource*){};
@@ -495,7 +495,7 @@
 std::array<std::atomic<int>,10> md::SignalSources::SourceRegistration::write_fds;
 
 md::SignalSources::SignalSources(md::FdSources& fd_sources)
-    : fd_sources{fd_sources}
+    : fd_sources(fd_sources)
 {
     int pipefd[2];