[omniORB] omniORB 4 preview patches for gcc 3.0.1

[Christof Meerwald]

--y0ulUmNC+osPPQO6
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi,

attached is a small patch to make the latest omniORB 4 preview (CVS
checkout) compile with gcc 3.0.1:

 - gcc 3 doesn't seem to like the implicit conversion from thisClassCompare
   to a void *

 - gcc 3 doesn't like the implicitely declared "abort" in
   src/lib/omniORB/orbcore/omniORB.cc


And a final problem which is not related to gcc 3: omniNames still tries to
use -ORBendpoint instead of -ORBendPoint (and the Omni Orb4 Development
Status page also still describes -ORBendpoint)


bye, Christof

-- 
http://cmeerw.cjb.net                          Jabber: cmeerw@jabber.at
mailto cmeerw at web.de                   ICQ: 93773535, Yahoo!: cmeerw

--y0ulUmNC+osPPQO6
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="omni.diff"

Index: src/lib/omniORB/include/inProcessIdentity.h
===================================================================
RCS file: /cvsroot/omni/src/lib/omniORB/include/Attic/inProcessIdentity.h,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 inProcessIdentity.h
--- inProcessIdentity.h	2001/08/15 10:26:09	1.1.2.2
+++ inProcessIdentity.h	2001/08/22 10:16:42
@@ -90,7 +90,7 @@
 
   static inline omniInProcessIdentity* downcast(omniIdentity* id)
   {
-    return (omniInProcessIdentity*)(id->classCompare()(id, thisClassCompare));
+    return (omniInProcessIdentity*)(id->classCompare()(id, (void *) thisClassCompare));
   }
 
 private:
Index: src/lib/omniORB/include/localIdentity.h
===================================================================
RCS file: /cvsroot/omni/src/lib/omniORB/include/Attic/localIdentity.h,v
retrieving revision 1.1.4.4
diff -u -r1.1.4.4 localIdentity.h
--- localIdentity.h	2001/08/15 10:26:09	1.1.4.4
+++ localIdentity.h	2001/08/22 10:16:42
@@ -147,7 +147,7 @@
 
   static inline omniLocalIdentity* downcast(omniIdentity* id)
   {
-    return (omniLocalIdentity*)(id->classCompare()(id, thisClassCompare));
+    return (omniLocalIdentity*)(id->classCompare()(id, (void *) thisClassCompare));
   }
 
 protected:
Index: src/lib/omniORB/include/objectTable.h
===================================================================
RCS file: /cvsroot/omni/src/lib/omniORB/include/Attic/objectTable.h,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 objectTable.h
--- objectTable.h	2001/08/15 10:26:09	1.1.2.1
+++ objectTable.h	2001/08/22 10:16:42
@@ -179,7 +179,7 @@
 
   static inline omniObjTableEntry* downcast(omniIdentity* id)
   {
-    return (omniObjTableEntry*)(id->classCompare()(id, thisClassCompare));
+    return (omniObjTableEntry*)(id->classCompare()(id, (void *) thisClassCompare));
   }
 
 private:
Index: src/lib/omniORB/include/remoteIdentity.h
===================================================================
RCS file: /cvsroot/omni/src/lib/omniORB/include/Attic/remoteIdentity.h,v
retrieving revision 1.1.4.2
diff -u -r1.1.4.2 remoteIdentity.h
--- remoteIdentity.h	2001/08/15 10:26:10	1.1.4.2
+++ remoteIdentity.h	2001/08/22 10:16:42
@@ -103,7 +103,7 @@
 
   static inline omniRemoteIdentity* downcast(omniIdentity* id)
   {
-    return (omniRemoteIdentity*)(id->classCompare()(id, thisClassCompare));
+    return (omniRemoteIdentity*)(id->classCompare()(id, (void *) thisClassCompare));
   }
 
 private:
Index: src/lib/omniORB/orbcore/omniORB.cc
===================================================================
RCS file: /cvsroot/omni/src/lib/omniORB/orbcore/Attic/omniORB.cc,v
retrieving revision 1.2.2.9
diff -u -r1.2.2.9 omniORB.cc
--- omniORB.cc	2001/08/17 17:12:40	1.2.2.9
+++ omniORB.cc	2001/08/22 10:16:42
@@ -76,6 +76,7 @@
   Major rewrite of orbcore to support POA.
 
 */
+#include <stdlib.h>
 
 #include <omniORB4/CORBA.h>
 #include <orbParameters.h>

--y0ulUmNC+osPPQO6--