diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-12-10 13:55:21 -0800 |
|---|---|---|
| committer | Chih-Hung Hsieh <chh@google.com> | 2014-12-11 11:19:57 -0800 |
| commit | c777f213b369bcd8dd7197e08c8d09673261143d (patch) | |
| tree | 6fce021a1649946ea0538dbf8be82332ff98fef4 /include | |
| parent | de180fc2834a3e42b6383027cf47b561e861108e (diff) | |
| download | system_core-c777f213b369bcd8dd7197e08c8d09673261143d.tar.gz system_core-c777f213b369bcd8dd7197e08c8d09673261143d.tar.bz2 system_core-c777f213b369bcd8dd7197e08c8d09673261143d.zip | |
Use full qualified name in macros.
The ANDROID_SINGLETON_STATIC_INSTANCE is used in some files
out of the android namespace. If it does not use full qualified
names, users of this macro will need to use it inside the 'android'
namespace to avoid warnings from clang compiler.
Change-Id: Ie4d4ba2b57fdc72d0deb3b7c2326304a44a1300f
Diffstat (limited to 'include')
| -rw-r--r-- | include/utils/Singleton.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/utils/Singleton.h b/include/utils/Singleton.h index c60680eab..ffc03cb5d 100644 --- a/include/utils/Singleton.h +++ b/include/utils/Singleton.h @@ -65,9 +65,10 @@ private: */ #define ANDROID_SINGLETON_STATIC_INSTANCE(TYPE) \ - template<> Mutex Singleton< TYPE >::sLock(Mutex::PRIVATE); \ - template<> TYPE* Singleton< TYPE >::sInstance(0); \ - template class Singleton< TYPE >; + template<> ::android::Mutex \ + (::android::Singleton< TYPE >::sLock)(::android::Mutex::PRIVATE); \ + template<> TYPE* ::android::Singleton< TYPE >::sInstance(0); \ + template class ::android::Singleton< TYPE >; // --------------------------------------------------------------------------- |