ChangeLogTag: Tue Aug 16 20:03:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

18 files changed, 177 insertions, 497 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index a9700da1c45..541f098e8d3 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 16 20:03:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp:
+          Generate the correct export macro
+
 Tue Aug 16 19:53:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/PortableServer/*:
diff --git a/TAO/tao/AnyTypeCode/PortableInterceptorA.h b/TAO/tao/AnyTypeCode/PortableInterceptorA.h
index 30517321e40..b342d9102e2 100644
--- a/TAO/tao/AnyTypeCode/PortableInterceptorA.h
+++ b/TAO/tao/AnyTypeCode/PortableInterceptorA.h
@@ -26,69 +26,30 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:754
 
-#ifndef _TAO_IDL_ORIG_PORTABLEINTERCEPTORA_H_
-#define _TAO_IDL_ORIG_PORTABLEINTERCEPTORA_H_
+#ifndef _TAO_IDL_ANYTYPECODE_PORTABLEINTERCEPTORA_H_
+#define _TAO_IDL_ANYTYPECODE_PORTABLEINTERCEPTORA_H_
 
 #include /**/ "ace/pre.h"
 
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h"
 #include "tao/PortableInterceptorC.h"
+#include "tao/AnyTypeCode/PI_ForwardA.h"
+#include "tao/AnyTypeCode/Messaging_SyncScopeA.h"
 
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_AnyTypeCode_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:59
 
 namespace PortableInterceptor
 {
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:86
 
 } // module PortableInterceptor
 
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
-
-
diff --git a/TAO/tao/AnyTypeCode/ShortSeqA.cpp b/TAO/tao/AnyTypeCode/ShortSeqA.cpp
index 229c37cc903..ed70a459f81 100644
--- a/TAO/tao/AnyTypeCode/ShortSeqA.cpp
+++ b/TAO/tao/AnyTypeCode/ShortSeqA.cpp
@@ -55,10 +55,10 @@ namespace TAO
         CORBA::tk_sequence,
         &CORBA::_tc_short,
         0U);
-
+      
     ::CORBA::TypeCode_ptr const tc_CORBA_ShortSeq_0 =
       &CORBA_ShortSeq_0;
-
+    
   }
 }
 
@@ -73,7 +73,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/CORBA/ShortSeq:1.0",
     "ShortSeq",
     &TAO::TypeCode::tc_CORBA_ShortSeq_0);
-
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ShortSeq =
@@ -82,7 +82,7 @@ namespace CORBA
 
 
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
diff --git a/TAO/tao/AnyTypeCode/ShortSeqA.h b/TAO/tao/AnyTypeCode/ShortSeqA.h
index 09f0211e2d6..11878875053 100644
--- a/TAO/tao/AnyTypeCode/ShortSeqA.h
+++ b/TAO/tao/AnyTypeCode/ShortSeqA.h
@@ -26,82 +26,41 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:754
 
-#ifndef _TAO_IDL_ORIG_SHORTSEQA_H_
-#define _TAO_IDL_ORIG_SHORTSEQA_H_
+#ifndef _TAO_IDL_ANYTYPECODE_SHORTSEQA_H_
+#define _TAO_IDL_ANYTYPECODE_SHORTSEQA_H_
 
 #include /**/ "ace/pre.h"
 
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h"
 #include "tao/ShortSeqC.h"
 
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_AnyTypeCode_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:59
 
 namespace CORBA
 {
 
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
 
   extern TAO_AnyTypeCode_Export ::CORBA::TypeCode_ptr const _tc_ShortSeq;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:86
 
 } // module CORBA
 
 // TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, const CORBA::ShortSeq &); // copying version
 TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::ShortSeq*); // noncopying version
 TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ShortSeq *&); // deprecated
 TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ShortSeq *&);
 
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
-
-
diff --git a/TAO/tao/AnyTypeCode/StringSeqA.cpp b/TAO/tao/AnyTypeCode/StringSeqA.cpp
index ccd9bc635cd..df52b396d70 100644
--- a/TAO/tao/AnyTypeCode/StringSeqA.cpp
+++ b/TAO/tao/AnyTypeCode/StringSeqA.cpp
@@ -56,10 +56,10 @@ namespace TAO
         CORBA::tk_sequence,
         &CORBA::_tc_string,
         0U);
-
+      
     ::CORBA::TypeCode_ptr const tc_CORBA_StringSeq_0 =
       &CORBA_StringSeq_0;
-
+    
   }
 }
 
@@ -74,7 +74,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/CORBA/StringSeq:1.0",
     "StringSeq",
     &TAO::TypeCode::tc_CORBA_StringSeq_0);
-
+  
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_StringSeq =
@@ -83,7 +83,7 @@ namespace CORBA
 
 
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
diff --git a/TAO/tao/AnyTypeCode/StringSeqA.h b/TAO/tao/AnyTypeCode/StringSeqA.h
index 333de9682fe..91054f86fea 100644
--- a/TAO/tao/AnyTypeCode/StringSeqA.h
+++ b/TAO/tao/AnyTypeCode/StringSeqA.h
@@ -26,82 +26,41 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:754
 
-#ifndef _TAO_IDL_ORIG_STRINGSEQA_H_
-#define _TAO_IDL_ORIG_STRINGSEQA_H_
+#ifndef _TAO_IDL_ANYTYPECODE_STRINGSEQA_H_
+#define _TAO_IDL_ANYTYPECODE_STRINGSEQA_H_
 
 #include /**/ "ace/pre.h"
 
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h"
 #include "tao/StringSeqC.h"
 
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_AnyTypeCode_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:59
 
 namespace CORBA
 {
 
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
 
   extern TAO_AnyTypeCode_Export ::CORBA::TypeCode_ptr const _tc_StringSeq;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:86
 
 } // module CORBA
 
 // TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, const CORBA::StringSeq &); // copying version
 TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::StringSeq*); // noncopying version
 TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::StringSeq *&); // deprecated
 TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::StringSeq *&);
 
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
-
-
diff --git a/TAO/tao/AnyTypeCode/TAOA.cpp b/TAO/tao/AnyTypeCode/TAOA.cpp
index f4c9f0bcd30..4230f001fc7 100644
--- a/TAO/tao/AnyTypeCode/TAOA.cpp
+++ b/TAO/tao/AnyTypeCode/TAOA.cpp
@@ -32,14 +32,11 @@
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
 #include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
-#include "tao/AnyTypeCode/Recursive_Type_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
-#include "tao/AnyTypeCode/TimeBaseA.h"
-
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
 
@@ -51,7 +48,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:tao/TAO/BufferingConstraintMode:1.0",
     "BufferingConstraintMode",
     &CORBA::_tc_ushort);
-
+  
 namespace TAO
 {
   ::CORBA::TypeCode_ptr const _tc_BufferingConstraintMode =
@@ -69,7 +66,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     { "timeout", &TimeBase::_tc_TimeT },
     { "message_count", &CORBA::_tc_ulong },
     { "message_bytes", &CORBA::_tc_ulong }
-
+    
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -81,7 +78,7 @@ static TAO::TypeCode::Struct<char const *,
     "BufferingConstraint",
     _tao_fields_TAO_BufferingConstraint,
     4);
-
+  
 namespace TAO
 {
   ::CORBA::TypeCode_ptr const _tc_BufferingConstraint =
@@ -99,7 +96,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:tao/TAO/BufferingConstraintPolicy:1.0",
     "BufferingConstraintPolicy");
-
+  
 namespace TAO
 {
   ::CORBA::TypeCode_ptr const _tc_BufferingConstraintPolicy =
@@ -108,7 +105,7 @@ namespace TAO
 
 
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -165,78 +162,3 @@ CORBA::Boolean operator>>= (
         _tao_elem
       );
 }
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<TAO::BufferingConstraintPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<TAO::BufferingConstraintPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<TAO::BufferingConstraintPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    TAO::BufferingConstraintPolicy_ptr _tao_elem
-  )
-{
-  TAO::BufferingConstraintPolicy_ptr _tao_objptr =
-    TAO::BufferingConstraintPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    TAO::BufferingConstraintPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<TAO::BufferingConstraintPolicy>::insert (
-      _tao_any,
-      TAO::BufferingConstraintPolicy::_tao_any_destructor,
-      TAO::_tc_BufferingConstraintPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    TAO::BufferingConstraintPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<TAO::BufferingConstraintPolicy>::extract (
-        _tao_any,
-        TAO::BufferingConstraintPolicy::_tao_any_destructor,
-        TAO::_tc_BufferingConstraintPolicy,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/AnyTypeCode/TAOA.h b/TAO/tao/AnyTypeCode/TAOA.h
index d98b5cf57ec..635bc26d982 100644
--- a/TAO/tao/AnyTypeCode/TAOA.h
+++ b/TAO/tao/AnyTypeCode/TAOA.h
@@ -26,90 +26,54 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:754
 
-#ifndef _TAO_IDL_ORIG_TAOA_H_
-#define _TAO_IDL_ORIG_TAOA_H_
+#ifndef _TAO_IDL_ANYTYPECODE_TAOA_H_
+#define _TAO_IDL_ANYTYPECODE_TAOA_H_
 
 #include /**/ "ace/pre.h"
 
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h"
 #include "tao/TAOC.h"
+#include "tao/AnyTypeCode/PolicyA.h"
+#include "tao/AnyTypeCode/TimeBaseA.h"
+#include "tao/AnyTypeCode/Messaging_SyncScopeA.h"
 
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_AnyTypeCode_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:59
 
 namespace TAO
 {
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
 
   extern TAO_AnyTypeCode_Export ::CORBA::TypeCode_ptr const _tc_BufferingConstraintMode;
 
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
 
   extern TAO_AnyTypeCode_Export ::CORBA::TypeCode_ptr const _tc_BufferingConstraint;
 
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
 
   extern TAO_AnyTypeCode_Export ::CORBA::TypeCode_ptr const _tc_BufferingConstraintPolicy;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:86
 
 } // module TAO
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, const TAO::BufferingConstraint &); // copying version
 TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, TAO::BufferingConstraint*); // noncopying version
 TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::BufferingConstraint *&); // deprecated
 TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO::BufferingConstraint *&);
 
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, TAO::BufferingConstraintPolicy_ptr); // copying
-TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, TAO::BufferingConstraintPolicy_ptr *); // non-copying
-TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::BufferingConstraintPolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
-
-
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index dd6819b1d9d..0493561e420 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -30,6 +30,8 @@
 #include "Policy_ForwardC.h"
 #include "CORBA_methods.h"
 #include "VarOut_T.h"
+#include "Seq_Var_T.h"
+#include "Seq_Out_T.h"
 
 #include "ace/Thread_Mutex.h"
 #include "ace/Guard_T.h"
diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h
index bbaaf3d2e3e..3346c12a828 100644
--- a/TAO/tao/PolicyC.h
+++ b/TAO/tao/PolicyC.h
@@ -577,8 +577,8 @@ TAO::Collocation_Proxy_Broker *
 namespace TAO
 {
 
-#if !defined (_CORBA_POLICY__TRAITS_CH_)
-#define _CORBA_POLICY__TRAITS_CH_
+#if !defined (_CORBA_POLICY__TRAITS_)
+#define _CORBA_POLICY__TRAITS_
 
   template<>
   struct TAO_Export Objref_Traits< ::CORBA::Policy>
@@ -619,8 +619,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_POLICYCURRENT__TRAITS_CH_)
-#define _CORBA_POLICYCURRENT__TRAITS_CH_
+#if !defined (_CORBA_POLICYCURRENT__TRAITS_)
+#define _CORBA_POLICYCURRENT__TRAITS_
 
   template<>
   struct TAO_Export Objref_Traits< ::CORBA::PolicyCurrent>
diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp
index 0d3842fe510..25d2f8334ff 100644
--- a/TAO/tao/PortableInterceptorC.cpp
+++ b/TAO/tao/PortableInterceptorC.cpp
@@ -26,16 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "PortableInterceptorC.h"
 #include "tao/CDR.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h
index 70871d4361a..bf1b51c4d81 100644
--- a/TAO/tao/PortableInterceptorC.h
+++ b/TAO/tao/PortableInterceptorC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_PORTABLEINTERCEPTORC_H_
-#define _TAO_IDL_ORIG_PORTABLEINTERCEPTORC_H_
+#ifndef _TAO_IDL_PORTABLEINTERCEPTORC_H_
+#define _TAO_IDL_PORTABLEINTERCEPTORC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -52,78 +52,69 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace PortableInterceptor
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::AdapterState HOLDING = 0;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::AdapterState ACTIVE = 1;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::AdapterState DISCARDING = 2;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::AdapterState INACTIVE = 3;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::AdapterState NON_EXISTENT = 4;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::ReplyStatus SUCCESSFUL = 0;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::ReplyStatus SYSTEM_EXCEPTION = 1;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::ReplyStatus USER_EXCEPTION = 2;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::ReplyStatus LOCATION_FORWARD = 3;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::ReplyStatus TRANSPORT_RETRY = 4;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::ReplyStatus UNKNOWN = 5;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableInterceptor
 
@@ -136,15 +127,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/ShortSeqC.cpp b/TAO/tao/ShortSeqC.cpp
index ef3a5aeb545..5b4df566b26 100644
--- a/TAO/tao/ShortSeqC.cpp
+++ b/TAO/tao/ShortSeqC.cpp
@@ -26,16 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "ShortSeqC.h"
 #include "tao/CDR.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
diff --git a/TAO/tao/ShortSeqC.h b/TAO/tao/ShortSeqC.h
index 955396b0fc8..79b6809bd5a 100644
--- a/TAO/tao/ShortSeqC.h
+++ b/TAO/tao/ShortSeqC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_SHORTSEQC_H_
-#define _TAO_IDL_ORIG_SHORTSEQC_H_
+#ifndef _TAO_IDL_SHORTSEQC_H_
+#define _TAO_IDL_SHORTSEQC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -52,36 +52,27 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace CORBA
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_SHORTSEQ_CH_)
 #define _CORBA_SHORTSEQ_CH_
-
+  
   class ShortSeq;
-
+  
   typedef
     TAO_FixedSeq_Var_T<
         ShortSeq,
         CORBA::Short
       >
     ShortSeq_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         ShortSeq,
@@ -89,7 +80,7 @@ namespace CORBA
         CORBA::Short
       >
     ShortSeq_out;
-
+  
   class TAO_Export ShortSeq
     : public
         TAO_Unbounded_Sequence<
@@ -102,21 +93,21 @@ namespace CORBA
     ShortSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        CORBA::Short* buffer,
+        CORBA::Short* buffer, 
         CORBA::Boolean release = 0
       );
     ShortSeq (const ShortSeq &);
     ~ShortSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef ShortSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module CORBA
 
@@ -146,15 +137,7 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_ShortSeq_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/StringSeqC.cpp b/TAO/tao/StringSeqC.cpp
index 4ee23832b66..5e3db1770bc 100644
--- a/TAO/tao/StringSeqC.cpp
+++ b/TAO/tao/StringSeqC.cpp
@@ -26,16 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "StringSeqC.h"
 #include "tao/CDR.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
diff --git a/TAO/tao/StringSeqC.h b/TAO/tao/StringSeqC.h
index 955c6fde1c1..9cfebe0ca70 100644
--- a/TAO/tao/StringSeqC.h
+++ b/TAO/tao/StringSeqC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_STRINGSEQC_H_
-#define _TAO_IDL_ORIG_STRINGSEQC_H_
+#ifndef _TAO_IDL_STRINGSEQC_H_
+#define _TAO_IDL_STRINGSEQC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -52,36 +52,27 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace CORBA
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_STRINGSEQ_CH_)
 #define _CORBA_STRINGSEQ_CH_
-
+  
   class StringSeq;
-
+  
   typedef
     TAO_MngSeq_Var_T<
         StringSeq,
         TAO_SeqElem_String_Manager
       >
     StringSeq_var;
-
+  
   typedef
     TAO_MngSeq_Out_T<
         StringSeq,
@@ -89,7 +80,7 @@ namespace CORBA
         TAO_SeqElem_String_Manager
       >
     StringSeq_out;
-
+  
   class TAO_Export StringSeq
     : public
         TAO_Unbounded_String_Sequence
@@ -100,21 +91,21 @@ namespace CORBA
     StringSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        char ** buffer,
+        char ** buffer, 
         CORBA::Boolean release = 0
       );
     StringSeq (const StringSeq &);
     ~StringSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef StringSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module CORBA
 
@@ -144,15 +135,7 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_StringSeq_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp
index 72b89820afc..9ec2b85fff5 100644
--- a/TAO/tao/TAOC.cpp
+++ b/TAO/tao/TAOC.cpp
@@ -26,17 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "TAOC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -101,14 +97,6 @@ TAO::BufferingConstraintPolicy::BufferingConstraintPolicy (void)
 TAO::BufferingConstraintPolicy::~BufferingConstraintPolicy (void)
 {}
 
-void 
-TAO::BufferingConstraintPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  BufferingConstraintPolicy *_tao_tmp_pointer =
-    static_cast<BufferingConstraintPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 TAO::BufferingConstraintPolicy_ptr
 TAO::BufferingConstraintPolicy::_narrow (
     CORBA::Object_ptr _tao_objref
diff --git a/TAO/tao/TAOC.h b/TAO/tao/TAOC.h
index c3d94c18895..72e9467c9ef 100644
--- a/TAO/tao/TAOC.h
+++ b/TAO/tao/TAOC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_TAOC_H_
-#define _TAO_IDL_ORIG_TAOC_H_
+#ifndef _TAO_IDL_TAOC_H_
+#define _TAO_IDL_TAOC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -57,96 +57,87 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace TAO
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
-
+  
   typedef CORBA::UShort BufferingConstraintMode;
   typedef CORBA::UShort_out BufferingConstraintMode_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const TAO::BufferingConstraintMode BUFFER_FLUSH = 0U;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const TAO::BufferingConstraintMode BUFFER_TIMEOUT = 1U;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const TAO::BufferingConstraintMode BUFFER_MESSAGE_COUNT = 2U;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const TAO::BufferingConstraintMode BUFFER_MESSAGE_BYTES = 4U;
-
+  
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-
+  
   struct BufferingConstraint;
-
+  
   typedef
     TAO_Fixed_Var_T<
         BufferingConstraint
       >
     BufferingConstraint_var;
-
+  
   typedef
     BufferingConstraint &
     BufferingConstraint_out;
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-
+  // be\be_visitor_structure/structure_ch.cpp:57
+  
   struct TAO_Export BufferingConstraint
   {
     typedef BufferingConstraint_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO::BufferingConstraintMode mode;
     TimeBase::TimeT timeout;
     CORBA::ULong message_count;
     CORBA::ULong message_bytes;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const CORBA::PolicyType BUFFERING_CONSTRAINT_POLICY_TYPE = 1413545985U;
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY__VAR_OUT_CH_)
 #define _TAO_BUFFERINGCONSTRAINTPOLICY__VAR_OUT_CH_
-
+  
   class BufferingConstraintPolicy;
   typedef BufferingConstraintPolicy *BufferingConstraintPolicy_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         BufferingConstraintPolicy
       >
     BufferingConstraintPolicy_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         BufferingConstraintPolicy
@@ -154,110 +145,110 @@ namespace TAO
     BufferingConstraintPolicy_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY_CH_)
 #define _TAO_BUFFERINGCONSTRAINTPOLICY_CH_
-
+  
   class TAO_Export BufferingConstraintPolicy
     : public virtual ::CORBA::Policy
   {
   public:
     typedef BufferingConstraintPolicy_ptr _ptr_type;
     typedef BufferingConstraintPolicy_var _var_type;
-
+    
     // The static operations.
     static BufferingConstraintPolicy_ptr _duplicate (BufferingConstraintPolicy_ptr obj);
-
+    
     static void _tao_release (BufferingConstraintPolicy_ptr obj);
-
+    
     static BufferingConstraintPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static BufferingConstraintPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static BufferingConstraintPolicy_ptr _nil (void)
     {
       return static_cast<BufferingConstraintPolicy_ptr> (0);
     }
-
-    static void _tao_any_destructor (void *);
-
+    
+    
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::TAO::BufferingConstraint buffering_constraint (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     BufferingConstraintPolicy (void);
-
+    
     virtual ~BufferingConstraintPolicy (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     BufferingConstraintPolicy (const BufferingConstraintPolicy &);
-
+    
     void operator= (const BufferingConstraintPolicy &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const Messaging::SyncScope SYNC_EAGER_BUFFERING = 0;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const Messaging::SyncScope SYNC_DELAYED_BUFFERING = -2;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module TAO
 
@@ -268,9 +259,9 @@ namespace TAO
 namespace TAO
 {
 
-#if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY__TRAITS_CH_)
-#define _TAO_BUFFERINGCONSTRAINTPOLICY__TRAITS_CH_
-
+#if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY__TRAITS_)
+#define _TAO_BUFFERINGCONSTRAINTPOLICY__TRAITS_
+  
   template<>
   struct TAO_Export Objref_Traits< ::TAO::BufferingConstraintPolicy>
   {
@@ -297,15 +288,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO::BufferingConst
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::BufferingConstraint &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"