diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-10-13 17:38:20 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-10-13 17:38:20 +0200 |
| commit | 4a12901ad7b08021b2adad1241bf750aec4a3d2d (patch) | |
| tree | 0dbb2480a325995422492a9488cdc4e5ffca47e9 /include/astra/Singleton.h | |
| parent | 399422985fd27a1e6a1f8cea3642402128b050fa (diff) | |
| parent | c599eac7c9576a74707a3fa9b3c02cff05b09760 (diff) | |
| download | astra-4a12901ad7b08021b2adad1241bf750aec4a3d2d.tar.gz astra-4a12901ad7b08021b2adad1241bf750aec4a3d2d.tar.bz2 astra-4a12901ad7b08021b2adad1241bf750aec4a3d2d.tar.xz astra-4a12901ad7b08021b2adad1241bf750aec4a3d2d.zip | |
Merge branch 'master' into fdk_custom_filter
Diffstat (limited to 'include/astra/Singleton.h')
| -rw-r--r-- | include/astra/Singleton.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/astra/Singleton.h b/include/astra/Singleton.h index 784c521..9d3c088 100644 --- a/include/astra/Singleton.h +++ b/include/astra/Singleton.h @@ -45,11 +45,7 @@ class Singleton { public: // constructor - Singleton() { - assert(!m_singleton); - int offset = (uintptr_t)(T*)1 - (uintptr_t)(Singleton<T>*)(T*)1; - m_singleton = (T*)((uintptr_t)this + offset); - }; + Singleton() { } // destructor virtual ~Singleton() { |