summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChih-Hung Hsieh2014-12-11 13:40:53 -0600
committerGerrit Code Review2014-12-11 13:40:54 -0600
commit3570072c362fc379ac83bcae6d9ff43db06ffcfb (patch)
tree6fce021a1649946ea0538dbf8be82332ff98fef4
parentde180fc2834a3e42b6383027cf47b561e861108e (diff)
parentc777f213b369bcd8dd7197e08c8d09673261143d (diff)
downloadplatform-system-core-3570072c362fc379ac83bcae6d9ff43db06ffcfb.tar.gz
platform-system-core-3570072c362fc379ac83bcae6d9ff43db06ffcfb.tar.xz
platform-system-core-3570072c362fc379ac83bcae6d9ff43db06ffcfb.zip
Merge "Use full qualified name in macros."android-wear-5.0.0_r1
-rw-r--r--include/utils/Singleton.h7
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:
65 */ 65 */
66 66
67#define ANDROID_SINGLETON_STATIC_INSTANCE(TYPE) \ 67#define ANDROID_SINGLETON_STATIC_INSTANCE(TYPE) \
68 template<> Mutex Singleton< TYPE >::sLock(Mutex::PRIVATE); \ 68 template<> ::android::Mutex \
69 template<> TYPE* Singleton< TYPE >::sInstance(0); \ 69 (::android::Singleton< TYPE >::sLock)(::android::Mutex::PRIVATE); \
70 template class Singleton< TYPE >; 70 template<> TYPE* ::android::Singleton< TYPE >::sInstance(0); \
71 template class ::android::Singleton< TYPE >;
71 72
72 73
73// --------------------------------------------------------------------------- 74// ---------------------------------------------------------------------------