Merge lp:~mir-team/mir/add-sync-support into lp:~kdub/mir/add-sync-support

[Alexandros Frantzis]

android: Style fixes

android: Style fixes

[Alan Griffiths (alan-griffiths)]

review: Approve

[Kevin DuBois (kdub)]

ok

review: Approve

=== modified file 'src/client/android/syncfence.h'
--- src/client/android/syncfence.h	2013-03-13 19:55:46 +0000
+++ src/client/android/syncfence.h	2013-03-14 08:55:47 +0000
@@ -32,26 +32,26 @@
 class IoctlWrapper
 {
 public:
-    IoctlWrapper() {};
-    virtual ~IoctlWrapper() {};
+    virtual ~IoctlWrapper() {}
     virtual int ioctl(int fd, unsigned long int request, int* timeout) const = 0;
     virtual int close(int fd) const = 0;
 
-private:
-    IoctlWrapper(const IoctlWrapper&) = delete;
-    IoctlWrapper& operator=(const IoctlWrapper& ) = delete;
+protected:
+    IoctlWrapper() = default;
+    IoctlWrapper(IoctlWrapper const&) = delete;
+    IoctlWrapper& operator=(IoctlWrapper const&) = delete;
 };
 
 class AndroidFence
 {
 public:
-    AndroidFence() {};
-    virtual ~AndroidFence() {};
+    virtual ~AndroidFence() {}
     virtual void wait() = 0;
 
-private:
-    AndroidFence(const AndroidFence&) = delete;
-    AndroidFence& operator=(const AndroidFence& ) = delete;
+protected:
+    AndroidFence() = default;
+    AndroidFence(AndroidFence const&) = delete;
+    AndroidFence& operator=(AndroidFence const&) = delete;
 };
 
 class SyncFence : public AndroidFence
@@ -63,8 +63,9 @@
     void wait();
 
 private:
-    SyncFence(const SyncFence&) = delete;
-    SyncFence& operator=(const SyncFence& ) = delete;
+    SyncFence(SyncFence const&) = delete;
+    SyncFence& operator=(SyncFence const&) = delete;
+
     std::shared_ptr<IoctlWrapper> const ioctl_wrapper;
     int const fence_fd;
 };

=== modified file 'tests/unit-tests/client/test_android_syncfence.cpp'
--- tests/unit-tests/client/test_android_syncfence.cpp	2013-03-13 19:47:44 +0000
+++ tests/unit-tests/client/test_android_syncfence.cpp	2013-03-14 08:55:47 +0000
@@ -42,8 +42,9 @@
     {
     }
 
-    std::shared_ptr<MockIoctlWrapper> ioctl_mock;
-    int dummyfd, invalid_fd;
+    std::shared_ptr<MockIoctlWrapper> const ioctl_mock;
+    int const dummyfd;
+    int const invalid_fd;
 };
 
 TEST_F(SyncFenceTest, test_valid_fd_wait)