From 86987a13fdae20082bc8aa62fbc6737d87859c71 Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh Date: Thu, 20 Dec 2018 15:48:40 -0800 Subject: Fix/suppress google-explicit-constructor warnings * 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: I6a755699f83d2d5929c9d4a6884a321110d78cea --- opengl/tests/hwc/hwcCommit.cpp | 4 +++- opengl/tests/hwc/hwcTestLib.h | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'opengl/tests') diff --git a/opengl/tests/hwc/hwcCommit.cpp b/opengl/tests/hwc/hwcCommit.cpp index 3686dab654..0a6ff556a0 100644 --- a/opengl/tests/hwc/hwcCommit.cpp +++ b/opengl/tests/hwc/hwcCommit.cpp @@ -183,7 +183,7 @@ public: uint32_t lower(void) { return _l; } uint32_t upper(void) { return _u; } - operator string(); + operator string(); // NOLINT(google-explicit-constructor) private: uint32_t _l; // lower @@ -216,7 +216,9 @@ public: static void double2Rational(double f, Range nRange, Range dRange, Rational& lower, Rational& upper); + // NOLINTNEXTLINE(google-explicit-constructor) operator string() const; + // NOLINTNEXTLINE(google-explicit-constructor) operator double() const { return (double) _n / (double) _d; } diff --git a/opengl/tests/hwc/hwcTestLib.h b/opengl/tests/hwc/hwcTestLib.h index 922fc1990b..5a49393a77 100644 --- a/opengl/tests/hwc/hwcTestLib.h +++ b/opengl/tests/hwc/hwcTestLib.h @@ -58,7 +58,7 @@ class ColorFract { float c2(void) const { return _c2; } float c3(void) const { return _c3; } - operator std::string(); + operator std::string(); // NOLINT(google-explicit-constructor) private: float _c1; @@ -71,7 +71,7 @@ class ColorFract { class ColorRGB { public: ColorRGB(): _r(0.0), _g(0.0), _b(0.0) {}; - ColorRGB(float f): _r(f), _g(f), _b(f) {}; // Gray, NOLINT(implicit) + ColorRGB(float f): _r(f), _g(f), _b(f) {}; // Gray, NOLINT(google-explicit-constructor) ColorRGB(float r, float g, float b): _r(r), _g(g), _b(b) {}; float r(void) const { return _r; } float g(void) const { return _g; } @@ -93,8 +93,8 @@ class HwcTestDim { void setWidth(uint32_t w) { _w = w; } void setHeight(uint32_t h) { _h = h; } - operator std::string(); - operator hwc_rect() const; + operator std::string(); // NOLINT(google-explicit-constructor) + operator hwc_rect() const; // NOLINT(google-explicit-constructor) private: uint32_t _w; -- cgit v1.2.3-59-g8ed1b