diff options
| author | Daniel Elstner <danielk@openismus.com> | 2009-09-21 17:50:08 +0200 |
|---|---|---|
| committer | Daniel Elstner <danielk@openismus.com> | 2009-09-21 17:50:08 +0200 |
| commit | 6b8358a0889c1afe9b376dcb4ac2dd70fd03ea39 (patch) | |
| tree | 832fc4a7cef78209852d1d516e95365fed0d3fc0 | |
| parent | 7c860ea566f4f7cabf2cc3cb771ea96db8e93dab (diff) | |
| download | glibmm-6b8358a0889c1afe9b376dcb4ac2dd70fd03ea39.tar.gz | |
Fix KeyFile build with exceptions disabled
* glib/src/keyfile.hg (Glib::KeyFile): Correct repeated syntax
error in the code that is built when GLIBMM_EXCEPTIONS_ENABLED
is not defined. Also remove the bogus default argument values
appearing in the middle of the argument list.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | glib/src/keyfile.hg | 10 |
2 files changed, 14 insertions, 5 deletions
@@ -1,3 +1,12 @@ +2009-09-21 Daniel Elstner <danielk@openismus.com> + + Fix KeyFile build with exceptions disabled + + * glib/src/keyfile.hg (Glib::KeyFile): Correct repeated syntax + error in the code that is built when GLIBMM_EXCEPTIONS_ENABLED + is not defined. Also remove the bogus default argument values + appearing in the middle of the argument list. + 2009-09-21 Jonathon Jongsma <jonathon.jongsma@collabora.co.uk> * NEWS: diff --git a/glib/src/keyfile.hg b/glib/src/keyfile.hg index 07a66c52..75b4b060 100644 --- a/glib/src/keyfile.hg +++ b/glib/src/keyfile.hg @@ -128,7 +128,7 @@ public: #ifdef GLIBMM_EXCEPTIONS_ENABLED bool load_from_data(const Glib::ustring& data, KeyFileFlags flags = Glib::KEY_FILE_NONE); #else - bool load_from_data(const Glib::ustring& data, KeyFileFlags flags = Glib::KEY_FILE_NONE, std:auto_ptr<Glib::Error>& error); + bool load_from_data(const Glib::ustring& data, KeyFileFlags flags, std::auto_ptr<Glib::Error>& error); #endif _IGNORE(g_key_file_load_from_data) @@ -156,7 +156,7 @@ public: #ifdef GLIBMM_EXCEPTIONS_ENABLED bool load_from_data_dirs(const std::string& file, std::string& full_path, KeyFileFlags flags = Glib::KEY_FILE_NONE); #else - bool load_from_data_dirs(const std::string& file, std::string& full_path, KeyFileFlags flags = Glib::KEY_FILE_NONE, std:auto_ptr<Glib::Error>& error); + bool load_from_data_dirs(const std::string& file, std::string& full_path, KeyFileFlags flags, std::auto_ptr<Glib::Error>& error); #endif _IGNORE(g_key_file_load_from_data_dirs) @@ -167,7 +167,7 @@ public: #ifdef GLIBMM_EXCEPTIONS_ENABLED Glib::ustring to_data(); #else - Glib::ustring to_data(std:auto_ptr<Glib::Error>& error); + Glib::ustring to_data(std::auto_ptr<Glib::Error>& error); #endif _IGNORE(g_key_file_to_data) @@ -187,7 +187,7 @@ public: #ifdef GLIBMM_EXCEPTIONS_ENABLED Glib::ArrayHandle<Glib::ustring> get_keys(const Glib::ustring& group_name) const; #else - Glib::ArrayHandle<Glib::ustring> get_keys(const Glib::ustring& group_name, std:auto_ptr<Glib::Error>& error) const; + Glib::ArrayHandle<Glib::ustring> get_keys(const Glib::ustring& group_name, std::auto_ptr<Glib::Error>& error) const; #endif _IGNORE(g_key_file_get_keys) @@ -205,7 +205,7 @@ public: #ifdef GLIBMM_EXCEPTIONS_ENABLED Glib::ustring get_locale_string(const Glib::ustring& group_name, const Glib::ustring& key) const; #else - Glib::ustring get_locale_string(const Glib::ustring& group_name, const Glib::ustring& key, std:auto_ptr<Glib::Error>& error) const; + Glib::ustring get_locale_string(const Glib::ustring& group_name, const Glib::ustring& key, std::auto_ptr<Glib::Error>& error) const; #endif _IGNORE(g_key_file_get_locale_string) |