ChangeLogTag: Mon Jun 19 14:49:25 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu>

1 files changed, 21 insertions, 41 deletions

diff --git a/TAO/tao/Fixed_Array_Argument_T.cpp b/TAO/tao/Fixed_Array_Argument_T.cpp
index 762219e3b6f..e49b66127b6 100644
--- a/TAO/tao/Fixed_Array_Argument_T.cpp
+++ b/TAO/tao/Fixed_Array_Argument_T.cpp
@@ -11,12 +11,10 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-template<typename S,
-         typename S_slice,
-         typename S_forany,
+template<typename S_forany,
          typename Insert_Policy>
 CORBA::Boolean
-TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::marshal (
+TAO::In_Fixed_Array_Argument_T<S_forany,Insert_Policy>::marshal (
     TAO_OutputCDR & cdr
   )
 {
@@ -25,12 +23,10 @@ TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::marshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S,
-         typename S_slice,
-         typename S_forany,
+template<typename S_forany,
          typename Insert_Policy>
 void
-TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::
+TAO::In_Fixed_Array_Argument_T<S_forany,Insert_Policy>::
   interceptor_value (CORBA::Any *any) const
 {
   this->Insert_Policy::any_insert (any, this->x_);
@@ -40,24 +36,20 @@ TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::
 
 // ===========================================================
 
-template<typename S,
-         typename S_slice,
-         typename S_forany,
+template<typename S_forany,
          typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::marshal (
+TAO::Inout_Fixed_Array_Argument_T<S_forany,Insert_Policy>::marshal (
     TAO_OutputCDR & cdr
   )
 {
   return cdr << this->x_;
 }
 
-template<typename S,
-         typename S_slice,
-         typename S_forany,
+template<typename S_forany,
          typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::demarshal (
+TAO::Inout_Fixed_Array_Argument_T<S_forany,Insert_Policy>::demarshal (
     TAO_InputCDR & cdr
   )
 {
@@ -66,12 +58,10 @@ TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::demarshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S,
-         typename S_slice,
-         typename S_forany,
+template<typename S_forany,
          typename Insert_Policy>
 void
-TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::
+TAO::Inout_Fixed_Array_Argument_T<S_forany,Insert_Policy>::
   interceptor_value (CORBA::Any *any) const
 {
   this->Insert_Policy::any_insert (any, this->x_);
@@ -81,12 +71,10 @@ TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::
 
 // ==============================================================
 
-template<typename S,
-         typename S_slice,
-         typename S_forany,
+template<typename S_forany,
          typename Insert_Policy>
 CORBA::Boolean
-TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::demarshal (
+TAO::Out_Fixed_Array_Argument_T<S_forany,Insert_Policy>::demarshal (
     TAO_InputCDR & cdr)
 {
   return cdr >> this->x_;
@@ -94,12 +82,10 @@ TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::demarshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S,
-         typename S_slice,
-         typename S_forany,
+template<typename S_forany,
          typename Insert_Policy>
 void
-TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::
+TAO::Out_Fixed_Array_Argument_T<S_forany,Insert_Policy>::
   interceptor_value (CORBA::Any *any) const
 {
   this->Insert_Policy::any_insert (any, this->x_);
@@ -109,21 +95,18 @@ TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::
 
 // ============================================================
 
-template<typename S,
-         typename S_slice,
-         typename S_var,
+template<typename S_var,
          typename S_forany,
-         typename S_tag,
          typename Insert_Policy>
 CORBA::Boolean
-TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag,Insert_Policy>::
+TAO::Ret_Fixed_Array_Argument_T<S_var,S_forany,Insert_Policy>::
   demarshal (TAO_InputCDR & cdr)
 {
-  typedef TAO::Array_Traits<S,S_slice,S_tag> ARRAY_TRAITS;
-  S_slice * tmp_ptr = 0;
+  typedef TAO::Array_Traits<S_forany> ARRAY_TRAITS;
+  typename S_forany::_slice_type * tmp_ptr = 0;
   ACE_ALLOCATOR_RETURN (tmp_ptr,
                         ARRAY_TRAITS::alloc (),
-                        0);
+                        false);
   this->x_ = tmp_ptr;
   S_forany tmp (this->x_.ptr ());
   return cdr >> tmp;
@@ -131,14 +114,11 @@ TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag,Insert_Policy>::
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S,
-         typename S_slice,
-         typename S_var,
+template<typename S_var,
          typename S_forany,
-         typename S_tag,
          typename Insert_Policy>
 void
-TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag,Insert_Policy>::
+TAO::Ret_Fixed_Array_Argument_T<S_var,S_forany,Insert_Policy>::
 interceptor_value (CORBA::Any *any) const
 {
   this->Insert_Policy::any_insert (any, S_forany (this->x_.ptr ()));