summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jean-Baptiste Queru <jbq@google.com> 2012-08-27 07:55:26 -0700
committer android code review <noreply-gerritcodereview@google.com> 2012-08-27 07:55:27 -0700
commit908c8ff55482b723eddec54c6308e54a136a3e49 (patch)
tree55f04990bbd899aac0aa8ef856d5396c151f71e6
parent349149b52a424c212e33d165bc146bc0337ea4c4 (diff)
parent114e968482a02b9153d9a236376efb5cd43f4a9a (diff)
Merge "Fixed clang build error for libgui"
-rw-r--r--include/utils/Singleton.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/utils/Singleton.h b/include/utils/Singleton.h
index a42ce210dd..c60680eabc 100644
--- a/include/utils/Singleton.h
+++ b/include/utils/Singleton.h
@@ -65,9 +65,9 @@ private:
*/
#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 >;
// ---------------------------------------------------------------------------