ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed clang build error for libgui

Browse Source 
Fixed the order of the statements in ANDROID_SINGLETON_STATIC_INSTANCE
macro so that the templated static member variable initialization
comes before the instantiation of the Singleton class. This
fixes the clang compile error.

Change-Id: Ic47d17e152b657f2dff3191ccc3770753fdf002b
Author: Tareq A. Siraj <tareq.a.siraj@intel.com>
Reviewed-by: Edwin Vane <edwin.vane@intel.com>
This commit is contained in:
Tareq A. Siraj 2012-07-26 16:04:24 -04:00 committed by Edwin Vane
parent 349149b52a
commit 114e968482
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/utils/Singleton.h
View File

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