diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2017-08-01 23:26:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-01 23:26:06 +0000 |
| commit | dfaa20c0690db178e7149de40251fb55f5cfe054 (patch) | |
| tree | eb8cd75b6a0a023d3d313a6176f36076e12208e1 /libutils | |
| parent | b1c18af2475100c2926356917c5acf5ffcea0257 (diff) | |
| parent | e4bd153e55a3dc39ae95e15c6995b310d08b8007 (diff) | |
| download | system_core-dfaa20c0690db178e7149de40251fb55f5cfe054.tar.gz system_core-dfaa20c0690db178e7149de40251fb55f5cfe054.tar.bz2 system_core-dfaa20c0690db178e7149de40251fb55f5cfe054.zip | |
Merge "Fix misc-macro-parentheses warnings in system/core."
am: e4bd153e55
Change-Id: I6b38149a0fa15874eff68cbf7ee62e4acd41c595
Diffstat (limited to 'libutils')
| -rw-r--r-- | libutils/include/utils/Singleton.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libutils/include/utils/Singleton.h b/libutils/include/utils/Singleton.h index bdb2332cf..9afedd4a0 100644 --- a/libutils/include/utils/Singleton.h +++ b/libutils/include/utils/Singleton.h @@ -85,7 +85,7 @@ private: #define ANDROID_SINGLETON_STATIC_INSTANCE(TYPE) \ template<> ::android::Mutex \ (::android::Singleton< TYPE >::sLock)(::android::Mutex::PRIVATE); \ - template<> TYPE* ::android::Singleton< TYPE >::sInstance(0); \ + template<> TYPE* ::android::Singleton< TYPE >::sInstance(0); /* NOLINT */ \ template class ::android::Singleton< TYPE >; |