diff options
| author | 2018-12-20 13:55:20 -0800 | |
|---|---|---|
| committer | 2018-12-20 15:10:23 -0800 | |
| commit | d736d4b8458ba00f1be76740d0019567e0552afb (patch) | |
| tree | b3d3e22d187efb9ccdc8c6c6504be98b3e57131a | |
| parent | bcf293c674307a90238671edcf5c82b17e3bca62 (diff) | |
Fix/suppress renderthread google-explicit-constructor warnings
* Add explicit to conversion constructors/operators
* Use NOLINT or NOLINTNEXTLINE to suppress warnings on intended converters
Bug: 28341362
Test: make with WITH_TIDY=1 DEFAULT_GLOBAL_TIDY_CHECKS=-*,google-explicit-constructor
Change-Id: Ib7d634bf1e0e9a1dda35b0a1d92de4d460193296
| -rw-r--r-- | libs/hwui/renderthread/CacheManager.h | 2 | ||||
| -rw-r--r-- | libs/hwui/renderthread/VulkanManager.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libs/hwui/renderthread/CacheManager.h b/libs/hwui/renderthread/CacheManager.h index 7d733525194f..78d2539a733f 100644 --- a/libs/hwui/renderthread/CacheManager.h +++ b/libs/hwui/renderthread/CacheManager.h @@ -59,7 +59,7 @@ public: private: friend class RenderThread; - CacheManager(const DisplayInfo& display); + explicit CacheManager(const DisplayInfo& display); void reset(sk_sp<GrContext> grContext); void destroy(); diff --git a/libs/hwui/renderthread/VulkanManager.h b/libs/hwui/renderthread/VulkanManager.h index c319c9ec209f..ea6970469e03 100644 --- a/libs/hwui/renderthread/VulkanManager.h +++ b/libs/hwui/renderthread/VulkanManager.h @@ -127,6 +127,7 @@ private: fPtr = ptr; return *this; } + // NOLINTNEXTLINE(google-explicit-constructor) operator FNPTR_TYPE() const { return fPtr; } private: |