summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-07-12 00:33:35 +0159
committerBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-11-14 13:09:38 +0100
commita80c6f80e0fceaf28f80e0df9086212f30b15fb9 (patch)
treec6a010175663fc2ee999d693f6b37e5e786dc4e3
parentf67623632a545bd9ca1d8afefc3dd0789eaba6b3 (diff)
downloadnative-a80c6f80e0fceaf28f80e0df9086212f30b15fb9.tar.gz
frameworks/base: Make sure Singleton instantiations are exported
This fixes using Singletons across shared library borders with gcc 4.7+ Change-Id: I84b9cc99add4ace64c16e4fa8414a4fc7e4693c7 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 c60680eabc..b88a8799bf 100644
--- a/include/utils/Singleton.h
+++ b/include/utils/Singleton.h
@@ -65,9 +65,9 @@ private:
*/
#define ANDROID_SINGLETON_STATIC_INSTANCE(TYPE) \
- template<> Mutex Singleton< TYPE >::sLock(Mutex::PRIVATE); \
- template<> TYPE* Singleton< TYPE >::sInstance(0); \
- template class Singleton< TYPE >;
+ template<> ANDROID_API Mutex Singleton< TYPE >::sLock(Mutex::PRIVATE); \
+ template<> ANDROID_API TYPE* Singleton< TYPE >::sInstance(0); \
+ template class ANDROID_API Singleton< TYPE >;
// ---------------------------------------------------------------------------