diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2004-06-02 07:42:55 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2004-06-02 07:42:55 +0000 |
| commit | 53174cfe5b3eb4738cbfe2bcb50e6378ce929528 (patch) | |
| tree | a6f606f665eb934ec0191b1536b40897a1607543 /TAO/tao | |
| parent | c91cf4730938d9f0cf99768e3092794e5c968120 (diff) | |
| download | ATCD-53174cfe5b3eb4738cbfe2bcb50e6378ce929528.tar.gz | |
ChangeLogTag:Wed Jun 2 00:37:17 2004 Ossama Othman <ossama@dre.vanderbilt.edu>
Diffstat (limited to 'TAO/tao')
| -rw-r--r-- | TAO/tao/Any_Array_Impl_T.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/Var_Array_Argument_T.inl | 49 | ||||
| -rw-r--r-- | TAO/tao/append.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/default_server.cpp | 2 |
4 files changed, 28 insertions, 29 deletions
diff --git a/TAO/tao/Any_Array_Impl_T.cpp b/TAO/tao/Any_Array_Impl_T.cpp index fadc63d4691..5b966c0bc54 100644 --- a/TAO/tao/Any_Array_Impl_T.cpp +++ b/TAO/tao/Any_Array_Impl_T.cpp @@ -109,8 +109,8 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any, mb->rd_ptr () - mb->base (), mb->wr_ptr () - mb->base (), impl->_tao_byte_order (), - TAO_DEF_GIOP_MAJOR, - TAO_DEF_GIOP_MINOR); + TAO_DEF_GIOP_MAJOR, + TAO_DEF_GIOP_MINOR); impl->assign_translator (any_tc, &cdr diff --git a/TAO/tao/Var_Array_Argument_T.inl b/TAO/tao/Var_Array_Argument_T.inl index a5f1521a87f..bc1c0bf0f45 100644 --- a/TAO/tao/Var_Array_Argument_T.inl +++ b/TAO/tao/Var_Array_Argument_T.inl @@ -36,10 +36,10 @@ TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany>::arg (void) // ========================================================================== -template<typename S, - typename S_slice, - typename S_var, - typename S_out, +template<typename S, + typename S_slice, + typename S_var, + typename S_out, typename S_forany, typename S_tag> ACE_INLINE @@ -49,10 +49,10 @@ Out_Var_Array_Argument_T (S_out x) { } -template<typename S, - typename S_slice, - typename S_var, - typename S_out, +template<typename S, + typename S_slice, + typename S_var, + typename S_out, typename S_forany, typename S_tag> ACE_INLINE @@ -64,20 +64,20 @@ TAO::Out_Var_Array_Argument_T<S,S_slice,S_var,S_out,S_forany,S_tag>::arg (void) // ========================================================================== -template<typename S, - typename S_slice, - typename S_var, - typename S_forany, +template<typename S, + typename S_slice, + typename S_var, + typename S_forany, typename S_tag> ACE_INLINE TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>:: Ret_Var_Array_Argument_T (void) {} -template<typename S, - typename S_slice, - typename S_var, - typename S_forany, +template<typename S, + typename S_slice, + typename S_var, + typename S_forany, typename S_tag> ACE_INLINE S_slice *& @@ -86,10 +86,10 @@ TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::arg (void) return this->x_.out (); } -template<typename S, - typename S_slice, - typename S_var, - typename S_forany, +template<typename S, + typename S_slice, + typename S_var, + typename S_forany, typename S_tag> ACE_INLINE S_slice * @@ -98,10 +98,10 @@ TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::excp (void) return this->x_.ptr (); } -template<typename S, - typename S_slice, - typename S_var, - typename S_forany, +template<typename S, + typename S_slice, + typename S_var, + typename S_forany, typename S_tag> ACE_INLINE S_slice * @@ -109,4 +109,3 @@ TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::retn (void) { return this->x_._retn (); } - diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp index 96ee1c2cc71..d33f4429ccd 100644 --- a/TAO/tao/append.cpp +++ b/TAO/tao/append.cpp @@ -1147,7 +1147,7 @@ TAO_Marshal_Except::append (CORBA::TypeCode_ptr tc, continue_append = dest->append_string (*src); // Number of fields in the struct. - const CORBA::ULong int member_count = + const CORBA::ULong member_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); diff --git a/TAO/tao/default_server.cpp b/TAO/tao/default_server.cpp index f0773d51b0b..500fdda3388 100644 --- a/TAO/tao/default_server.cpp +++ b/TAO/tao/default_server.cpp @@ -176,7 +176,7 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (argv[curarg], ACE_LIB_TEXT("-ORBPOAMapSize")) == 0) { - ++curarg; + ++curarg; if (curarg < argc) this->active_object_map_creation_parameters_.poa_map_size_ = ACE_OS::strtoul (argv[curarg], |