aboutsummaryrefslogtreecommitdiff
path: root/src/server/shared/Dynamic
diff options
context:
space:
mode:
authorleak <leak@bitmx.net>2014-07-20 00:39:43 +0200
committerleak <leak@bitmx.net>2014-07-20 00:40:08 +0200
commitdce92611f3ff33e7db0a7234d611f5bffb0cc45f (patch)
tree19f51fac4cccdac6d4e81466a5e643c244239106 /src/server/shared/Dynamic
parentd2c120f2c2920760c56f1c2d1954bb28b9f2b678 (diff)
Refactored singletons to enable proper deconstruction during shutdown
Diffstat (limited to 'src/server/shared/Dynamic')
-rw-r--r--src/server/shared/Dynamic/ObjectRegistry.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/shared/Dynamic/ObjectRegistry.h b/src/server/shared/Dynamic/ObjectRegistry.h
index e9e57415073..fe55982f15f 100644
--- a/src/server/shared/Dynamic/ObjectRegistry.h
+++ b/src/server/shared/Dynamic/ObjectRegistry.h
@@ -35,8 +35,8 @@ class ObjectRegistry
static ObjectRegistry<T, Key>* instance()
{
- static ObjectRegistry<T, Key>* instance = new ObjectRegistry<T, Key>();
- return instance;
+ static ObjectRegistry<T, Key> instance;
+ return &instance;
}
/// Returns a registry item