aboutsummaryrefslogtreecommitdiff
path: root/src/common/Configuration/Config.h
diff options
context:
space:
mode:
authorDDuarte <dnpd.dd@gmail.com>2016-03-31 03:19:13 +0100
committerDDuarte <dnpd.dd@gmail.com>2016-03-31 03:31:46 +0100
commit9aadd97fba29a4b736058d0caa705e7545838585 (patch)
tree48db1f36c612f048cbc3b9fadf4e0b0ca4bdd493 /src/common/Configuration/Config.h
parent8a050c574f95da180d2c2c507c2ab11a7fbe45d3 (diff)
Core/Config: Error logging for ptree_bad_data
Ref https://github.com/TrinityCore/TrinityCore/commit/6487e2f2d6a1ddbeff77362219658376b8a3f9f0#commitcomment-16888976 (cherry picked from commit 9431b94bff939457cb915da3728cda6067674558)
Diffstat (limited to 'src/common/Configuration/Config.h')
-rw-r--r--src/common/Configuration/Config.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/common/Configuration/Config.h b/src/common/Configuration/Config.h
index ff6d279f9ce..10113cd88d3 100644
--- a/src/common/Configuration/Config.h
+++ b/src/common/Configuration/Config.h
@@ -28,8 +28,10 @@
class TC_COMMON_API ConfigMgr
{
- ConfigMgr() { }
- ~ConfigMgr() { }
+ ConfigMgr() = default;
+ ConfigMgr(ConfigMgr const&) = delete;
+ ConfigMgr& operator=(ConfigMgr const&) = delete;
+ ~ConfigMgr() = default;
public:
/// Method used only for loading main configuration files (authserver.conf and worldserver.conf)
@@ -52,8 +54,8 @@ private:
boost::property_tree::ptree _config;
std::mutex _configLock;
- ConfigMgr(ConfigMgr const&);
- ConfigMgr& operator=(ConfigMgr const&);
+ template<class T>
+ T GetValueDefault(std::string const& name, T def) const;
};
#define sConfigMgr ConfigMgr::instance()