*** empty log message ***

16 files changed, 293 insertions, 27 deletions

diff --git a/TAO/tao/Fixed_TypeCode.h b/TAO/tao/Fixed_TypeCode.h
index aff9cc46dba..39be9be1f8f 100644
--- a/TAO/tao/Fixed_TypeCode.h
+++ b/TAO/tao/Fixed_TypeCode.h
@@ -99,6 +99,15 @@ namespace TAO
 # include "tao/Fixed_TypeCode.inl"
 #endif  /* __ACE_INLINE__ */
 
+#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
+# include "tao/Fixed_TypeCode.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
+# pragma implementation ("Fixed_TypeCode.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_FIXED_TYPECODE_H */
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index 4db77b34ac1..fd68ae950bb 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -197,6 +197,7 @@ libTAO_la_SOURCES = \
   PICurrent_Copy_Callback.cpp \
   PICurrent_ORBInitializer.cpp \
   PI_ForwardC.cpp \
+  ParameterModeA.cpp \
   ParameterModeC.cpp \
   Parser_Registry.cpp \
   Pluggable_Messaging.cpp \
diff --git a/TAO/tao/Marshal.h b/TAO/tao/Marshal.h
index ad4683da238..2fee59a0e01 100644
--- a/TAO/tao/Marshal.h
+++ b/TAO/tao/Marshal.h
@@ -64,12 +64,6 @@ namespace TAO
     };
 }
 
-namespace TAO
-{
-  // Used only by TAO_Marshal_Object::append().
-  extern TAO_Export CORBA::TypeCode_ptr TC_opaque;
-}
-
 /**
  * @class TAO_Marshal_Object
  *
diff --git a/TAO/tao/ObjectIdListC.cpp b/TAO/tao/ObjectIdListC.cpp
index 4014840cefb..c8097e80245 100644
--- a/TAO/tao/ObjectIdListC.cpp
+++ b/TAO/tao/ObjectIdListC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:302
+// be/be_codegen.cpp:302
 
 
 #include "ObjectIdListC.h"
@@ -41,7 +41,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be/be_visitor_arg_traits.cpp:69
 
 // Arg traits specializations.
 namespace TAO
@@ -50,7 +50,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
+// be/be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_ORB_OBJECTIDLIST_CS_)
 #define _CORBA_ORB_OBJECTIDLIST_CS_
@@ -85,10 +85,19 @@ CORBA::ORB_ObjectIdList::ORB_ObjectIdList (
 CORBA::ORB_ObjectIdList::~ORB_ObjectIdList (void)
 {}
 
+void CORBA::ORB_ObjectIdList::_tao_any_destructor (
+    void * _tao_void_pointer
+  )
+{
+  ORB_ObjectIdList * _tao_tmp_pointer =
+    static_cast<ORB_ObjectIdList *> (_tao_void_pointer);
+  delete _tao_tmp_pointer;
+}
+
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
+// be/be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_CORBA_ORB_ObjectIdList_CPP_
 #define _TAO_CDR_OP_CORBA_ORB_ObjectIdList_CPP_
@@ -161,7 +170,7 @@ return false;
 #endif /* _TAO_CDR_OP_CORBA_ORB_ObjectIdList_CPP_ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1528
+// be/be_visitor_root/root.cpp:1528
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/ParameterMode.pidl b/TAO/tao/ParameterMode.pidl
index 0e48d86aa49..d793063b961 100644
--- a/TAO/tao/ParameterMode.pidl
+++ b/TAO/tao/ParameterMode.pidl
@@ -10,7 +10,7 @@
  *   used to generate code is:
  *
  *     tao_idl
- *        -o orig -Ge 1 -GT -Sc -St -SS
+ *        -o orig -Ge 1 -GA -GT -Sc -SS
  *          -Wb,export_macro=TAO_Export
  *          -Wb,export_include="tao/TAO_Export.h"
  *          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/ParameterModeA.cpp b/TAO/tao/ParameterModeA.cpp
new file mode 100644
index 00000000000..1137c7bb35d
--- /dev/null
+++ b/TAO/tao/ParameterModeA.cpp
@@ -0,0 +1,108 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+#include "ParameterModeC.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/TypeCode_Enumerator.h"
+#include "tao/Enum_TypeCode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
+#include "tao/Any_Basic_Impl_T.h"
+
+// TAO_IDL - Generated from
+// be/be_visitor_typecode/enum_typecode.cpp:34
+
+static TAO::TypeCode::Enumerator<char const *> const _tao_enumerators_CORBA_ParameterMode[] =
+  {
+    { "PARAM_IN" },
+    { "PARAM_OUT" },
+    { "PARAM_INOUT" }
+    
+  };
+
+static TAO::TypeCode::Enum<char const *,
+                           TAO::TypeCode::Enumerator<char const *> const *,
+                           TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ParameterMode (
+    "IDL:omg.org/CORBA/ParameterMode:1.0",
+    "ParameterMode",
+    _tao_enumerators_CORBA_ParameterMode,
+    3);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ParameterMode =
+    &_tao_tc_CORBA_ParameterMode;
+}
+
+
+
+// TAO_IDL - Generated from
+// be/be_visitor_enum/any_op_cs.cpp:52
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ParameterMode _tao_elem
+  )
+{
+  TAO::Any_Basic_Impl_T<CORBA::ParameterMode>::insert (
+      _tao_any,
+      CORBA::_tc_ParameterMode,
+      _tao_elem
+    );
+}
+
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ParameterMode &_tao_elem
+  )
+{
+  return
+    TAO::Any_Basic_Impl_T<CORBA::ParameterMode>::extract (
+        _tao_any,
+        CORBA::_tc_ParameterMode,
+        _tao_elem 
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        CORBA::ParameterMode
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        CORBA::ParameterMode \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/ParameterModeC.cpp b/TAO/tao/ParameterModeC.cpp
index 4a8a25a37d0..4248195c4dc 100644
--- a/TAO/tao/ParameterModeC.cpp
+++ b/TAO/tao/ParameterModeC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:302
+// be/be_codegen.cpp:302
 
 
 #include "ParameterModeC.h"
@@ -41,7 +41,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be/be_visitor_arg_traits.cpp:69
 
 // Arg traits specializations.
 namespace TAO
@@ -50,7 +50,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_cs.cpp:51
+// be/be_visitor_enum/cdr_op_cs.cpp:51
 
 CORBA::Boolean operator<< (TAO_OutputCDR & strm, CORBA::ParameterMode _tao_enumerator)
 {
@@ -69,3 +69,12 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, CORBA::ParameterMode & _tao_enum
   
   return _tao_success;
 }
+
+// TAO_IDL - Generated from
+// be/be_visitor_root/root.cpp:1528
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/Sequence_TypeCode.cpp b/TAO/tao/Sequence_TypeCode.cpp
index ec2b84efcc7..ac7a767778c 100644
--- a/TAO/tao/Sequence_TypeCode.cpp
+++ b/TAO/tao/Sequence_TypeCode.cpp
@@ -126,5 +126,13 @@ TAO::TypeCode::Sequence<RefCountPolicy>::length_i (
   return this->length_;
 }
 
+template <class RefCountPolicy>
+CORBA::TypeCode_ptr
+TAO::TypeCode::Sequence<RefCountPolicy>::content_type_i (
+  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+{
+  return CORBA::TypeCode::_duplicate (*this->content_type_);
+}
+
 
 #endif  /* TAO_SEQUENCE_TYPECODE_CPP */
diff --git a/TAO/tao/Sequence_TypeCode.h b/TAO/tao/Sequence_TypeCode.h
index 4109ed4fa4a..cc7321bbc7f 100644
--- a/TAO/tao/Sequence_TypeCode.h
+++ b/TAO/tao/Sequence_TypeCode.h
@@ -85,7 +85,8 @@ namespace TAO
       virtual CORBA::TypeCode_ptr get_compact_typecode_i (
         ACE_ENV_SINGLE_ARG_DECL) const;
       virtual CORBA::ULong length_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr content_type (ACE_ENV_SINGLE_ARG_DECL) const;
+      virtual CORBA::TypeCode_ptr content_type_i (
+        ACE_ENV_SINGLE_ARG_DECL) const;
 
     private:
 
diff --git a/TAO/tao/String_TypeCode.cpp b/TAO/tao/String_TypeCode.cpp
index c74a102d463..61800f5d3fe 100644
--- a/TAO/tao/String_TypeCode.cpp
+++ b/TAO/tao/String_TypeCode.cpp
@@ -79,7 +79,8 @@ TAO::TypeCode::String<RefCountPolicy>::equivalent_i (CORBA::TypeCode_ptr tc
   // Since TCKind comparisons must be performed before equal_i() is
   // called, we can also call it to determine equivalence of
   // tk_string-based TypeCodes.
-  return this->equal_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->equal_i (tc
+                        ACE_ENV_ARG_PARAMETER);
 }
 
 template <class RefCountPolicy>
@@ -95,10 +96,14 @@ CORBA::TypeCode_ptr
 TAO::TypeCode::String<RefCountPolicy>::get_compact_typecode_i (
   ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
 {
-  // Already compact since tk_string TypeCodes have no name or member
-  // names, meaning that we can simply call _duplicate() on this
-  // TypeCode.
-  return CORBA::TypeCode::_duplicate (this);
+  // Already compact since tk_string and tk_wstring TypeCodes have no
+  // name or member names, meaning that we can simply call
+  // _duplicate() on this TypeCode.
+
+  CORBA::TypeCode_ptr mutable_tc =
+    const_cast<TAO::TypeCode::String<RefCountPolicy> *> (this);
+
+  return CORBA::TypeCode::_duplicate (mutable_tc);
 }
 
 template <class RefCountPolicy>
diff --git a/TAO/tao/String_TypeCode.h b/TAO/tao/String_TypeCode.h
index 0a95958921a..6b87b5cacaa 100644
--- a/TAO/tao/String_TypeCode.h
+++ b/TAO/tao/String_TypeCode.h
@@ -105,6 +105,14 @@ namespace TAO
 # include "tao/String_TypeCode.inl"
 #endif  /* __ACE_INLINE__ */
 
+#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
+# include "tao/String_TypeCode.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
+# pragma implementation ("String_TypeCode.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_STRING_TYPECODE_H */
diff --git a/TAO/tao/TypeCode.cpp b/TAO/tao/TypeCode.cpp
index 1094c62c02b..0b5f217ad8b 100644
--- a/TAO/tao/TypeCode.cpp
+++ b/TAO/tao/TypeCode.cpp
@@ -174,6 +174,110 @@ CORBA::TypeCode::concrete_base_type_i (ACE_ENV_SINGLE_ARG_DECL) const
 
 // ---------------------------------------------------------------
 
+CORBA::TypeCode::Bounds::Bounds (void)
+  : CORBA::UserException ("IDL:omg.org/CORBA/TypeCode/Bounds:1.0",
+                          "Bounds")
+{
+}
+
+CORBA::TypeCode::Bounds*
+CORBA::TypeCode::Bounds::_downcast (CORBA::Exception *ex)
+{
+   return dynamic_cast <CORBA::TypeCode::Bounds*> (ex);
+}
+
+CORBA::Exception *
+CORBA::TypeCode::Bounds::_alloc (void)
+{
+  CORBA::Exception *retval = 0;
+  ACE_NEW_RETURN (retval, ::CORBA::TypeCode::Bounds, 0);
+  return retval;
+}
+
+CORBA::Exception *
+CORBA::TypeCode::Bounds::_tao_duplicate (void) const
+{
+  CORBA::Exception *result;
+  ACE_NEW_RETURN (result,
+                  CORBA::TypeCode::Bounds (*this),
+                  0);
+  return result;
+}
+
+void
+CORBA::TypeCode::Bounds::_raise (void) const
+{
+  TAO_RAISE(*this);
+}
+
+void
+CORBA::TypeCode::Bounds::_tao_encode (TAO_OutputCDR &cdr
+                                      ACE_ENV_ARG_DECL) const
+{
+  if (cdr << this->_rep_id ())
+    {
+      return;
+    }
+
+  ACE_THROW (CORBA::MARSHAL ());
+}
+
+void
+CORBA::TypeCode::Bounds::_tao_decode (TAO_InputCDR &
+                                      ACE_ENV_ARG_DECL_NOT_USED)
+{
+}
+
+// ****************************************************************
+
+CORBA::TypeCode::BadKind::BadKind (void)
+  : CORBA::UserException ("IDL:omg.org/CORBA/TypeCode/BadKind:1.0",
+                          "BadKind")
+{
+}
+
+CORBA::TypeCode::BadKind*
+CORBA::TypeCode::BadKind::_downcast (CORBA::Exception *ex)
+{
+  return dynamic_cast <CORBA::TypeCode::BadKind*> (ex);
+}
+
+CORBA::Exception *
+CORBA::TypeCode::BadKind::_tao_duplicate (void) const
+{
+  CORBA::Exception *result;
+  ACE_NEW_RETURN (result,
+                  CORBA::TypeCode::BadKind (*this),
+                  0);
+  return result;
+}
+
+void
+CORBA::TypeCode::BadKind::_raise (void) const
+{
+  TAO_RAISE(*this);
+}
+
+void
+CORBA::TypeCode::BadKind::_tao_encode (TAO_OutputCDR &cdr
+                                       ACE_ENV_ARG_DECL) const
+{
+  if (cdr << this->_rep_id ())
+    {
+      return;
+    }
+
+  ACE_THROW (CORBA::MARSHAL ());
+}
+
+void
+CORBA::TypeCode::BadKind::_tao_decode (TAO_InputCDR &
+                                       ACE_ENV_ARG_DECL_NOT_USED)
+{
+}
+
+// ---------------------------------------------------------------
+
 bool
 operator<< (TAO_OutputCDR & cdr,
             CORBA::TypeCode_ptr tc)
@@ -215,7 +319,7 @@ operator>> (TAO_InputCDR & cdr,
 
 }
 
-
+// ---------------------------------------------------------------
 
 CORBA::TypeCode_ptr
 TAO::unaliased_typecode (CORBA::TypeCode_ptr tc
diff --git a/TAO/tao/TypeCodeFactory_Adapter.h b/TAO/tao/TypeCodeFactory_Adapter.h
index c80642be4a3..40bb9ee065f 100644
--- a/TAO/tao/TypeCodeFactory_Adapter.h
+++ b/TAO/tao/TypeCodeFactory_Adapter.h
@@ -215,7 +215,7 @@ public:
   // i.e. it is TAO-specific.
 
   virtual bool _tao_make_typecode (TAO_InputCDR & cdr,
-                                   CORBA::TypeCode *& tc);
+                                   CORBA::TypeCode *& tc) = 0;
 
   virtual CORBA::TypeCode_ptr _tao_create_enum_tc (
     CORBA::TCKind,
diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp
index 585a517aa95..5fbd5ba2dc3 100644
--- a/TAO/tao/append.cpp
+++ b/TAO/tao/append.cpp
@@ -229,7 +229,7 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr,
               {
                 // write the encapsulation i.e., octet sequence
                 retval =
-                  TAO_Marshal_Object::perform_append (TAO::TC_opaque,
+                  TAO_Marshal_Object::perform_append (CORBA::_tc_OctetSeq,
                                                       src,
                                                       dest
                                                       ACE_ENV_ARG_PARAMETER);
@@ -274,7 +274,7 @@ TAO_Marshal_Principal::append (CORBA::TypeCode_ptr,
                                ACE_ENV_ARG_DECL)
 {
   // write the octet sequence representing the Principal
-  return TAO_Marshal_Object::perform_append (TAO::TC_opaque,
+  return TAO_Marshal_Object::perform_append (CORBA::_tc_OctetSeq,
                                              src,
                                              dest
                                              ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/tao/orb_typesC.cpp b/TAO/tao/orb_typesC.cpp
index 542b5204bc8..e15d5472037 100644
--- a/TAO/tao/orb_typesC.cpp
+++ b/TAO/tao/orb_typesC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:302
+// be/be_codegen.cpp:302
 
 
 #include "orb_typesC.h"
@@ -41,10 +41,19 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be/be_visitor_arg_traits.cpp:69
 
 // Arg traits specializations.
 namespace TAO
 {
 }
 
+
+// TAO_IDL - Generated from
+// be/be_visitor_root/root.cpp:1528
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc
index 9e00406355c..e31c698eeca 100644
--- a/TAO/tao/tao.mpc
+++ b/TAO/tao/tao.mpc
@@ -181,6 +181,7 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     ORB_Table.cpp
     ORBInitializer_Registry.cpp
     ORBInitInfo.cpp
+    ParameterModeA.cpp
     ParameterModeC.cpp
     params.cpp
     Parser_Registry.cpp