ChangeLogTag: Tue Jan 4 11:33:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

6 files changed, 75 insertions, 80 deletions

diff --git a/TAO/tao/IIOP_Endpoints.pidl b/TAO/tao/IIOP_Endpoints.pidl
index 18163b527d2..5e156dbf281 100644
--- a/TAO/tao/IIOP_Endpoints.pidl
+++ b/TAO/tao/IIOP_Endpoints.pidl
@@ -30,9 +30,6 @@
 //          -Wb,post_include="ace/post.h" \
 //          IIOP_Endpoints.pidl
 //
-//   Use the patch in diff/IIOP_Endpoints.diff to patch the generated
-//   code.
-//
 // ================================================================
 
 #ifndef _TAO_IIOP_ENDPOINTS_IDL_
diff --git a/TAO/tao/IIOP_EndpointsA.cpp b/TAO/tao/IIOP_EndpointsA.cpp
index a28f8a7f92d..478a3bd9abd 100644
--- a/TAO/tao/IIOP_EndpointsA.cpp
+++ b/TAO/tao/IIOP_EndpointsA.cpp
@@ -27,43 +27,45 @@
 
 #include "IIOP_EndpointsC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_TAO_IIOP_Endpoint_Info[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   31,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x54414f2f),
-  ACE_NTOHL (0x49494f50),
-  ACE_NTOHL (0x5f456e64),
-  ACE_NTOHL (0x706f696e),
-  ACE_NTOHL (0x745f496e),
-  ACE_NTOHL (0x666f3a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f2f), 
+  ACE_NTOHL (0x49494f50), 
+  ACE_NTOHL (0x5f456e64), 
+  ACE_NTOHL (0x706f696e), 
+  ACE_NTOHL (0x745f496e), 
+  ACE_NTOHL (0x666f3a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:TAO/IIOP_Endpoint_Info:1.0
     19,
-  ACE_NTOHL (0x49494f50),
-  ACE_NTOHL (0x5f456e64),
-  ACE_NTOHL (0x706f696e),
-  ACE_NTOHL (0x745f496e),
+  ACE_NTOHL (0x49494f50), 
+  ACE_NTOHL (0x5f456e64), 
+  ACE_NTOHL (0x706f696e), 
+  ACE_NTOHL (0x745f496e), 
   ACE_NTOHL (0x666f0000),  // name = IIOP_Endpoint_Info
   3, // member count
     5,
-  ACE_NTOHL (0x686f7374),
+  ACE_NTOHL (0x686f7374), 
   ACE_NTOHL (0x0),  // name = host
-    CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
   5,
-  ACE_NTOHL (0x706f7274),
+  ACE_NTOHL (0x706f7274), 
   ACE_NTOHL (0x0),  // name = port
     CORBA::tk_short,
 
   9,
-  ACE_NTOHL (0x7072696f),
-  ACE_NTOHL (0x72697479),
+  ACE_NTOHL (0x7072696f), 
+  ACE_NTOHL (0x72697479), 
   ACE_NTOHL (0x0),  // name = priority
     CORBA::tk_short,
 
@@ -74,7 +76,7 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_IIOP_Endpoint_Info (
     sizeof (_oc_TAO_IIOP_Endpoint_Info),
     (char *) &_oc_TAO_IIOP_Endpoint_Info,
     0,
-    sizeof (TAO::IIOP_Endpoint_Info)
+    0
   );
 
 namespace TAO
@@ -84,27 +86,27 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_TAO_IIOPEndpointSequence[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x54414f2f),
-  ACE_NTOHL (0x49494f50),
-  ACE_NTOHL (0x456e6470),
-  ACE_NTOHL (0x6f696e74),
-  ACE_NTOHL (0x53657175),
-  ACE_NTOHL (0x656e6365),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f2f), 
+  ACE_NTOHL (0x49494f50), 
+  ACE_NTOHL (0x456e6470), 
+  ACE_NTOHL (0x6f696e74), 
+  ACE_NTOHL (0x53657175), 
+  ACE_NTOHL (0x656e6365), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:TAO/IIOPEndpointSequence:1.0
     21,
-  ACE_NTOHL (0x49494f50),
-  ACE_NTOHL (0x456e6470),
-  ACE_NTOHL (0x6f696e74),
-  ACE_NTOHL (0x53657175),
-  ACE_NTOHL (0x656e6365),
+  ACE_NTOHL (0x49494f50), 
+  ACE_NTOHL (0x456e6470), 
+  ACE_NTOHL (0x6f696e74), 
+  ACE_NTOHL (0x53657175), 
+  ACE_NTOHL (0x656e6365), 
   ACE_NTOHL (0x0),  // name = IIOPEndpointSequence
     CORBA::tk_sequence, // typecode kind
   140, // encapsulation length
@@ -113,34 +115,34 @@ static const CORBA::Long _oc_TAO_IIOPEndpointSequence[] =
     124, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       31,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x54414f2f),
-      ACE_NTOHL (0x49494f50),
-      ACE_NTOHL (0x5f456e64),
-      ACE_NTOHL (0x706f696e),
-      ACE_NTOHL (0x745f496e),
-      ACE_NTOHL (0x666f3a31),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x54414f2f), 
+      ACE_NTOHL (0x49494f50), 
+      ACE_NTOHL (0x5f456e64), 
+      ACE_NTOHL (0x706f696e), 
+      ACE_NTOHL (0x745f496e), 
+      ACE_NTOHL (0x666f3a31), 
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:TAO/IIOP_Endpoint_Info:1.0
             19,
-      ACE_NTOHL (0x49494f50),
-      ACE_NTOHL (0x5f456e64),
-      ACE_NTOHL (0x706f696e),
-      ACE_NTOHL (0x745f496e),
+      ACE_NTOHL (0x49494f50), 
+      ACE_NTOHL (0x5f456e64), 
+      ACE_NTOHL (0x706f696e), 
+      ACE_NTOHL (0x745f496e), 
       ACE_NTOHL (0x666f0000),  // name = IIOP_Endpoint_Info
       3, // member count
             5,
-      ACE_NTOHL (0x686f7374),
+      ACE_NTOHL (0x686f7374), 
       ACE_NTOHL (0x0),  // name = host
-            CORBA::tk_string,
+            CORBA::tk_string, 
       0U, // string length
       5,
-      ACE_NTOHL (0x706f7274),
+      ACE_NTOHL (0x706f7274), 
       ACE_NTOHL (0x0),  // name = port
             CORBA::tk_short,
 
       9,
-      ACE_NTOHL (0x7072696f),
-      ACE_NTOHL (0x72697479),
+      ACE_NTOHL (0x7072696f), 
+      ACE_NTOHL (0x72697479), 
       ACE_NTOHL (0x0),  // name = priority
             CORBA::tk_short,
 
@@ -154,7 +156,7 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_IIOPEndpointSequence (
     sizeof (_oc_TAO_IIOPEndpointSequence),
     (char *) &_oc_TAO_IIOPEndpointSequence,
     0,
-    sizeof (TAO::IIOPEndpointSequence)
+    0
   );
 
 namespace TAO
@@ -163,7 +165,7 @@ namespace TAO
     &_tc_TAO_tc_TAO_IIOPEndpointSequence;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -200,8 +202,8 @@ CORBA::Boolean operator>>= (
     TAO::IIOP_Endpoint_Info *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const TAO::IIOP_Endpoint_Info *&,
+  return _tao_any >>= const_cast<
+      const TAO::IIOP_Endpoint_Info *&> (
       _tao_elem
     );
 }
@@ -221,7 +223,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -258,8 +260,8 @@ CORBA::Boolean operator>>= (
     TAO::IIOPEndpointSequence *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const TAO::IIOPEndpointSequence *&,
+  return _tao_any >>= const_cast<
+      const TAO::IIOPEndpointSequence *&> (
       _tao_elem
     );
 }
@@ -279,8 +281,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -305,5 +305,4 @@ CORBA::Boolean operator>>= (
         TAO::IIOPEndpointSequence \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/IIOP_EndpointsC.cpp b/TAO/tao/IIOP_EndpointsC.cpp
index 38f684d391d..fac99a7040b 100644
--- a/TAO/tao/IIOP_EndpointsC.cpp
+++ b/TAO/tao/IIOP_EndpointsC.cpp
@@ -26,23 +26,22 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "IIOP_EndpointsC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "IIOP_EndpointsC.i"
+#include "IIOP_EndpointsC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -59,7 +58,7 @@ TAO::IIOP_Endpoint_Info::_tao_any_destructor (
   )
 {
   IIOP_Endpoint_Info *_tao_tmp_pointer =
-    ACE_static_cast (IIOP_Endpoint_Info *, _tao_void_pointer);
+    static_cast<IIOP_Endpoint_Info *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -110,7 +109,7 @@ void TAO::IIOPEndpointSequence::_tao_any_destructor (
   )
 {
   IIOPEndpointSequence * _tao_tmp_pointer =
-    ACE_static_cast (IIOPEndpointSequence *, _tao_void_pointer);
+    static_cast<IIOPEndpointSequence *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -152,7 +151,7 @@ CORBA::Boolean operator<< (
     const TAO::IIOPEndpointSequence &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
@@ -214,7 +213,7 @@ CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_TAO_IIOPEndpointSequence_CPP_ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -311,4 +310,3 @@ CORBA::Boolean operator>> (
 #endif /* end #if !defined */
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/IIOP_EndpointsC.h b/TAO/tao/IIOP_EndpointsC.h
index 9666b8691af..30ad5796ff9 100644
--- a/TAO/tao/IIOP_EndpointsC.h
+++ b/TAO/tao/IIOP_EndpointsC.h
@@ -26,20 +26,23 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_IIOP_ENDPOINTSC_H_
 #define _TAO_IDL_ORIG_IIOP_ENDPOINTSC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Environment.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
+#include "tao/ORB.h"
+#include "tao/Environment.h"
 #include "tao/Sequence_T.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
@@ -58,9 +61,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -216,13 +217,13 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_TAO_IIOPEndpointSequence_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "IIOP_EndpointsC.i"
+#include "IIOP_EndpointsC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -234,3 +235,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/IIOP_EndpointsC.i b/TAO/tao/IIOP_EndpointsC.inl
index 38aa32569ba..c944d806c1f 100644
--- a/TAO/tao/IIOP_EndpointsC.i
+++ b/TAO/tao/IIOP_EndpointsC.inl
@@ -25,4 +25,3 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index 81665efe505..2d98357d1e6 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -738,7 +738,7 @@ nobase_include_HEADERS += \
   IIOP_Acceptor.i \
   IIOP_Connection_Handler.i \
   IIOP_Endpoint.i \
-  IIOP_EndpointsC.i \
+  IIOP_EndpointsC.inl \
   IIOP_Profile.i \
   IIOP_Transport.i \
   IOPC.i \