Mir

Merge lp:~vanvugt/mir/fix-1200107 into lp:~mir-team/mir/trunk

  1. fix-1200107
  2. Merge into trunk
Proposed by Daniel van Vugt
Status: Merged
Approved by: Robert Ancell
Approved revision: no longer in the source branch.
Merged at revision: 843
Proposed branch: lp:~vanvugt/mir/fix-1200107
Merge into: lp:~mir-team/mir/trunk
Diff against target: 11 lines (+2/-0)
1 file modified
src/server/frontend/protobuf_message_processor.h (+2/-0)
To merge this branch: bzr merge lp:~vanvugt/mir/fix-1200107
Reviewer Review Type Date Requested Status
Robert Ancell Approve
Alexandros Frantzis (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+174122@code.launchpad.net

Commit message

Another workaround for gcc-4.7 bugs causing build failure. (LP: #1200107)

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:841
http://jenkins.qa.ubuntu.com/job/mir-ci/981/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1269
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1153
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/219
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/219/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/618

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

review: Approve (continuous-integration)
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

OK.

review: Approve
Revision history for this message
Robert Ancell (robert-ancell) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/server/frontend/protobuf_message_processor.h'
2--- src/server/frontend/protobuf_message_processor.h 2013-07-09 17:07:50 +0000
3+++ src/server/frontend/protobuf_message_processor.h 2013-07-11 07:09:27 +0000
4@@ -52,6 +52,8 @@
5 std::shared_ptr<ResourceCache> const& resource_cache,
6 std::shared_ptr<MessageProcessorReport> const& report);
7
8+ ~ProtobufMessageProcessor() noexcept {}
9+
10 private:
11 void send_response(::google::protobuf::uint32 id, google::protobuf::Message* response);
12

Subscribers

People subscribed via source and target branches