Merge lp:~alan-griffiths/mir/fix-1475994-g++-5-backport-to-0.13 into lp:mir/0.13

[Alan Griffiths]

Fix compiler errors from g++-5

Fix compiler errors from g++-5

Unmerged revisions

2558. By Alan Griffiths on 2015-07-23

Update changelog

2557. By Alan Griffiths on 2015-07-23

Fix compiler errors from g++-5

=== modified file 'debian/changelog'
--- debian/changelog	2015-06-17 20:02:15 +0000
+++ debian/changelog	2015-07-23 13:27:04 +0000
@@ -1,3 +1,12 @@
+mir (0.13.4) UNRELEASED; urgency=medium
+
+  [ Alan Griffiths ]
+  * New upstream release 0.13.4 (https://launchpad.net/mir/+milestone/0.13.4)
+    - Bug fixes:
+      . mir fails to build with GCC 5 (LP: #1475994)
+
+ -- Alan Griffiths <alan@Octopull-desktop>  Thu, 23 Jul 2015 14:15:43 +0100
+
 mir (0.13.3+15.10.20150617-0ubuntu1) wily; urgency=medium
 
   [ Alberto Aguirre ]

=== modified file 'examples/basic.c'
--- examples/basic.c	2015-03-31 02:35:42 +0000
+++ examples/basic.c	2015-07-23 13:27:04 +0000
@@ -91,7 +91,7 @@
 
     ///\internal [connect_tag]
     // Call mir_connect and wait for callback to complete.
-    mir_wait_for(mir_connect(server, __PRETTY_FUNCTION__, connection_callback, &mcd));
+    mir_wait_for(mir_connect(server, __FILE__, connection_callback, &mcd));
     puts("Connected");
     ///\internal [connect_tag]
 
@@ -125,7 +125,7 @@
     MirSurfaceSpec *spec =
         mir_connection_create_spec_for_normal_surface(mcd.connection, 640, 480, pixel_format);
     assert(spec != NULL);
-    mir_surface_spec_set_name(spec, __PRETTY_FUNCTION__);
+    mir_surface_spec_set_name(spec, __FILE__);
 
     ///\internal [surface_create_tag]
     // ...we create a surface using that format and wait for callback to complete.

=== modified file 'examples/flicker.c'
--- examples/flicker.c	2015-03-31 02:35:42 +0000
+++ examples/flicker.c	2015-07-23 13:27:04 +0000
@@ -129,7 +129,7 @@
 
     puts("Starting");
 
-    connection = mir_connect_sync(socket_file, __PRETTY_FUNCTION__);
+    connection = mir_connect_sync(socket_file, __FILE__);
     assert(connection != NULL);
     assert(mir_connection_is_valid(connection));
     assert(strcmp(mir_connection_get_error_message(connection), "") == 0);
@@ -144,7 +144,7 @@
     MirSurfaceSpec *spec =
         mir_connection_create_spec_for_normal_surface(connection, 640, 480, pixel_format);
     assert(spec != NULL);
-    mir_surface_spec_set_name(spec, __PRETTY_FUNCTION__);
+    mir_surface_spec_set_name(spec, __FILE__);
     mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_software);
 
     surface = mir_surface_create_sync(spec);

=== modified file 'src/client/rpc/mir_protobuf_rpc_channel.cpp'
--- src/client/rpc/mir_protobuf_rpc_channel.cpp	2015-06-17 19:11:14 +0000
+++ src/client/rpc/mir_protobuf_rpc_channel.cpp	2015-07-23 13:27:04 +0000
@@ -19,7 +19,6 @@
 #include "mir_protobuf_rpc_channel.h"
 #include "rpc_report.h"
 
-#include "mir/protobuf/google_protobuf_guard.h"
 #include "../surface_map.h"
 #include "../mir_surface.h"
 #include "../display_configuration.h"

=== removed file 'src/include/common/mir/protobuf/google_protobuf_guard.h'
--- src/include/common/mir/protobuf/google_protobuf_guard.h	2015-01-21 07:34:50 +0000
+++ src/include/common/mir/protobuf/google_protobuf_guard.h	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-/*
- * Copyright © 2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Alan Griffiths <[e-mail]>
- */
-
-#ifndef MIR_PROTOBUF_GOOGLE_PROTOBUF_GUARD_H_
-#define MIR_PROTOBUF_GOOGLE_PROTOBUF_GUARD_H_
-
-namespace mir
-{
-
-/// subsystem dealing with Google protobuf protocol.
-namespace protobuf
-{
-void google_protobuf_guard();
-}
-}
-
-// Any translation unit that includes this header will get this as part
-// of its initialization, and, in turn, this ensures that protobuf gets
-// initialized (and cleaned up) in a sensible sequence.
-namespace
-{
-bool force_google_protobuf_init{(mir::protobuf::google_protobuf_guard(), true)};
-}
-
-#endif /* MIR_PROTOBUF_GOOGLE_PROTOBUF_GUARD_H_ */

=== modified file 'src/protobuf/google_protobuf_guard.cpp'
--- src/protobuf/google_protobuf_guard.cpp	2013-04-24 05:22:20 +0000
+++ src/protobuf/google_protobuf_guard.cpp	2015-07-23 13:27:04 +0000
@@ -16,39 +16,26 @@
  * Authored by: Alan Griffiths <[e-mail]>
  */
 
-#include "mir/protobuf/google_protobuf_guard.h"
-
 #include <google/protobuf/descriptor.h>
-#include <mutex>
-
-namespace mir
-{
-namespace
-{
-std::once_flag init_flag;
-std::once_flag shutdown_flag;
-
-void init_google_protobuf()
+
+extern "C" int __attribute__((constructor))
+init_google_protobuf()
 {
     GOOGLE_PROTOBUF_VERIFY_VERSION;
+
+    return 0;
 }
 
-void shutdown_google_protobuf()
+extern "C" int __attribute__((destructor))
+shutdown_google_protobuf()
 {
     google::protobuf::ShutdownProtobufLibrary();
+    return 0;
 }
 
-// Too clever? The idea is to ensure protbuf version is verified once (on
-// the first google_protobuf_guard() call) and memory is released on exit.
-struct google_protobuf_guard_t
-{
-    google_protobuf_guard_t() { std::call_once(init_flag, init_google_protobuf); }
-    ~google_protobuf_guard_t() { std::call_once(shutdown_flag, shutdown_google_protobuf); }
-};
-}
-}
+// Preserve ABI
+namespace mir { namespace protobuf { void google_protobuf_guard(); }}
 
 void mir::protobuf::google_protobuf_guard()
 {
-    static google_protobuf_guard_t guard;
 }

=== modified file 'src/server/frontend/protobuf_connection_creator.cpp'
--- src/server/frontend/protobuf_connection_creator.cpp	2015-01-21 07:34:50 +0000
+++ src/server/frontend/protobuf_connection_creator.cpp	2015-07-23 13:27:04 +0000
@@ -27,7 +27,6 @@
 
 #include "protobuf_ipc_factory.h"
 #include "mir/frontend/session_authorizer.h"
-#include "mir/protobuf/google_protobuf_guard.h"
 
 namespace mf = mir::frontend;
 namespace mfd = mir::frontend::detail;

=== modified file 'tests/unit-tests/android_input/property_map.cpp'
--- tests/unit-tests/android_input/property_map.cpp	2013-05-03 16:38:07 +0000
+++ tests/unit-tests/android_input/property_map.cpp	2015-07-23 13:27:04 +0000
@@ -36,7 +36,7 @@
 
     static void SetUpTestCase()
     {
-        ASSERT_TRUE(std::ofstream(test_file) <<
+        ASSERT_TRUE((std::ofstream(test_file) <<
             "test.string=a_string\n"
             "#test.bool.true=true\n"
             "test.bool.true=1\n"
@@ -45,7 +45,7 @@
             "# a comment\n"
             "#test.int.ignored=1\n"
             "test.int_32=123\n"
-            "test.float=0.5\n");
+            "test.float=0.5\n").good());
     }
 
     void SetUp()