Revert "server:: namespace"

This reverts commit aa69d11
AdamYuan · May 9, 2023 · dcc188f · dcc188f
1 parent a0adb42
commit dcc188f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/server/include/server/ENetServer.hpp b/server/include/server/ENetServer.hpp
@@ -2,10 +2,8 @@
 #define HYPERCRAFT_SERVER_ENET_SERVER_HPP
 
 #include <common/WorldDatabase.hpp>
-#include <enet/enet.h>
 #include <thread>
-
-namespace server {
+#include <enet/enet.h>
 
 class ENetServer {
 private:
@@ -27,6 +25,4 @@ class ENetServer {
 	inline const std::shared_ptr<common::WorldDatabase> &GetLevelDBPtr() const { return m_level_db_ptr; }
 };
 
-} // namespace server
-
 #endif
diff --git a/server/src/ENetServer.cpp b/server/src/ENetServer.cpp
@@ -3,9 +3,7 @@
 
 #include <iostream>
 
-namespace server {
-
-std::shared_ptr<ENetServer> ENetServer::Create(const std::shared_ptr<common::WorldDatabase> &level_db, uint16_t port) {
+std::shared_ptr<ENetServer> ENetServer::Create(const std::shared_ptr<WorldDatabase> &level_db, uint16_t port) {
 	ENetAddress address;
 	address.host = ENET_HOST_ANY;
 	address.port = port;
@@ -28,7 +26,9 @@ void ENetServer::Join() {
 	m_event_thread.join();
 }
 
-ENetServer::~ENetServer() { enet_host_destroy(m_host); }
+ENetServer::~ENetServer() {
+	enet_host_destroy(m_host);
+}
 
 void ENetServer::RunShell() {
 	std::string line;
@@ -70,5 +70,3 @@ void ENetServer::event_thread_func() {
 	}
 	spdlog::info("Quit event thread");
 }
-
-} // namespace server
diff --git a/server/src/main.cpp b/server/src/main.cpp
@@ -14,7 +14,7 @@ int main() {
 		spdlog::error("Failed to open sqlite3 database {}", kLevelDBFilename);
 		return EXIT_FAILURE;
 	}
-	std::shared_ptr<server::ENetServer> server = server::ENetServer::Create(level_db, kPort);
+	std::shared_ptr<ENetServer> server = ENetServer::Create(level_db, kPort);
 	if (!server) {
 		spdlog::error("Failed to open open server in port {}", kPort);
 		return EXIT_FAILURE;