Couldn't find wdiff. Falling back to builtin diff colouring...
| 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 6 | | #define LIBCONFIG_VER_REVISION 7 | |
| | | | |
| #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 | |
| | | | |
| skipping to change at line 107 | | skipping to change at line 107 | |
| unsigned int length; | | unsigned int length; | |
| config_setting_t **elements; | | config_setting_t **elements; | |
| } config_list_t; | | } config_list_t; | |
| | | | |
| typedef struct config_t | | typedef struct config_t | |
| { | | { | |
| config_setting_t *root; | | config_setting_t *root; | |
| void (*destructor)(void *); | | void (*destructor)(void *); | |
| unsigned short flags; | | unsigned short flags; | |
| unsigned short tab_width; | | unsigned short tab_width; | |
|
| | | short default_format; | |
| const char *include_dir; | | const char *include_dir; | |
| const char *error_text; | | const char *error_text; | |
| const char *error_file; | | const char *error_file; | |
| int error_line; | | int error_line; | |
| config_error_t error_type; | | config_error_t error_type; | |
| const char **filenames; | | const char **filenames; | |
| unsigned int num_filenames; | | unsigned int num_filenames; | |
| } config_t; | | } config_t; | |
| | | | |
| extern LIBCONFIG_API int config_read(config_t *config, FILE *stream); | | extern LIBCONFIG_API int config_read(config_t *config, FILE *stream); | |
| extern LIBCONFIG_API void config_write(const config_t *config, FILE *stream
); | | extern LIBCONFIG_API void config_write(const config_t *config, FILE *stream
); | |
| | | | |
|
| | | extern LIBCONFIG_API void config_set_default_format(config_t *config, | |
| | | short format); | |
| | | | |
| extern LIBCONFIG_API void config_set_auto_convert(config_t *config, int fla
g); | | extern LIBCONFIG_API void config_set_auto_convert(config_t *config, int fla
g); | |
| extern LIBCONFIG_API int config_get_auto_convert(const config_t *config); | | extern LIBCONFIG_API int config_get_auto_convert(const config_t *config); | |
| | | | |
| extern LIBCONFIG_API int config_read_string(config_t *config, const char *s
tr); | | extern LIBCONFIG_API int config_read_string(config_t *config, const char *s
tr); | |
| | | | |
| extern LIBCONFIG_API int config_read_file(config_t *config, | | extern LIBCONFIG_API int config_read_file(config_t *config, | |
| const char *filename); | | const char *filename); | |
| extern LIBCONFIG_API int config_write_file(config_t *config, | | extern LIBCONFIG_API int config_write_file(config_t *config, | |
| const char *filename); | | const char *filename); | |
| | | | |
| | | | |
| skipping to change at line 172 | | skipping to change at line 176 | |
| long long value); | | long long value); | |
| extern LIBCONFIG_API int config_setting_set_float(config_setting_t *setting
, | | extern LIBCONFIG_API int config_setting_set_float(config_setting_t *setting
, | |
| double value); | | double value); | |
| extern LIBCONFIG_API int config_setting_set_bool(config_setting_t *setting, | | extern LIBCONFIG_API int config_setting_set_bool(config_setting_t *setting, | |
| int value); | | int value); | |
| extern LIBCONFIG_API int config_setting_set_string(config_setting_t *settin
g, | | extern LIBCONFIG_API int config_setting_set_string(config_setting_t *settin
g, | |
| const char *value); | | const char *value); | |
| | | | |
| extern LIBCONFIG_API int config_setting_set_format(config_setting_t *settin
g, | | extern LIBCONFIG_API int config_setting_set_format(config_setting_t *settin
g, | |
| short format); | | short format); | |
|
| extern LIBCONFIG_API short config_setting_get_format(config_setting_t *sett
ing); | | extern LIBCONFIG_API short config_setting_get_format( | |
| | | const config_setting_t *setting); | |
| | | | |
| extern LIBCONFIG_API int config_setting_get_int_elem( | | extern LIBCONFIG_API int config_setting_get_int_elem( | |
| const config_setting_t *setting, int idx); | | const config_setting_t *setting, int idx); | |
| extern LIBCONFIG_API long long config_setting_get_int64_elem( | | extern LIBCONFIG_API long long config_setting_get_int64_elem( | |
| const config_setting_t *setting, int idx); | | const config_setting_t *setting, int idx); | |
| extern LIBCONFIG_API double config_setting_get_float_elem( | | extern LIBCONFIG_API double config_setting_get_float_elem( | |
| const config_setting_t *setting, int idx); | | const config_setting_t *setting, int idx); | |
| extern LIBCONFIG_API int config_setting_get_bool_elem( | | extern LIBCONFIG_API int config_setting_get_bool_elem( | |
| const config_setting_t *setting, int idx); | | const config_setting_t *setting, int idx); | |
| extern LIBCONFIG_API const char *config_setting_get_string_elem( | | extern LIBCONFIG_API const char *config_setting_get_string_elem( | |
| | | | |
| skipping to change at line 278 | | skipping to change at line 283 | |
| extern LIBCONFIG_API int config_lookup_bool(const config_t *config, | | extern LIBCONFIG_API int config_lookup_bool(const config_t *config, | |
| const char *path, int *value); | | const char *path, int *value); | |
| extern LIBCONFIG_API int config_lookup_string(const config_t *config, | | extern LIBCONFIG_API int config_lookup_string(const config_t *config, | |
| const char *path, | | const char *path, | |
| const char **value); | | const char **value); | |
| | | | |
| #define /* config_setting_t * */ config_root_setting( \ | | #define /* config_setting_t * */ config_root_setting( \ | |
| /* const config_t * */ C) \ | | /* const config_t * */ C) \ | |
| ((C)->root) | | ((C)->root) | |
| | | | |
|
| | | #define /* void */ config_set_default_format(/* config_t * */ C, \ | |
| | | /* short */ F) \ | |
| | | (C)->default_format = (F) | |
| | | | |
| | | #define /* short */ config_get_default_format(/* config_t * */ C) \ | |
| | | ((C)->default_format) | |
| | | | |
| #define /* void */ config_set_tab_width(/* config_t * */ C, \ | | #define /* void */ config_set_tab_width(/* config_t * */ C, \ | |
| /* unsigned short */ W) \ | | /* unsigned short */ W) \ | |
| (C)->tab_width = ((W) & 0x0F) | | (C)->tab_width = ((W) & 0x0F) | |
| | | | |
| #define /* unsigned char */ config_get_tab_width(/* const config_t * */ C)
\ | | #define /* unsigned char */ config_get_tab_width(/* const config_t * */ C)
\ | |
| ((C)->tab_width) | | ((C)->tab_width) | |
| | | | |
| #define /* unsigned short */ config_setting_source_line( \ | | #define /* unsigned short */ config_setting_source_line( \ | |
| /* const config_setting_t * */ S) \ | | /* const config_setting_t * */ S) \ | |
| ((S)->line) | | ((S)->line) | |
| | | | |
End of changes. 5 change blocks. |
| 2 lines changed or deleted | | 14 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 6 | | #define LIBCONFIGXX_VER_REVISION 7 | |
| | | | |
| 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 372 | | skipping to change at line 372 | |
| Config& operator=(const Config& other); // not supported | | Config& operator=(const Config& other); // not supported | |
| | | | |
| public: | | public: | |
| | | | |
| Config(); | | Config(); | |
| virtual ~Config(); | | virtual ~Config(); | |
| | | | |
| void setAutoConvert(bool flag); | | void setAutoConvert(bool flag); | |
| bool getAutoConvert() const; | | bool getAutoConvert() const; | |
| | | | |
|
| | | void setDefaultFormat(Setting::Format format); | |
| | | inline Setting::Format getDefaultFormat() const | |
| | | { return(_defaultFormat); } | |
| | | | |
| void setTabWidth(unsigned short width) throw(); | | void setTabWidth(unsigned short width) throw(); | |
| unsigned short getTabWidth() const throw(); | | unsigned short getTabWidth() const throw(); | |
| | | | |
| void setIncludeDir(const char *includeDir) throw(); | | void setIncludeDir(const char *includeDir) throw(); | |
| const char *getIncludeDir() const throw(); | | const char *getIncludeDir() const throw(); | |
| | | | |
| void read(FILE *stream) throw(ParseException); | | void read(FILE *stream) throw(ParseException); | |
| void write(FILE *stream) const; | | void write(FILE *stream) const; | |
| | | | |
| void readString(const char *str) throw(ParseException); | | void readString(const char *str) throw(ParseException); | |
| | | | |
| skipping to change at line 448 | | skipping to change at line 452 | |
| { return(lookupValue(path.c_str(), value)); } | | { return(lookupValue(path.c_str(), value)); } | |
| | | | |
| inline bool lookupValue(const std::string &path, std::string &value) | | inline bool lookupValue(const std::string &path, std::string &value) | |
| const throw() | | const throw() | |
| { return(lookupValue(path.c_str(), value)); } | | { return(lookupValue(path.c_str(), value)); } | |
| | | | |
| Setting & getRoot() const; | | Setting & getRoot() const; | |
| | | | |
| private: | | private: | |
| | | | |
|
| | | Setting::Format _defaultFormat; | |
| | | | |
| void handleError() const; | | void handleError() const; | |
| }; | | }; | |
| | | | |
| } // namespace libconfig | | } // namespace libconfig | |
| | | | |
| #endif // __libconfig_hpp | | #endif // __libconfig_hpp | |
| | | | |
End of changes. 3 change blocks. |
| 1 lines changed or deleted | | 7 lines changed or added | |
|