Mon Mar 5 11:09:32 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

7 files changed, 49 insertions, 83 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index b192851f201..99de832338c 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,13 @@
+Mon Mar  5 11:09:32 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/Recursive_Type_TypeCode.cpp:
+        * tao/AnyTypeCode/Recursive_Type_TypeCode.h:
+        * tao/AnyTypeCode/Struct_TypeCode.cpp:
+        * tao/AnyTypeCode/Struct_TypeCode.h:
+        * tao/AnyTypeCode/Struct_TypeCode_Static.cpp:
+        * tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp:
+          Layout changes
+
 Mon Mar  5 11:03:32 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/Bounded_Object_Reference_Sequence_T.h:
diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp
index e35d3bad781..d7df0270792 100644
--- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp
@@ -57,8 +57,7 @@ CORBA::Boolean
 TAO::TypeCode::Recursive_Type<TypeCodeBase,
                               TypeCodeType,
                               MemberArrayType>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ) const
+  CORBA::TypeCode_ptr tc) const
 {
   ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
                     guard,
@@ -76,8 +75,7 @@ TAO::TypeCode::Recursive_Type<TypeCodeBase,
       // Only reset the recursion flag at the top-level.
       Reset flag (this->in_recursion_);
 
-      return this->TypeCodeBase::equal_i (tc
-                                         );
+      return this->TypeCodeBase::equal_i (tc);
     }
 
   // Nothing else to do.
@@ -89,8 +87,7 @@ CORBA::Boolean
 TAO::TypeCode::Recursive_Type<TypeCodeBase,
                               TypeCodeType,
                               MemberArrayType>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ) const
+  CORBA::TypeCode_ptr tc) const
 {
   ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
                     guard,
@@ -108,8 +105,7 @@ TAO::TypeCode::Recursive_Type<TypeCodeBase,
       // Only reset the recursion flag at the top-level.
       Reset flag (this->in_recursion_);
 
-      return this->TypeCodeBase::equivalent_i (tc
-                                              );
+      return this->TypeCodeBase::equivalent_i (tc);
     }
 
   // Nothing else to do.
diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h
index a1ad3a2f0db..3ce4d621e8c 100644
--- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h
@@ -121,13 +121,10 @@ namespace TAO
        * @see @c CORBA::TypeCode
        */
       //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ) const;
+      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const;
+      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const;
       //@}
 
-
     public:
 
       /// Set @c struct @c TypeCode parameters.
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp b/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp
index 36ac2a22f2b..b299ab6947b 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp
@@ -111,9 +111,7 @@ CORBA::Boolean
 TAO::TypeCode::Struct<StringType,
                       TypeCodeType,
                       FieldArrayType,
-                      RefCountPolicy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ) const
+                      RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc) const
 {
   // This call shouldn't throw since CORBA::TypeCode::equal() verified
   // that the TCKind is the same as our's prior to invoking this
@@ -132,8 +130,7 @@ TAO::TypeCode::Struct<StringType,
 
       char const * const lhs_name =
         Traits<StringType>::get_string (lhs_field.name);
-      char const * const rhs_name = tc->member_name (i
-                                                    );
+      char const * const rhs_name = tc->member_name (i);
 
       if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
         return false;
@@ -141,12 +138,10 @@ TAO::TypeCode::Struct<StringType,
       CORBA::TypeCode_ptr const lhs_tc =
         Traits<StringType>::get_typecode (lhs_field.type);
       CORBA::TypeCode_var const rhs_tc =
-        tc->member_type (i
-                        );
+        tc->member_type (i);
 
       CORBA::Boolean const equal_members =
-        lhs_tc->equal (rhs_tc.in ()
-                      );
+        lhs_tc->equal (rhs_tc.in ());
 
       if (!equal_members)
         return false;
@@ -164,8 +159,7 @@ TAO::TypeCode::Struct<StringType,
                       TypeCodeType,
                       FieldArrayType,
                       RefCountPolicy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ) const
+  CORBA::TypeCode_ptr tc) const
 {
   // Perform a structural comparison, excluding the name() and
   // member_name() operations.
@@ -181,12 +175,10 @@ TAO::TypeCode::Struct<StringType,
       CORBA::TypeCode_ptr const lhs =
         Traits<StringType>::get_typecode (this->fields_[i].type);
       CORBA::TypeCode_var const rhs =
-        tc->member_type (i
-                        );
+        tc->member_type (i);
 
       CORBA::Boolean const equiv_members =
-        lhs->equivalent (rhs.in ()
-                        );
+        lhs->equivalent (rhs.in ());
 
       if (!equiv_members)
         return false;
@@ -225,8 +217,7 @@ TAO::TypeCode::Struct<StringType,
           tc_fields[i].name = empty_name;
           tc_fields[i].type =
             Traits<StringType>::get_typecode (
-              this->fields_[i].type)->get_compact_typecode (
-                );
+              this->fields_[i].type)->get_compact_typecode ();
         }
     }
 
@@ -244,8 +235,7 @@ TAO::TypeCode::Struct<StringType,
                                       this->base_attributes_.id (),
                                       ""  /* empty name */,
                                       tc_fields,
-                                      this->nfields_
-                                     );
+                                      this->nfields_);
 }
 
 template <typename StringType,
@@ -256,8 +246,7 @@ char const *
 TAO::TypeCode::Struct<StringType,
                       TypeCodeType,
                       FieldArrayType,
-                      RefCountPolicy>::id_i (
-  void) const
+                      RefCountPolicy>::id_i (void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -272,8 +261,7 @@ char const *
 TAO::TypeCode::Struct<StringType,
                       TypeCodeType,
                       FieldArrayType,
-                      RefCountPolicy>::name_i (
-  void) const
+                      RefCountPolicy>::name_i (void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -288,8 +276,7 @@ CORBA::ULong
 TAO::TypeCode::Struct<StringType,
                       TypeCodeType,
                       FieldArrayType,
-                      RefCountPolicy>::member_count_i (
-  void) const
+                      RefCountPolicy>::member_count_i (void) const
 {
   return this->nfields_;
 }
@@ -303,8 +290,7 @@ TAO::TypeCode::Struct<StringType,
                       TypeCodeType,
                       FieldArrayType,
                       RefCountPolicy>::member_name_i (
-  CORBA::ULong index
-  ) const
+  CORBA::ULong index) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -323,8 +309,7 @@ TAO::TypeCode::Struct<StringType,
                       TypeCodeType,
                       FieldArrayType,
                       RefCountPolicy>::member_type_i (
-  CORBA::ULong index
-  ) const
+  CORBA::ULong index) const
 {
   if (index >= this->nfields_)
     throw ::CORBA::TypeCode::Bounds ();
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.h b/TAO/tao/AnyTypeCode/Struct_TypeCode.h
index 3881586b117..16405c3747b 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.h
@@ -62,8 +62,7 @@ namespace TAO
               CORBA::ULong nfields);
 
       /// Constructor used for recursive TypeCodes.
-      Struct (CORBA::TCKind kind,
-              char const * id);
+      Struct (CORBA::TCKind kind, char const * id);
 
       /**
        * @name TAO-specific @c CORBA::TypeCode Methods
@@ -91,19 +90,14 @@ namespace TAO
        * @see @c CORBA::TypeCode
        */
       //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        void) const;
+      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const;
+      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const;
+      virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const;
       virtual char const * id_i (void) const;
       virtual char const * name_i (void) const;
       virtual CORBA::ULong member_count_i (void) const;
-      virtual char const * member_name_i (CORBA::ULong index
-                                          ) const;
-      virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index
-                                                 ) const;
+      virtual char const * member_name_i (CORBA::ULong index) const;
+      virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index) const;
       //@}
 
     protected:
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
index f6aa45aa0fc..028e5f5571b 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
@@ -106,8 +106,7 @@ TAO::TypeCode::Struct<char const *,
                       TAO::TypeCode::Struct_Field<char const *,
                                                   CORBA::TypeCode_ptr const *> const *,
                       TAO::Null_RefCount_Policy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ) const
+  CORBA::TypeCode_ptr tc) const
 {
   // This call shouldn't throw since CORBA::TypeCode::equal() verified
   // that the TCKind is the same as our's prior to invoking this
@@ -135,12 +134,10 @@ TAO::TypeCode::Struct<char const *,
       CORBA::TypeCode_ptr const lhs_tc =
         Traits<char const *>::get_typecode (lhs_field.type);
       CORBA::TypeCode_var const rhs_tc =
-        tc->member_type (i
-                        );
+        tc->member_type (i);
 
       CORBA::Boolean const equal_members =
-        lhs_tc->equal (rhs_tc.in ()
-                      );
+        lhs_tc->equal (rhs_tc.in ());
 
       if (!equal_members)
         return false;
@@ -155,8 +152,7 @@ TAO::TypeCode::Struct<char const *,
                       TAO::TypeCode::Struct_Field<char const *,
                                                   CORBA::TypeCode_ptr const *> const *,
                       TAO::Null_RefCount_Policy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ) const
+  CORBA::TypeCode_ptr tc) const
 {
   // Perform a structural comparison, excluding the name() and
   // member_name() operations.
@@ -172,12 +168,10 @@ TAO::TypeCode::Struct<char const *,
       CORBA::TypeCode_ptr const lhs =
         Traits<char const *>::get_typecode (this->fields_[i].type);
       CORBA::TypeCode_var const rhs =
-        tc->member_type (i
-                        );
+        tc->member_type (i);
 
       CORBA::Boolean const equiv_members =
-        lhs->equivalent (rhs.in ()
-                        );
+        lhs->equivalent (rhs.in ());
 
       if (!equiv_members)
         return false;
@@ -213,8 +207,7 @@ TAO::TypeCode::Struct<char const *,
           tc_fields[i].name = empty_name;
           tc_fields[i].type =
             Traits<char const *>::get_typecode (
-              this->fields_[i].type)->get_compact_typecode (
-                );
+              this->fields_[i].type)->get_compact_typecode ();
         }
     }
 
@@ -232,8 +225,7 @@ TAO::TypeCode::Struct<char const *,
                                       this->base_attributes_.id (),
                                       ""  /* empty name */,
                                       tc_fields,
-                                      this->nfields_
-                                     );
+                                      this->nfields_);
 }
 
 char const *
@@ -254,8 +246,7 @@ TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
                       TAO::TypeCode::Struct_Field<char const *,
                                                   CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::name_i (
-  void) const
+                      TAO::Null_RefCount_Policy>::name_i (void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -267,8 +258,7 @@ TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
                       TAO::TypeCode::Struct_Field<char const *,
                                                   CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::member_count_i (
-  void) const
+                      TAO::Null_RefCount_Policy>::member_count_i (void) const
 {
   return this->nfields_;
 }
@@ -279,8 +269,7 @@ TAO::TypeCode::Struct<char const *,
                       TAO::TypeCode::Struct_Field<char const *,
                                                   CORBA::TypeCode_ptr const *> const *,
                       TAO::Null_RefCount_Policy>::member_name_i (
-  CORBA::ULong index
-  ) const
+  CORBA::ULong index) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -296,8 +285,7 @@ TAO::TypeCode::Struct<char const *,
                       TAO::TypeCode::Struct_Field<char const *,
                                                   CORBA::TypeCode_ptr const *> const *,
                       TAO::Null_RefCount_Policy>::member_type_i (
-  CORBA::ULong index
-  ) const
+  CORBA::ULong index) const
 {
   if (index >= this->nfields_)
     throw ::CORBA::TypeCode::Bounds ();
diff --git a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
index a04d76ec0f9..cd6a5735295 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
@@ -414,13 +414,11 @@ TAO::TypeCodeFactory::tc_struct_factory (CORBA::TCKind kind,
     member_array_type,
     TAO::True_RefCount_Policy> typecode_type;
 
-
   // Check if struct TypeCode is recursive.
   TAO::TypeCodeFactory::TC_Info_List recursive_tc;
   if (kind == CORBA::tk_struct && find_recursive_tc (id.in (), recursive_tc, infos))
     {
       // Set remaining parameters.
-
       typedef TAO::TypeCode::Recursive_Type<typecode_type,
                                             CORBA::TypeCode_var,
                                             member_array_type>
@@ -438,9 +436,7 @@ TAO::TypeCodeFactory::tc_struct_factory (CORBA::TCKind kind,
           if (!rtc)
             return false;  // Should never occur.
 
-          rtc->struct_parameters (name.in (),
-                                  fields,
-                                  nfields);
+          rtc->struct_parameters (name.in (), fields, nfields);
         }
 
       tc = recursive_tc[0].type;