[PATCH] Remove assert in giop_main_run()
- From: Jules Colding <colding omesc com>
- To: ORBit2 <orbit-list gnome org>
- Subject: [PATCH] Remove assert in giop_main_run()
- Date: Wed, 07 Sep 2005 15:42:46 +0200
Hi,
The patch below fixes my earlier problems with ORBit2 and shared
libraries. "make check" is happy and I have used a few days to spot for
any unwanted side effect, but found none.
Please comment. I'll commit shortly if no-one objects.
--
jules
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/ORBit2/ChangeLog,v
retrieving revision 1.727
diff -u -p -r1.727 ChangeLog
--- ChangeLog 6 Sep 2005 13:22:30 -0000 1.727
+++ ChangeLog 7 Sep 2005 13:16:25 -0000
@@ -1,3 +1,10 @@
+2005-09-07 Jules Colding <colding omesc com>
+
+ * configure.in (LT_VERSION): Version 2.13.2. This is needed as the change
+ below actually makes some programs run when they would not otherwise.
+
+ * src/orb/GIOP/giop.c (giop_main_run): Remove g_assert().
+
2005-09-06 Mark McLoughlin <mark skynet ie>
* configure.in: Version 2.13.1
Index: src/orb/GIOP/giop.c
===================================================================
RCS file: /cvs/gnome/ORBit2/src/orb/GIOP/giop.c,v
retrieving revision 1.52
diff -u -p -r1.52 giop.c
--- src/orb/GIOP/giop.c 13 Apr 2005 11:40:08 -0000 1.52
+++ src/orb/GIOP/giop.c 7 Sep 2005 13:16:26 -0000
@@ -625,13 +625,12 @@ void
giop_main_run (void)
{
if (giop_thread_io ()) {
- g_assert (giop_thread_self () == giop_main_thread);
- g_assert (giop_main_loop == NULL);
- giop_main_loop = g_main_loop_new (NULL, TRUE);
+ g_assert (giop_main_loop == NULL);
+ giop_main_loop = g_main_loop_new (NULL, TRUE);
g_main_loop_run (giop_main_loop);
g_main_loop_unref (giop_main_loop);
giop_main_loop = NULL;
- } else
+ } else
link_main_loop_run ();
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]