diff options
author | 2019-01-09 15:34:01 -0800 | |
---|---|---|
committer | 2019-01-09 15:34:01 -0800 | |
commit | 2c9dad72bddfd16bc0d111d4f3e86337e6ee13a4 (patch) | |
tree | b0c1f46cdfd369cacec4ce2071aa760f347adf93 | |
parent | 3811a537a19b6a65147fd69434cd92ac457a7a3a (diff) | |
parent | 739cf0d6592fca10f9c8307bdd2a895964aeaa7e (diff) |
Merge "Fix/suppress hwui google-explicit-constructor warnings" am: dcfef16295 am: 50991469e3
am: 739cf0d659
Change-Id: Id2422881831785eb9a47fda38b3fe6ce95b843cb
-rw-r--r-- | libs/hwui/Matrix.h | 2 | ||||
-rw-r--r-- | libs/hwui/Rect.h | 8 | ||||
-rw-r--r-- | libs/hwui/debug/GlesErrorCheckWrapper.h | 2 | ||||
-rw-r--r-- | libs/hwui/hwui/Paint.h | 2 | ||||
-rw-r--r-- | libs/hwui/service/GraphicsStatsService.cpp | 8 | ||||
-rw-r--r-- | libs/hwui/utils/LinearAllocator.h | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/libs/hwui/Matrix.h b/libs/hwui/Matrix.h index b33cfe2ec511..0c515a41689d 100644 --- a/libs/hwui/Matrix.h +++ b/libs/hwui/Matrix.h @@ -81,7 +81,7 @@ public: explicit Matrix4(const float* v) { load(v); } - Matrix4(const SkMatrix& v) { // NOLINT, implicit + Matrix4(const SkMatrix& v) { // NOLINT(google-explicit-constructor) load(v); } diff --git a/libs/hwui/Rect.h b/libs/hwui/Rect.h index d6362ef10aad..24443c8c9836 100644 --- a/libs/hwui/Rect.h +++ b/libs/hwui/Rect.h @@ -57,15 +57,15 @@ public: inline Rect(float width, float height) : left(0.0f), top(0.0f), right(width), bottom(height) {} - inline Rect(const SkIRect& rect) - : // NOLINT, implicit + inline Rect(const SkIRect& rect) // NOLINT(google-explicit-constructor) + : left(rect.fLeft) , top(rect.fTop) , right(rect.fRight) , bottom(rect.fBottom) {} - inline Rect(const SkRect& rect) - : // NOLINT, implicit + inline Rect(const SkRect& rect) // NOLINT(google-explicit-constructor) + : left(rect.fLeft) , top(rect.fTop) , right(rect.fRight) diff --git a/libs/hwui/debug/GlesErrorCheckWrapper.h b/libs/hwui/debug/GlesErrorCheckWrapper.h index ee5cc1f46de8..791400bf30ec 100644 --- a/libs/hwui/debug/GlesErrorCheckWrapper.h +++ b/libs/hwui/debug/GlesErrorCheckWrapper.h @@ -24,7 +24,7 @@ namespace debug { class GlesErrorCheckWrapper : public GlesDriver { public: - GlesErrorCheckWrapper(GlesDriver& base) : mBase(base) {} + explicit GlesErrorCheckWrapper(GlesDriver& base) : mBase(base) {} #define GL_ENTRY(ret, api, ...) virtual ret api##_(__VA_ARGS__) override; #include "gles_decls.in" diff --git a/libs/hwui/hwui/Paint.h b/libs/hwui/hwui/Paint.h index c1a3b6d1143b..92ffda9486bb 100644 --- a/libs/hwui/hwui/Paint.h +++ b/libs/hwui/hwui/Paint.h @@ -46,7 +46,7 @@ public: Paint(); Paint(const Paint& paint); - Paint(const SkPaint& paint); // NOLINT(implicit) + Paint(const SkPaint& paint); // NOLINT(google-explicit-constructor) ~Paint(); Paint& operator=(const Paint& other); diff --git a/libs/hwui/service/GraphicsStatsService.cpp b/libs/hwui/service/GraphicsStatsService.cpp index 29e4256e2ab7..8a16b2077f6f 100644 --- a/libs/hwui/service/GraphicsStatsService.cpp +++ b/libs/hwui/service/GraphicsStatsService.cpp @@ -48,7 +48,7 @@ static void dumpAsTextToFd(protos::GraphicsStatsProto* proto, int outFd); class FileDescriptor { public: - FileDescriptor(int fd) : mFd(fd) {} + explicit FileDescriptor(int fd) : mFd(fd) {} ~FileDescriptor() { if (mFd != -1) { close(mFd); @@ -56,7 +56,7 @@ public: } } bool valid() { return mFd != -1; } - operator int() { return mFd; } + operator int() { return mFd; } // NOLINT(google-explicit-constructor) private: int mFd; @@ -64,7 +64,7 @@ private: class FileOutputStreamLite : public io::ZeroCopyOutputStream { public: - FileOutputStreamLite(int fd) : mCopyAdapter(fd), mImpl(&mCopyAdapter) {} + explicit FileOutputStreamLite(int fd) : mCopyAdapter(fd), mImpl(&mCopyAdapter) {} virtual ~FileOutputStreamLite() {} int GetErrno() { return mCopyAdapter.mErrno; } @@ -82,7 +82,7 @@ private: int mFd; int mErrno = 0; - FDAdapter(int fd) : mFd(fd) {} + explicit FDAdapter(int fd) : mFd(fd) {} virtual ~FDAdapter() {} virtual bool Write(const void* buffer, int size) override { diff --git a/libs/hwui/utils/LinearAllocator.h b/libs/hwui/utils/LinearAllocator.h index b401fcf58f76..9c4a1be4b269 100644 --- a/libs/hwui/utils/LinearAllocator.h +++ b/libs/hwui/utils/LinearAllocator.h @@ -168,7 +168,7 @@ public: }; // enable allocators to be constructed from other templated types template <class U> - LinearStdAllocator(const LinearStdAllocator<U>& other) // NOLINT(implicit) + LinearStdAllocator(const LinearStdAllocator<U>& other) // NOLINT(google-explicit-constructor) : linearAllocator(other.linearAllocator) {} T* allocate(size_t num, const void* = 0) { |