summaryrefslogtreecommitdiffstats
path: root/include/utils/Singleton.h
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2009-04-15 18:34:24 -0700
committerMathias Agopian <mathias@google.com>2009-04-15 18:34:24 -0700
commita6b40ba521d5c2fc23da74015531bd4ed8657921 (patch)
tree148f806ad3253b6582f9287750535f3b3bfeb26a /include/utils/Singleton.h
parent5f105d38e2c0c45d1d997906a2fa220b001a8e75 (diff)
downloadframeworks_base-a6b40ba521d5c2fc23da74015531bd4ed8657921.zip
frameworks_base-a6b40ba521d5c2fc23da74015531bd4ed8657921.tar.gz
frameworks_base-a6b40ba521d5c2fc23da74015531bd4ed8657921.tar.bz2
fix a rookie mistake causing Singleton<> to be a "multiton". Also improve the BufferMapper's debugging, but turn it off.
Squashed commit of the following: commit 04e9cae7f806bd65f2cfe35c011b47a36773bbe5 Author: Mathias Agopian <mathias@google.com> Date: Wed Apr 15 18:30:30 2009 -0700 fix and improve BufferMapper's tracking of mapped buffers. commit 1a8deaed15811092b2349cc3c40cafb5f722046c Author: Mathias Agopian <mathias@google.com> Date: Wed Apr 15 00:52:02 2009 -0700 fix some bugs with the Singleton<> class. untested. commit ed01cc06ad70cf640ce1258f01189cb1a96fd3a8 Author: Mathias Agopian <mathias@google.com> Date: Tue Apr 14 19:29:25 2009 -0700 some work to debug the Singleton<> template.
Diffstat (limited to 'include/utils/Singleton.h')
-rw-r--r--include/utils/Singleton.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/utils/Singleton.h b/include/utils/Singleton.h
index 776f93b..ee07df1 100644
--- a/include/utils/Singleton.h
+++ b/include/utils/Singleton.h
@@ -49,9 +49,6 @@ private:
static TYPE* sInstance;
};
-template<class TYPE> Mutex Singleton<TYPE>::sLock;
-template<class TYPE> TYPE* Singleton<TYPE>::sInstance(0);
-
// ---------------------------------------------------------------------------
}; // namespace android