diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-27 08:15:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-27 08:15:12 -0700 |
| commit | 9801575a65f2f9d0bdc924ec0a4bbfb6ef071bbe (patch) | |
| tree | 577fd438f8a27e1e6f7221620a08d9dbc6c89e27 | |
| parent | 21938749faf2c4dd0c77bee3dec1f7a85780c85a (diff) | |
| parent | 908c8ff55482b723eddec54c6308e54a136a3e49 (diff) | |
| download | native-9801575a65f2f9d0bdc924ec0a4bbfb6ef071bbe.tar.gz | |
am 908c8ff5: Merge "Fixed clang build error for libgui"
* commit '908c8ff55482b723eddec54c6308e54a136a3e49':
Fixed clang build error for libgui
| -rw-r--r-- | include/utils/Singleton.h | 4 |
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 >; // --------------------------------------------------------------------------- |