Mir

Merge lp:~kdub/mir/fix-android-build into lp:~mir-team/mir/trunk

  1. fix-android-build
  2. Merge into trunk
Proposed by Kevin DuBois
Status: Merged
Approved by: Robert Carr
Approved revision: no longer in the source branch.
Merged at revision: 492
Proposed branch: lp:~kdub/mir/fix-android-build
Merge into: lp:~mir-team/mir/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
tests/unit-tests/frontend/test_application_mediator_android.cpp (+1/-1)
To merge this branch: bzr merge lp:~kdub/mir/fix-android-build
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Robert Carr (community) Approve
Review via email: mp+152962@code.launchpad.net

Commit message

android build broke on file tests/unit-tests/frontend/test_application_mediator_android.cpp due to missing namespace qualifier. fix by adding the namespace

Description of the change

android build broke on file tests/unit-tests/frontend/test_application_mediator_android.cpp due to missing namespace qualifier. fix by adding the namespace

To post a comment you must log in.
Revision history for this message
Robert Carr (robertcarr) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/unit-tests/frontend/test_application_mediator_android.cpp'
2--- tests/unit-tests/frontend/test_application_mediator_android.cpp 2013-03-12 12:48:39 +0000
3+++ tests/unit-tests/frontend/test_application_mediator_android.cpp 2013-03-12 16:47:24 +0000
4@@ -97,7 +97,7 @@
5 {
6 }
7
8- std::shared_ptr<StubSessionStore> const session_store;
9+ std::shared_ptr<mtd::StubSessionStore> const session_store;
10 std::shared_ptr<StubPlatform> const graphics_platform;
11 std::shared_ptr<mg::Display> const graphics_display;
12 std::shared_ptr<mc::GraphicBufferAllocator> const buffer_allocator;

Subscribers

People subscribed via source and target branches