Mir

Merge lp:~afrantzis/mir/fix-1416317-clang-build into lp:mir

  1. fix-1416317-clang-build
  2. Merge into development-branch
Proposed by Alexandros Frantzis on 2015-01-30
Status: Merged
Approved by: Alan Griffiths on 2015-01-30
Approved revision: 2279
Merged at revision: 2279
Proposed branch: lp:~afrantzis/mir/fix-1416317-clang-build
Merge into: lp:mir
Diff against target: 65 lines (+22/-22)
1 file modified
src/server/shell/default_shell.h (+22/-22)
To merge this branch: bzr merge lp:~afrantzis/mir/fix-1416317-clang-build
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2015-01-30
Alan Griffiths 2015-01-30 Approve on 2015-01-30
Review via email: mp+248089@code.launchpad.net

Commit Message

Fix build with clang 3.6

Description of the Change

Fix build with clang 3.6

To post a comment you must log in.
Alan Griffiths (alan-griffiths) wrote :

Correct. (For some reason lp:~alan-griffiths/mir/MVC-introduce-msh-Shell -c 2288 didn't get merged with despite being approved)

review: Approve
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 'src/server/shell/default_shell.h'
2--- src/server/shell/default_shell.h 2015-01-29 04:34:12 +0000
3+++ src/server/shell/default_shell.h 2015-01-30 10:26:03 +0000
4@@ -57,39 +57,39 @@
5
6 /** @name these come from frontend::Shell
7 * @{ */
8- virtual std::shared_ptr<scene::Session> open_session(
9+ std::shared_ptr<scene::Session> open_session(
10 pid_t client_pid,
11 std::string const& name,
12- std::shared_ptr<frontend::EventSink> const& sink);
13-
14- virtual void close_session(std::shared_ptr<scene::Session> const& session);
15-
16- virtual void handle_surface_created(std::shared_ptr<scene::Session> const& session);
17-
18- virtual std::shared_ptr<scene::PromptSession> start_prompt_session_for(
19+ std::shared_ptr<frontend::EventSink> const& sink) override;
20+
21+ void close_session(std::shared_ptr<scene::Session> const& session) override;
22+
23+ void handle_surface_created(std::shared_ptr<scene::Session> const& session) override;
24+
25+ std::shared_ptr<scene::PromptSession> start_prompt_session_for(
26 std::shared_ptr<scene::Session> const& session,
27- scene::PromptSessionCreationParameters const& params);
28+ scene::PromptSessionCreationParameters const& params) override;
29
30- virtual void add_prompt_provider_for(
31+ void add_prompt_provider_for(
32 std::shared_ptr<scene::PromptSession> const& prompt_session,
33- std::shared_ptr<scene::Session> const& session);
34-
35- virtual void stop_prompt_session(std::shared_ptr<scene::PromptSession> const& prompt_session);
36-
37- virtual frontend::SurfaceId create_surface(std::shared_ptr<scene::Session> const& session, scene::SurfaceCreationParameters const& params);
38-
39- virtual void destroy_surface(std::shared_ptr<scene::Session> const& session, frontend::SurfaceId surface);
40-
41- virtual int set_surface_attribute(
42+ std::shared_ptr<scene::Session> const& session) override;
43+
44+ void stop_prompt_session(std::shared_ptr<scene::PromptSession> const& prompt_session) override;
45+
46+ frontend::SurfaceId create_surface(std::shared_ptr<scene::Session> const& session, scene::SurfaceCreationParameters const& params) override;
47+
48+ void destroy_surface(std::shared_ptr<scene::Session> const& session, frontend::SurfaceId surface) override;
49+
50+ int set_surface_attribute(
51 std::shared_ptr<scene::Session> const& session,
52 frontend::SurfaceId surface_id,
53 MirSurfaceAttrib attrib,
54- int value);
55+ int value) override;
56
57- virtual int get_surface_attribute(
58+ int get_surface_attribute(
59 std::shared_ptr<scene::Session> const& session,
60 frontend::SurfaceId surface_id,
61- MirSurfaceAttrib attrib);
62+ MirSurfaceAttrib attrib) override;
63 /** @} */
64
65 private:

Subscribers

People subscribed via source and target branches