1
=== modified file '3rd_party/cucumber-cpp/include/cucumber-cpp/internal/hook/HookRegistrar.hpp'
2
--- 3rd_party/cucumber-cpp/include/cucumber-cpp/internal/hook/HookRegistrar.hpp	2013-01-03 21:26:48 +0000
3
+++ 3rd_party/cucumber-cpp/include/cucumber-cpp/internal/hook/HookRegistrar.hpp	2013-06-19 10:10:36 +0000
4
@@ -15,11 +15,14 @@
5
15
15
6
16
class CallableStep {
16
class CallableStep {
7
17
public:
17
public:
8
18
    virtual ~CallableStep() {}
9
18
    virtual void call() = 0;
19
    virtual void call() = 0;
10
19
};
20
};
11
20
21
12
21
class Hook {
22
class Hook {
13
22
public:
23
public:
14
24
    virtual ~Hook() {}
15
25
16
23
    void setTags(const std::string &csvTagNotation);
26
    void setTags(const std::string &csvTagNotation);
17
24
    virtual void invokeHook(Scenario *scenario);
27
    virtual void invokeHook(Scenario *scenario);
18
25
    virtual void skipHook();
28
    virtual void skipHook();
19
26
29
20
=== modified file '3rd_party/cucumber-cpp/include/cucumber-cpp/internal/hook/Tag.hpp'
21
--- 3rd_party/cucumber-cpp/include/cucumber-cpp/internal/hook/Tag.hpp	2013-01-03 21:26:48 +0000
22
+++ 3rd_party/cucumber-cpp/include/cucumber-cpp/internal/hook/Tag.hpp	2013-06-19 10:10:36 +0000
23
@@ -14,6 +14,7 @@
24
14
14
25
15
class TagExpression {
15
class TagExpression {
26
16
public:
16
public:
27
17
    virtual ~TagExpression() {}
28
17
    typedef std::vector<std::string> tag_list;
18
    typedef std::vector<std::string> tag_list;
29
18
19
30
19
    virtual bool matches(const tag_list &tags) = 0;
20
    virtual bool matches(const tag_list &tags) = 0;
31
20
21
32
=== modified file '3rd_party/cucumber-cpp/include/cucumber-cpp/internal/step/StepManager.hpp'
33
--- 3rd_party/cucumber-cpp/include/cucumber-cpp/internal/step/StepManager.hpp	2013-01-03 21:26:48 +0000
34
+++ 3rd_party/cucumber-cpp/include/cucumber-cpp/internal/step/StepManager.hpp	2013-06-19 10:10:36 +0000
35
@@ -100,6 +100,8 @@
36
100
class StepInfo {
100
class StepInfo {
37
101
public:
101
public:
38
102
    StepInfo(const std::string &stepMatcher, const std::string source);
102
    StepInfo(const std::string &stepMatcher, const std::string source);
39
103
    virtual ~StepInfo() {}
40
104
41
103
    SingleStepMatch matches(const std::string &stepDescription);
105
    SingleStepMatch matches(const std::string &stepDescription);
42
104
    virtual InvokeResult invokeStep(const InvokeArgs * pArgs) = 0;
106
    virtual InvokeResult invokeStep(const InvokeArgs * pArgs) = 0;
43
105
107
44
@@ -111,6 +113,7 @@
45
111
113
46
112
class BasicStep {
114
class BasicStep {
47
113
public:
115
public:
48
116
    virtual ~BasicStep() {}
49
114
    InvokeResult invoke(const InvokeArgs *pArgs);
117
    InvokeResult invoke(const InvokeArgs *pArgs);
50
115
118
51
116
protected:
119
protected:
52
117
120
53
=== modified file 'CMakeLists.txt'
54
--- CMakeLists.txt	2013-06-18 14:04:37 +0000
55
+++ CMakeLists.txt	2013-06-19 10:10:36 +0000
56
@@ -42,7 +42,7 @@
57
42
include (cmake/PrePush.cmake)
42
include (cmake/PrePush.cmake)
58
43
43
59
44
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Werror -Wall -pedantic -Wextra -fPIC")
44
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Werror -Wall -pedantic -Wextra -fPIC")
61
45
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -std=c++0x -Werror -Wall -fno-strict-aliasing -pedantic -Wextra -fPIC")
45
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -std=c++0x -Werror -Wall -fno-strict-aliasing -pedantic -Wnon-virtual-dtor -Wextra -fPIC")
62
46
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
46
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
63
47
47
64
48
#####################################################################
48
#####################################################################
65
49
49
66
=== modified file 'include/server/mir/compositor/buffer_allocation_strategy.h'
67
--- include/server/mir/compositor/buffer_allocation_strategy.h	2013-06-11 14:27:33 +0000
68
+++ include/server/mir/compositor/buffer_allocation_strategy.h	2013-06-19 10:10:36 +0000
69
@@ -52,7 +52,7 @@
70
52
52
71
53
protected:
53
protected:
72
54
    BufferAllocationStrategy() {}
54
    BufferAllocationStrategy() {}
74
55
    ~BufferAllocationStrategy() = default;
55
    virtual ~BufferAllocationStrategy() { /* TODO: make nothrow */ }
75
56
56
76
57
    BufferAllocationStrategy(const BufferAllocationStrategy&);
57
    BufferAllocationStrategy(const BufferAllocationStrategy&);
77
58
    BufferAllocationStrategy& operator=(const BufferAllocationStrategy& );
58
    BufferAllocationStrategy& operator=(const BufferAllocationStrategy& );
78
59
59
79
=== modified file 'include/server/mir/compositor/buffer_stream_surfaces.h'
80
--- include/server/mir/compositor/buffer_stream_surfaces.h	2013-06-13 10:40:42 +0000
81
+++ include/server/mir/compositor/buffer_stream_surfaces.h	2013-06-19 10:10:36 +0000
82
@@ -37,7 +37,6 @@
83
37
{
37
{
84
38
public:
38
public:
85
39
    BufferStreamSurfaces(std::shared_ptr<BufferBundle> const& swapper);
39
    BufferStreamSurfaces(std::shared_ptr<BufferBundle> const& swapper);
86
40
87
41
    ~BufferStreamSurfaces();
40
    ~BufferStreamSurfaces();
88
42
41
89
43
    std::shared_ptr<Buffer> secure_client_buffer();
42
    std::shared_ptr<Buffer> secure_client_buffer();
90
44
43
91
=== modified file 'include/server/mir/frontend/session_mediator_report.h'
92
--- include/server/mir/frontend/session_mediator_report.h	2013-05-30 03:50:54 +0000
93
+++ include/server/mir/frontend/session_mediator_report.h	2013-06-19 10:10:36 +0000
94
@@ -30,6 +30,8 @@
95
30
class SessionMediatorReport
30
class SessionMediatorReport
96
31
{
31
{
97
32
public:
32
public:
98
33
    virtual ~SessionMediatorReport() { /* TODO: make nothrow */ }
99
34
100
33
    virtual void session_connect_called(std::string const& app_name) = 0;
35
    virtual void session_connect_called(std::string const& app_name) = 0;
101
34
36
102
35
    virtual void session_create_surface_called(std::string const& app_name) = 0;
37
    virtual void session_create_surface_called(std::string const& app_name) = 0;
103
36
38
104
=== modified file 'include/server/mir/graphics/display.h'
105
--- include/server/mir/graphics/display.h	2013-06-17 09:51:42 +0000
106
+++ include/server/mir/graphics/display.h	2013-06-19 10:10:36 +0000
107
@@ -100,7 +100,7 @@
108
100
100
109
101
protected:
101
protected:
110
102
    Display() = default;
102
    Display() = default;
112
103
    ~Display() = default;
103
    virtual ~Display() {/* TODO: make nothrow */}
113
104
private:
104
private:
114
105
    Display(Display const&) = delete;
105
    Display(Display const&) = delete;
115
106
    Display& operator=(Display const&) = delete;
106
    Display& operator=(Display const&) = delete;
116
107
107
117
=== modified file 'include/server/mir/graphics/display_report.h'
118
--- include/server/mir/graphics/display_report.h	2013-05-10 18:16:51 +0000
119
+++ include/server/mir/graphics/display_report.h	2013-06-19 10:10:36 +0000
120
@@ -46,7 +46,7 @@
121
46
46
122
47
protected:
47
protected:
123
48
    DisplayReport() = default;
48
    DisplayReport() = default;
125
49
    ~DisplayReport() = default;
49
    virtual ~DisplayReport() { /* TODO: make nothrow */ }
126
50
    DisplayReport(const DisplayReport&) = delete;
50
    DisplayReport(const DisplayReport&) = delete;
127
51
    DisplayReport& operator=(const DisplayReport&) = delete;
51
    DisplayReport& operator=(const DisplayReport&) = delete;
128
52
};
52
};
129
53
53
130
=== modified file 'include/server/mir/graphics/platform.h'
131
--- include/server/mir/graphics/platform.h	2013-06-17 09:51:42 +0000
132
+++ include/server/mir/graphics/platform.h	2013-06-19 10:10:36 +0000
133
@@ -63,11 +63,14 @@
134
63
    Platform(const Platform& p) = delete;
63
    Platform(const Platform& p) = delete;
135
64
    Platform& operator=(const Platform& p) = delete;
64
    Platform& operator=(const Platform& p) = delete;
136
65
65
137
66
    virtual ~Platform() { /* TODO: make nothrow */ }
138
67
139
66
    /**
68
    /**
140
67
     * Creates the buffer allocator subsystem.
69
     * Creates the buffer allocator subsystem.
141
68
     *
70
     *
142
69
     * \param [in] buffer_initializer the object responsible for initializing the buffers
71
     * \param [in] buffer_initializer the object responsible for initializing the buffers
143
70
     */
72
     */
144
73
145
71
    virtual std::shared_ptr<compositor::GraphicBufferAllocator> create_buffer_allocator(
74
    virtual std::shared_ptr<compositor::GraphicBufferAllocator> create_buffer_allocator(
146
72
        std::shared_ptr<BufferInitializer> const& buffer_initializer) = 0;
75
        std::shared_ptr<BufferInitializer> const& buffer_initializer) = 0;
147
73
76
148
74
77
149
=== modified file 'include/server/mir/graphics/viewable_area.h'
150
--- include/server/mir/graphics/viewable_area.h	2013-04-24 05:22:20 +0000
151
+++ include/server/mir/graphics/viewable_area.h	2013-06-19 10:10:36 +0000
152
@@ -34,7 +34,7 @@
153
34
34
154
35
protected:
35
protected:
155
36
    ViewableArea() = default;
36
    ViewableArea() = default;
157
37
    ~ViewableArea() = default;
37
    virtual ~ViewableArea() { /* TODO: make nothrow */ }
158
38
private:
38
private:
159
39
    ViewableArea(ViewableArea const&) = delete;
39
    ViewableArea(ViewableArea const&) = delete;
160
40
    ViewableArea& operator=(ViewableArea const&) = delete;
40
    ViewableArea& operator=(ViewableArea const&) = delete;
161
41
41
162
=== modified file 'include/server/mir/options/option.h'
163
--- include/server/mir/options/option.h	2013-04-24 05:22:20 +0000
164
+++ include/server/mir/options/option.h	2013-06-19 10:10:36 +0000
165
@@ -39,7 +39,7 @@
166
39
39
167
40
protected:
40
protected:
168
41
    Option() = default;
41
    Option() = default;
170
42
    ~Option() = default;
42
    virtual ~Option() { /* TODO: make nothrow */ }
171
43
    Option(Option const&) = delete;
43
    Option(Option const&) = delete;
172
44
    Option& operator=(Option const&) = delete;
44
    Option& operator=(Option const&) = delete;
173
45
};
45
};
174
46
46
175
=== modified file 'include/server/mir/server_configuration.h'
176
--- include/server/mir/server_configuration.h	2013-04-25 09:48:54 +0000
177
+++ include/server/mir/server_configuration.h	2013-06-19 10:10:36 +0000
178
@@ -60,7 +60,7 @@
179
60
60
180
61
protected:
61
protected:
181
62
    ServerConfiguration() = default;
62
    ServerConfiguration() = default;
183
63
    virtual ~ServerConfiguration() {}
63
    virtual ~ServerConfiguration() { /* TODO: make nothrow */ }
184
64
64
185
65
    ServerConfiguration(ServerConfiguration const&) = delete;
65
    ServerConfiguration(ServerConfiguration const&) = delete;
186
66
    ServerConfiguration& operator=(ServerConfiguration const&) = delete;
66
    ServerConfiguration& operator=(ServerConfiguration const&) = delete;
187
67
67
188
=== modified file 'include/server/mir/surfaces/buffer_stream.h'
189
--- include/server/mir/surfaces/buffer_stream.h	2013-06-13 10:40:42 +0000
190
+++ include/server/mir/surfaces/buffer_stream.h	2013-06-19 10:10:36 +0000
191
@@ -40,6 +40,8 @@
192
40
class BufferStream
40
class BufferStream
193
41
{
41
{
194
42
public:
42
public:
195
43
    virtual ~BufferStream() {/* TODO: make nothrow */}
196
44
197
43
    virtual std::shared_ptr<compositor::Buffer> secure_client_buffer() = 0;
45
    virtual std::shared_ptr<compositor::Buffer> secure_client_buffer() = 0;
198
44
    virtual std::shared_ptr<surfaces::GraphicRegion> lock_back_buffer() = 0;
46
    virtual std::shared_ptr<surfaces::GraphicRegion> lock_back_buffer() = 0;
199
45
    virtual geometry::PixelFormat get_stream_pixel_format() = 0;
47
    virtual geometry::PixelFormat get_stream_pixel_format() = 0;
200
46
48
201
=== modified file 'include/test/mir_test_doubles/mock_android_alloc_device.h'
202
--- include/test/mir_test_doubles/mock_android_alloc_device.h	2013-05-01 17:35:49 +0000
203
+++ include/test/mir_test_doubles/mock_android_alloc_device.h	2013-06-19 10:10:36 +0000
204
@@ -30,6 +30,7 @@
205
30
class ICSAllocInterface
30
class ICSAllocInterface
206
31
{
31
{
207
32
public:
32
public:
208
33
    virtual ~ICSAllocInterface() {/* TODO: make nothrow */}
209
33
    virtual int alloc_interface(alloc_device_t* dev, int w, int h,
34
    virtual int alloc_interface(alloc_device_t* dev, int w, int h,
210
34
                                int format, int usage, buffer_handle_t* handle, int* stride) = 0;
35
                                int format, int usage, buffer_handle_t* handle, int* stride) = 0;
211
35
    virtual int free_interface(alloc_device_t* dev, buffer_handle_t handle) = 0;
36
    virtual int free_interface(alloc_device_t* dev, buffer_handle_t handle) = 0;
212
36
37
213
=== modified file 'include/test/mir_test_doubles/mock_android_registrar.h'
214
--- include/test/mir_test_doubles/mock_android_registrar.h	2013-04-24 05:22:20 +0000
215
+++ include/test/mir_test_doubles/mock_android_registrar.h	2013-06-19 10:10:36 +0000
216
@@ -35,6 +35,7 @@
217
35
{
35
{
218
36
struct MockAndroidRegistrar : public client::android::AndroidRegistrar
36
struct MockAndroidRegistrar : public client::android::AndroidRegistrar
219
37
{
37
{
220
38
    ~MockAndroidRegistrar() noexcept {}
221
38
    MOCK_METHOD1(register_buffer,   void(const native_handle_t*));
39
    MOCK_METHOD1(register_buffer,   void(const native_handle_t*));
222
39
    MOCK_METHOD1(unregister_buffer, void(const native_handle_t*));
40
    MOCK_METHOD1(unregister_buffer, void(const native_handle_t*));
223
40
    MOCK_METHOD2(secure_for_cpu, std::shared_ptr<char>(std::shared_ptr<const native_handle_t>, geometry::Rectangle));
41
    MOCK_METHOD2(secure_for_cpu, std::shared_ptr<char>(std::shared_ptr<const native_handle_t>, geometry::Rectangle));
224
41
42
225
=== modified file 'include/test/mir_test_framework/testing_process_manager.h'
226
--- include/test/mir_test_framework/testing_process_manager.h	2013-04-24 05:22:20 +0000
227
+++ include/test/mir_test_framework/testing_process_manager.h	2013-06-19 10:10:36 +0000
228
@@ -40,6 +40,7 @@
229
40
40
230
41
struct TestingClientConfiguration
41
struct TestingClientConfiguration
231
42
{
42
{
232
43
    virtual ~TestingClientConfiguration() = default;
233
43
    // Code to run in client process
44
    // Code to run in client process
234
44
    virtual void exec() = 0;
45
    virtual void exec() = 0;
235
45
};
46
};
236
46
47
237
=== modified file 'src/client/aging_buffer.h'
238
--- src/client/aging_buffer.h	2013-05-03 18:39:57 +0000
239
+++ src/client/aging_buffer.h	2013-06-19 10:10:36 +0000
240
@@ -30,7 +30,7 @@
241
30
{
30
{
242
31
public:
31
public:
243
32
    AgingBuffer();
32
    AgingBuffer();
245
33
    ~AgingBuffer() noexcept {};
33
    ~AgingBuffer() noexcept {}
246
34
34
247
35
    virtual uint32_t age() const;
35
    virtual uint32_t age() const;
248
36
    virtual void increment_age();
36
    virtual void increment_age();
249
37
37
250
=== modified file 'src/client/android/android_registrar.h'
251
--- src/client/android/android_registrar.h	2013-04-24 05:22:20 +0000
252
+++ src/client/android/android_registrar.h	2013-06-19 10:10:36 +0000
253
@@ -35,6 +35,8 @@
254
35
class AndroidRegistrar
35
class AndroidRegistrar
255
36
{
36
{
256
37
public:
37
public:
257
38
    virtual ~AndroidRegistrar() = default;
258
39
259
38
    virtual void register_buffer(const native_handle_t *handle) = 0;
40
    virtual void register_buffer(const native_handle_t *handle) = 0;
260
39
    virtual void unregister_buffer(const native_handle_t *handle) = 0;
41
    virtual void unregister_buffer(const native_handle_t *handle) = 0;
261
40
    virtual std::shared_ptr<char> secure_for_cpu(std::shared_ptr<const native_handle_t> handle, const geometry::Rectangle) = 0;
42
    virtual std::shared_ptr<char> secure_for_cpu(std::shared_ptr<const native_handle_t> handle, const geometry::Rectangle) = 0;
262
41
43
263
=== modified file 'src/client/client_platform.h'
264
--- src/client/client_platform.h	2013-06-17 09:51:42 +0000
265
+++ src/client/client_platform.h	2013-06-19 10:10:36 +0000
266
@@ -42,6 +42,8 @@
267
42
    ClientPlatform(const ClientPlatform& p) = delete;
42
    ClientPlatform(const ClientPlatform& p) = delete;
268
43
    ClientPlatform& operator=(const ClientPlatform& p) = delete;
43
    ClientPlatform& operator=(const ClientPlatform& p) = delete;
269
44
44
270
45
    virtual ~ClientPlatform() { /* TODO: make nothrow */ }
271
46
272
45
    virtual MirPlatformType platform_type() const = 0; 
47
    virtual MirPlatformType platform_type() const = 0; 
273
46
    virtual std::shared_ptr<ClientBufferFactory> create_buffer_factory() = 0;
48
    virtual std::shared_ptr<ClientBufferFactory> create_buffer_factory() = 0;
274
47
    virtual std::shared_ptr<EGLNativeWindowType> create_egl_native_window(ClientSurface *surface) = 0;
49
    virtual std::shared_ptr<EGLNativeWindowType> create_egl_native_window(ClientSurface *surface) = 0;
275
48
50
276
=== modified file 'src/server/compositor/rw_lock.h'
277
--- src/server/compositor/rw_lock.h	2013-06-07 15:23:27 +0000
278
+++ src/server/compositor/rw_lock.h	2013-06-19 10:10:36 +0000
279
@@ -33,6 +33,8 @@
280
33
public:
33
public:
281
34
    void lock() { read_lock(); }
34
    void lock() { read_lock(); }
282
35
    void unlock() { read_unlock(); }
35
    void unlock() { read_unlock(); }
283
36
284
37
    virtual ~ReadLock() = default;
285
36
protected:
38
protected:
286
37
    ReadLock()
39
    ReadLock()
287
38
    {
40
    {
288
@@ -50,6 +52,8 @@
289
50
public:
52
public:
290
51
    void lock() { write_lock(); }
53
    void lock() { write_lock(); }
291
52
    void unlock() { write_unlock(); }
54
    void unlock() { write_unlock(); }
292
55
293
56
    virtual ~WriteLock() = default;
294
53
protected:
57
protected:
295
54
    WriteLock()
58
    WriteLock()
296
55
    {
59
    {
297
56
60
298
=== modified file 'src/server/frontend/message_processor.h'
299
--- src/server/frontend/message_processor.h	2013-04-24 05:22:20 +0000
300
+++ src/server/frontend/message_processor.h	2013-06-19 10:10:36 +0000
301
@@ -37,7 +37,7 @@
302
37
    virtual void send_fds(std::vector<int32_t> const& fd) = 0;
37
    virtual void send_fds(std::vector<int32_t> const& fd) = 0;
303
38
protected:
38
protected:
304
39
    MessageSender() = default;
39
    MessageSender() = default;
306
40
    ~MessageSender() = default;
40
    virtual ~MessageSender() { /* TODO: make nothrow */ }
307
41
    MessageSender(MessageSender const&) = delete;
41
    MessageSender(MessageSender const&) = delete;
308
42
    MessageSender& operator=(MessageSender const&) = delete;
42
    MessageSender& operator=(MessageSender const&) = delete;
309
43
};
43
};
310
@@ -47,7 +47,7 @@
311
47
    virtual bool process_message(std::istream& msg) = 0;
47
    virtual bool process_message(std::istream& msg) = 0;
312
48
protected:
48
protected:
313
49
    MessageProcessor() = default;
49
    MessageProcessor() = default;
315
50
    ~MessageProcessor() = default;
50
    virtual ~MessageProcessor() = default;
316
51
    MessageProcessor(MessageProcessor const&) = delete;
51
    MessageProcessor(MessageProcessor const&) = delete;
317
52
    MessageProcessor& operator=(MessageProcessor const&) = delete;
52
    MessageProcessor& operator=(MessageProcessor const&) = delete;
318
53
};
53
};
319
54
54
320
=== modified file 'src/server/frontend/socket_session.cpp'
321
--- src/server/frontend/socket_session.cpp	2013-04-24 05:22:20 +0000
322
+++ src/server/frontend/socket_session.cpp	2013-06-19 10:10:36 +0000
323
@@ -27,7 +27,6 @@
324
27
27
325
28
namespace mfd = mir::frontend::detail;
28
namespace mfd = mir::frontend::detail;
326
29
29
327
30
328
31
void mfd::SocketSession::send(std::string const& body)
30
void mfd::SocketSession::send(std::string const& body)
329
32
{
31
{
330
33
    const size_t size = body.size();
32
    const size_t size = body.size();
331
34
33
332
=== modified file 'src/server/graphics/gbm/gbm_display.cpp'
333
--- src/server/graphics/gbm/gbm_display.cpp	2013-06-12 10:27:50 +0000
334
+++ src/server/graphics/gbm/gbm_display.cpp	2013-06-19 10:10:36 +0000
335
@@ -87,6 +87,9 @@
336
87
    shared_egl.make_current();
87
    shared_egl.make_current();
337
88
}
88
}
338
89
89
339
90
// please don't remove this empty destructor, it's here for the
340
91
// unique ptr!! if you accidentally remove it you will get a not
341
92
// so relevant linker error about some missing headers
342
90
mgg::GBMDisplay::~GBMDisplay()
93
mgg::GBMDisplay::~GBMDisplay()
343
91
{
94
{
344
92
}
95
}
345
93
96
346
=== modified file 'src/server/graphics/gbm/gbm_platform.cpp'
347
--- src/server/graphics/gbm/gbm_platform.cpp	2013-05-30 03:50:54 +0000
348
+++ src/server/graphics/gbm/gbm_platform.cpp	2013-06-19 10:10:36 +0000
349
@@ -17,7 +17,6 @@
350
17
 */
17
 */
351
18
18
352
19
#include "gbm_platform.h"
19
#include "gbm_platform.h"
353
20
354
21
#include "gbm_buffer_allocator.h"
20
#include "gbm_buffer_allocator.h"
355
22
#include "gbm_display.h"
21
#include "gbm_display.h"
356
23
#include "internal_client.h"
22
#include "internal_client.h"
357
24
23
358
=== modified file 'tests/integration-tests/compositor/multithread_harness.h'
359
--- tests/integration-tests/compositor/multithread_harness.h	2013-01-11 23:47:40 +0000
360
+++ tests/integration-tests/compositor/multithread_harness.h	2013-06-19 10:10:36 +0000
361
@@ -32,6 +32,8 @@
362
32
class SynchronizerController
32
class SynchronizerController
363
33
{
33
{
364
34
public:
34
public:
365
35
    virtual ~SynchronizerController() {}
366
36
367
35
        virtual void ensure_child_is_waiting() = 0;
37
        virtual void ensure_child_is_waiting() = 0;
368
36
        virtual void activate_waiting_child() = 0;
38
        virtual void activate_waiting_child() = 0;
369
37
        virtual void kill_thread() = 0;
39
        virtual void kill_thread() = 0;
370
@@ -41,6 +43,7 @@
371
41
class SynchronizerSpawned
43
class SynchronizerSpawned
372
42
{
44
{
373
43
public:
45
public:
374
46
    virtual ~SynchronizerSpawned() {}
375
44
    virtual bool child_enter_wait() = 0;
47
    virtual bool child_enter_wait() = 0;
376
45
    virtual bool child_check_wait_request() = 0;
48
    virtual bool child_check_wait_request() = 0;
377
46
};
49
};
378
47
50
379
=== modified file 'tests/unit-tests/client/android/test_client_android_registrar.cpp'
380
--- tests/unit-tests/client/android/test_client_android_registrar.cpp	2013-04-24 05:22:20 +0000
381
+++ tests/unit-tests/client/android/test_client_android_registrar.cpp	2013-06-19 10:10:36 +0000
382
@@ -33,6 +33,7 @@
383
33
class ICSRegistrarInterface
33
class ICSRegistrarInterface
384
34
{
34
{
385
35
public:
35
public:
386
36
    virtual ~ICSRegistrarInterface() {}
387
36
    virtual int registerBuffer_interface(struct gralloc_module_t const* module, buffer_handle_t handle) const = 0;
37
    virtual int registerBuffer_interface(struct gralloc_module_t const* module, buffer_handle_t handle) const = 0;
388
37
    virtual int unregisterBuffer_interface(struct gralloc_module_t const* module, buffer_handle_t handle) const = 0;
38
    virtual int unregisterBuffer_interface(struct gralloc_module_t const* module, buffer_handle_t handle) const = 0;
389
38
    virtual int lock_interface(struct gralloc_module_t const* module, buffer_handle_t handle,
39
    virtual int lock_interface(struct gralloc_module_t const* module, buffer_handle_t handle,
390
39
40
391
=== modified file 'tests/unit-tests/graphics/android/test_android_framebuffer_window.cpp'
392
--- tests/unit-tests/graphics/android/test_android_framebuffer_window.cpp	2013-05-20 15:55:48 +0000
393
+++ tests/unit-tests/graphics/android/test_android_framebuffer_window.cpp	2013-06-19 10:10:36 +0000
394
@@ -31,6 +31,7 @@
395
31
class ANativeWindowInterface
31
class ANativeWindowInterface
396
32
{
32
{
397
33
public:
33
public:
398
34
    virtual ~ANativeWindowInterface() = default;
399
34
    virtual int query_interface(const ANativeWindow* win , int code, int* value) const = 0;
35
    virtual int query_interface(const ANativeWindow* win , int code, int* value) const = 0;
400
35
};
36
};
401
36
37
402
@@ -51,6 +52,8 @@
403
51
                           Return(0)));
52
                           Return(0)));
404
52
    }
53
    }
405
53
54
406
55
    ~MockANativeWindow() noexcept {}
407
56
408
54
    static int hook_query(const ANativeWindow* anw, int code, int *ret)
57
    static int hook_query(const ANativeWindow* anw, int code, int *ret)
409
55
    {
58
    {
410
56
        const MockANativeWindow* mocker = static_cast<const MockANativeWindow*>(anw);
59
        const MockANativeWindow* mocker = static_cast<const MockANativeWindow*>(anw);
411
57
60
412
=== modified file 'tests/unit-tests/test_gmock_fixes.cpp'
413
--- tests/unit-tests/test_gmock_fixes.cpp	2012-07-12 14:11:36 +0000
414
+++ tests/unit-tests/test_gmock_fixes.cpp	2013-06-19 10:10:36 +0000
415
@@ -26,12 +26,14 @@
416
26
{
26
{
417
27
    struct Interface
27
    struct Interface
418
28
    {
28
    {
419
29
        virtual ~Interface() = default;
420
29
        virtual std::unique_ptr<int> function() const = 0;
30
        virtual std::unique_ptr<int> function() const = 0;
421
30
    };
31
    };
422
31
32
423
32
    struct MockImplementation : Interface
33
    struct MockImplementation : Interface
424
33
    {
34
    {
425
34
        MOCK_CONST_METHOD0(function, std::unique_ptr<int>());
35
        MOCK_CONST_METHOD0(function, std::unique_ptr<int>());
426
36
        ~MockImplementation() noexcept {}
427
35
    };
37
    };
428
36
38
429
37
    MockImplementation mi;
39
    MockImplementation mi;
Reviewer	Review Type	Date Requested	Status
Daniel van Vugt		2013-06-12	Approve on 2013-06-20
Alan Griffiths		2013-06-12	Approve on 2013-06-19
PS Jenkins bot (community)	continuous-integration		Approve on 2013-06-19
Review via email: mp+168934@code.launchpad.net