libconfig.h   libconfig.h 
skipping to change at line 44 skipping to change at line 44
#define LIBCONFIG_API __declspec(dllexport) #define LIBCONFIG_API __declspec(dllexport)
#else /* ! LIBCONFIG_EXPORTS */ #else /* ! LIBCONFIG_EXPORTS */
#define LIBCONFIG_API __declspec(dllimport) #define LIBCONFIG_API __declspec(dllimport)
#endif /* LIBCONFIG_STATIC */ #endif /* LIBCONFIG_STATIC */
#else /* ! WIN32 */ #else /* ! WIN32 */
#define LIBCONFIG_API #define LIBCONFIG_API
#endif /* WIN32 */ #endif /* WIN32 */
#define LIBCONFIG_VER_MAJOR 1 #define LIBCONFIG_VER_MAJOR 1
#define LIBCONFIG_VER_MINOR 4 #define LIBCONFIG_VER_MINOR 4
#define LIBCONFIG_VER_REVISION 8 #define LIBCONFIG_VER_REVISION 9
#include <stdio.h> #include <stdio.h>
#define CONFIG_TYPE_NONE 0 #define CONFIG_TYPE_NONE 0
#define CONFIG_TYPE_GROUP 1 #define CONFIG_TYPE_GROUP 1
#define CONFIG_TYPE_INT 2 #define CONFIG_TYPE_INT 2
#define CONFIG_TYPE_INT64 3 #define CONFIG_TYPE_INT64 3
#define CONFIG_TYPE_FLOAT 4 #define CONFIG_TYPE_FLOAT 4
#define CONFIG_TYPE_STRING 5 #define CONFIG_TYPE_STRING 5
#define CONFIG_TYPE_BOOL 6 #define CONFIG_TYPE_BOOL 6
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 libconfig.h++   libconfig.h++ 
skipping to change at line 44 skipping to change at line 44
#define LIBCONFIGXX_API __declspec(dllexport) #define LIBCONFIGXX_API __declspec(dllexport)
#else /* ! LIBCONFIGXX_EXPORTS */ #else /* ! LIBCONFIGXX_EXPORTS */
#define LIBCONFIGXX_API __declspec(dllimport) #define LIBCONFIGXX_API __declspec(dllimport)
#endif /* LIBCONFIGXX_STATIC */ #endif /* LIBCONFIGXX_STATIC */
#else /* ! WIN32 */ #else /* ! WIN32 */
#define LIBCONFIGXX_API #define LIBCONFIGXX_API
#endif /* WIN32 */ #endif /* WIN32 */
#define LIBCONFIGXX_VER_MAJOR 1 #define LIBCONFIGXX_VER_MAJOR 1
#define LIBCONFIGXX_VER_MINOR 4 #define LIBCONFIGXX_VER_MINOR 4
#define LIBCONFIGXX_VER_REVISION 8 #define LIBCONFIGXX_VER_REVISION 9
struct config_t; // fwd decl struct config_t; // fwd decl
struct config_setting_t; // fwd decl struct config_setting_t; // fwd decl
namespace libconfig { namespace libconfig {
class LIBCONFIGXX_API ConfigException : public std::exception { }; class LIBCONFIGXX_API ConfigException : public std::exception { };
class Setting; // fwd decl class Setting; // fwd decl
skipping to change at line 89 skipping to change at line 89
char *_path; char *_path;
}; };
class LIBCONFIGXX_API SettingTypeException : public SettingException class LIBCONFIGXX_API SettingTypeException : public SettingException
{ {
friend class Config; friend class Config;
friend class Setting; friend class Setting;
public: public:
const char *what() const throw(); virtual const char *what() const throw();
private: private:
SettingTypeException(const Setting &setting); SettingTypeException(const Setting &setting);
SettingTypeException(const Setting &setting, int idx); SettingTypeException(const Setting &setting, int idx);
SettingTypeException(const Setting &setting, const char *name); SettingTypeException(const Setting &setting, const char *name);
}; };
class LIBCONFIGXX_API SettingNotFoundException : public SettingException class LIBCONFIGXX_API SettingNotFoundException : public SettingException
{ {
friend class Config; friend class Config;
friend class Setting; friend class Setting;
public: public:
const char *what() const throw(); virtual const char *what() const throw();
private: private:
SettingNotFoundException(const Setting &setting, int idx); SettingNotFoundException(const Setting &setting, int idx);
SettingNotFoundException(const Setting &setting, const char *name); SettingNotFoundException(const Setting &setting, const char *name);
SettingNotFoundException(const char *path); SettingNotFoundException(const char *path);
}; };
class LIBCONFIGXX_API SettingNameException : public SettingException class LIBCONFIGXX_API SettingNameException : public SettingException
{ {
friend class Config; friend class Config;
friend class Setting; friend class Setting;
public: public:
const char *what() const throw(); virtual const char *what() const throw();
private: private:
SettingNameException(const Setting &setting, const char *name); SettingNameException(const Setting &setting, const char *name);
}; };
class LIBCONFIGXX_API FileIOException : public ConfigException class LIBCONFIGXX_API FileIOException : public ConfigException
{ {
public: public:
const char *what() const throw(); virtual const char *what() const throw();
}; };
class LIBCONFIGXX_API ParseException : public ConfigException class LIBCONFIGXX_API ParseException : public ConfigException
{ {
friend class Config; friend class Config;
public: public:
ParseException(const ParseException &other); ParseException(const ParseException &other);
skipping to change at line 154 skipping to change at line 154
inline const char *getFile() const throw() inline const char *getFile() const throw()
{ return(_file); } { return(_file); }
inline int getLine() const throw() inline int getLine() const throw()
{ return(_line); } { return(_line); }
inline const char *getError() const throw() inline const char *getError() const throw()
{ return(_error); } { return(_error); }
const char *what() const throw(); virtual const char *what() const throw();
private: private:
ParseException(const char *file, int line, const char *error); ParseException(const char *file, int line, const char *error);
const char *_file; const char *_file;
int _line; int _line;
const char *_error; const char *_error;
}; };
skipping to change at line 200 skipping to change at line 200
}; };
private: private:
config_setting_t *_setting; config_setting_t *_setting;
Type _type; Type _type;
Format _format; Format _format;
Setting(config_setting_t *setting); Setting(config_setting_t *setting);
void assertType(Type type) const void assertType(Type type) const throw(SettingTypeException);
throw(SettingTypeException);
static Setting & wrapSetting(config_setting_t *setting); static Setting & wrapSetting(config_setting_t *setting);
Setting(const Setting& other); // not supported Setting(const Setting& other); // not supported
Setting& operator=(const Setting& other); // not supported Setting& operator=(const Setting& other); // not supported
public: public:
virtual ~Setting() throw(); virtual ~Setting() throw();
inline Type getType() const throw() { return(_type); } inline Type getType() const throw() { return(_type); }
 End of changes. 7 change blocks. 
8 lines changed or deleted 7 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/