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-03-29 09:41:17 +0200
commitdd02b070591ccfa264cd2ae397cf4287e16df02b (patch)
treed973ef82c9a3768ccd7c6bf5a4410d9aa6a1344a
parent0dde4c957a806a141c99eeb075716fb3ecf8686a (diff)
downloadbase-dd02b070591ccfa264cd2ae397cf4287e16df02b.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);
// ---------------------------------------------------------------------------