aboutsummaryrefslogtreecommitdiff
path: root/src/server/shared/Configuration/Config.cpp
diff options
context:
space:
mode:
authorblub <Vincent_Michael@gmx.de>2014-09-07 21:52:29 +0200
committerblub <Vincent_Michael@gmx.de>2014-09-07 21:52:29 +0200
commitd1183e55b5610a3ded9e9135ab281f1cbdea9a58 (patch)
tree9e8a99957a942d627365695418326d0c91a13c76 /src/server/shared/Configuration/Config.cpp
parentcfc0c50b5e3bc84310417c5146ce0d5901e39fc5 (diff)
parent1e34aa9dcfbab5d4dec3d10dcc7978c9f9db3e24 (diff)
Merge pull request #13060 from LogvinovLeon/master
Removed redundant cast to c_str() in ConfigMgr::Reload function.
Diffstat (limited to 'src/server/shared/Configuration/Config.cpp')
-rw-r--r--src/server/shared/Configuration/Config.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/shared/Configuration/Config.cpp b/src/server/shared/Configuration/Config.cpp
index 6b83f562520..21bbd063b53 100644
--- a/src/server/shared/Configuration/Config.cpp
+++ b/src/server/shared/Configuration/Config.cpp
@@ -59,7 +59,7 @@ bool ConfigMgr::LoadInitial(std::string const& file, std::string& error)
bool ConfigMgr::Reload(std::string& error)
{
- return LoadInitial(_filename.c_str(), error);
+ return LoadInitial(_filename, error);
}
std::string ConfigMgr::GetStringDefault(std::string const& name, const std::string& def)