commit 1ae49e3fef34ee38f8dfeb08b5914e3362af3b2f
author Jeff Brown <jeffbrown@google.com> Mon Aug 27 17:17:08 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 27 17:17:09 2012 -0700
tree 61e54572966f9d19e8350d3441d9d59e235eff3d
parent e310c3949f7de7183ef43e751526a5dc4cf0d74c
parent 380223bf1b340e7503177254a60d5982f95ab793

Merge "Remove unused "layer" argument from show()." into jb-mr1-dev

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