summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-02-17 08:18:00 +0059
committerBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-02-17 08:18:00 +0059
commit41e024ff4740c11bbf4f6a393872dca99215699c (patch)
tree83113d449694f0c80cf9d53454deff157242aec4
parentfe2c662863c8f50edee65d2754914a1eac3b15fc (diff)
downloadbase-41e024ff4740c11bbf4f6a393872dca99215699c.tar.gz
frameworks/base: Make sure Singleton instantiations are exported
This fixes using Singletons across shared library borders with gcc 4.7 Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
-rw-r--r--include/utils/Singleton.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/utils/Singleton.h b/include/utils/Singleton.h
index a42ce210dd48..4dde6eaabfee 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 class ANDROID_API Singleton< TYPE >; \
+ template<> ANDROID_API Mutex Singleton< TYPE >::sLock(Mutex::PRIVATE); \
+ template<> ANDROID_API TYPE* Singleton< TYPE >::sInstance(0);
// ---------------------------------------------------------------------------