Changeset 163eec for src/CodePatterns/Singleton_impl.hpp

Timestamp:

Jul 30, 2015, 8:47:36 PM (10 years ago)

Author:

Frederik Heber <heber@…>

Children:

1b5188

Parents:

73ab25

git-author:

Frederik Heber <heber@…> (06/01/15 08:23:04)

git-committer:

Frederik Heber <heber@…> (07/30/15 20:47:36)

Message:

Added Singleton:getConstInstance() and ..Pointer() functions.

File:

• src/CodePatterns/Singleton_impl.hpp (modified) (2 diffs)

src/CodePatterns/Singleton_impl.hpp

@@ -38 +38 @@
 
 template <class T,bool _may_create>
+const T& Singleton<T,_may_create>::getConstInstance(){
+  // boost supports RAII-Style locking, so we don't need to unlock
+  boost::recursive_mutex::scoped_lock guard(instanceLock);
+  if(!theInstance.get()) {
+    theInstance.reset(creator::make());
+  }
+  return *theInstance;
+}
+
+template <class T,bool _may_create>
 T* Singleton<T,_may_create>::getPointer(){
+  // boost supports RAII-Style locking, so we don't need to unlock
+  boost::recursive_mutex::scoped_lock guard(instanceLock);
+  if(!theInstance.get()) {
+    theInstance.reset(creator::make());
+  }
+  return theInstance.get();
+
+}
+
+template <class T,bool _may_create>
+const T* Singleton<T,_may_create>::getConstPointer(){
   // boost supports RAII-Style locking, so we don't need to unlock
   boost::recursive_mutex::scoped_lock guard(instanceLock);
@@ -98 +119 @@
 #define CONSTRUCT_SINGLETON(name) \
     template name& Singleton< name , name::may_create >::getInstance(); \
+    template const name& Singleton< name , name::may_create >::getConstInstance(); \
     template name* Singleton< name , name::may_create >::getPointer();  \
+    template const name* Singleton< name , name::may_create >::getConstPointer();  \
     template void  Singleton< name , name::may_create >::purgeInstance(); \
     template name& Singleton< name , name::may_create >::resetInstance(); \