summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2016-09-26 18:11:41 -0700
committer Colin Cross <ccross@android.com> 2016-09-29 23:35:15 +0000
commit3175c094d782822f6b7aaf31a8593150b5c48b41 (patch)
tree869122c4273f5a8bad05786dcb53d87b625356fc
parent9984fa0ed09c1ce33e78db4ba2b35a8201c0119e (diff)
Fix rule of three warnings
Sensor and BufferItem have destructors, the copy constructor and assignment operators should not be implicit. The warnings were being hidden by the use of -isystem to include frameworks/native/include. Bug: 31752268 Test: m -j Change-Id: If375d85cd3d6ded4ee6b27b841bf10f563254682
-rw-r--r--include/gui/BufferItem.h2
-rw-r--r--include/gui/Sensor.h3
2 files changed, 5 insertions, 0 deletions
diff --git a/include/gui/BufferItem.h b/include/gui/BufferItem.h
index f45d85207a..3ab63d0632 100644
--- a/include/gui/BufferItem.h
+++ b/include/gui/BufferItem.h
@@ -46,6 +46,8 @@ class BufferItem : public Flattenable<BufferItem> {
enum { INVALID_BUFFER_SLOT = -1 };
BufferItem();
~BufferItem();
+ BufferItem(const BufferItem&) = default;
+ BufferItem& operator=(const BufferItem&) = default;
static const char* scalingModeName(uint32_t scalingMode);
diff --git a/include/gui/Sensor.h b/include/gui/Sensor.h
index 094fd163bc..750683559d 100644
--- a/include/gui/Sensor.h
+++ b/include/gui/Sensor.h
@@ -61,6 +61,9 @@ public:
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);