am 3570072c: Merge "Use full qualified name in macros."

* commit '3570072c362fc379ac83bcae6d9ff43db06ffcfb':
  Use full qualified name in macros.
This commit is contained in:
Chih-Hung Hsieh 2014-12-11 19:54:27 +00:00 committed by Android Git Automerger
commit d3653c90cd

View file

@ -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 >;
// ---------------------------------------------------------------------------