diff options
| author | Jonathan McCrohan <jmccrohan@gmail.com> | 2012-11-17 17:04:05 +0000 |
|---|---|---|
| committer | Jonathan McCrohan <jmccrohan@gmail.com> | 2012-11-17 17:04:05 +0000 |
| commit | 2fc13f629ad1d5f991ac3679e9d399760ceef085 (patch) | |
| tree | b267e6b0bacca43f0563a12d9b2a3efb51feaf61 /lib/libconfigcpp.c++ | |
| parent | c317fac1d7221e4a278c41490ff300f7802e9dcb (diff) | |
| parent | f2499612c5594944d3e0891259859668d35c85b2 (diff) | |
| download | libconfig-2fc13f629ad1d5f991ac3679e9d399760ceef085.tar.gz | |
Merge tag 'upstream/1.4.9'
Upstream version 1.4.9
Conflicts:
debian/changelog
debian/control
libconfig.spec
Diffstat (limited to 'lib/libconfigcpp.c++')
| -rw-r--r-- | lib/libconfigcpp.c++ | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/libconfigcpp.c++ b/lib/libconfigcpp.c++ index 846c067..6d196e7 100644 --- a/lib/libconfigcpp.c++ +++ b/lib/libconfigcpp.c++ @@ -45,7 +45,8 @@ ParseException::ParseException(const char *file, int line, const char *error) // --------------------------------------------------------------------------- ParseException::ParseException(const ParseException &other) - : _file(other._file ? ::strdup(other._file) : NULL), + : ConfigException(other), + _file(other._file ? ::strdup(other._file) : NULL), _line(other._line), _error(other._error) { @@ -182,6 +183,7 @@ const char *SettingException::getPath() const // --------------------------------------------------------------------------- SettingException::SettingException(const SettingException &other) + : ConfigException(other) { _path = ::strdup(other._path); } @@ -461,7 +463,7 @@ bool Config::exists(const char *path) const throw() V = (T)s; \ return(true); \ } \ - catch(ConfigException) \ + catch(const ConfigException &) \ { \ return(false); \ } @@ -868,7 +870,7 @@ Setting & Setting::operator[](const char *key) const V = (T)s; \ return(true); \ } \ - catch(ConfigException) \ + catch(const ConfigException &) \ { \ return(false); \ } @@ -1162,6 +1164,6 @@ Setting & Setting::wrapSetting(config_setting_t *s) // --------------------------------------------------------------------------- -}; // namespace libconfig +} // namespace libconfig // eof |