Merge "Use full qualified name in macros."
This commit is contained in:
commit
3570072c36
1 changed files with 4 additions and 3 deletions
|
|
@ -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 >;
|
||||||
|
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue