← Back to branch summary

~ci-train-bot/unity-system-compositor/unity-system-compositor-ubuntu-zesty-2373

« back to all changes in this revision

Viewing changes to tests/include/usc/test/mock_display.h

  • Committer: Tarmac
  • Author(s): Alan Griffiths
  • Date: 2017-04-01 10:40:12 UTC
  • mfrom: (307.1.2 unity-system-compositor)
  • Revision ID: tarmac-20170401104012-vcjvu7wyfpi2vy3a
Fix build against lp:mir (and Mir 0.26!).

Approved by mir-ci-bot, Brandon Schaefer, Stephen M. Webb.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/include/usc/test/mock_display.h
21
21
 
22
22
#include <mir/graphics/display.h>
23
23
#include <mir/graphics/virtual_output.h>
 
24
#include <mir/version.h>
24
25
#include <gmock/gmock.h>
25
26
 
26
27
namespace usc
53
54
 
54
55
    void resume() override {};
55
56
 
 
57
#if MIR_SERVER_VERSION < MIR_VERSION_NUMBER(0, 27, 0)
56
58
    std::shared_ptr<mir::graphics::Cursor> create_hardware_cursor(
57
59
        std::shared_ptr<mir::graphics::CursorImage> const&) override
58
60
    {
59
61
        return {};
60
62
    };
 
63
#else
 
64
    std::shared_ptr<mir::graphics::Cursor> create_hardware_cursor() override { return {}; }
 
65
#endif
61
66
 
62
67
    std::unique_ptr<mir::graphics::VirtualOutput> create_virtual_output(int, int) override
63
68
    { return std::unique_ptr<mir::graphics::VirtualOutput>{}; }