ChangeLogTag: Sat Jan 11 000:18:33 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

7 files changed, 99 insertions, 380 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 0be32960736..d8e6163b85f 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,15 @@
+Sat Jan 11 000:18:33 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/Any.cpp:
+        * tao/Any.h:
+        * tao/Any_T.h:
+        * tao/NVList.cpp:
+        * tao/Typecode_Constants.cpp:
+        * tao/append.cpp:
+
+	  More cleanup of internal incompatibilities with the new
+	  Any implementation.
+
 Fri Jan 10 18:57:58 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tao/Any.cpp:
diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp
index 3ab0aba7ef8..6ce0a706814 100644
--- a/TAO/tao/Any.cpp
+++ b/TAO/tao/Any.cpp
@@ -28,11 +28,15 @@ CORBA::Any::Any (CORBA::TypeCode_ptr tc,
                  void *value,
                  CORBA::Boolean release)
 {
-  ACE_Message_Block *mb = ACE_reinterpret_cast (ACE_Message_Block *,
-                                                value);
+  if (value != 0)
+    {
+      ACE_THROW (CORBA::NO_IMPLEMENT ());
+      return;
+    }
+
   ACE_NEW (this->impl_,
            TAO::Unknown_IDL_Type (tc,
-                                  mb,
+                                  0,
                                   tc->byte_order_,
                                   release));
 }
@@ -67,18 +71,11 @@ CORBA::Any::operator= (const CORBA::Any &rhs)
 }
 
 void
-CORBA::Any::replace (CORBA::TypeCode_ptr tc,
-                     void *value,
-                     CORBA::Boolean release)
-{
-  ACE_Message_Block *mb = ACE_reinterpret_cast (ACE_Message_Block *,
-                                                value);
-  TAO::Unknown_IDL_Type *unk = 0;
-  ACE_NEW (unk,
-           TAO::Unknown_IDL_Type (tc,
-                                  mb,
-                                  release));
-  this->replace (unk);
+CORBA::Any::replace (CORBA::TypeCode_ptr,
+                     void *,
+                     CORBA::Boolean)
+{
+  ACE_THROW (CORBA::NO_IMPLEMENT ());
 }
 
 void 
@@ -272,6 +269,12 @@ TAO::Any_Impl::_remove_ref (void)
     }
 }
 
+void 
+TAO::Any_Impl::_tao_decode (TAO_InputCDR &
+                            ACE_ENV_ARG_DECL_NOT_USED)
+{
+}
+
 // =======================================================================
 
 TAO::Unknown_IDL_Type::Unknown_IDL_Type (CORBA::TypeCode_ptr tc,
@@ -330,6 +333,17 @@ TAO::Unknown_IDL_Type::free_value (void)
   ACE_Message_Block::release (this->cdr_);
 }
 
+void
+TAO::Unknown_IDL_Type::_tao_decode (TAO_InputCDR &cdr
+                                    ACE_ENV_ARG_DECL)
+{
+  ACE_Message_Block::release (this->cdr_);
+  ACE_NEW (this->cdr_,
+           ACE_Message_Block);
+  ACE_CDR::consolidate (this->cdr_,
+                        cdr.start ());
+}
+
 // ****************************************************************
 
 CORBA::Any_var &
@@ -402,52 +416,17 @@ operator>> (TAO_InputCDR &cdr, CORBA::Any &any)
           return any_impl->demarshal_value (cdr);
         }
 
-      // @@ (JP) The following code depends on the fact that
-      //         TAO_InputCDR does not contain chained message blocks,
-      //         otherwise <begin> and <end> could be part of
-      //         different buffers!
-
-      // This will be the start of a new message block.
-      char *begin = cdr.rd_ptr ();
-
-      // Skip over the next aregument.
-      CORBA::TypeCode::traverse_status status =
-        TAO_Marshal_Object::perform_skip (tc,
-                                          &cdr
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
-        {
-          return 0;
-        }
-
-      // This will be the end of the new message block.
-      char *end = cdr.rd_ptr ();
-
-      // The ACE_CDR::mb_align() call can shift the rd_ptr by up to
-      // ACE_CDR::MAX_ALIGNMENT - 1 bytes. Similarly, the offset adjustment
-      // can move the rd_ptr by up to the same amount. We accommodate
-      // this by including 2 * ACE_CDR::MAX_ALIGNMENT bytes of additional
-      // space in the message block.
-      size_t size = end - begin;
-
-      ACE_Message_Block mb (size + 2 * ACE_CDR::MAX_ALIGNMENT);
-
-      ACE_CDR::mb_align (&mb);
-      ptr_arith_t offset = ptr_arith_t (begin) % ACE_CDR::MAX_ALIGNMENT;
-      mb.rd_ptr (offset);
-      mb.wr_ptr (offset + size);
-      ACE_OS::memcpy (mb.rd_ptr (), begin, size);
-
       TAO::Unknown_IDL_Type *impl = 0;
       ACE_NEW_RETURN (impl,
                       TAO::Unknown_IDL_Type (tc,
-                                             &mb,
+                                             0,
                                              cdr.byte_order ()),
                       0);
 
       any.replace (impl);
+      impl->_tao_decode (cdr
+                         ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::Exception, ex)
     {
diff --git a/TAO/tao/Any.h b/TAO/tao/Any.h
index a17eb282fdf..9c1efa57ae6 100644
--- a/TAO/tao/Any.h
+++ b/TAO/tao/Any.h
@@ -43,17 +43,6 @@ namespace CORBA
   class TAO_Export Any
   {
   public:
-
-// ********** TEMPORARY *********************
-    CORBA::TypeCode_ptr type_;
-    ACE_Message_Block *cdr_;
-    void _tao_encode (TAO_OutputCDR &cdr,
-                      TAO_ORB_Core *orb_core
-                      ACE_ENV_ARG_DECL) {}
-    void _tao_decode (TAO_InputCDR &cdr
-                      ACE_ENV_ARG_DECL) {}
-// ******************************************
-
     typedef Any_ptr _ptr_type;
     typedef Any_var _var_type;
 
@@ -62,12 +51,11 @@ namespace CORBA
 
     /// This signature is required by the C++ mapping, but allows
     /// obvious type safety dangers. TAO's implementation will
-    /// accept an ACE_Message_Block passed in as a void*. This is
-    /// also useful for interceptors, where an Any may need to be
-    /// created that contains a void type. In that case, we can
-    /// pass in a void* value of 0.
+    /// accept only 0 for the void*. This constructor is
+    /// used with interceptors, where an Any may need to be
+    /// created that contains a void type.
     Any (TypeCode_ptr,
-         void *value,
+         void *,
          Boolean release = 0);
 
     ~Any (void);
@@ -305,6 +293,10 @@ namespace TAO
     static void _tao_any_string_destructor (void *);
     static void _tao_any_wstring_destructor (void *);
 
+    // Used only by Unknown_IDL_Type.
+    virtual void _tao_decode (TAO_InputCDR &
+                              ACE_ENV_ARG_DECL_NOT_USED);
+
   protected:
     Any_Impl (_tao_destructor,
               CORBA::TypeCode_ptr);
@@ -337,6 +329,9 @@ namespace TAO
     virtual ACE_Message_Block *_tao_get_cdr (void) const;
     virtual int _tao_byte_order (void) const;
 
+    void _tao_decode (TAO_InputCDR &
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
   private:
     ACE_Message_Block *cdr_;
     int byte_order_;
diff --git a/TAO/tao/Any_T.h b/TAO/tao/Any_T.h
index bf62c0f2316..146296ea890 100644
--- a/TAO/tao/Any_T.h
+++ b/TAO/tao/Any_T.h
@@ -159,7 +159,7 @@ namespace TAO
                                    const T *&);
 
     virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
-    virtual CORBA::Boolean demarshal_value (TAO_InputCDR &);
+    CORBA::Boolean demarshal_value (TAO_InputCDR &);
 
     virtual const void *value (void) const;
     virtual void free_value (void);
diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp
index bec12ddcdf8..eadc307a6fb 100644
--- a/TAO/tao/NVList.cpp
+++ b/TAO/tao/NVList.cpp
@@ -294,7 +294,10 @@ CORBA_NVList::_tao_encode (TAO_OutputCDR &cdr,
                            int flag
                            ACE_ENV_ARG_DECL)
 {
-  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, 
+             ace_mon, 
+             this->refcount_lock_);
+
   if (this->incoming_ != 0)
     {
       if (this->max_ == 0)
@@ -319,23 +322,28 @@ CORBA_NVList::_tao_encode (TAO_OutputCDR &cdr,
           CORBA::NamedValue_ptr nv = *item;
 
           if (ACE_BIT_DISABLED (nv->flags (), flag))
-            continue;
+            {
+              continue;
+            }
 
           if (TAO_debug_level > 3)
             {
               const char* arg = nv->name ();
+
               if (arg == 0)
-                arg = "(nil)";
+                {
+                  arg = "(nil)";
+                }
 
               ACE_DEBUG ((LM_DEBUG,
                           ACE_TEXT ("NVList::_tao_encode - parameter <%s>\n"),
                           arg));
             }
-          CORBA::TypeCode_var tc = nv->value ()->type ();
-          (void) TAO_Marshal_Object::perform_append (tc.in (),
+          CORBA::TypeCode_ptr tc = nv->value ()->_tao_get_typecode ();
+          (void) TAO_Marshal_Object::perform_append (tc,
                                                      this->incoming_,
                                                      &cdr
-                                                      ACE_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -358,12 +366,11 @@ CORBA_NVList::_tao_encode (TAO_OutputCDR &cdr,
       CORBA::NamedValue_ptr nv = *item;
 
       if (ACE_BIT_DISABLED (nv->flags (), flag))
-        continue;
+        {
+          continue;
+        }
 
-      nv->value ()->_tao_encode (cdr,
-                                 orb_core
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      nv->value ()->impl ()->marshal_value (cdr);
     }
 }
 
@@ -373,7 +380,10 @@ CORBA_NVList::_tao_decode (TAO_InputCDR &incoming,
                            ACE_ENV_ARG_DECL)
 {
   if (TAO_debug_level > 3)
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) : NVList::_tao_decode\n")));
+    {
+      ACE_DEBUG ((LM_DEBUG, 
+                  ACE_TEXT ("TAO (%P|%t) : NVList::_tao_decode\n")));
+    }
 
   // Then unmarshal each "in" and "inout" parameter.
   ACE_Unbounded_Queue_Iterator<CORBA::NamedValue_ptr> i (this->values_);
@@ -390,16 +400,20 @@ CORBA_NVList::_tao_decode (TAO_InputCDR &incoming,
       //    a Server-side request, we could probably handle both
       //    cases with a flag, but there is no clear need for that.
       if (ACE_BIT_DISABLED (nv->flags (), flag))
-        continue;
+        {
+          continue;
+        }
 
       if (TAO_debug_level > 3)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) : NVList::_tao_decode - %s\n"),
-                    nv->name ()?nv->name ():"(no name given)" ));
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("TAO (%P|%t) : NVList::_tao_decode - %s\n"),
+                      nv->name ()? nv->name () : "(no name given)" ));
+        }
 
       CORBA::Any_ptr any = nv->value ();
-      any->_tao_decode (incoming
-                         ACE_ENV_ARG_PARAMETER);
+      any->impl ()->_tao_decode (incoming
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -407,10 +421,15 @@ CORBA_NVList::_tao_decode (TAO_InputCDR &incoming,
 ptr_arith_t
 CORBA_NVList::_tao_target_alignment (void)
 {
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_,
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, 
+                    ace_mon, 
+                    this->refcount_lock_,
                     ACE_CDR::MAX_ALIGNMENT);
+
   if (this->incoming_ == 0)
-    return ACE_CDR::MAX_ALIGNMENT;
+    {
+      return ACE_CDR::MAX_ALIGNMENT;
+    }
 
   const char* rd = this->incoming_->start ()->rd_ptr ();
   return ptr_arith_t(rd) % ACE_CDR::MAX_ALIGNMENT;
diff --git a/TAO/tao/Typecode_Constants.cpp b/TAO/tao/Typecode_Constants.cpp
index 07cc383163b..45e8605df8f 100644
--- a/TAO/tao/Typecode_Constants.cpp
+++ b/TAO/tao/Typecode_Constants.cpp
@@ -405,282 +405,6 @@ TAO_TypeCodes::init (void)
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
- // Service Types
-  static const CORBA::Long _oc_CORBA_ServiceOption[] =
-  {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   36,
-   ACE_NTOHL (0x49444c3a),
-   ACE_NTOHL (0x6f6d672e),
-   ACE_NTOHL (0x6f72672f),
-   ACE_NTOHL (0x434f5242),
-   ACE_NTOHL (0x412f5365),
-   ACE_NTOHL (0x72766963),
-   ACE_NTOHL (0x654f7074),
-   ACE_NTOHL (0x696f6e3a),
-   ACE_NTOHL (0x312e3000),  // repository ID =
-                            //   IDL:omg.org/CORBA/ServiceOption:1.0
-   14,
-   ACE_NTOHL (0x53657276),
-   ACE_NTOHL (0x6963654f),
-   ACE_NTOHL (0x7074696f),
-   ACE_NTOHL (0x6e000000),  // name = ServiceOption
-   CORBA::tk_ulong,
-  };
-
-  CORBA::_tc_ServiceOption =
-    new CORBA::TypeCode (CORBA::tk_alias,
-                         sizeof (_oc_CORBA_ServiceOption),
-                         (char *) &_oc_CORBA_ServiceOption,
-                         0,
-                         sizeof (CORBA::ServiceOption));
-
-  static const CORBA::Long _oc_CORBA_ServiceDetailType[] =
-  {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    40,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x72766963),
-    ACE_NTOHL (0x65446574),
-    ACE_NTOHL (0x61696c54),
-    ACE_NTOHL (0x7970653a),
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
-    18,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x69636544),
-    ACE_NTOHL (0x65746169),
-    ACE_NTOHL (0x6c547970),
-    ACE_NTOHL (0x65000000),  // name = ServiceDetailType
-    CORBA::tk_ulong,
-  };
-
- CORBA::_tc_ServiceDetailType =
-   new CORBA::TypeCode (CORBA::tk_alias,
-                        sizeof (_oc_CORBA_ServiceDetailType),
-                        (char *) &_oc_CORBA_ServiceDetailType,
-                        0,
-                        sizeof (CORBA::ServiceDetailType));
-
-  static const CORBA::Long _oc_CORBA_ServiceType[] =
-  {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x72766963),
-    ACE_NTOHL (0x65547970),
-    ACE_NTOHL (0x653a312e),
-    ACE_NTOHL (0x30000000),  // repository ID= IDL:omg.org/CORBA/ServiceType:1.0
-    12,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x69636554),
-    ACE_NTOHL (0x79706500),  // name = ServiceType
-    CORBA::tk_ushort,
-  };
-
- CORBA::_tc_ServiceType =
-   new CORBA::TypeCode (CORBA::tk_alias,
-                        sizeof (_oc_CORBA_ServiceType),
-                        (char *) &_oc_CORBA_ServiceType,
-                        0,
-                        sizeof (CORBA::ServiceType));
-
-  static const CORBA::Long _oc_CORBA_ServiceDetail[] =
-  {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    36,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x72766963),
-    ACE_NTOHL (0x65446574),
-    ACE_NTOHL (0x61696c3a),
-    ACE_NTOHL (0x312e3000),  // repository ID= IDL:omg.org/CORBA/ServiceDetail:1.0
-    14,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x69636544),
-    ACE_NTOHL (0x65746169),
-    ACE_NTOHL (0x6c000000),  // name = ServiceDetail
-    2, // member count
-    20,
-    ACE_NTOHL (0x73657276),
-    ACE_NTOHL (0x6963655f),
-    ACE_NTOHL (0x64657461),
-    ACE_NTOHL (0x696c5f74),
-    ACE_NTOHL (0x79706500),  // name = service_detail_type
-    CORBA::tk_alias, // typecode kind for typedefs
-    76, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    40,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x72766963),
-    ACE_NTOHL (0x65446574),
-    ACE_NTOHL (0x61696c54),
-    ACE_NTOHL (0x7970653a),
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
-    18,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x69636544),
-    ACE_NTOHL (0x65746169),
-    ACE_NTOHL (0x6c547970),
-    ACE_NTOHL (0x65000000),  // name = ServiceDetailType
-    CORBA::tk_ulong,
-    15,
-    ACE_NTOHL (0x73657276),
-    ACE_NTOHL (0x6963655f),
-    ACE_NTOHL (0x64657461),
-    ACE_NTOHL (0x696c0000),  // name = service_detail
-    CORBA::tk_sequence, // typecode kind
-    12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
-    0,
-  };
-
-  CORBA::_tc_ServiceDetail =
-    new CORBA::TypeCode (CORBA::tk_struct,
-                         sizeof (_oc_CORBA_ServiceDetail),
-                         (char *) &_oc_CORBA_ServiceDetail,
-                         0,
-                         sizeof (CORBA::ServiceDetail));
-
-
-  static const CORBA::Long _oc_CORBA_ServiceInformation[] =
-  {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    41,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x72766963),
-    ACE_NTOHL (0x65496e66),
-    ACE_NTOHL (0x6f726d61),
-    ACE_NTOHL (0x74696f6e),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ServiceInformation:1.0
-    19,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x69636549),
-    ACE_NTOHL (0x6e666f72),
-    ACE_NTOHL (0x6d617469),
-    ACE_NTOHL (0x6f6e0000),  // name = ServiceInformation
-    2, // member count
-    16,
-    ACE_NTOHL (0x73657276),
-    ACE_NTOHL (0x6963655f),
-    ACE_NTOHL (0x6f707469),
-    ACE_NTOHL (0x6f6e7300),  // name = service_options
-    CORBA::tk_sequence, // typecode kind
-    84, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_alias, // typecode kind for typedefs
-    68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    36,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x72766963),
-    ACE_NTOHL (0x654f7074),
-    ACE_NTOHL (0x696f6e3a),
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceOption:1.0
-    14,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x6963654f),
-    ACE_NTOHL (0x7074696f),
-    ACE_NTOHL (0x6e000000),  // name = ServiceOption
-    CORBA::tk_ulong,
-    0,
-    16,
-    ACE_NTOHL (0x73657276),
-    ACE_NTOHL (0x6963655f),
-    ACE_NTOHL (0x64657461),
-    ACE_NTOHL (0x696c7300),  // name = service_details
-    CORBA::tk_sequence, // typecode kind
-    232, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    216, // encapsulation length
-    36,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x72766963),
-    ACE_NTOHL (0x65446574),
-    ACE_NTOHL (0x61696c3a),
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetail:1.0
-    14,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x69636544),
-    ACE_NTOHL (0x65746169),
-    ACE_NTOHL (0x6c000000),  // name = ServiceDetail
-    2, // member count
-    20,
-    ACE_NTOHL (0x73657276),
-    ACE_NTOHL (0x6963655f),
-    ACE_NTOHL (0x64657461),
-    ACE_NTOHL (0x696c5f74),
-    ACE_NTOHL (0x79706500),  // name = service_detail_type
-    CORBA::tk_alias, // typecode kind for typedefs
-    76, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    40,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x72766963),
-    ACE_NTOHL (0x65446574),
-    ACE_NTOHL (0x61696c54),
-    ACE_NTOHL (0x7970653a),
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
-    18,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x69636544),
-    ACE_NTOHL (0x65746169),
-    ACE_NTOHL (0x6c547970),
-    ACE_NTOHL (0x65000000),  // name = ServiceDetailType
-    CORBA::tk_ulong,
-    15,
-    ACE_NTOHL (0x73657276),
-    ACE_NTOHL (0x6963655f),
-    ACE_NTOHL (0x64657461),
-    ACE_NTOHL (0x696c0000),  // name = service_detail
-    CORBA::tk_sequence, // typecode kind
-    12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
-    0,
-    0,
-  };
-
- CORBA::_tc_ServiceInformation =
-    new CORBA::TypeCode (CORBA::tk_struct,
-                         sizeof (_oc_CORBA_ServiceInformation),
-                         (char *) &_oc_CORBA_ServiceInformation,
-                         0,
-                         sizeof (CORBA::ServiceInformation));
-
  // ****************************************************************
 
  // The following are internal to the TAO ORB
@@ -864,9 +588,6 @@ TAO_TypeCodes::fini (void)
 
   CORBA::release (CORBA::TypeCode::_tc_BadKind);
 
-  // additional typecodes in the CORBA namespace
-  CORBA::release (CORBA::_tc_Current);
-
   CORBA::release (CORBA::_tc_ORBid);
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
@@ -874,15 +595,6 @@ TAO_TypeCodes::fini (void)
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
-  CORBA::release (CORBA_ORB::_tc_ObjectId);
-
-  // Service types
-  CORBA::release (CORBA::_tc_ServiceType);
-  CORBA::release (CORBA::_tc_ServiceOption);
-  CORBA::release (CORBA::_tc_ServiceDetailType);
-  CORBA::release (CORBA::_tc_ServiceDetail);
-  CORBA::release (CORBA::_tc_ServiceInformation);
-  
   // TAO specific
   CORBA::release (TC_opaque);
 
diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp
index da8f45226a0..546f025a41c 100644
--- a/TAO/tao/append.cpp
+++ b/TAO/tao/append.cpp
@@ -26,7 +26,9 @@
 #include "tao/ValueBase.h"
 #include "tao/debug.h"
 
-ACE_RCSID(tao, append, "$Id$")
+ACE_RCSID (tao, 
+           append, 
+           "$Id$")
 
 // Encode instances of arbitrary data types based only on typecode.
 // "data" points to the data type; if it's not a primitve data type,