commit f671385e71644b6f34a06f425aff8dd16ffc0105
author Jean-Baptiste Queru <jbq@google.com> Mon Aug 27 08:17:48 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 27 08:17:48 2012 -0700
tree 2f93161074ea25d8462ccd90cc2181ec5d8259ed
parent 225c66a48cdc3acef21ee380dc134449749d3cb3
parent 9801575a65f2f9d0bdc924ec0a4bbfb6ef071bbe

am 9801575a: am 908c8ff5: Merge "Fixed clang build error for libgui"

* commit '9801575a65f2f9d0bdc924ec0a4bbfb6ef071bbe':
  Fixed clang build error for libgui

include/utils/Singleton.h

diff --git a/include/utils/Singleton.h b/include/utils/Singleton.h
index a42ce21..c60680e 100644
--- a/include/utils/Singleton.h
+++ b/include/utils/Singleton.h
@@ -65,9 +65,9 @@
  */
 
 #define ANDROID_SINGLETON_STATIC_INSTANCE(TYPE)                 \
-    template class Singleton< TYPE >;                           \
     template<> Mutex Singleton< TYPE >::sLock(Mutex::PRIVATE);  \
-    template<> TYPE* Singleton< TYPE >::sInstance(0);
+    template<> TYPE* Singleton< TYPE >::sInstance(0);           \
+    template class Singleton< TYPE >;
 
 
 // ---------------------------------------------------------------------------