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

5 files changed, 426 insertions, 506 deletions

diff --git a/TAO/tao/DynamicAny/DynamicAnyC.cpp b/TAO/tao/DynamicAny/DynamicAnyC.cpp
index fd1ffe9666d..9df5252908c 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.cpp
+++ b/TAO/tao/DynamicAny/DynamicAnyC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "DynamicAny.h"
@@ -38,11 +38,11 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "DynamicAnyC.i"
+#include "DynamicAnyC.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
@@ -90,12 +90,6 @@ TAO::Objref_Traits<DynamicAny::DynAny>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*DynamicAny__TAO_DynAny_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
@@ -129,14 +123,13 @@ DynamicAny::DynAny::InvalidValue::operator= (const ::DynamicAny::DynAny::Invalid
 DynamicAny::DynAny::InvalidValue *
 DynamicAny::DynAny::InvalidValue::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/DynamicAny/DynAny/InvalidValue:1.0", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (InvalidValue *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<InvalidValue *> (_tao_excp);
+}
+
+const DynamicAny::DynAny::InvalidValue *
+DynamicAny::DynAny::InvalidValue::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const InvalidValue *> (_tao_excp);
 }
 
 CORBA::Exception *DynamicAny::DynAny::InvalidValue::_alloc (void)
@@ -214,14 +207,13 @@ DynamicAny::DynAny::TypeMismatch::operator= (const ::DynamicAny::DynAny::TypeMis
 DynamicAny::DynAny::TypeMismatch *
 DynamicAny::DynAny::TypeMismatch::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/DynamicAny/DynAny/TypeMismatch:1.0", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (TypeMismatch *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<TypeMismatch *> (_tao_excp);
+}
+
+const DynamicAny::DynAny::TypeMismatch *
+DynamicAny::DynAny::TypeMismatch::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const TypeMismatch *> (_tao_excp);
 }
 
 CORBA::Exception *DynamicAny::DynAny::TypeMismatch::_alloc (void)
@@ -325,7 +317,7 @@ DynamicAny::DynAny::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/DynamicAny/DynAny:1.0"
         ) ||
       !ACE_OS::strcmp (
@@ -397,12 +389,6 @@ TAO::Objref_Traits<DynamicAny::DynFixed>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*DynamicAny__TAO_DynFixed_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 DynamicAny::DynFixed::DynFixed (void)
 {}
 
@@ -462,11 +448,11 @@ DynamicAny::DynFixed::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/DynamicAny/DynAny:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/DynamicAny/DynFixed:1.0"
         ) ||
       !ACE_OS::strcmp (
@@ -538,12 +524,6 @@ TAO::Objref_Traits<DynamicAny::DynEnum>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*DynamicAny__TAO_DynEnum_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 DynamicAny::DynEnum::DynEnum (void)
 {}
 
@@ -603,11 +583,11 @@ DynamicAny::DynEnum::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/DynamicAny/DynAny:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/DynamicAny/DynEnum:1.0"
         ) ||
       !ACE_OS::strcmp (
@@ -777,12 +757,6 @@ TAO::Objref_Traits<DynamicAny::DynStruct>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*DynamicAny__TAO_DynStruct_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 DynamicAny::DynStruct::DynStruct (void)
 {}
 
@@ -842,11 +816,11 @@ DynamicAny::DynStruct::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/DynamicAny/DynAny:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/DynamicAny/DynStruct:1.0"
         ) ||
       !ACE_OS::strcmp (
@@ -918,12 +892,6 @@ TAO::Objref_Traits<DynamicAny::DynUnion>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*DynamicAny__TAO_DynUnion_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 DynamicAny::DynUnion::DynUnion (void)
 {}
 
@@ -983,11 +951,11 @@ DynamicAny::DynUnion::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/DynamicAny/DynAny:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/DynamicAny/DynUnion:1.0"
         ) ||
       !ACE_OS::strcmp (
@@ -1150,12 +1118,6 @@ TAO::Objref_Traits<DynamicAny::DynSequence>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*DynamicAny__TAO_DynSequence_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 DynamicAny::DynSequence::DynSequence (void)
 {}
 
@@ -1215,11 +1177,11 @@ DynamicAny::DynSequence::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/DynamicAny/DynAny:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/DynamicAny/DynSequence:1.0"
         ) ||
       !ACE_OS::strcmp (
@@ -1291,12 +1253,6 @@ TAO::Objref_Traits<DynamicAny::DynArray>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*DynamicAny__TAO_DynArray_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 DynamicAny::DynArray::DynArray (void)
 {}
 
@@ -1356,11 +1312,11 @@ DynamicAny::DynArray::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/DynamicAny/DynAny:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/DynamicAny/DynArray:1.0"
         ) ||
       !ACE_OS::strcmp (
@@ -1432,12 +1388,6 @@ TAO::Objref_Traits<DynamicAny::DynValue>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*DynamicAny__TAO_DynValue_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 DynamicAny::DynValue::DynValue (void)
 {}
 
@@ -1497,11 +1447,11 @@ DynamicAny::DynValue::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/DynamicAny/DynAny:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/DynamicAny/DynValue:1.0"
         ) ||
       !ACE_OS::strcmp (
@@ -1573,12 +1523,6 @@ TAO::Objref_Traits<DynamicAny::DynAnyFactory>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*DynamicAny__TAO_DynAnyFactory_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
@@ -1612,14 +1556,13 @@ DynamicAny::DynAnyFactory::InconsistentTypeCode::operator= (const ::DynamicAny::
 DynamicAny::DynAnyFactory::InconsistentTypeCode *
 DynamicAny::DynAnyFactory::InconsistentTypeCode::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/DynamicAny/DynAnyFactory/InconsistentTypeCode:1.0", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (InconsistentTypeCode *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<InconsistentTypeCode *> (_tao_excp);
+}
+
+const DynamicAny::DynAnyFactory::InconsistentTypeCode *
+DynamicAny::DynAnyFactory::InconsistentTypeCode::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const InconsistentTypeCode *> (_tao_excp);
 }
 
 CORBA::Exception *DynamicAny::DynAnyFactory::InconsistentTypeCode::_alloc (void)
@@ -1723,7 +1666,7 @@ DynamicAny::DynAnyFactory::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/DynamicAny/DynAnyFactory:1.0"
         ) ||
       !ACE_OS::strcmp (
@@ -1789,12 +1732,12 @@ CORBA::Boolean operator<< (
     const DynamicAny::NameValuePairSeq &_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)
         {
@@ -1804,7 +1747,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -1821,7 +1764,7 @@ 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.
@@ -1830,11 +1773,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       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)
         {
@@ -1845,7 +1788,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_DynamicAny_NameValuePairSeq_CPP_ */
@@ -1861,12 +1804,12 @@ CORBA::Boolean operator<< (
     const DynamicAny::AnySeq &_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)
         {
@@ -1876,7 +1819,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -1893,7 +1836,7 @@ 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.
@@ -1902,11 +1845,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       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)
         {
@@ -1917,13 +1860,13 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_DynamicAny_AnySeq_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)
 
@@ -2502,4 +2445,3 @@ CORBA::Boolean operator>> (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.h b/TAO/tao/DynamicAny/DynamicAnyC.h
index 686c7a586a8..f85f95dbfd0 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.h
+++ b/TAO/tao/DynamicAny/DynamicAnyC.h
@@ -26,7 +26,7 @@
 //     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_DYNAMICANYC_H_
 #define _TAO_IDL_ORIG_DYNAMICANYC_H_
@@ -38,13 +38,15 @@
 #error "You should not include DynamicAnyC.h directly, use DynamicAny.h"
 #endif /* !TAO_DYNAMICANY_SAFE_INCLUDE */
 
-#include "tao/ORB.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "dynamicany_export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Typecode.h"
@@ -68,9 +70,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 */
 
@@ -79,7 +79,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
 {
@@ -96,7 +96,7 @@ namespace DynamicAny
 {
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_DYNAMICANY_DYNANY__VAR_OUT_CH_)
 #define _DYNAMICANY_DYNANY__VAR_OUT_CH_
@@ -146,7 +146,7 @@ namespace DynamicAny
     
     static DynAny_ptr _nil (void)
     {
-      return (DynAny_ptr)0;
+      return static_cast<DynAny_ptr> (0);
     }
     
     
@@ -168,8 +168,10 @@ namespace DynamicAny
       InvalidValue &operator= (const InvalidValue &);
       
       static InvalidValue *_downcast (CORBA::Exception *);
+      static const InvalidValue *_downcast (CORBA::Exception const *);
+      
       static CORBA::Exception *_alloc (void);
-
+      
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -185,7 +187,7 @@ namespace DynamicAny
         );
       
       // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:125
+      // be\be_visitor_exception/exception_ch.cpp:127
     };
 
 #endif /* end #if !defined */
@@ -207,8 +209,10 @@ namespace DynamicAny
       TypeMismatch &operator= (const TypeMismatch &);
       
       static TypeMismatch *_downcast (CORBA::Exception *);
+      static const TypeMismatch *_downcast (CORBA::Exception const *);
+      
       static CORBA::Exception *_alloc (void);
-
+      
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -224,7 +228,7 @@ namespace DynamicAny
         );
       
       // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:125
+      // be\be_visitor_exception/exception_ch.cpp:127
     };
 
 #endif /* end #if !defined */
@@ -243,25 +247,25 @@ namespace DynamicAny
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void assign (
-        DynamicAny::DynAny_ptr dyn_any
+        ::DynamicAny::DynAny_ptr dyn_any
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void from_any (
-        const CORBA::Any & value
+        const ::CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -278,7 +282,7 @@ namespace DynamicAny
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Boolean equal (
-        DynamicAny::DynAny_ptr dyn_any
+        ::DynamicAny::DynAny_ptr dyn_any
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -309,117 +313,117 @@ namespace DynamicAny
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void insert_boolean (
-        CORBA::Boolean value
+        ::CORBA::Boolean value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void insert_octet (
-        CORBA::Octet value
+        ::CORBA::Octet value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void insert_char (
-        CORBA::Char value
+        ::CORBA::Char value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void insert_short (
-        CORBA::Short value
+        ::CORBA::Short value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void insert_ushort (
-        CORBA::UShort value
+        ::CORBA::UShort value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void insert_long (
-        CORBA::Long value
+        ::CORBA::Long value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void insert_ulong (
-        CORBA::ULong value
+        ::CORBA::ULong value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void insert_float (
-        CORBA::Float value
+        ::CORBA::Float value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void insert_double (
-        CORBA::Double value
+        ::CORBA::Double value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -430,87 +434,87 @@ namespace DynamicAny
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void insert_reference (
-        CORBA::Object_ptr value
+        ::CORBA::Object_ptr value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void insert_typecode (
-        CORBA::TypeCode_ptr value
+        ::CORBA::TypeCode_ptr value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void insert_longlong (
-        CORBA::LongLong value
+        ::CORBA::LongLong value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void insert_ulonglong (
-        CORBA::ULongLong value
+        ::CORBA::ULongLong value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void insert_longdouble (
-        CORBA::LongDouble value
+        ::CORBA::LongDouble value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void insert_wchar (
-        CORBA::WChar value
+        ::CORBA::WChar value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -521,48 +525,48 @@ namespace DynamicAny
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void insert_any (
-        const CORBA::Any & value
+        const ::CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void insert_dyn_any (
-        DynamicAny::DynAny_ptr value
+        ::DynamicAny::DynAny_ptr value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void insert_val (
-        CORBA::ValueBase * value
+        ::CORBA::ValueBase * value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -572,9 +576,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -584,9 +588,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -596,9 +600,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -608,9 +612,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -620,9 +624,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -632,9 +636,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -644,9 +648,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -656,9 +660,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -668,9 +672,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -680,9 +684,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -692,9 +696,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -704,9 +708,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -716,9 +720,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -728,9 +732,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -740,9 +744,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -752,9 +756,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -764,9 +768,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -776,9 +780,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -788,9 +792,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -800,16 +804,16 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Boolean seek (
-        CORBA::Long index
+        ::CORBA::Long index
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -853,8 +857,8 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -884,7 +888,7 @@ namespace DynamicAny
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_DYNAMICANY_DYNFIXED__VAR_OUT_CH_)
 #define _DYNAMICANY_DYNFIXED__VAR_OUT_CH_
@@ -913,7 +917,7 @@ namespace DynamicAny
 #define _DYNAMICANY_DYNFIXED_CH_
   
   class TAO_DynamicAny_Export DynFixed
-    : public virtual DynamicAny::DynAny
+    : public virtual ::DynamicAny::DynAny
   {
   public:
     typedef DynFixed_ptr _ptr_type;
@@ -934,7 +938,7 @@ namespace DynamicAny
     
     static DynFixed_ptr _nil (void)
     {
-      return (DynFixed_ptr)0;
+      return static_cast<DynFixed_ptr> (0);
     }
     
     
@@ -957,9 +961,9 @@ namespace DynamicAny
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -989,7 +993,7 @@ namespace DynamicAny
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_DYNAMICANY_DYNENUM__VAR_OUT_CH_)
 #define _DYNAMICANY_DYNENUM__VAR_OUT_CH_
@@ -1018,7 +1022,7 @@ namespace DynamicAny
 #define _DYNAMICANY_DYNENUM_CH_
   
   class TAO_DynamicAny_Export DynEnum
-    : public virtual DynamicAny::DynAny
+    : public virtual ::DynamicAny::DynAny
   {
   public:
     typedef DynEnum_ptr _ptr_type;
@@ -1039,7 +1043,7 @@ namespace DynamicAny
     
     static DynEnum_ptr _nil (void)
     {
-      return (DynEnum_ptr)0;
+      return static_cast<DynEnum_ptr> (0);
     }
     
     
@@ -1062,8 +1066,8 @@ namespace DynamicAny
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -1080,12 +1084,12 @@ namespace DynamicAny
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void set_as_ulong (
-        CORBA::ULong value
+        ::CORBA::ULong value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -1115,7 +1119,7 @@ namespace DynamicAny
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:376
+  // be\be_visitor_typedef/typedef_ch.cpp:413
   
   typedef char * FieldName;
   typedef CORBA::String_var FieldName_var;
@@ -1274,7 +1278,7 @@ namespace DynamicAny
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_DYNAMICANY_DYNSTRUCT__VAR_OUT_CH_)
 #define _DYNAMICANY_DYNSTRUCT__VAR_OUT_CH_
@@ -1303,7 +1307,7 @@ namespace DynamicAny
 #define _DYNAMICANY_DYNSTRUCT_CH_
   
   class TAO_DynamicAny_Export DynStruct
-    : public virtual DynamicAny::DynAny
+    : public virtual ::DynamicAny::DynAny
   {
   public:
     typedef DynStruct_ptr _ptr_type;
@@ -1324,7 +1328,7 @@ namespace DynamicAny
     
     static DynStruct_ptr _nil (void)
     {
-      return (DynStruct_ptr)0;
+      return static_cast<DynStruct_ptr> (0);
     }
     
     
@@ -1336,9 +1340,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -1348,9 +1352,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -1367,13 +1371,13 @@ namespace DynamicAny
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void set_members (
-        const DynamicAny::NameValuePairSeq & value
+        const ::DynamicAny::NameValuePairSeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -1390,13 +1394,13 @@ namespace DynamicAny
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void set_members_as_dyn_any (
-        const DynamicAny::NameDynAnyPairSeq & value
+        const ::DynamicAny::NameDynAnyPairSeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -1426,7 +1430,7 @@ namespace DynamicAny
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_DYNAMICANY_DYNUNION__VAR_OUT_CH_)
 #define _DYNAMICANY_DYNUNION__VAR_OUT_CH_
@@ -1455,7 +1459,7 @@ namespace DynamicAny
 #define _DYNAMICANY_DYNUNION_CH_
   
   class TAO_DynamicAny_Export DynUnion
-    : public virtual DynamicAny::DynAny
+    : public virtual ::DynamicAny::DynAny
   {
   public:
     typedef DynUnion_ptr _ptr_type;
@@ -1476,7 +1480,7 @@ namespace DynamicAny
     
     static DynUnion_ptr _nil (void)
     {
-      return (DynUnion_ptr)0;
+      return static_cast<DynUnion_ptr> (0);
     }
     
     
@@ -1495,12 +1499,12 @@ namespace DynamicAny
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void set_discriminator (
-        DynamicAny::DynAny_ptr d
+        ::DynamicAny::DynAny_ptr d
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -1510,8 +1514,8 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -1521,8 +1525,8 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -1552,8 +1556,8 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -1563,8 +1567,8 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -1574,8 +1578,8 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -1704,7 +1708,7 @@ namespace DynamicAny
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_DYNAMICANY_DYNSEQUENCE__VAR_OUT_CH_)
 #define _DYNAMICANY_DYNSEQUENCE__VAR_OUT_CH_
@@ -1733,7 +1737,7 @@ namespace DynamicAny
 #define _DYNAMICANY_DYNSEQUENCE_CH_
   
   class TAO_DynamicAny_Export DynSequence
-    : public virtual DynamicAny::DynAny
+    : public virtual ::DynamicAny::DynAny
   {
   public:
     typedef DynSequence_ptr _ptr_type;
@@ -1754,7 +1758,7 @@ namespace DynamicAny
     
     static DynSequence_ptr _nil (void)
     {
-      return (DynSequence_ptr)0;
+      return static_cast<DynSequence_ptr> (0);
     }
     
     
@@ -1773,12 +1777,12 @@ namespace DynamicAny
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void set_length (
-        CORBA::ULong len
+        ::CORBA::ULong len
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -1795,13 +1799,13 @@ namespace DynamicAny
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void set_elements (
-        const DynamicAny::AnySeq & value
+        const ::DynamicAny::AnySeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -1818,13 +1822,13 @@ namespace DynamicAny
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void set_elements_as_dyn_any (
-        const DynamicAny::DynAnySeq & value
+        const ::DynamicAny::DynAnySeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -1854,7 +1858,7 @@ namespace DynamicAny
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_DYNAMICANY_DYNARRAY__VAR_OUT_CH_)
 #define _DYNAMICANY_DYNARRAY__VAR_OUT_CH_
@@ -1883,7 +1887,7 @@ namespace DynamicAny
 #define _DYNAMICANY_DYNARRAY_CH_
   
   class TAO_DynamicAny_Export DynArray
-    : public virtual DynamicAny::DynAny
+    : public virtual ::DynamicAny::DynAny
   {
   public:
     typedef DynArray_ptr _ptr_type;
@@ -1904,7 +1908,7 @@ namespace DynamicAny
     
     static DynArray_ptr _nil (void)
     {
-      return (DynArray_ptr)0;
+      return static_cast<DynArray_ptr> (0);
     }
     
     
@@ -1923,13 +1927,13 @@ namespace DynamicAny
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void set_elements (
-        const DynamicAny::AnySeq & value
+        const ::DynamicAny::AnySeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -1946,13 +1950,13 @@ namespace DynamicAny
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void set_elements_as_dyn_any (
-        const DynamicAny::DynAnySeq & value
+        const ::DynamicAny::DynAnySeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -1982,7 +1986,7 @@ namespace DynamicAny
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_DYNAMICANY_DYNVALUE__VAR_OUT_CH_)
 #define _DYNAMICANY_DYNVALUE__VAR_OUT_CH_
@@ -2011,7 +2015,7 @@ namespace DynamicAny
 #define _DYNAMICANY_DYNVALUE_CH_
   
   class TAO_DynamicAny_Export DynValue
-    : public virtual DynamicAny::DynAny
+    : public virtual ::DynamicAny::DynAny
   {
   public:
     typedef DynValue_ptr _ptr_type;
@@ -2032,7 +2036,7 @@ namespace DynamicAny
     
     static DynValue_ptr _nil (void)
     {
-      return (DynValue_ptr)0;
+      return static_cast<DynValue_ptr> (0);
     }
     
     
@@ -2044,9 +2048,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -2056,9 +2060,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -2075,13 +2079,13 @@ namespace DynamicAny
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void set_members (
-        const DynamicAny::NameValuePairSeq & value
+        const ::DynamicAny::NameValuePairSeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -2098,13 +2102,13 @@ namespace DynamicAny
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void set_members_as_dyn_any (
-        const DynamicAny::NameDynAnyPairSeq & value
+        const ::DynamicAny::NameDynAnyPairSeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -2134,7 +2138,7 @@ namespace DynamicAny
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_DYNAMICANY_DYNANYFACTORY__VAR_OUT_CH_)
 #define _DYNAMICANY_DYNANYFACTORY__VAR_OUT_CH_
@@ -2184,7 +2188,7 @@ namespace DynamicAny
     
     static DynAnyFactory_ptr _nil (void)
     {
-      return (DynAnyFactory_ptr)0;
+      return static_cast<DynAnyFactory_ptr> (0);
     }
     
     
@@ -2206,8 +2210,10 @@ namespace DynamicAny
       InconsistentTypeCode &operator= (const InconsistentTypeCode &);
       
       static InconsistentTypeCode *_downcast (CORBA::Exception *);
+      static const InconsistentTypeCode *_downcast (CORBA::Exception const *);
+      
       static CORBA::Exception *_alloc (void);
-
+      
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -2223,7 +2229,7 @@ namespace DynamicAny
         );
       
       // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:125
+      // be\be_visitor_exception/exception_ch.cpp:127
     };
 
 #endif /* end #if !defined */
@@ -2232,24 +2238,24 @@ namespace DynamicAny
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::DynamicAny::DynAny_ptr create_dyn_any (
-        const CORBA::Any & value
+        const ::CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAnyFactory::InconsistentTypeCode
+        CORBA::SystemException,
+        ::DynamicAny::DynAnyFactory::InconsistentTypeCode
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::DynamicAny::DynAny_ptr create_dyn_any_from_type_code (
-        CORBA::TypeCode_ptr type
+        ::CORBA::TypeCode_ptr type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAnyFactory::InconsistentTypeCode
+        CORBA::SystemException,
+        ::DynamicAny::DynAnyFactory::InconsistentTypeCode
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -2294,17 +2300,17 @@ namespace TAO
 #define _DYNAMICANY_DYNANY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynAny>
+  struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynAny>
   {
-    static DynamicAny::DynAny_ptr duplicate (
-        DynamicAny::DynAny_ptr
+    static ::DynamicAny::DynAny_ptr duplicate (
+        ::DynamicAny::DynAny_ptr
       );
     static void release (
-        DynamicAny::DynAny_ptr
+        ::DynamicAny::DynAny_ptr
       );
-    static DynamicAny::DynAny_ptr nil (void);
+    static ::DynamicAny::DynAny_ptr nil (void);
     static CORBA::Boolean marshal (
-        DynamicAny::DynAny_ptr p,
+        ::DynamicAny::DynAny_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2315,17 +2321,17 @@ namespace TAO
 #define _DYNAMICANY_DYNFIXED__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynFixed>
+  struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynFixed>
   {
-    static DynamicAny::DynFixed_ptr duplicate (
-        DynamicAny::DynFixed_ptr
+    static ::DynamicAny::DynFixed_ptr duplicate (
+        ::DynamicAny::DynFixed_ptr
       );
     static void release (
-        DynamicAny::DynFixed_ptr
+        ::DynamicAny::DynFixed_ptr
       );
-    static DynamicAny::DynFixed_ptr nil (void);
+    static ::DynamicAny::DynFixed_ptr nil (void);
     static CORBA::Boolean marshal (
-        DynamicAny::DynFixed_ptr p,
+        ::DynamicAny::DynFixed_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2336,17 +2342,17 @@ namespace TAO
 #define _DYNAMICANY_DYNENUM__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynEnum>
+  struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynEnum>
   {
-    static DynamicAny::DynEnum_ptr duplicate (
-        DynamicAny::DynEnum_ptr
+    static ::DynamicAny::DynEnum_ptr duplicate (
+        ::DynamicAny::DynEnum_ptr
       );
     static void release (
-        DynamicAny::DynEnum_ptr
+        ::DynamicAny::DynEnum_ptr
       );
-    static DynamicAny::DynEnum_ptr nil (void);
+    static ::DynamicAny::DynEnum_ptr nil (void);
     static CORBA::Boolean marshal (
-        DynamicAny::DynEnum_ptr p,
+        ::DynamicAny::DynEnum_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2357,17 +2363,17 @@ namespace TAO
 #define _DYNAMICANY_DYNSTRUCT__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynStruct>
+  struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynStruct>
   {
-    static DynamicAny::DynStruct_ptr duplicate (
-        DynamicAny::DynStruct_ptr
+    static ::DynamicAny::DynStruct_ptr duplicate (
+        ::DynamicAny::DynStruct_ptr
       );
     static void release (
-        DynamicAny::DynStruct_ptr
+        ::DynamicAny::DynStruct_ptr
       );
-    static DynamicAny::DynStruct_ptr nil (void);
+    static ::DynamicAny::DynStruct_ptr nil (void);
     static CORBA::Boolean marshal (
-        DynamicAny::DynStruct_ptr p,
+        ::DynamicAny::DynStruct_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2378,17 +2384,17 @@ namespace TAO
 #define _DYNAMICANY_DYNUNION__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynUnion>
+  struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynUnion>
   {
-    static DynamicAny::DynUnion_ptr duplicate (
-        DynamicAny::DynUnion_ptr
+    static ::DynamicAny::DynUnion_ptr duplicate (
+        ::DynamicAny::DynUnion_ptr
       );
     static void release (
-        DynamicAny::DynUnion_ptr
+        ::DynamicAny::DynUnion_ptr
       );
-    static DynamicAny::DynUnion_ptr nil (void);
+    static ::DynamicAny::DynUnion_ptr nil (void);
     static CORBA::Boolean marshal (
-        DynamicAny::DynUnion_ptr p,
+        ::DynamicAny::DynUnion_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2399,17 +2405,17 @@ namespace TAO
 #define _DYNAMICANY_DYNSEQUENCE__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynSequence>
+  struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynSequence>
   {
-    static DynamicAny::DynSequence_ptr duplicate (
-        DynamicAny::DynSequence_ptr
+    static ::DynamicAny::DynSequence_ptr duplicate (
+        ::DynamicAny::DynSequence_ptr
       );
     static void release (
-        DynamicAny::DynSequence_ptr
+        ::DynamicAny::DynSequence_ptr
       );
-    static DynamicAny::DynSequence_ptr nil (void);
+    static ::DynamicAny::DynSequence_ptr nil (void);
     static CORBA::Boolean marshal (
-        DynamicAny::DynSequence_ptr p,
+        ::DynamicAny::DynSequence_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2420,17 +2426,17 @@ namespace TAO
 #define _DYNAMICANY_DYNARRAY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynArray>
+  struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynArray>
   {
-    static DynamicAny::DynArray_ptr duplicate (
-        DynamicAny::DynArray_ptr
+    static ::DynamicAny::DynArray_ptr duplicate (
+        ::DynamicAny::DynArray_ptr
       );
     static void release (
-        DynamicAny::DynArray_ptr
+        ::DynamicAny::DynArray_ptr
       );
-    static DynamicAny::DynArray_ptr nil (void);
+    static ::DynamicAny::DynArray_ptr nil (void);
     static CORBA::Boolean marshal (
-        DynamicAny::DynArray_ptr p,
+        ::DynamicAny::DynArray_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2441,17 +2447,17 @@ namespace TAO
 #define _DYNAMICANY_DYNVALUE__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynValue>
+  struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynValue>
   {
-    static DynamicAny::DynValue_ptr duplicate (
-        DynamicAny::DynValue_ptr
+    static ::DynamicAny::DynValue_ptr duplicate (
+        ::DynamicAny::DynValue_ptr
       );
     static void release (
-        DynamicAny::DynValue_ptr
+        ::DynamicAny::DynValue_ptr
       );
-    static DynamicAny::DynValue_ptr nil (void);
+    static ::DynamicAny::DynValue_ptr nil (void);
     static CORBA::Boolean marshal (
-        DynamicAny::DynValue_ptr p,
+        ::DynamicAny::DynValue_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2462,17 +2468,17 @@ namespace TAO
 #define _DYNAMICANY_DYNANYFACTORY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynAnyFactory>
+  struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynAnyFactory>
   {
-    static DynamicAny::DynAnyFactory_ptr duplicate (
-        DynamicAny::DynAnyFactory_ptr
+    static ::DynamicAny::DynAnyFactory_ptr duplicate (
+        ::DynamicAny::DynAnyFactory_ptr
       );
     static void release (
-        DynamicAny::DynAnyFactory_ptr
+        ::DynamicAny::DynAnyFactory_ptr
       );
-    static DynamicAny::DynAnyFactory_ptr nil (void);
+    static ::DynamicAny::DynAnyFactory_ptr nil (void);
     static CORBA::Boolean marshal (
-        DynamicAny::DynAnyFactory_ptr p,
+        ::DynamicAny::DynAnyFactory_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2521,13 +2527,13 @@ TAO_DynamicAny_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_DynamicAny_AnySeq_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "DynamicAnyC.i"
+#include "DynamicAnyC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -2539,3 +2545,4 @@ TAO_DynamicAny_Export CORBA::Boolean operator>> (
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.i b/TAO/tao/DynamicAny/DynamicAnyC.inl
index 38aa32569ba..c944d806c1f 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.i
+++ b/TAO/tao/DynamicAny/DynamicAnyC.inl
@@ -25,4 +25,3 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
diff --git a/TAO/tao/DynamicAny/diffs/DynamicAny.diff b/TAO/tao/DynamicAny/diffs/DynamicAny.diff
index 232c87b148f..f5de7e6491c 100644
--- a/TAO/tao/DynamicAny/diffs/DynamicAny.diff
+++ b/TAO/tao/DynamicAny/diffs/DynamicAny.diff
@@ -1,60 +1,32 @@
---- orig/DynamicAnyC.h	Wed Feb  6 11:11:22 2002
-+++ DynamicAnyC.h	Wed Feb  6 11:17:29 2002
-@@ -22,6 +22,10 @@
- #ifndef _TAO_IDL_ORIG_DYNAMICANYC_H_
- #define _TAO_IDL_ORIG_DYNAMICANYC_H_
+--- orig/DynamicAnyC.h	2004-11-24 08:54:01.902620800 +0100
++++ DynamicAnyC.h	2004-11-24 08:57:51.632956800 +0100
+@@ -34,6 +34,10 @@
+ #include /**/ "ace/pre.h"
+ 
  
 +#ifndef TAO_DYNAMICANY_SAFE_INCLUDE
 +#error "You should not include DynamicAnyC.h directly, use DynamicAny.h"
 +#endif /* !TAO_DYNAMICANY_SAFE_INCLUDE */
 +
- #include "ace/pre.h"
- #include "tao/corba.h"
+ #include "ace/config-all.h"
+ 
+ #if !defined (ACE_LACKS_PRAGMA_ONCE)
+@@ -41,7 +45,6 @@
+ #endif /* ACE_LACKS_PRAGMA_ONCE */
+ 
+ #include "dynamicany_export.h"
+-#include "tao/Valuetype/ValueBase.h"
+ #include "tao/ORB.h"
+ #include "tao/SystemException.h"
+ #include "tao/Environment.h"
+--- orig/DynamicAnyC.cpp	2004-11-24 08:54:01.902620800 +0100
++++ DynamicAnyC.cpp	2004-11-24 08:58:10.009380800 +0100
+@@ -29,7 +29,7 @@
+ // be\be_codegen.cpp:301
  
-@@ -1650,7 +1654,7 @@
-         , DynamicAny::DynAny::InvalidValue
-       )) = 0;
-     
--    virtual ::TCKind current_member_kind (
-+    virtual CORBA::TCKind current_member_kind (
-         
-         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-       )
-@@ -1868,7 +1872,7 @@
-         CORBA::SystemException
-       )) = 0;
-     
--    virtual ::TCKind discriminator_kind (
-+    virtual CORBA::TCKind discriminator_kind (
-         
-         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-       )
-@@ -1894,7 +1898,7 @@
-         , DynamicAny::DynAny::InvalidValue
-       )) = 0;
-     
--    virtual ::TCKind member_kind (
-+    virtual CORBA::TCKind member_kind (
-         
-         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-       )
-@@ -2716,7 +2720,7 @@
-         , DynamicAny::DynAny::InvalidValue
-       )) = 0;
-     
--    virtual ::TCKind current_member_kind (
-+    virtual CORBA::TCKind current_member_kind (
-         
-         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-       )
---- orig/DynamicAnyC.cpp	Wed Feb  6 11:11:22 2002
-+++ DynamicAnyC.cpp	Wed Feb  6 11:15:25 2002
-@@ -19,7 +19,7 @@
- // Information about TAO is available at:
- //     http://www.cs.wustl.edu/~schmidt/TAO.html
  
 -#include "DynamicAnyC.h"
 +#include "DynamicAny.h"
+ #include "tao/CDR.h"
+ #include "ace/OS_NS_string.h"
  
- #include "tao/Stub.h"
- #include "tao/Invocation.h"
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index f91d08c88ff..aa41c0a247a 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -19,7 +19,7 @@ TAO_ROOT = $(top_srcdir)
 pkgconfigdata_DATA =
 lib_LTLIBRARIES =
 
-## Makefile.TAO.am 
+## Makefile.TAO.am
 
 lib_LTLIBRARIES += libTAO.la
 
@@ -917,7 +917,7 @@ EXTRA_DIST = \
   tao.rc
 
 
-## Makefile.BiDir_GIOP.am 
+## Makefile.BiDir_GIOP.am
 
 lib_LTLIBRARIES += libTAO_BiDirGIOP.la
 
@@ -964,7 +964,7 @@ EXTRA_DIST += \
   BiDir_GIOP/TAO_BiDir_GIOP.rc
 
 
-## Makefile.PortableServer.am 
+## Makefile.PortableServer.am
 
 lib_LTLIBRARIES += libTAO_PortableServer.la
 
@@ -1097,7 +1097,7 @@ EXTRA_DIST += \
   PortableServer/TAO_PortableServer.rc
 
 
-## Makefile.IFR_Client.am 
+## Makefile.IFR_Client.am
 
 lib_LTLIBRARIES += libTAO_IFR_Client.la
 
@@ -1153,7 +1153,7 @@ EXTRA_DIST += \
   IFR_Client/TAO_IFR_Client.rc
 
 
-## Makefile.Domain.am 
+## Makefile.Domain.am
 
 lib_LTLIBRARIES += libTAO_Domain.la
 
@@ -1194,7 +1194,7 @@ EXTRA_DIST += \
   Domain/TAO_Domain.rc
 
 
-## Makefile.DynamicAny.am 
+## Makefile.DynamicAny.am
 
 lib_LTLIBRARIES += libTAO_DynamicAny.la
 
@@ -1236,7 +1236,7 @@ nobase_include_HEADERS += \
   DynamicAny/DynamicAny.h \
   DynamicAny/DynamicAny.pidl \
   DynamicAny/DynamicAnyC.h \
-  DynamicAny/DynamicAnyC.i \
+  DynamicAny/DynamicAnyC.inl \
   DynamicAny/dynamicany_export.h
 
 pkgconfigdata_DATA += TAO_DynamicAny.pc
@@ -1249,7 +1249,7 @@ EXTRA_DIST += \
   DynamicAny/TAO_DynamicAny.rc
 
 
-## Makefile.Valuetype.am 
+## Makefile.Valuetype.am
 
 lib_LTLIBRARIES += libTAO_Valuetype.la
 
@@ -1305,7 +1305,7 @@ EXTRA_DIST += \
   Valuetype/TAO_Valuetype.rc
 
 
-## Makefile.Messaging.am 
+## Makefile.Messaging.am
 
 lib_LTLIBRARIES += libTAO_Messaging.la
 
@@ -1388,7 +1388,7 @@ EXTRA_DIST += \
   Messaging/TAO_Messaging.rc
 
 
-## Makefile.DynamicInterface.am 
+## Makefile.DynamicInterface.am
 
 if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
@@ -1459,7 +1459,7 @@ EXTRA_DIST += \
   DynamicInterface/TAO_DynamicInterface.rc
 
 
-## Makefile.ObjRefTemplate.am 
+## Makefile.ObjRefTemplate.am
 
 lib_LTLIBRARIES += libTAO_ObjRefTemplate.la
 
@@ -1514,7 +1514,7 @@ EXTRA_DIST += \
   ObjRefTemplate/TAO_ObjRefTemplate.rc
 
 
-## Makefile.IORInterceptor.am 
+## Makefile.IORInterceptor.am
 
 lib_LTLIBRARIES += libTAO_IORInterceptor.la
 
@@ -1569,7 +1569,7 @@ EXTRA_DIST += \
   IORInterceptor/TAO_IORInterceptor.rc
 
 
-## Makefile.IORManipulation.am 
+## Makefile.IORManipulation.am
 
 lib_LTLIBRARIES += libTAO_IORManip.la
 
@@ -1611,7 +1611,7 @@ EXTRA_DIST += \
   IORManipulation/TAO_IORManip.rc
 
 
-## Makefile.IORTable.am 
+## Makefile.IORTable.am
 
 lib_LTLIBRARIES += libTAO_IORTable.la
 
@@ -1654,7 +1654,7 @@ EXTRA_DIST += \
   IORTable/TAO_IORTable.rc
 
 
-## Makefile.RTCORBA.am 
+## Makefile.RTCORBA.am
 
 if BUILD_RT_CORBA
 
@@ -1757,7 +1757,7 @@ EXTRA_DIST += \
   RTCORBA/TAO_RTCORBA.rc
 
 
-## Makefile.RTPortableServer.am 
+## Makefile.RTPortableServer.am
 
 if BUILD_RT_CORBA
 
@@ -1816,7 +1816,7 @@ EXTRA_DIST += \
   RTPortableServer/TAO_RTPortableServer.rc
 
 
-## Makefile.RTScheduler.am 
+## Makefile.RTScheduler.am
 
 if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
@@ -1879,7 +1879,7 @@ EXTRA_DIST += \
   RTScheduling/TAO_RTScheduler.rc
 
 
-## Makefile.SmartProxies.am 
+## Makefile.SmartProxies.am
 
 lib_LTLIBRARIES += libTAO_SmartProxies.la
 
@@ -1915,7 +1915,7 @@ EXTRA_DIST += \
   SmartProxies/TAO_SmartProxies.pc.in
 
 
-## Makefile.Strategies.am 
+## Makefile.Strategies.am
 
 lib_LTLIBRARIES += libTAO_Strategies.la
 
@@ -2033,7 +2033,7 @@ EXTRA_DIST += \
   Strategies/TAO_Strategies.rc
 
 
-## Makefile.TAO_FlResource.am 
+## Makefile.TAO_FlResource.am
 
 if BUILD_ACE_FLREACTOR
 if BUILD_FL
@@ -2071,7 +2071,7 @@ endif BUILD_GL
 endif BUILD_FL
 endif BUILD_ACE_FLREACTOR
 
-## Makefile.TAO_QtResource.am 
+## Makefile.TAO_QtResource.am
 
 if BUILD_ACE_QTREACTOR
 if BUILD_QT
@@ -2108,7 +2108,7 @@ nobase_include_HEADERS += \
 endif BUILD_QT
 endif BUILD_ACE_QTREACTOR
 
-## Makefile.TAO_TkResource.am 
+## Makefile.TAO_TkResource.am
 
 if BUILD_ACE_TKREACTOR
 if BUILD_TK
@@ -2142,7 +2142,7 @@ nobase_include_HEADERS += \
 endif BUILD_TK
 endif BUILD_ACE_TKREACTOR
 
-## Makefile.TAO_XtResource.am 
+## Makefile.TAO_XtResource.am
 
 if BUILD_ACE_XTREACTOR
 if BUILD_X11
@@ -2178,7 +2178,7 @@ endif BUILD_XT
 endif BUILD_X11
 endif BUILD_ACE_XTREACTOR
 
-## Makefile.TypeCodeFactory.am 
+## Makefile.TypeCodeFactory.am
 
 lib_LTLIBRARIES += libTAO_TypeCodeFactory.la
 
@@ -2222,7 +2222,7 @@ EXTRA_DIST += \
   TypeCodeFactory/TypeCodeFactory.rc
 
 
-## Makefile.Utils.am 
+## Makefile.Utils.am
 
 lib_LTLIBRARIES += libTAO_Utils.la