summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chih-hung Hsieh <chh@google.com> 2019-01-11 10:19:25 -0800
committer android-build-merger <android-build-merger@google.com> 2019-01-11 10:19:25 -0800
commit3169d6895d91c2435cac88db604e1d0c622bbb6b (patch)
treea2066ccb6a3585ae19cca161acbec8ddb5c6af87
parentc7aeafd2db8bf96b4086b259d54c314177ddec97 (diff)
parent0aab12591f2ec715569dc325290d9d6ad54f7834 (diff)
Merge "Fix/suppress libs/* google-explicit-constructor warnings" am: a35900fd8e
am: 0aab12591f Change-Id: I8f22019ad2a92b24ef61e151d5692fbe6e7e387f
-rw-r--r--libs/input/PointerController.cpp2
-rw-r--r--libs/protoutil/include/android/util/EncodedBuffer.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/libs/input/PointerController.cpp b/libs/input/PointerController.cpp
index 0a90f85cda0e..6c5f20c1d416 100644
--- a/libs/input/PointerController.cpp
+++ b/libs/input/PointerController.cpp
@@ -39,7 +39,7 @@ protected:
virtual ~WeakLooperCallback() { }
public:
- WeakLooperCallback(const wp<LooperCallback>& callback) :
+ explicit WeakLooperCallback(const wp<LooperCallback>& callback) :
mCallback(callback) {
}
diff --git a/libs/protoutil/include/android/util/EncodedBuffer.h b/libs/protoutil/include/android/util/EncodedBuffer.h
index c84de4c1c083..0b7f6e46be65 100644
--- a/libs/protoutil/include/android/util/EncodedBuffer.h
+++ b/libs/protoutil/include/android/util/EncodedBuffer.h
@@ -38,13 +38,13 @@ class EncodedBuffer
{
public:
EncodedBuffer();
- EncodedBuffer(size_t chunkSize);
+ explicit EncodedBuffer(size_t chunkSize);
~EncodedBuffer();
class Pointer {
public:
Pointer();
- Pointer(size_t chunkSize);
+ explicit Pointer(size_t chunkSize);
size_t pos() const;
size_t index() const;
@@ -161,7 +161,7 @@ public:
friend class iterator;
class iterator {
public:
- iterator(const EncodedBuffer& buffer);
+ explicit iterator(const EncodedBuffer& buffer);
/**
* Returns the number of bytes written in the buffer