ChangeLogTag:Sun Apr 27 11:31:42 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

7 files changed, 382 insertions, 307 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 44a4cbcde53..ea561ce35fb 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Sun Apr 27 11:31:42 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* tao/GIOPC.{h,cpp,i}: Regenerated code
+	* tao/diffs/GIOP.diff: Updated diffs
+
+	* tao/IOP_IORC.cpp: Removed unwanted headers
+	* tao/diffs/IOP_IOR.diff: Updated diffs.
+
 Sun Apr 27 11:01:15 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
 	* tao/GIOPC.h:
diff --git a/TAO/tao/GIOPC.cpp b/TAO/tao/GIOPC.cpp
index 64913a181a6..7037f2d3543 100644
--- a/TAO/tao/GIOPC.cpp
+++ b/TAO/tao/GIOPC.cpp
@@ -15,25 +15,21 @@
 //       Irvine, CA
 //       USA
 //       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
 //
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+// be/be_codegen.cpp:314
 
 
 #include "GIOPC.h"
-#include "tao/Stub.h"
-#include "tao/Invocation.h"
-#include "tao/PortableInterceptor.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-#include "tao/RequestInfo_Util.h"
-#include "tao/ClientRequestInfo_i.h"
-#include "tao/ClientInterceptorAdapter.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -44,29 +40,29 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_GIOP_AddressingDisposition[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   43,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x47494f50),
-  ACE_NTOHL (0x2f416464),
-  ACE_NTOHL (0x72657373),
-  ACE_NTOHL (0x696e6744),
-  ACE_NTOHL (0x6973706f),
-  ACE_NTOHL (0x73697469),
-  ACE_NTOHL (0x6f6e3a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x47494f50), 
+  ACE_NTOHL (0x2f416464), 
+  ACE_NTOHL (0x72657373), 
+  ACE_NTOHL (0x696e6744), 
+  ACE_NTOHL (0x6973706f), 
+  ACE_NTOHL (0x73697469), 
+  ACE_NTOHL (0x6f6e3a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/GIOP/AddressingDisposition:1.0
     22,
-  ACE_NTOHL (0x41646472),
-  ACE_NTOHL (0x65737369),
-  ACE_NTOHL (0x6e674469),
-  ACE_NTOHL (0x73706f73),
-  ACE_NTOHL (0x6974696f),
+  ACE_NTOHL (0x41646472), 
+  ACE_NTOHL (0x65737369), 
+  ACE_NTOHL (0x6e674469), 
+  ACE_NTOHL (0x73706f73), 
+  ACE_NTOHL (0x6974696f), 
   ACE_NTOHL (0x6e000000),  // name = AddressingDisposition
     CORBA::tk_short,
 
@@ -90,31 +86,31 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_GIOP_Version[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   29,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x47494f50),
-  ACE_NTOHL (0x2f566572),
-  ACE_NTOHL (0x73696f6e),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x47494f50), 
+  ACE_NTOHL (0x2f566572), 
+  ACE_NTOHL (0x73696f6e), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/GIOP/Version:1.0
     8,
-  ACE_NTOHL (0x56657273),
+  ACE_NTOHL (0x56657273), 
   ACE_NTOHL (0x696f6e00),  // name = Version
   2, // member count
     6,
-  ACE_NTOHL (0x6d616a6f),
+  ACE_NTOHL (0x6d616a6f), 
   ACE_NTOHL (0x72000000),  // name = major
     CORBA::tk_octet,
 
   6,
-  ACE_NTOHL (0x6d696e6f),
+  ACE_NTOHL (0x6d696e6f), 
   ACE_NTOHL (0x72000000),  // name = minor
     CORBA::tk_octet,
 
@@ -137,8 +133,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
+// TAO_IDL - Generated from 
+// be/be_visitor_structure/structure_cs.cpp:66
 
 void GIOP::Version::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -147,7 +143,7 @@ void GIOP::Version::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+// be/be_type.cpp:292
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -155,7 +151,10 @@ template class
   TAO_Fixed_Var_T<
       GIOP::Version
     >;
-template class TAO_Var_Base_T<GIOP::Version>;
+
+template class TAO_Var_Base_T<
+    GIOP::Version
+  >;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
@@ -164,87 +163,89 @@ template class TAO_Var_Base_T<GIOP::Version>;
       GIOP::Version \
     >
 
-#pragma instantiate TAO_Var_Base_T<GIOP::Version>
+#pragma instantiate TAO_Var_Base_T<
+    GIOP::Version
+  >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_GIOP_IORAddressingInfo[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x47494f50),
-  ACE_NTOHL (0x2f494f52),
-  ACE_NTOHL (0x41646472),
-  ACE_NTOHL (0x65737369),
-  ACE_NTOHL (0x6e67496e),
-  ACE_NTOHL (0x666f3a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x47494f50), 
+  ACE_NTOHL (0x2f494f52), 
+  ACE_NTOHL (0x41646472), 
+  ACE_NTOHL (0x65737369), 
+  ACE_NTOHL (0x6e67496e), 
+  ACE_NTOHL (0x666f3a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/GIOP/IORAddressingInfo:1.0
     18,
-  ACE_NTOHL (0x494f5241),
-  ACE_NTOHL (0x64647265),
-  ACE_NTOHL (0x7373696e),
-  ACE_NTOHL (0x67496e66),
+  ACE_NTOHL (0x494f5241), 
+  ACE_NTOHL (0x64647265), 
+  ACE_NTOHL (0x7373696e), 
+  ACE_NTOHL (0x67496e66), 
   ACE_NTOHL (0x6f000000),  // name = IORAddressingInfo
   2, // member count
     23,
-  ACE_NTOHL (0x73656c65),
-  ACE_NTOHL (0x63746564),
-  ACE_NTOHL (0x5f70726f),
-  ACE_NTOHL (0x66696c65),
-  ACE_NTOHL (0x5f696e64),
+  ACE_NTOHL (0x73656c65), 
+  ACE_NTOHL (0x63746564), 
+  ACE_NTOHL (0x5f70726f), 
+  ACE_NTOHL (0x66696c65), 
+  ACE_NTOHL (0x5f696e64), 
   ACE_NTOHL (0x65780000),  // name = selected_profile_index
     CORBA::tk_ulong,
 
   4,
   ACE_NTOHL (0x696f7200),  // name = ior
     CORBA::tk_struct, // typecode kind
-  288, // encapsulation length
+  352, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     24,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x494f502f),
-    ACE_NTOHL (0x494f523a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x494f502f), 
+    ACE_NTOHL (0x494f523a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/IOR:1.0
         4,
     ACE_NTOHL (0x494f5200),  // name = IOR
     2, // member count
         8,
-    ACE_NTOHL (0x74797065),
+    ACE_NTOHL (0x74797065), 
     ACE_NTOHL (0x5f696400),  // name = type_id
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
     9,
-    ACE_NTOHL (0x70726f66),
-    ACE_NTOHL (0x696c6573),
+    ACE_NTOHL (0x70726f66), 
+    ACE_NTOHL (0x696c6573), 
     ACE_NTOHL (0x0),  // name = profiles
         CORBA::tk_sequence, // typecode kind
-    200, // encapsulation length
+    264, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       CORBA::tk_struct, // typecode kind
-      184, // encapsulation length
+      248, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         34,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x494f502f),
-        ACE_NTOHL (0x54616767),
-        ACE_NTOHL (0x65645072),
-        ACE_NTOHL (0x6f66696c),
-        ACE_NTOHL (0x653a312e),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x494f502f), 
+        ACE_NTOHL (0x54616767), 
+        ACE_NTOHL (0x65645072), 
+        ACE_NTOHL (0x6f66696c), 
+        ACE_NTOHL (0x653a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
                 14,
-        ACE_NTOHL (0x54616767),
-        ACE_NTOHL (0x65645072),
-        ACE_NTOHL (0x6f66696c),
+        ACE_NTOHL (0x54616767), 
+        ACE_NTOHL (0x65645072), 
+        ACE_NTOHL (0x6f66696c), 
         ACE_NTOHL (0x65000000),  // name = TaggedProfile
         2, // member count
                 4,
@@ -253,32 +254,49 @@ static const CORBA::Long _oc_GIOP_IORAddressingInfo[] =
         60, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           30,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x494f502f),
-          ACE_NTOHL (0x50726f66),
-          ACE_NTOHL (0x696c6549),
-          ACE_NTOHL (0x643a312e),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x494f502f), 
+          ACE_NTOHL (0x50726f66), 
+          ACE_NTOHL (0x696c6549), 
+          ACE_NTOHL (0x643a312e), 
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
                     10,
-          ACE_NTOHL (0x50726f66),
-          ACE_NTOHL (0x696c6549),
+          ACE_NTOHL (0x50726f66), 
+          ACE_NTOHL (0x696c6549), 
           ACE_NTOHL (0x64000000),  // name = ProfileId
                     CORBA::tk_ulong,
 
 
         13,
-        ACE_NTOHL (0x70726f66),
-        ACE_NTOHL (0x696c655f),
-        ACE_NTOHL (0x64617461),
+        ACE_NTOHL (0x70726f66), 
+        ACE_NTOHL (0x696c655f), 
+        ACE_NTOHL (0x64617461), 
         ACE_NTOHL (0x0),  // name = profile_data
-                CORBA::tk_sequence, // typecode kind
-        12, // encapsulation length
+                CORBA::tk_alias, // typecode kind for typedefs
+        76, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
-          CORBA::tk_octet,
+          31,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4f63), 
+          ACE_NTOHL (0x74657453), 
+          ACE_NTOHL (0x65713a31), 
+          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
+                    9,
+          ACE_NTOHL (0x4f637465), 
+          ACE_NTOHL (0x74536571), 
+          ACE_NTOHL (0x0),  // name = OctetSeq
+                    CORBA::tk_sequence, // typecode kind
+          12, // encapsulation length
+            TAO_ENCAP_BYTE_ORDER, // byte order
+            CORBA::tk_octet,
+
+            0U,
 
-          0U,
 
 
       0U,
@@ -303,8 +321,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
+// TAO_IDL - Generated from 
+// be/be_visitor_structure/structure_cs.cpp:66
 
 void GIOP::IORAddressingInfo::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -313,7 +331,7 @@ void GIOP::IORAddressingInfo::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+// be/be_type.cpp:292
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -322,31 +340,37 @@ template class
       GIOP::IORAddressingInfo
     >;
 
+template class TAO_Var_Base_T<
+    GIOP::IORAddressingInfo
+  >;
+
 template class
   TAO_Out_T<
       GIOP::IORAddressingInfo,
       GIOP::IORAddressingInfo_var
     >;
 
-template class TAO_Var_Base_T<GIOP::IORAddressingInfo>;
-
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 # pragma instantiate \
   TAO_Var_Var_T< \
       GIOP::IORAddressingInfo \
     >
-#pragma instantiate template class TAO_Var_Base_T<GIOP::IORAddressingInfo>
+
+#pragma instantiate TAO_Var_Base_T<
+    GIOP::IORAddressingInfo
+  >
+
 # pragma instantiate \
   TAO_Out_T< \
       GIOP::IORAddressingInfo, \
       GIOP::IORAddressingInfo_var \
     >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/union_cs.cpp:91
+// be/be_visitor_union/union_cs.cpp:91
 
 GIOP::TargetAddress::TargetAddress (void)
 {
@@ -429,10 +453,10 @@ GIOP::TargetAddress::operator= (const ::GIOP::TargetAddress &u)
     {
       return *this;
     }
-
+  
   this->_reset (u.disc_, 0);
   this->disc_ = u.disc_;
-
+  
   switch (this->disc_)
   {
     case 0:
@@ -486,7 +510,7 @@ GIOP::TargetAddress::operator= (const ::GIOP::TargetAddress &u)
     default:
     break;
   }
-
+  
   return *this;
 }
 
@@ -513,25 +537,25 @@ void GIOP::TargetAddress::_reset (CORBA::Short, CORBA::Boolean /*finalize*/)
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_GIOP_TargetAddress[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x47494f50),
-  ACE_NTOHL (0x2f546172),
-  ACE_NTOHL (0x67657441),
-  ACE_NTOHL (0x64647265),
-  ACE_NTOHL (0x73733a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x47494f50), 
+  ACE_NTOHL (0x2f546172), 
+  ACE_NTOHL (0x67657441), 
+  ACE_NTOHL (0x64647265), 
+  ACE_NTOHL (0x73733a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/GIOP/TargetAddress:1.0
   14,
-  ACE_NTOHL (0x54617267),
-  ACE_NTOHL (0x65744164),
-  ACE_NTOHL (0x64726573),
+  ACE_NTOHL (0x54617267), 
+  ACE_NTOHL (0x65744164), 
+  ACE_NTOHL (0x64726573), 
   ACE_NTOHL (0x73000000),  // name = TargetAddress
     CORBA::tk_short,
 
@@ -539,24 +563,24 @@ static const CORBA::Long _oc_GIOP_TargetAddress[] =
   3, // member count
     ACE_IDL_NSTOHL (0x0000), // union case label (evaluated value)
   11,
-  ACE_NTOHL (0x6f626a65),
-  ACE_NTOHL (0x63745f6b),
+  ACE_NTOHL (0x6f626a65), 
+  ACE_NTOHL (0x63745f6b), 
   ACE_NTOHL (0x65790000),  // name = object_key
     CORBA::tk_alias, // typecode kind for typedefs
   76, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4f63),
-    ACE_NTOHL (0x74657453),
-    ACE_NTOHL (0x65713a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4f63), 
+    ACE_NTOHL (0x74657453), 
+    ACE_NTOHL (0x65713a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
         9,
-    ACE_NTOHL (0x4f637465),
-    ACE_NTOHL (0x74536571),
+    ACE_NTOHL (0x4f637465), 
+    ACE_NTOHL (0x74536571), 
     ACE_NTOHL (0x0),  // name = OctetSeq
         CORBA::tk_sequence, // typecode kind
     12, // encapsulation length
@@ -568,25 +592,25 @@ static const CORBA::Long _oc_GIOP_TargetAddress[] =
 
   ACE_IDL_NSTOHL (0x0001), // union case label (evaluated value)
   8,
-  ACE_NTOHL (0x70726f66),
+  ACE_NTOHL (0x70726f66), 
   ACE_NTOHL (0x696c6500),  // name = profile
     CORBA::tk_struct, // typecode kind
-  184, // encapsulation length
+  172, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x494f502f),
-    ACE_NTOHL (0x54616767),
-    ACE_NTOHL (0x65645072),
-    ACE_NTOHL (0x6f66696c),
-    ACE_NTOHL (0x653a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x494f502f), 
+    ACE_NTOHL (0x54616767), 
+    ACE_NTOHL (0x65645072), 
+    ACE_NTOHL (0x6f66696c), 
+    ACE_NTOHL (0x653a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
         14,
-    ACE_NTOHL (0x54616767),
-    ACE_NTOHL (0x65645072),
-    ACE_NTOHL (0x6f66696c),
+    ACE_NTOHL (0x54616767), 
+    ACE_NTOHL (0x65645072), 
+    ACE_NTOHL (0x6f66696c), 
     ACE_NTOHL (0x65000000),  // name = TaggedProfile
     2, // member count
         4,
@@ -595,33 +619,28 @@ static const CORBA::Long _oc_GIOP_TargetAddress[] =
     60, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       30,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x494f502f),
-      ACE_NTOHL (0x50726f66),
-      ACE_NTOHL (0x696c6549),
-      ACE_NTOHL (0x643a312e),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x494f502f), 
+      ACE_NTOHL (0x50726f66), 
+      ACE_NTOHL (0x696c6549), 
+      ACE_NTOHL (0x643a312e), 
       ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
             10,
-      ACE_NTOHL (0x50726f66),
-      ACE_NTOHL (0x696c6549),
+      ACE_NTOHL (0x50726f66), 
+      ACE_NTOHL (0x696c6549), 
       ACE_NTOHL (0x64000000),  // name = ProfileId
             CORBA::tk_ulong,
 
 
     13,
-    ACE_NTOHL (0x70726f66),
-    ACE_NTOHL (0x696c655f),
-    ACE_NTOHL (0x64617461),
+    ACE_NTOHL (0x70726f66), 
+    ACE_NTOHL (0x696c655f), 
+    ACE_NTOHL (0x64617461), 
     ACE_NTOHL (0x0),  // name = profile_data
-        CORBA::tk_sequence, // typecode kind
-    12, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_octet,
-
-      0U,
-
+        0xffffffff, // indirection
+    0xfffffeec, // negative offset (-276)
 
   ACE_IDL_NSTOHL (0x0002), // union case label (evaluated value)
   4,
@@ -630,29 +649,29 @@ static const CORBA::Long _oc_GIOP_TargetAddress[] =
   228, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     39,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x47494f50),
-    ACE_NTOHL (0x2f494f52),
-    ACE_NTOHL (0x41646472),
-    ACE_NTOHL (0x65737369),
-    ACE_NTOHL (0x6e67496e),
-    ACE_NTOHL (0x666f3a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x47494f50), 
+    ACE_NTOHL (0x2f494f52), 
+    ACE_NTOHL (0x41646472), 
+    ACE_NTOHL (0x65737369), 
+    ACE_NTOHL (0x6e67496e), 
+    ACE_NTOHL (0x666f3a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/GIOP/IORAddressingInfo:1.0
         18,
-    ACE_NTOHL (0x494f5241),
-    ACE_NTOHL (0x64647265),
-    ACE_NTOHL (0x7373696e),
-    ACE_NTOHL (0x67496e66),
+    ACE_NTOHL (0x494f5241), 
+    ACE_NTOHL (0x64647265), 
+    ACE_NTOHL (0x7373696e), 
+    ACE_NTOHL (0x67496e66), 
     ACE_NTOHL (0x6f000000),  // name = IORAddressingInfo
     2, // member count
         23,
-    ACE_NTOHL (0x73656c65),
-    ACE_NTOHL (0x63746564),
-    ACE_NTOHL (0x5f70726f),
-    ACE_NTOHL (0x66696c65),
-    ACE_NTOHL (0x5f696e64),
+    ACE_NTOHL (0x73656c65), 
+    ACE_NTOHL (0x63746564), 
+    ACE_NTOHL (0x5f70726f), 
+    ACE_NTOHL (0x66696c65), 
+    ACE_NTOHL (0x5f696e64), 
     ACE_NTOHL (0x65780000),  // name = selected_profile_index
         CORBA::tk_ulong,
 
@@ -662,29 +681,29 @@ static const CORBA::Long _oc_GIOP_TargetAddress[] =
     104, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       24,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x494f502f),
-      ACE_NTOHL (0x494f523a),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x494f502f), 
+      ACE_NTOHL (0x494f523a), 
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/IOR:1.0
             4,
       ACE_NTOHL (0x494f5200),  // name = IOR
       2, // member count
             8,
-      ACE_NTOHL (0x74797065),
+      ACE_NTOHL (0x74797065), 
       ACE_NTOHL (0x5f696400),  // name = type_id
-            CORBA::tk_string,
+            CORBA::tk_string, 
       0U, // string length
       9,
-      ACE_NTOHL (0x70726f66),
-      ACE_NTOHL (0x696c6573),
+      ACE_NTOHL (0x70726f66), 
+      ACE_NTOHL (0x696c6573), 
       ACE_NTOHL (0x0),  // name = profiles
             CORBA::tk_sequence, // typecode kind
       16, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         0xffffffff, // indirection
-        0xfffffe50, // negative offset (-432)
+        0xfffffe5c, // negative offset (-420)
         0U,
 
 
@@ -709,7 +728,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+// be/be_type.cpp:292
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -718,31 +737,37 @@ template class
       GIOP::TargetAddress
     >;
 
+template class TAO_Var_Base_T<
+    GIOP::TargetAddress
+  >;
+
 template class
   TAO_Out_T<
       GIOP::TargetAddress,
       GIOP::TargetAddress_var
     >;
 
-template class TAO_Var_Base_T<GIOP::TargetAddress>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 # pragma instantiate \
   TAO_Var_Var_T< \
-      TargetAddress \
+      GIOP::TargetAddress \
     >
 
+#pragma instantiate TAO_Var_Base_T<
+    GIOP::TargetAddress
+  >
+
 # pragma instantiate \
   TAO_Out_T< \
       GIOP::TargetAddress, \
       GIOP::TargetAddress_var \
     >
 
-#pragma instantiate TAO_Var_Base_T<GIOP::TargetAddress>
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
+// TAO_IDL - Generated from 
+// be/be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -806,8 +831,8 @@ CORBA::Boolean operator>>= (
 # pragma instantiate TAO::Any_Dual_Impl_T<GIOP::Version>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
+// TAO_IDL - Generated from 
+// be/be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -871,8 +896,8 @@ CORBA::Boolean operator>>= (
 # pragma instantiate TAO::Any_Dual_Impl_T<GIOP::IORAddressingInfo>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/any_op_cs.cpp:54
+// TAO_IDL - Generated from 
+// be/be_visitor_union/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -935,3 +960,4 @@ CORBA::Boolean operator>>= (
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 # pragma instantiate TAO::Any_Dual_Impl_T<GIOP::TargetAddress>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/GIOPC.h b/TAO/tao/GIOPC.h
index bf37f17ec98..5bf31a26cf4 100644
--- a/TAO/tao/GIOPC.h
+++ b/TAO/tao/GIOPC.h
@@ -15,30 +15,32 @@
 //       Irvine, CA
 //       USA
 //       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
 //
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+// be/be_codegen.cpp:151
 
 #ifndef _TAO_IDL_ORIG_GIOPC_H_
 #define _TAO_IDL_ORIG_GIOPC_H_
-
 #include "ace/pre.h"
-#include "tao/corbafwd.h"
-#include "tao/IOP_IORC.h"
-#include "tao/VarOut_T.h"
-#include "tao/Any_T.h"
 
-#if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION)
-#include "ace/streams.h"
-#endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */
+#include "tao/corbafwd.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/IOP_IORC.h"
+#include "tao/VarOut_T.h"
+#include "tao/Any_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -64,39 +66,39 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+// be/be_visitor_module/module_ch.cpp:48
 
 TAO_NAMESPACE  GIOP
 {
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
+  // be/be_visitor_typedef/typedef_ch.cpp:333
   
   typedef CORBA::Short AddressingDisposition;
   typedef CORBA::Short_out AddressingDisposition_out;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AddressingDisposition;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  // be/be_visitor_constant/constant_ch.cpp:52
   
   const CORBA::Short KeyAddr = 0;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  // be/be_visitor_constant/constant_ch.cpp:52
   
   const CORBA::Short ProfileAddr = 1;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  // be/be_visitor_constant/constant_ch.cpp:52
   
   const CORBA::Short ReferenceAddr = 2;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+  // be/be_type.cpp:249
   
   struct Version;
   
@@ -111,7 +113,7 @@ TAO_NAMESPACE  GIOP
     Version_out;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
+  // be/be_visitor_structure/structure_ch.cpp:52
   
   struct TAO_Export Version
   {
@@ -123,12 +125,12 @@ TAO_NAMESPACE  GIOP
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Version;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+  // be/be_type.cpp:249
   
   struct IORAddressingInfo;
   
@@ -146,7 +148,7 @@ TAO_NAMESPACE  GIOP
     IORAddressingInfo_out;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
+  // be/be_visitor_structure/structure_ch.cpp:52
   
   struct TAO_Export IORAddressingInfo
   {
@@ -158,12 +160,12 @@ TAO_NAMESPACE  GIOP
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IORAddressingInfo;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+  // be/be_type.cpp:249
   
   class TargetAddress;
   
@@ -194,39 +196,39 @@ TAO_NAMESPACE  GIOP
     TargetAddress &operator= (const TargetAddress &);
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/discriminant_ch.cpp:114
+    // be/be_visitor_union/discriminant_ch.cpp:114
     
     void _d (CORBA::Short);
     CORBA::Short _d (void) const;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/union_ch.cpp:108
+    // be/be_visitor_union/union_ch.cpp:108
     
     typedef TargetAddress_var _var_type;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ch.cpp:507
+    // be/be_visitor_union_branch/public_ch.cpp:507
     
     void object_key (const CORBA::OctetSeq &);
     const CORBA::OctetSeq &object_key (void) const;
     CORBA::OctetSeq &object_key (void);
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ch.cpp:615
+    // be/be_visitor_union_branch/public_ch.cpp:615
     
     void profile (const IOP::TaggedProfile &);
     const IOP::TaggedProfile &profile (void) const;
     IOP::TaggedProfile &profile (void);
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ch.cpp:615
+    // be/be_visitor_union_branch/public_ch.cpp:615
     
     void ior (const ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &);
     const ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &ior (void) const;
     ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &ior (void);
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/union_ch.cpp:142
+    // be/be_visitor_union/union_ch.cpp:142
     
     void _default (void);
   private:
@@ -236,13 +238,13 @@ TAO_NAMESPACE  GIOP
     union
     {
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/private_ch.cpp:407
+      // be/be_visitor_union_branch/private_ch.cpp:407
       CORBA::OctetSeq *object_key_;
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/private_ch.cpp:482
+      // be/be_visitor_union_branch/private_ch.cpp:482
       IOP::TaggedProfile *profile_;
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/private_ch.cpp:482
+      // be/be_visitor_union_branch/private_ch.cpp:482
       ACE_NESTED_CLASS (GIOP, IORAddressingInfo) *ior_;
     } u_;
     
@@ -251,20 +253,20 @@ TAO_NAMESPACE  GIOP
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TargetAddress;
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
+// be/be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module GIOP
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+// be/be_visitor_structure/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, const GIOP::Version &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, GIOP::Version*); // noncopying version
@@ -272,7 +274,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, GIOP::Version *&); //
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const GIOP::Version *&);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+// be/be_visitor_structure/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, const GIOP::IORAddressingInfo &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, GIOP::IORAddressingInfo*); // noncopying version
@@ -280,7 +282,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, GIOP::IORAddressingIn
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const GIOP::IORAddressingInfo *&);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/any_op_ch.cpp:52
+// be/be_visitor_union/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, const GIOP::TargetAddress &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, GIOP::TargetAddress*); // noncopying version
@@ -288,35 +290,35 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, GIOP::TargetAddress *
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const GIOP::TargetAddress *&);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+// be/be_visitor_root/cdr_op.cpp:48
 
 #ifndef __ACE_INLINE__
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+// be/be_visitor_structure/cdr_op_ch.cpp:53
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const GIOP::Version &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::Version &);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+// be/be_visitor_structure/cdr_op_ch.cpp:53
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const GIOP::IORAddressingInfo &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::IORAddressingInfo &);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/cdr_op_ch.cpp:54
+// be/be_visitor_union/cdr_op_ch.cpp:54
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const GIOP::TargetAddress &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::TargetAddress &);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
+// be/be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
+// be/be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "GIOPC.i"
diff --git a/TAO/tao/GIOPC.i b/TAO/tao/GIOPC.i
index 531f5d1255b..27aac9780aa 100644
--- a/TAO/tao/GIOPC.i
+++ b/TAO/tao/GIOPC.i
@@ -15,20 +15,26 @@
 //       Irvine, CA
 //       USA
 //       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
 //
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/union_ci.cpp:51
+// be/be_visitor_union/union_ci.cpp:51
 
 // *************************************************************
 // Inline operations for union GIOP::TargetAddress
 // *************************************************************
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/discriminant_ci.cpp:164
+// be/be_visitor_union/discriminant_ci.cpp:164
 
 ACE_INLINE
 void 
@@ -54,7 +60,7 @@ GIOP::TargetAddress::_d (void) const
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ci.cpp:906
+// be/be_visitor_union_branch/public_ci.cpp:906
 
 // Accessor to set the member.
 ACE_INLINE
@@ -87,7 +93,7 @@ GIOP::TargetAddress::object_key (void)
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ci.cpp:1215
+// be/be_visitor_union_branch/public_ci.cpp:1215
 
 // Accessor to set the member.
 ACE_INLINE
@@ -120,7 +126,7 @@ GIOP::TargetAddress::profile (void)
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ci.cpp:1215
+// be/be_visitor_union_branch/public_ci.cpp:1215
 
 // Accessor to set the member.
 ACE_INLINE
@@ -153,7 +159,7 @@ GIOP::TargetAddress::ior (void)
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
+// be/be_visitor_structure/cdr_op_ci.cpp:70
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -161,17 +167,9 @@ CORBA::Boolean operator<< (
     const GIOP::Version &_tao_aggregate
   )
 {
-  if (
+  return
     (strm << CORBA::Any::from_octet (_tao_aggregate.major)) &&
-    (strm << CORBA::Any::from_octet (_tao_aggregate.minor))
-   )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    (strm << CORBA::Any::from_octet (_tao_aggregate.minor));
 }
 
 ACE_INLINE
@@ -180,21 +178,13 @@ CORBA::Boolean operator>> (
     GIOP::Version &_tao_aggregate
   )
 {
-  if (
+  return
     (strm >> CORBA::Any::to_octet (_tao_aggregate.major)) &&
-    (strm >> CORBA::Any::to_octet (_tao_aggregate.minor))
-   )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    (strm >> CORBA::Any::to_octet (_tao_aggregate.minor));
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
+// be/be_visitor_structure/cdr_op_ci.cpp:70
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -202,17 +192,9 @@ CORBA::Boolean operator<< (
     const GIOP::IORAddressingInfo &_tao_aggregate
   )
 {
-  if (
+  return
     (strm << _tao_aggregate.selected_profile_index) &&
-    (strm << _tao_aggregate.ior)
-   )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    (strm << _tao_aggregate.ior);
 }
 
 ACE_INLINE
@@ -221,21 +203,13 @@ CORBA::Boolean operator>> (
     GIOP::IORAddressingInfo &_tao_aggregate
   )
 {
-  if (
+  return
     (strm >> _tao_aggregate.selected_profile_index) &&
-    (strm >> _tao_aggregate.ior)
-   )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    (strm >> _tao_aggregate.ior);
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/cdr_op_ci.cpp:69
+// be/be_visitor_union/cdr_op_ci.cpp:69
 
 ACE_INLINE
 CORBA::Boolean operator<< (
diff --git a/TAO/tao/IOP_IORC.cpp b/TAO/tao/IOP_IORC.cpp
index d44b2b05cb2..f6c74605bef 100644
--- a/TAO/tao/IOP_IORC.cpp
+++ b/TAO/tao/IOP_IORC.cpp
@@ -30,16 +30,7 @@
 
 
 #include "IOP_IORC.h"
-#include "tao/Stub.h"
-#include "tao/Invocation.h"
-#include "tao/PortableInterceptor.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-#include "tao/RequestInfo_Util.h"
-#include "tao/ClientRequestInfo_i.h"
-#include "tao/ClientInterceptorAdapter.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
+#include "Any_T.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
diff --git a/TAO/tao/diffs/GIOP.diff b/TAO/tao/diffs/GIOP.diff
new file mode 100644
index 00000000000..2291bfc3a83
--- /dev/null
+++ b/TAO/tao/diffs/GIOP.diff
@@ -0,0 +1,46 @@
+--- orig/GIOPC.h	2003-04-27 11:09:17.000000000 -0500
++++ ./GIOPC.h	2003-04-27 11:15:10.000000000 -0500
+@@ -30,20 +30,17 @@
+ 
+ #ifndef _TAO_IDL_ORIG_GIOPC_H_
+ #define _TAO_IDL_ORIG_GIOPC_H_
+-
+ #include "ace/pre.h"
+ 
+-#include "tao/corba.h"
++#include "tao/corbafwd.h"
+ 
+ #if !defined (ACE_LACKS_PRAGMA_ONCE)
+ # pragma once
+ #endif /* ACE_LACKS_PRAGMA_ONCE */
+ 
+-
+-#include "tao/TAO_Export.h"
+-
+-#include "IOPC.h"
+-#include "OctetSeqC.h"
++#include "tao/IOP_IORC.h"
++#include "tao/VarOut_T.h"
++#include "tao/Any_T.h"
+ 
+ #if defined (TAO_EXPORT_MACRO)
+ #undef TAO_EXPORT_MACRO
+--- orig/GIOPC.cpp	2003-04-27 11:09:17.000000000 -0500
++++ ./GIOPC.cpp	2003-04-27 11:16:07.000000000 -0500
+@@ -30,16 +30,6 @@
+ 
+ 
+ #include "GIOPC.h"
+-#include "tao/Stub.h"
+-#include "tao/Invocation.h"
+-#include "tao/PortableInterceptor.h"
+-
+-#if TAO_HAS_INTERCEPTORS == 1
+-#include "tao/RequestInfo_Util.h"
+-#include "tao/ClientRequestInfo_i.h"
+-#include "tao/ClientInterceptorAdapter.h"
+-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+-
+ 
+ #if defined (__BORLANDC__)
+ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
diff --git a/TAO/tao/diffs/IOP_IOR.diff b/TAO/tao/diffs/IOP_IOR.diff
index 2b490e13e61..e60eb388537 100644
--- a/TAO/tao/diffs/IOP_IOR.diff
+++ b/TAO/tao/diffs/IOP_IOR.diff
@@ -789,3 +789,31 @@
  
  #endif /* ifndef */
 -
+--- orig/IOP_IORC.cpp	2003-04-27 07:39:11.000000000 -0500
++++ ./IOP_IORC.cpp	2003-04-27 11:28:07.000000000 -0500
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++// $Id$
+ 
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
+@@ -30,16 +30,7 @@
+ 
+ 
+ #include "IOP_IORC.h"
+-#include "tao/Stub.h"
+-#include "tao/Invocation.h"
+-#include "tao/PortableInterceptor.h"
+-
+-#if TAO_HAS_INTERCEPTORS == 1
+-#include "tao/RequestInfo_Util.h"
+-#include "tao/ClientRequestInfo_i.h"
+-#include "tao/ClientInterceptorAdapter.h"
+-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+-
++#include "Any_T.h"
+ 
+ #if defined (__BORLANDC__)
+ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig