ChangeLogTag: Tue Feb 1 12:25:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

10 files changed, 176 insertions, 199 deletions

diff --git a/TAO/tao/CurrentA.cpp b/TAO/tao/CurrentA.cpp
index 742bd171d18..53643ccffab 100644
--- a/TAO/tao/CurrentA.cpp
+++ b/TAO/tao/CurrentA.cpp
@@ -82,14 +82,14 @@ ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<CORBA::Current>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<CORBA::Current>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // Copying insertion.
diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp
index 1871cc17ac8..417e74ce188 100644
--- a/TAO/tao/CurrentC.cpp
+++ b/TAO/tao/CurrentC.cpp
@@ -157,7 +157,7 @@ CORBA::Current::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Current:1.0"
         ) ||
       !ACE_OS::strcmp (
diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h
index eb45c5d5328..351feaf0542 100644
--- a/TAO/tao/CurrentC.h
+++ b/TAO/tao/CurrentC.h
@@ -68,7 +68,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from 
-// be\be_visitor_root/root_ch.cpp:63
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
@@ -85,7 +85,7 @@ namespace CORBA
 {
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:603
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_CURRENT__VAR_OUT_CH_)
 #define _CORBA_CURRENT__VAR_OUT_CH_
@@ -135,7 +135,7 @@ namespace CORBA
     
     static Current_ptr _nil (void)
     {
-      return (Current_ptr)0;
+      return static_cast<Current_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -213,7 +213,7 @@ TAO_Export void operator<<= (CORBA::Any &, CORBA::Current_ptr *); // non-copying
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Current_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:963
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
 #include "CurrentC.inl"
diff --git a/TAO/tao/IORTable/diffs/IORTable.diff b/TAO/tao/IORTable/diffs/IORTable.diff
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/TAO/tao/IORTable/diffs/IORTable.diff
+++ /dev/null
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index aa41c0a247a..47014fa3d90 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -686,7 +686,7 @@ nobase_include_HEADERS = \
   PolicyS.h \
   Policy_Forward.pidl \
   Policy_ForwardC.h \
-  Policy_ForwardC.i \
+  Policy_ForwardC.inl \
   Policy_Manager.h \
   Policy_Manager.i \
   Policy_Set.h \
diff --git a/TAO/tao/Policy_ForwardA.cpp b/TAO/tao/Policy_ForwardA.cpp
index 0a4aca61ee6..5c38aac4bd5 100644
--- a/TAO/tao/Policy_ForwardA.cpp
+++ b/TAO/tao/Policy_ForwardA.cpp
@@ -26,30 +26,31 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "Policy_ForwardC.h"
-#include "tao/SystemException.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 #include "tao/Any_Basic_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_CORBA_PolicyType[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f506f),
-  ACE_NTOHL (0x6c696379),
-  ACE_NTOHL (0x54797065),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x54797065), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
     11,
-  ACE_NTOHL (0x506f6c69),
-  ACE_NTOHL (0x63795479),
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63795479), 
   ACE_NTOHL (0x70650000),  // name = PolicyType
     CORBA::tk_ulong,
 
@@ -60,7 +61,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyType (
     sizeof (_oc_CORBA_PolicyType),
     (char *) &_oc_CORBA_PolicyType,
     0,
-    sizeof (CORBA::PolicyType)
+    0
   );
 
 namespace CORBA
@@ -70,24 +71,24 @@ namespace CORBA
 }
 
 // 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_CORBA_PolicyList[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f506f),
-  ACE_NTOHL (0x6c696379),
-  ACE_NTOHL (0x4c697374),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyList:1.0
     11,
-  ACE_NTOHL (0x506f6c69),
-  ACE_NTOHL (0x63794c69),
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63794c69), 
   ACE_NTOHL (0x73740000),  // name = PolicyList
     CORBA::tk_sequence, // typecode kind
   68, // encapsulation length
@@ -96,18 +97,18 @@ static const CORBA::Long _oc_CORBA_PolicyList[] =
     52, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       29,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f506f),
-      ACE_NTOHL (0x6c696379),
-      ACE_NTOHL (0x3a312e30),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f506f), 
+      ACE_NTOHL (0x6c696379), 
+      ACE_NTOHL (0x3a312e30), 
       ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Policy:1.0
             7,
-      ACE_NTOHL (0x506f6c69),
+      ACE_NTOHL (0x506f6c69), 
       ACE_NTOHL (0x63790000),  // name = Policy
-
+      
     0U,
 
 };
@@ -117,7 +118,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyList (
     sizeof (_oc_CORBA_PolicyList),
     (char *) &_oc_CORBA_PolicyList,
     0,
-    sizeof (CORBA::PolicyList)
+    0
   );
 
 namespace CORBA
@@ -127,25 +128,25 @@ namespace CORBA
 }
 
 // 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_CORBA_PolicyTypeSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   36,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f506f),
-  ACE_NTOHL (0x6c696379),
-  ACE_NTOHL (0x54797065),
-  ACE_NTOHL (0x5365713a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x54797065), 
+  ACE_NTOHL (0x5365713a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/PolicyTypeSeq:1.0
     14,
-  ACE_NTOHL (0x506f6c69),
-  ACE_NTOHL (0x63795479),
-  ACE_NTOHL (0x70655365),
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63795479), 
+  ACE_NTOHL (0x70655365), 
   ACE_NTOHL (0x71000000),  // name = PolicyTypeSeq
     CORBA::tk_sequence, // typecode kind
   80, // encapsulation length
@@ -154,18 +155,18 @@ static const CORBA::Long _oc_CORBA_PolicyTypeSeq[] =
     64, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       33,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f506f),
-      ACE_NTOHL (0x6c696379),
-      ACE_NTOHL (0x54797065),
-      ACE_NTOHL (0x3a312e30),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f506f), 
+      ACE_NTOHL (0x6c696379), 
+      ACE_NTOHL (0x54797065), 
+      ACE_NTOHL (0x3a312e30), 
       ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
             11,
-      ACE_NTOHL (0x506f6c69),
-      ACE_NTOHL (0x63795479),
+      ACE_NTOHL (0x506f6c69), 
+      ACE_NTOHL (0x63795479), 
       ACE_NTOHL (0x70650000),  // name = PolicyType
             CORBA::tk_ulong,
 
@@ -179,7 +180,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyTypeSeq (
     sizeof (_oc_CORBA_PolicyTypeSeq),
     (char *) &_oc_CORBA_PolicyTypeSeq,
     0,
-    sizeof (CORBA::PolicyTypeSeq)
+    0
   );
 
 namespace CORBA
@@ -189,37 +190,37 @@ namespace CORBA
 }
 
 // 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_CORBA_SetOverrideType[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5365),
-  ACE_NTOHL (0x744f7665),
-  ACE_NTOHL (0x72726964),
-  ACE_NTOHL (0x65547970),
-  ACE_NTOHL (0x653a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5365), 
+  ACE_NTOHL (0x744f7665), 
+  ACE_NTOHL (0x72726964), 
+  ACE_NTOHL (0x65547970), 
+  ACE_NTOHL (0x653a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/SetOverrideType:1.0
   16,
-  ACE_NTOHL (0x5365744f),
-  ACE_NTOHL (0x76657272),
-  ACE_NTOHL (0x69646554),
+  ACE_NTOHL (0x5365744f), 
+  ACE_NTOHL (0x76657272), 
+  ACE_NTOHL (0x69646554), 
   ACE_NTOHL (0x79706500),  // name = SetOverrideType
   2, // member count
   13,
-  ACE_NTOHL (0x5345545f),
-  ACE_NTOHL (0x4f564552),
-  ACE_NTOHL (0x52494445),
+  ACE_NTOHL (0x5345545f), 
+  ACE_NTOHL (0x4f564552), 
+  ACE_NTOHL (0x52494445), 
   ACE_NTOHL (0x0),  // name = SET_OVERRIDE
   13,
-  ACE_NTOHL (0x4144445f),
-  ACE_NTOHL (0x4f564552),
-  ACE_NTOHL (0x52494445),
+  ACE_NTOHL (0x4144445f), 
+  ACE_NTOHL (0x4f564552), 
+  ACE_NTOHL (0x52494445), 
   ACE_NTOHL (0x0),  // name = ADD_OVERRIDE
   };
 
@@ -228,7 +229,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_SetOverrideType (
     sizeof (_oc_CORBA_SetOverrideType),
     (char *) &_oc_CORBA_SetOverrideType,
     0,
-    sizeof (CORBA::SetOverrideType)
+    0
   );
 
 namespace CORBA
@@ -237,7 +238,7 @@ namespace CORBA
     &_tc_TAO_tc_CORBA_SetOverrideType;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -274,8 +275,8 @@ CORBA::Boolean operator>>= (
     CORBA::PolicyList *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::PolicyList *&,
+  return _tao_any >>= const_cast<
+      const CORBA::PolicyList *&> (
       _tao_elem
     );
 }
@@ -295,7 +296,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -332,8 +333,8 @@ CORBA::Boolean operator>>= (
     CORBA::PolicyTypeSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::PolicyTypeSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::PolicyTypeSeq *&> (
       _tao_elem
     );
 }
@@ -377,12 +378,10 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>::extract (
         _tao_any,
         CORBA::_tc_SetOverrideType,
-        _tao_elem
+        _tao_elem 
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -417,4 +416,4 @@ CORBA::Boolean operator>>= (
         CORBA::SetOverrideType \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/Policy_ForwardC.cpp b/TAO/tao/Policy_ForwardC.cpp
index 11609fa1252..882e487259b 100644
--- a/TAO/tao/Policy_ForwardC.cpp
+++ b/TAO/tao/Policy_ForwardC.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 "Policy_ForwardC.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 "Policy_ForwardC.i"
+#include "Policy_ForwardC.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
@@ -50,7 +49,7 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_POLICYLIST_CS_)
@@ -100,13 +99,13 @@ void CORBA::PolicyList::_tao_any_destructor (
   )
 {
   PolicyList * _tao_tmp_pointer =
-    ACE_static_cast (PolicyList *, _tao_void_pointer);
+    static_cast<PolicyList *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_POLICYTYPESEQ_CS_)
@@ -153,7 +152,7 @@ void CORBA::PolicyTypeSeq::_tao_any_destructor (
   )
 {
   PolicyTypeSeq * _tao_tmp_pointer =
-    ACE_static_cast (PolicyTypeSeq *, _tao_void_pointer);
+    static_cast<PolicyTypeSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -170,13 +169,13 @@ CORBA::Boolean operator<< (
     const CORBA::PolicyList &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
-
+      CORBA::Boolean _tao_marshal_flag = true;
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag =
@@ -184,11 +183,11 @@ CORBA::Boolean operator<< (
                 _tao_sequence[i].in (), strm
               );
         }
-
+      
       return _tao_marshal_flag;
     }
-
-  return 0;
+  
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -197,7 +196,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-
+  
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -205,31 +204,31 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
-
+      
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-
+      
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
+      if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
-
+      
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
-
+      CORBA::Boolean _tao_marshal_flag = true;
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
         }
-
+      
       return _tao_marshal_flag;
-
+    
     }
-
-  return 0;
+  
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_PolicyList_CPP_ */
@@ -245,15 +244,15 @@ CORBA::Boolean operator<< (
     const CORBA::PolicyTypeSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
     }
-
-  return 0;
+  
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -262,7 +261,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-
+  
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -270,24 +269,24 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
-
+      
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-
+      
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
+      if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
-
+      
       // Retrieve all the elements.
       return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+    
     }
-
-  return 0;
+  
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_PolicyTypeSeq_CPP_ */
@@ -305,17 +304,17 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::SetOverrideType &_tao_enum
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+  
   if (_tao_result == 1)
     {
-      _tao_enumval = ACE_static_cast (CORBA::SetOverrideType, _tao_temp);
+      _tao_enumval = static_cast<CORBA::SetOverrideType> (_tao_temp);
     }
-
+  
   return _tao_result;
 }
 
 // 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)
 
@@ -443,4 +442,4 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::SetOverrideType &_tao_enum
         CORBA::PolicyType \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/Policy_ForwardC.h b/TAO/tao/Policy_ForwardC.h
index 516e4a032d9..84aa61ae939 100644
--- a/TAO/tao/Policy_ForwardC.h
+++ b/TAO/tao/Policy_ForwardC.h
@@ -26,14 +26,15 @@
 //     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_POLICY_FORWARDC_H_
 #define _TAO_IDL_ORIG_POLICY_FORWARDC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Sequence_T.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -41,6 +42,7 @@
 
 #include "tao/TAO_Export.h"
 #include "tao/Environment.h"
+#include "tao/Sequence_T.h"
 #include "tao/Objref_VarOut_T.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
@@ -58,9 +60,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 */
 
@@ -75,7 +75,7 @@ namespace CORBA
 {
 
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:379
 
   typedef CORBA::ULong PolicyType;
   typedef CORBA::ULong_out PolicyType_out;
@@ -86,7 +86,7 @@ namespace CORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyType;
 
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_POLICY__VAR_OUT_CH_)
 #define _CORBA_POLICY__VAR_OUT_CH_
@@ -203,38 +203,38 @@ namespace CORBA
     PolicyTypeSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        CORBA::ULong* buffer,
+        CORBA::ULong* buffer, 
         CORBA::Boolean release = 0
       );
     PolicyTypeSeq (const PolicyTypeSeq &);
     ~PolicyTypeSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef PolicyTypeSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyTypeSeq;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_enum/enum_ch.cpp:57
-
+  
   enum SetOverrideType
   {
     SET_OVERRIDE,
     ADD_OVERRIDE
   };
-
+  
   typedef SetOverrideType &SetOverrideType_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SetOverrideType;
 
 // TAO_IDL - Generated from
@@ -248,31 +248,10 @@ namespace CORBA
 // Traits specializations.
 namespace TAO
 {
-
-#if !defined (_CORBA_POLICY__TRAITS_CH_)
-#define _CORBA_POLICY__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Export Objref_Traits<CORBA::Policy>
-  {
-    static CORBA::Policy_ptr duplicate (
-        CORBA::Policy_ptr
-      );
-    static void release (
-        CORBA::Policy_ptr
-      );
-    static CORBA::Policy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        CORBA::Policy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:65
+// be\be_visitor_interface_fwd/any_op_ch.cpp:63
 
 TAO_Export void operator<<= (CORBA::Any &, CORBA::Policy_ptr); // copying
 TAO_Export void operator<<= (CORBA::Any &, CORBA::Policy_ptr *); // non-copying
@@ -348,13 +327,13 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::SetOverrideT
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::SetOverrideType &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "Policy_ForwardC.i"
+#include "Policy_ForwardC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -365,3 +344,5 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::SetOverrideType &);
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
+
diff --git a/TAO/tao/Policy_ForwardC.i b/TAO/tao/Policy_ForwardC.inl
index 38aa32569ba..c944d806c1f 100644
--- a/TAO/tao/Policy_ForwardC.i
+++ b/TAO/tao/Policy_ForwardC.inl
@@ -25,4 +25,3 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
diff --git a/TAO/tao/diffs/Policy_Forward.diff b/TAO/tao/diffs/Policy_Forward.diff
index 45dbdd0cf80..1739675e21d 100644
--- a/TAO/tao/diffs/Policy_Forward.diff
+++ b/TAO/tao/diffs/Policy_Forward.diff
@@ -1,19 +1,18 @@
---- orig/Policy_ForwardC.h	Fri Apr  5 18:57:34 2002
-+++ Policy_ForwardC.h	Fri Apr  5 18:43:52 2002
-@@ -23,13 +23,15 @@
- #define _TAO_IDL_POLICY_FORWARDC_H_
+--- orig/Policy_ForwardC.h	2004-11-24 14:19:29.301641600 +0100
++++ Policy_ForwardC.h	2004-11-24 14:53:14.000000000 +0100
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++// $Id$
  
- #include "ace/pre.h"
--#include "tao/corba.h"
-+#include "tao/corbafwd.h"
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
- # pragma once
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
+@@ -41,7 +41,6 @@
  #endif /* ACE_LACKS_PRAGMA_ONCE */
  
  #include "tao/TAO_Export.h"
-+#include "Sequence.h"
-+#include "CDR.h"
- 
- #if defined (TAO_EXPORT_MACRO)
- #undef TAO_EXPORT_MACRO
+-#include "tao/ORB.h"
+ #include "tao/Environment.h"
+ #include "tao/Sequence_T.h"
+ #include "tao/Objref_VarOut_T.h"