ChangeLogTag: Thu Jun 22 16:13:29 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu>

3 files changed, 13 insertions, 18 deletions

diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp
index 5fa5e197343..35c0b5d83e8 100644
--- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp
@@ -17,8 +17,7 @@ CORBA::Boolean
 TAO::In_Fixed_Array_SArgument_T<S_forany,
                                 Insert_Policy>::demarshal (TAO_InputCDR &cdr)
 {
-  S_forany tmp (this->x_);
-  return cdr >> tmp;
+  return cdr >> this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
@@ -30,7 +29,7 @@ TAO::In_Fixed_Array_SArgument_T<S_forany,
                                 Insert_Policy>::interceptor_value (
     CORBA::Any *any) const
 {
-  Insert_Policy<S_forany>::any_insert (any, S_forany (this->x_));
+  Insert_Policy<S_forany>::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -43,7 +42,7 @@ CORBA::Boolean
 TAO::Inout_Fixed_Array_SArgument_T<S_forany,
                                    Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
-  return cdr << S_forany (this->x_);
+  return cdr << this->x_;
 }
 
 template<typename S_forany,
@@ -53,8 +52,7 @@ TAO::Inout_Fixed_Array_SArgument_T<S_forany,
                                    Insert_Policy>::
 demarshal (TAO_InputCDR & cdr)
 {
-  S_forany tmp (this->x_);
-  return cdr >> tmp;
+  return cdr >> this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
@@ -66,7 +64,7 @@ TAO::Inout_Fixed_Array_SArgument_T<S_forany,
                                    Insert_Policy>::interceptor_value (
     CORBA::Any *any) const
 {
-  Insert_Policy<S_forany>::any_insert (any, S_forany (this->x_));
+  Insert_Policy<S_forany>::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -79,7 +77,7 @@ CORBA::Boolean
 TAO::Out_Fixed_Array_SArgument_T<S_forany,
                                  Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
-  return cdr << S_forany (this->x_);
+  return cdr << this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
@@ -91,7 +89,7 @@ TAO::Out_Fixed_Array_SArgument_T<S_forany,
                                  Insert_Policy>::interceptor_value (
     CORBA::Any *any) const
 {
-  Insert_Policy<S_forany>::any_insert (any, S_forany (this->x_));
+  Insert_Policy<S_forany>::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h
index 3aee0929d6b..62c41402ebc 100644
--- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h
+++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h
@@ -47,7 +47,7 @@ namespace TAO
     typename S_forany::_slice_type const * arg (void) const;
 
   private:
-    mutable typename S_forany::_array_type x_;
+    mutable typename S_forany x_;
   };
 
   /**
@@ -70,7 +70,7 @@ namespace TAO
     typename S_forany::_slice_type * arg (void);
 
   private:
-    typename S_forany::_array_type x_;
+    typename S_forany x_;
   };
 
   /**
@@ -92,7 +92,7 @@ namespace TAO
     typename S_forany::_slice_type * arg (void);
 
   private:
-    typename S_forany::_array_type x_;
+    typename S_forany x_;
   };
 
   /**
diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl
index 837709dd619..ed832f73e0f 100644
--- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl
@@ -19,8 +19,7 @@ typename S_forany::_slice_type const *
 TAO::In_Fixed_Array_SArgument_T<S_forany,
                                 Insert_Policy>::arg (void) const
 {
-  S_forany tmp (this->x_);
-  return tmp.in ();
+  return this->x_.in ();
 }
 
 // ===========================================================================
@@ -41,8 +40,7 @@ typename S_forany::_slice_type *
 TAO::Inout_Fixed_Array_SArgument_T<S_forany,
                                    Insert_Policy>::arg (void)
 {
-  S_forany tmp (this->x_);
-  return tmp.inout ();
+  return this->x_.inout ();
 }
 
 // ===========================================================================
@@ -63,8 +61,7 @@ typename S_forany::_slice_type *
 TAO::Out_Fixed_Array_SArgument_T<S_forany,
                                  Insert_Policy>::arg (void)
 {
-  S_forany tmp (this->x_);
-  return tmp.inout ();
+  return this->x_.inout ();
 }
 
 // ===========================================================================