From 365bc3fc20eeebad894e03ba1374ed68bf27e984 Mon Sep 17 00:00:00 2001 From: Daniel Elstner Date: Mon, 21 Sep 2009 17:50:08 +0200 Subject: 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. --- ChangeLog | 9 +++++++++ glib/src/keyfile.hg | 10 +++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 38322fa3..7b48cbff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2009-09-21 Daniel Elstner + + 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-17 Daniel Elstner Do not complain about missing docs_override.xml 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& error); + bool load_from_data(const Glib::ustring& data, KeyFileFlags flags, std::auto_ptr& 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& error); + bool load_from_data_dirs(const std::string& file, std::string& full_path, KeyFileFlags flags, std::auto_ptr& 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& error); + Glib::ustring to_data(std::auto_ptr& error); #endif _IGNORE(g_key_file_to_data) @@ -187,7 +187,7 @@ public: #ifdef GLIBMM_EXCEPTIONS_ENABLED Glib::ArrayHandle get_keys(const Glib::ustring& group_name) const; #else - Glib::ArrayHandle get_keys(const Glib::ustring& group_name, std:auto_ptr& error) const; + Glib::ArrayHandle get_keys(const Glib::ustring& group_name, std::auto_ptr& 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& error) const; + Glib::ustring get_locale_string(const Glib::ustring& group_name, const Glib::ustring& key, std::auto_ptr& error) const; #endif _IGNORE(g_key_file_get_locale_string) -- cgit v1.2.1