aboutsummaryrefslogtreecommitdiffstats
path: root/lib/libconfig.h++
diff options
context:
space:
mode:
authorJonathan McCrohan <jmccrohan@gmail.com>2012-11-17 17:04:05 +0000
committerJonathan McCrohan <jmccrohan@gmail.com>2012-11-17 17:04:05 +0000
commit2fc13f629ad1d5f991ac3679e9d399760ceef085 (patch)
treeb267e6b0bacca43f0563a12d9b2a3efb51feaf61 /lib/libconfig.h++
parentc317fac1d7221e4a278c41490ff300f7802e9dcb (diff)
parentf2499612c5594944d3e0891259859668d35c85b2 (diff)
downloadlibconfig-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/libconfig.h++')
-rw-r--r--lib/libconfig.h++15
1 files changed, 7 insertions, 8 deletions
diff --git a/lib/libconfig.h++ b/lib/libconfig.h++
index dfc7939..04be7a9 100644
--- a/lib/libconfig.h++
+++ b/lib/libconfig.h++
@@ -41,7 +41,7 @@
#define LIBCONFIGXX_VER_MAJOR 1
#define LIBCONFIGXX_VER_MINOR 4
-#define LIBCONFIGXX_VER_REVISION 8
+#define LIBCONFIGXX_VER_REVISION 9
struct config_t; // fwd decl
struct config_setting_t; // fwd decl
@@ -86,7 +86,7 @@ class LIBCONFIGXX_API SettingTypeException : public SettingException
public:
- const char *what() const throw();
+ virtual const char *what() const throw();
private:
@@ -102,7 +102,7 @@ class LIBCONFIGXX_API SettingNotFoundException : public SettingException
public:
- const char *what() const throw();
+ virtual const char *what() const throw();
private:
@@ -118,7 +118,7 @@ class LIBCONFIGXX_API SettingNameException : public SettingException
public:
- const char *what() const throw();
+ virtual const char *what() const throw();
private:
@@ -129,7 +129,7 @@ class LIBCONFIGXX_API FileIOException : public ConfigException
{
public:
- const char *what() const throw();
+ virtual const char *what() const throw();
};
class LIBCONFIGXX_API ParseException : public ConfigException
@@ -151,7 +151,7 @@ class LIBCONFIGXX_API ParseException : public ConfigException
inline const char *getError() const throw()
{ return(_error); }
- const char *what() const throw();
+ virtual const char *what() const throw();
private:
@@ -197,8 +197,7 @@ class LIBCONFIGXX_API Setting
Setting(config_setting_t *setting);
- void assertType(Type type) const
- throw(SettingTypeException);
+ void assertType(Type type) const throw(SettingTypeException);
static Setting & wrapSetting(config_setting_t *setting);
Setting(const Setting& other); // not supported