diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-12-11 19:54:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-11 19:54:27 +0000 |
| commit | d3653c90cd7ca7dbfe180d0230067b153abb016b (patch) | |
| tree | 4e71d02a3321eec97c9b8e207a441a580f3110b4 /include | |
| parent | 6984e6dc97c1a3b7e018efecddc6cb581a6a383a (diff) | |
| parent | 3570072c362fc379ac83bcae6d9ff43db06ffcfb (diff) | |
| download | system_core-d3653c90cd7ca7dbfe180d0230067b153abb016b.zip system_core-d3653c90cd7ca7dbfe180d0230067b153abb016b.tar.gz system_core-d3653c90cd7ca7dbfe180d0230067b153abb016b.tar.bz2 | |
am 3570072c: Merge "Use full qualified name in macros."
* commit '3570072c362fc379ac83bcae6d9ff43db06ffcfb':
Use full qualified name in macros.
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 c60680e..ffc03cb 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 >; // --------------------------------------------------------------------------- |