[ekiga] Fix the handling of exception in the build code
- From: Julien Puydt <jpuydt src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [ekiga] Fix the handling of exception in the build code
- Date: Wed, 7 Oct 2009 07:27:55 +0000 (UTC)
commit ed6d89a7e1ab0a509de0a9c005e16771ca3110c8
Author: Julien Puydt <jpuydt gnome org>
Date: Wed Oct 7 08:12:47 2009 +0200
Fix the handling of exception in the build code
Thanks to Michael Rickmann.
lib/Makefile.am | 3 +--
lib/engine/components/opal/opal-main.cpp | 9 ---------
2 files changed, 1 insertions(+), 11 deletions(-)
---
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 8850557..ce696b4 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -52,10 +52,9 @@ AM_CFLAGS = \
$(GLIB_CFLAGS) $(GTK_CFLAGS) $(GCONF_CFLAGS) \
$(DBUS_CFLAGS) $(GNOME_CFLAGS)
-# FIXME: here we add -fexceptions because ptlib&opal put them out and that's a problem for boost...
AM_CPPFLAGS = \
$(BOOST_CPPFLAGS) $(GLIB_CFLAGS) $(XML_CFLAGS) $(GTK_CFLAGS) \
- $(DBUS_CFLAGS) $(GNOME_CFLAGS) $(PTLIB_CFLAGS) $(OPAL_CFLAGS) -fexceptions
+ $(DBUS_CFLAGS) $(GNOME_CFLAGS) $(PTLIB_CFLAGS) $(OPAL_CFLAGS)
AM_LIBS = \
$(BOOST_LIBS) $(GLIB_LIBS) $(XML_LIBS) $(GTK_LIBS)
diff --git a/lib/engine/components/opal/opal-main.cpp b/lib/engine/components/opal/opal-main.cpp
index 077284e..d28b7ba 100644
--- a/lib/engine/components/opal/opal-main.cpp
+++ b/lib/engine/components/opal/opal-main.cpp
@@ -177,12 +177,3 @@ opal_init (Ekiga::KickStart& kickstart)
kickstart.add_spark (spark);
}
-
-// FIXME: I have no clue why this is needed only for the opal code!
-#ifdef BOOST_NO_EXCEPTIONS
-
-void
-boost::throw_exception (const std::exception&)
-{
-}
-#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]