[omniORB-dev] omni4_1_develop Build Patch

[Gary Duzan]

   Attached is a patch which includes the changes I had to make to get
the current omni4_1_develop branch code to compile on my RedHat 7.3 box.
The ServantBase changes were necessary to get activate_servant_with_id()
to work. The OverflowError shows up with Python 1.5.2 when the number
is greater than 2^31. I tested the change and got the same thing (modulo
case) under Python 1.5.2 as an unmodified version using Python 2.2. And
the unambiguous call doesn't take a gscope, so that had to go.

					Gary Duzan
					BBN Technologies
					A Verizon Company




Index: src/appl/omniMapper/omniMapper.cc
===================================================================
RCS file: /cvsroot/omniorb/omni/src/appl/omniMapper/Attic/omniMapper.cc,v
retrieving revision 1.5.2.1
diff -u -r1.5.2.1 omniMapper.cc
--- src/appl/omniMapper/omniMapper.cc	23 Mar 2003 21:03:18 -0000	1.5.2.1
+++ src/appl/omniMapper/omniMapper.cc	19 Feb 2004 22:13:54 -0000
@@ -88,7 +88,7 @@
 
 
 class Mapper :
-  public PortableServer::RefCountServantBase
+  public PortableServer::ServantBase
 {
 public:
 
Index: src/appl/omniNames/INSMapper.h
===================================================================
RCS file: /cvsroot/omniorb/omni/src/appl/omniNames/Attic/INSMapper.h,v
retrieving revision 1.5.2.1
diff -u -r1.5.2.1 INSMapper.h
--- src/appl/omniNames/INSMapper.h	23 Mar 2003 21:03:18 -0000	1.5.2.1
+++ src/appl/omniNames/INSMapper.h	19 Feb 2004 22:13:54 -0000
@@ -51,7 +51,7 @@
 #include <omniORB4/CORBA.h>
 
 class INSMapper :
-  public PortableServer::RefCountServantBase
+  public PortableServer::ServantBase
 {
 public:
 
Index: src/lib/omniORB/omniidl_be/cxx/descriptor.py
===================================================================
RCS file: /cvsroot/omniorb/omni/src/lib/omniORB/omniidl_be/cxx/Attic/descriptor.py,v
retrieving revision 1.1.6.2
diff -u -r1.1.6.2 descriptor.py
--- src/lib/omniORB/omniidl_be/cxx/descriptor.py	23 Oct 2003 11:25:54 -0000	1.1.6.2
+++ src/lib/omniORB/omniidl_be/cxx/descriptor.py	19 Feb 2004 22:13:54 -0000
@@ -221,4 +221,7 @@
 # takes an int and returns the int in hex, without leading 0x and
 # with 0s padding
 def hex_word(x):
-    return "%08x" % x
+    try:
+      return "%08x" % x
+    except OverflowError:
+      return "%08x" % (int(x >> 1) << 1)
Index: src/lib/omniORB/omniidl_be/cxx/types.py
===================================================================
RCS file: /cvsroot/omniorb/omni/src/lib/omniORB/omniidl_be/cxx/Attic/types.py,v
retrieving revision 1.4.2.3
diff -u -r1.4.2.3 types.py
--- src/lib/omniORB/omniidl_be/cxx/types.py	16 Feb 2004 10:10:30 -0000	1.4.2.3
+++ src/lib/omniORB/omniidl_be/cxx/types.py	19 Feb 2004 22:13:54 -0000
@@ -618,7 +618,7 @@
                 # CORBA::Object doesn't have an _objref_xxx
                 scopedName = scopedName.prefix("_objref_")
            
-            objref_name = scopedName.unambiguous(environment, gscope=gscope)
+            objref_name = scopedName.unambiguous(environment)
 
             if not is_array:
                 objref_template = d_SeqType.objRefTemplate("Element", environment)