*** empty log message ***

10 files changed, 51 insertions, 42 deletions

diff --git a/TAO/tao/Empty_Param_TypeCode.h b/TAO/tao/Empty_Param_TypeCode.h
index 89f0e65cc48..7416d9d6161 100644
--- a/TAO/tao/Empty_Param_TypeCode.h
+++ b/TAO/tao/Empty_Param_TypeCode.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/TypeCode/TypeCode.h"
+#include "tao/TypeCode.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -95,7 +95,7 @@ namespace TAO
 
 
 #ifdef __ACE_INLINE__
-# include "tao/TypeCode/Empty_Param_TypeCode.inl"
+# include "tao/Empty_Param_TypeCode.inl"
 #endif  /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Objref_TypeCode.cpp b/TAO/tao/Objref_TypeCode.cpp
index fdd760ce8dd..26a5b7bcd25 100644
--- a/TAO/tao/Objref_TypeCode.cpp
+++ b/TAO/tao/Objref_TypeCode.cpp
@@ -3,10 +3,10 @@
 #ifndef TAO_OBJREF_TYPECODE_CPP
 #define TAO_OBJREF_TYPECODE_CPP
 
-#include "tao/TypeCode/Objref_TypeCode.h"
+#include "tao/Objref_TypeCode.h"
 
 #ifndef __ACE_INLINE__
-# include "tao/TypeCode/Objref_TypeCode.inl"
+# include "tao/Objref_TypeCode.inl"
 #endif  /* !__ACE_INLINE__ */
 
 #include "tao/ORB_Core.h"
diff --git a/TAO/tao/Objref_TypeCode.h b/TAO/tao/Objref_TypeCode.h
index 2fa47f22aa0..cd8629b2fb7 100644
--- a/TAO/tao/Objref_TypeCode.h
+++ b/TAO/tao/Objref_TypeCode.h
@@ -23,7 +23,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/TypeCode/TypeCode.h"
+#include "tao/TypeCode.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -31,7 +31,7 @@
 
 #include "tao/TypeCodeFactory_Adapter.h"
 
-#include "tao/TypeCode/TypeCode_Base_Attributes.h"
+#include "tao/TypeCode_Base_Attributes.h"
 
 
 namespace TAO
@@ -199,11 +199,11 @@ namespace TAO
 
 
 #ifdef __ACE_INLINE__
-# include "tao/TypeCode/Objref_TypeCode.inl"
+# include "tao/Objref_TypeCode.inl"
 #endif  /* __ACE_INLINE__ */
 
 #ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/TypeCode/Objref_TypeCode.cpp"
+# include "tao/Objref_TypeCode.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
diff --git a/TAO/tao/String_TypeCode.inl b/TAO/tao/String_TypeCode.inl
index 75eb41cc884..781f9f30061 100644
--- a/TAO/tao/String_TypeCode.inl
+++ b/TAO/tao/String_TypeCode.inl
@@ -4,8 +4,8 @@
 
 template <class RefCountPolicy>
 ACE_INLINE
-TAO::TypeCode::String<RefCountPolicy::String (CORBA::TCKind kind,
-                                              CORBA::ULong length)
+TAO::TypeCode::String<RefCountPolicy>::String (CORBA::TCKind kind,
+                                               CORBA::ULong length)
   : kind_ (kind),
     length_ (length)
 {
diff --git a/TAO/tao/TypeCode_Constants.cpp b/TAO/tao/TypeCode_Constants.cpp
index 8c66f67a7f7..69771b39f6c 100644
--- a/TAO/tao/TypeCode_Constants.cpp
+++ b/TAO/tao/TypeCode_Constants.cpp
@@ -74,9 +74,9 @@ namespace TAO
     char const tc_value_base_id[]   = "IDL:omg.org/CORBA/ValueBase:1.0";
     char const tc_value_base_name[] = "ValueBase";
     Value<char const *,
-          Field<char const *> *,
+          Value_Field<char const *> const *,
           CORBA::tk_value,
-          TAO::Null_RefCount_policy> tc_ValueBase (tc_value_base_id,
+          TAO::Null_RefCount_Policy> tc_ValueBase (tc_value_base_id,
                                                    tc_value_base_name,
                                                    CORBA::VM_NONE,
                                                    0,  // Nil TypeCode
@@ -86,9 +86,9 @@ namespace TAO
     char const tc_event_base_id[]   = "IDL:omg.org/CORBA/EventBase:1.0";
     char const tc_event_base_name[] = "EventBase";
     Value<char const *,
-          Field<char const *> *,
+          Value_Field<char const *> const *,
           CORBA::tk_event,
-          TAO::Null_RefCount_policy> tc_EventBase (tc_event_base_id,
+          TAO::Null_RefCount_Policy> tc_EventBase (tc_event_base_id,
                                                    tc_event_base_name,
                                                    CORBA::VM_NONE,
                                                    0,  // Nil TypeCode
diff --git a/TAO/tao/TypeCode_Constants.h b/TAO/tao/TypeCode_Constants.h
index c82e815b45d..f3302e9071b 100644
--- a/TAO/tao/TypeCode_Constants.h
+++ b/TAO/tao/TypeCode_Constants.h
@@ -23,6 +23,9 @@
 
 namespace CORBA
 {
+  class TypeCode;
+  typedef TypeCode * TypeCode_ptr;
+
   /**
    * @name TypeCode Constants
    *
diff --git a/TAO/tao/TypeCode_Value_Field.cpp b/TAO/tao/TypeCode_Value_Field.cpp
index 296bcda06fb..df8eb7720a7 100644
--- a/TAO/tao/TypeCode_Value_Field.cpp
+++ b/TAO/tao/TypeCode_Value_Field.cpp
@@ -11,7 +11,6 @@
 
 
 template <typename STRING_TYPE>
-char const *
 TAO::TypeCode::Value_Field<STRING_TYPE>::~Value_Field (void)
 {
   if (this->type)
diff --git a/TAO/tao/Value_TypeCode.cpp b/TAO/tao/Value_TypeCode.cpp
index 0989cfb988e..62b33ebb993 100644
--- a/TAO/tao/Value_TypeCode.cpp
+++ b/TAO/tao/Value_TypeCode.cpp
@@ -322,19 +322,20 @@ TAO::TypeCode::Value<StringType,
                         CORBA::TypeCode::_nil ());
     }
 
-  tc = adapter->_tao_create_value_event_tc (Kind,
-                                            this->base_attributes_.id (),
-                                            ""  /* empty name */,
-                                            this->value_modifier_,
-                                            *this->concrete_base_,
-                                            tc_fields,
-                                            this->nfields_
-                                            ACE_ENV_ARG_PARAMETER);
+  CORBA::TypeCode_var tc =
+    adapter->_tao_create_value_event_tc (Kind,
+                                         this->base_attributes_.id (),
+                                         ""  /* empty name */,
+                                         this->value_modifier_,
+                                         *this->concrete_base_,
+                                         tc_fields,
+                                         this->nfields_
+                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   (void) safe_fields.release ();
 
-  return tc;
+  return tc._retn ();
 }
 
 template <typename StringType,
@@ -431,14 +432,14 @@ TAO::TypeCode::Value<StringType,
                      FieldArrayType,
                      Kind,
                      RefCountPolicy>::member_visibility_i (
-  ULong index
+  CORBA::ULong index
   ACE_ENV_ARG_DECL) const
 {
   if (index >= this->nfields_)
     ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
                       CORBA::TypeCode::_nil ());
 
-  return this->fields_[index].visibility));
+  return this->fields_[index].visibility;
 }
 
 template <typename StringType,
diff --git a/TAO/tao/Value_TypeCode.h b/TAO/tao/Value_TypeCode.h
index d0702893a2e..5e981127a66 100644
--- a/TAO/tao/Value_TypeCode.h
+++ b/TAO/tao/Value_TypeCode.h
@@ -25,6 +25,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TypeCode_Base_Attributes.h"
+#include "tao/OBV_Constants.h"
 
 
 namespace TAO
@@ -55,7 +56,7 @@ namespace TAO
       /// Constructor.
       Value (char const * id,
              char const * name,
-             CORBA::ValueModifer modifier,
+             CORBA::ValueModifier modifier,
              CORBA::TypeCode_ptr * concrete_base,
              Value_Field<StringType> const * fields,
              CORBA::ULong nfields);
@@ -99,7 +100,7 @@ namespace TAO
                                           ACE_ENV_ARG_DECL) const;
       virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index
                                                  ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Visibility member_visibility_i (ULong index
+      virtual CORBA::Visibility member_visibility_i (CORBA::ULong index
                                                      ACE_ENV_ARG_DECL) const;
       virtual CORBA::ValueModifier type_modifier (
         ACE_ENV_SINGLE_ARG_DECL) const;
@@ -132,7 +133,7 @@ namespace TAO
 
       /// The @c ValueModifier of the @c valuetype of @c eventtype
       /// represented by this @c TypeCode.
-      CORBA::ValueModifer const type_modifier_;
+      CORBA::ValueModifier const type_modifier_;
 
       /// The @c TypeCode corresponding to the concrete base
       /// @c valuetype or @c eventtype.
diff --git a/TAO/tao/Value_TypeCode.inl b/TAO/tao/Value_TypeCode.inl
index f10676a12b1..e54295cc7e8 100644
--- a/TAO/tao/Value_TypeCode.inl
+++ b/TAO/tao/Value_TypeCode.inl
@@ -2,7 +2,10 @@
 //
 // $Id$
 
-#include "TypeCode_Value_Field.h"
+#include "tao/TypeCode_Value_Field.h"
+#include "tao/True_RefCount_Policy.h"
+
+#include "ace/Auto_Ptr.h"
 
 
 template <typename StringType,
@@ -15,7 +18,7 @@ TAO::TypeCode::Value<StringType, FieldArrayType, Kind, RefCountPolicy>::Value (
   char const * name,
   CORBA::ValueModifier modifier,
   CORBA::TypeCode_ptr * concrete_base,
-  Field<StringType> const * fields,
+  Value_Field<StringType> const * fields,
   CORBA::ULong nfields)
   : base_attributes_ (id, name)
   , type_modifier_ (modifier)
@@ -29,7 +32,7 @@ template <typename StringType,
           class FieldArrayType,
           CORBA::TCKind Kind,
           class RefCountPolicy>
-ACE_INLINE TAO::TypeCode::Field<StringType> const *
+ACE_INLINE TAO::TypeCode::Value_Field<StringType> const *
 TAO::TypeCode::Value<StringType,
                      FieldArrayType,
                      Kind,
@@ -42,20 +45,22 @@ TAO::TypeCode::Value<StringType,
 // Member specializations
 // -------------------------------------------------------------
 
-ACE_INLINE TAO::TypeCode::Field<CORBA::String_var> const *
-TAO::TypeCode::Value<CORBA::String_var,
-                     ACE_Auto_Ptr_Array<Field<CORBA::String_var> const>,
-                     CORBA::tk_value,
-                     TAO::True_RefCount_Policy>::fields (void) const
+ACE_INLINE TAO::TypeCode::Value_Field<CORBA::String_var> const *
+TAO::TypeCode::Value<
+  CORBA::String_var,
+  ACE_Auto_Array_Ptr<TAO::TypeCode::Value_Field<CORBA::String_var> const>,
+  CORBA::tk_value,
+  TAO::True_RefCount_Policy>::fields (void) const
 {
   return this->fields_.get ();
 }
 
-ACE_INLINE TAO::TypeCode::Field<CORBA::String_var> const *
-TAO::TypeCode::Value<CORBA::String_var,
-                     ACE_Auto_Ptr_Array<Field<CORBA::String_var> const>,
-                     CORBA::tk_event,
-                     TAO::True_RefCount_Policy>::fields (void) const
+ACE_INLINE TAO::TypeCode::Value_Field<CORBA::String_var> const *
+TAO::TypeCode::Value<
+  CORBA::String_var,
+  ACE_Auto_Array_Ptr<TAO::TypeCode::Value_Field<CORBA::String_var> const>,
+  CORBA::tk_event,
+  TAO::True_RefCount_Policy>::fields (void) const
 {
   return this->fields_.get ();
 }