[fixed] ubsan compiling issue

Change-Id: I69cae4a1c32a979346dea6d23bb224bfa17a7ca0
TheAnswer · Oct 19, 2018 · 599f2b5 · 599f2b5
1 parent 6d0b57e
commit 599f2b5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/MMOCoreORB/src/server/ServerCore.cpp b/MMOCoreORB/src/server/ServerCore.cpp
@@ -12,7 +12,6 @@
 
 #include "server/chat/ChatManager.h"
 #include "server/login/LoginServer.h"
-#include "features/Features.h"
 #include "ping/PingServer.h"
 #include "status/StatusServer.h"
 #include "web/WebServer.h"

diff --git a/MMOCoreORB/src/server/ServerCore.h b/MMOCoreORB/src/server/ServerCore.h
@@ -6,6 +6,7 @@
 #define SERVERCORE_H_
 
 #include "engine/engine.h"
+#include "server/features/Features.h"
 
 namespace server {
 	namespace zone{
@@ -26,7 +27,6 @@ using namespace conf;
 class ServerDatabase;
 class MantisDatabase;
 class StatusServer;
-class Features;
 class PingServer;
 
 namespace server {
@@ -56,7 +56,7 @@ class ServerCore : public Core, public Logger {
 
 	StatusServer* statusServer;
 
-	Features* features;
+	server::features::Features* features;
 
 	PingServer* pingServer;
 

diff --git a/MMOCoreORB/src/server/features/Features.cpp b/MMOCoreORB/src/server/features/Features.cpp
@@ -5,20 +5,16 @@
 #include "Features.h"
 #include "engine/lua/Lua.h"
 
-Features::Features()
-	: HashTable<String, String>() {
-}
+using namespace server::features;
 
-Features::~Features() {
+Features::Features() {
 }
 
 bool Features::loadFeatures() {
-	Lua* lua = new Lua();
+	Lua lua;
 
-	if (!lua->runFile("conf/features.lua"))
+	if (!lua.runFile("conf/features.lua"))
 		return false;
 
-	delete lua;
-
 	return true;
 }
diff --git a/MMOCoreORB/src/server/features/Features.h b/MMOCoreORB/src/server/features/Features.h
@@ -6,18 +6,26 @@
 #define FEATURES_H_
 
 #include "system/lang.h"
+#include "system/util/HashTable.h"
 
-class Features : public HashTable<String, String> {
+namespace server {
+ namespace features {
+
+class Features {
+protected:
+	HashTable<String, String> options;
 
 public:
 	Features();
-	~Features();
 
 	bool loadFeatures();
 
 	inline bool hasFeature(const String& key) {
-		return containsKey(key);
+		return options.containsKey(key);
 	}
 };
 
+}
+}
+
 #endif /* FEATURES_H_ */