Changeset 97f035 for molecuilder/src

Timestamp:

Mar 11, 2010, 3:17:29 PM (15 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

1e0785

Parents:

e9f2e1

Message:

Small improvements to singleton pattern

Location:

molecuilder/src

Files:

• Patterns/Singleton.hpp (modified) (2 diffs)
• Patterns/Singleton_impl.hpp (modified) (2 diffs)
• unittests/SingletonTest.cpp (modified) (2 diffs)

molecuilder/src/Patterns/Singleton.hpp

@@ -32 +32 @@
     void reset(T* _content);
     void reset();
-    ptr_t& operator=(ptr_t& rhs);
+    ptr_t& operator=(const ptr_t& rhs);
   private:
-    T* content;
+    mutable T* content;
   };
 
@@ -85 +85 @@
   static void setInstance(T*);
 protected:
+  // constructor accessible by subclasses
+  Singleton();
 
 private:
+  // private copy constructor to avoid unintended copying
+  Singleton(const Singleton&);
+
   static boost::recursive_mutex instanceLock;
   static ptr_t theInstance;

molecuilder/src/Patterns/Singleton_impl.hpp

@@ -77 +77 @@
 }
 
+template<class T, bool _may_create>
+Singleton<T,_may_create>::Singleton(){/* empty */}
+
+// private copy constructor to avoid unintended copying
+template <class T, bool _may_create>
+Singleton<T,_may_create>::Singleton(const Singleton<T,_may_create>&){
+  assert(0 && "Copy constructor of singleton template called");
+}
+
 /**
  * This define allows simple instantiation of the necessary singleton functions
@@ -121 +130 @@
 
 template <class T,bool _may_create>
-typename Singleton<T,_may_create>::ptr_t& Singleton<T,_may_create>::ptr_t::operator=(typename Singleton<T,_may_create>::ptr_t& rhs){
+typename Singleton<T,_may_create>::ptr_t& Singleton<T,_may_create>::ptr_t::operator=(const typename Singleton<T,_may_create>::ptr_t& rhs){
   if(&rhs!=this){
     delete content;

molecuilder/src/unittests/SingletonTest.cpp

@@ -29 +29 @@
     count1++;
   }
+  // explicit copy constructor to catch if this is ever called
+  SingletonStub1(const SingletonStub1&){
+    CPPUNIT_FAIL    ( "Copy constructor of Singleton called" );
+  }
   virtual ~SingletonStub1(){
     count2++;
@@ -47 +51 @@
   SingletonStub2(){
     count1++;
+  }
+  // explicit copy constructor to catch if thsi is ever called
+  SingletonStub2(const SingletonStub2&){
+    CPPUNIT_FAIL    ( "Copy constructor of Singleton called" );
   }
   virtual ~SingletonStub2(){