diff options
author | Murray Cumming <murrayc@murrayc.com> | 2010-05-31 13:16:28 +0200 |
---|---|---|
committer | Murray Cumming <murrayc@murrayc.com> | 2010-05-31 13:16:28 +0200 |
commit | de7e9208edb460830accf5835afcbbf9ac4d212b (patch) | |
tree | d74cd224716e60e11723a3ba2777f1a757c218fe /glib/glibmm/error.cc | |
parent | f510673363137d691f5063bc68d9fa7bb3ef9709 (diff) | |
download | glibmm-de7e9208edb460830accf5835afcbbf9ac4d212b.tar.gz |
Remove the reduced API options and code, as discussed on mailing list.
* configure.ac: Removed the --enable-api-exceptions, --enable-api-properties,
--enable-api-vfuncs and --enable-api-default-signal-handlers options.
* build/reduced.m4: Removed.
* tools/m4/*.m4:
* tools/pm/Output.pm: Remove any use of ifdefs and auto_ptr for reduced API.
* *.[hg|ccg|h|cc]: Remove the idefed code.
Diffstat (limited to 'glib/glibmm/error.cc')
-rw-r--r-- | glib/glibmm/error.cc | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/glib/glibmm/error.cc b/glib/glibmm/error.cc index df5441b4..fe01cc6f 100644 --- a/glib/glibmm/error.cc +++ b/glib/glibmm/error.cc @@ -153,12 +153,8 @@ void Error::register_domain(GQuark domain, Error::ThrowFunc throw_func) (*throw_func_table)[domain] = throw_func; } -#ifdef GLIBMM_EXCEPTIONS_ENABLED // static, noreturn void Error::throw_exception(GError* gobject) -#else -std::auto_ptr<Glib::Error> Error::throw_exception(GError* gobject) -#endif //GLIBMM_EXCEPTIONS_ENABLED { g_assert(gobject != 0); @@ -168,11 +164,7 @@ std::auto_ptr<Glib::Error> Error::throw_exception(GError* gobject) if(const ThrowFunc throw_func = (*throw_func_table)[gobject->domain]) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED (*throw_func)(gobject); - #else - return (*throw_func)(gobject); - #endif //GLIBMM_EXCEPTIONS_ENABLED g_assert_not_reached(); } @@ -180,12 +172,8 @@ std::auto_ptr<Glib::Error> Error::throw_exception(GError* gobject) "unknown error domain '%s': throwing generic Glib::Error exception\n", (gobject->domain) ? g_quark_to_string(gobject->domain) : "(null)"); -#ifdef GLIBMM_EXCEPTIONS_ENABLED // Doesn't copy, because error-returning functions return a newly allocated GError for us. throw Glib::Error(gobject); -#else - return std::auto_ptr<Glib::Error>(new Glib::Error(gobject)); -#endif //GLIBMM_EXCEPTIONS_ENABLED } |