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/libconfig.h | |
| 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 '')
| -rw-r--r-- | lib/libconfig.h | 2 | ||||
| -rw-r--r-- | lib/libconfig.h++ | 15 |
2 files changed, 8 insertions, 9 deletions
diff --git a/lib/libconfig.h b/lib/libconfig.h index cc079db..1774a26 100644 --- a/lib/libconfig.h +++ b/lib/libconfig.h @@ -41,7 +41,7 @@ extern "C" { #define LIBCONFIG_VER_MAJOR 1 #define LIBCONFIG_VER_MINOR 4 -#define LIBCONFIG_VER_REVISION 8 +#define LIBCONFIG_VER_REVISION 9 #include <stdio.h> 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 |