aboutsummaryrefslogtreecommitdiff
path: root/src/server/shared/Configuration/Config.h
diff options
context:
space:
mode:
authorChaplain <aionthefirst@gmail.com>2014-07-15 17:46:09 +0200
committerleak <leak@bitmx.net>2014-07-15 18:15:55 +0200
commit68398a559e2264b85d8765949989f44e39ce364d (patch)
tree5524aa83c45922dcb5a05e5cc78e162233361093 /src/server/shared/Configuration/Config.h
parentecde28d1c114a151c9828fff8898def5e74de4e1 (diff)
[Auth\Worldserver] Use boost to load console arguments. (Added a few style changes and cmake fix)
Conflicts: src/server/worldserver/Main.cpp
Diffstat (limited to 'src/server/shared/Configuration/Config.h')
-rw-r--r--src/server/shared/Configuration/Config.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/server/shared/Configuration/Config.h b/src/server/shared/Configuration/Config.h
index d05a083d166..68daca5440f 100644
--- a/src/server/shared/Configuration/Config.h
+++ b/src/server/shared/Configuration/Config.h
@@ -31,7 +31,7 @@ class ConfigMgr
public:
/// Method used only for loading main configuration files (authserver.conf and worldserver.conf)
- bool LoadInitial(char const* file);
+ bool LoadInitial(std::string const& file);
static ConfigMgr* instance()
{
@@ -41,10 +41,10 @@ public:
bool Reload();
- std::string GetStringDefault(const char* name, const std::string& def);
- bool GetBoolDefault(const char* name, bool def);
- int GetIntDefault(const char* name, int def);
- float GetFloatDefault(const char* name, float def);
+ std::string GetStringDefault(std::string const& name, const std::string& def);
+ bool GetBoolDefault(std::string const& name, bool def);
+ int GetIntDefault(std::string const& name, int def);
+ float GetFloatDefault(std::string const& name, float def);
std::string const& GetFilename();
std::list<std::string> GetKeysByString(std::string const& name);