Merge "Use full qualified name in macros."

This commit is contained in:
Chih-Hung Hsieh 2014-12-11 19:40:53 +00:00 committed by Gerrit Code Review
commit 3570072c36

View file

@ -65,9 +65,10 @@ private:
*/ */
#define ANDROID_SINGLETON_STATIC_INSTANCE(TYPE) \ #define ANDROID_SINGLETON_STATIC_INSTANCE(TYPE) \
template<> Mutex Singleton< TYPE >::sLock(Mutex::PRIVATE); \ template<> ::android::Mutex \
template<> TYPE* Singleton< TYPE >::sInstance(0); \ (::android::Singleton< TYPE >::sLock)(::android::Mutex::PRIVATE); \
template class Singleton< TYPE >; template<> TYPE* ::android::Singleton< TYPE >::sInstance(0); \
template class ::android::Singleton< TYPE >;
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------