commit dfd195160a5bcccde55543585674d91afcadd861
author Colin Cross <ccross@android.com> Thu Sep 29 23:35:27 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 29 23:35:27 2016 +0000
tree 869122c4273f5a8bad05786dcb53d87b625356fc
parent 9984fa0ed09c1ce33e78db4ba2b35a8201c0119e
parent 3175c094d782822f6b7aaf31a8593150b5c48b41

Merge "Fix rule of three warnings"

include/gui/BufferItem.h

diff --git a/include/gui/BufferItem.h b/include/gui/BufferItem.h
index f45d852..3ab63d0 100644
--- a/include/gui/BufferItem.h
+++ b/include/gui/BufferItem.h
@@ -46,6 +46,8 @@
     enum { INVALID_BUFFER_SLOT = -1 };
     BufferItem();
     ~BufferItem();
+    BufferItem(const BufferItem&) = default;
+    BufferItem& operator=(const BufferItem&) = default;
 
     static const char* scalingModeName(uint32_t scalingMode);
 

include/gui/Sensor.h

diff --git a/include/gui/Sensor.h b/include/gui/Sensor.h
index 094fd16..7506835 100644
--- a/include/gui/Sensor.h
+++ b/include/gui/Sensor.h
@@ -61,6 +61,9 @@
         uuid_t() : b{0} {}
     };
 
+    Sensor(const Sensor&) = default;
+    Sensor& operator=(const Sensor&) = default;
+
     Sensor(const char * name = "");
     Sensor(struct sensor_t const* hwSensor, int halVersion = 0);
     Sensor(struct sensor_t const& hwSensor, const uuid_t& uuid, int halVersion = 0);