1 files changed, 4 insertions, 5 deletions
diff --git a/src/Common/RequestManager.h b/src/Common/RequestManager.h
index 0bc8080..c2f58d2 100644
--- a/src/Common/RequestManager.h
+++ b/src/Common/RequestManager.h
@@ -20,7 +20,6 @@
 #ifndef MAD_COMMON_REQUESTMANAGER_H_
 #define MAD_COMMON_REQUESTMANAGER_H_
 
-#include "SingletonPtr.h"
 #include <Net/Connection.h>
 
 #include <map>
@@ -65,7 +64,7 @@ class RequestManager {
         }
     };
 
-    static SingletonPtr<RequestManager> requestManager;
+    static RequestManager requestManager;
 
     std::map<Net::Connection*,RequestMap*> requestMaps;
     bool core;
@@ -83,13 +82,13 @@ class RequestManager {
 
     void receiveHandler(Net::Connection *connection, const Net::Packet &packet);
 
+    RequestManager();
+
   public:
     static RequestManager* get() {
-      return requestManager.get();
+      return &requestManager;
     }
 
-    RequestManager();
-
     bool isCore() const {return core;}
     void setCore(bool newCore) {
       core = newCore;