diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2019-01-09 15:34:01 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-09 15:34:01 -0800 |
| commit | 2c9dad72bddfd16bc0d111d4f3e86337e6ee13a4 (patch) | |
| tree | b0c1f46cdfd369cacec4ce2071aa760f347adf93 /libs/hwui/utils | |
| parent | 3811a537a19b6a65147fd69434cd92ac457a7a3a (diff) | |
| parent | 739cf0d6592fca10f9c8307bdd2a895964aeaa7e (diff) | |
Merge "Fix/suppress hwui google-explicit-constructor warnings" am: dcfef16295 am: 50991469e3
am: 739cf0d659
Change-Id: Id2422881831785eb9a47fda38b3fe6ce95b843cb
Diffstat (limited to 'libs/hwui/utils')
| -rw-r--r-- | libs/hwui/utils/LinearAllocator.h | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |