From 68398a559e2264b85d8765949989f44e39ce364d Mon Sep 17 00:00:00 2001 From: Chaplain Date: Tue, 15 Jul 2014 17:46:09 +0200 Subject: [Auth\Worldserver] Use boost to load console arguments. (Added a few style changes and cmake fix) Conflicts: src/server/worldserver/Main.cpp --- src/server/shared/Configuration/Config.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src/server/shared/Configuration/Config.cpp') diff --git a/src/server/shared/Configuration/Config.cpp b/src/server/shared/Configuration/Config.cpp index fe61cde5594..5cd7ef52f82 100644 --- a/src/server/shared/Configuration/Config.cpp +++ b/src/server/shared/Configuration/Config.cpp @@ -25,10 +25,8 @@ using namespace boost::property_tree; -bool ConfigMgr::LoadInitial(char const* file) +bool ConfigMgr::LoadInitial(std::string const& file) { - ASSERT(file); - std::lock_guard lock(_configLock); _filename = file; @@ -57,7 +55,7 @@ bool ConfigMgr::Reload() return LoadInitial(_filename.c_str()); } -std::string ConfigMgr::GetStringDefault(const char* name, const std::string& def) +std::string ConfigMgr::GetStringDefault(std::string const& name, const std::string& def) { std::string value = _config.get(ptree::path_type(name, '/'), def); @@ -66,7 +64,7 @@ std::string ConfigMgr::GetStringDefault(const char* name, const std::string& def return value; } -bool ConfigMgr::GetBoolDefault(const char* name, bool def) +bool ConfigMgr::GetBoolDefault(std::string const& name, bool def) { try { @@ -80,12 +78,12 @@ bool ConfigMgr::GetBoolDefault(const char* name, bool def) } } -int ConfigMgr::GetIntDefault(const char* name, int def) +int ConfigMgr::GetIntDefault(std::string const& name, int def) { return _config.get(ptree::path_type(name, '/'), def); } -float ConfigMgr::GetFloatDefault(const char* name, float def) +float ConfigMgr::GetFloatDefault(std::string const& name, float def) { return _config.get(ptree::path_type(name, '/'), def); } -- cgit v1.2.3