diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2004-06-02 07:38:06 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2004-06-02 07:38:06 +0000 |
| commit | 2f07894e38530ebc50073fc738c6f38f428cb9d4 (patch) | |
| tree | 5d66542032fa0d8a6e6477f5044d305055fced07 | |
| parent | 26aef7fbb583ca26865956ce365312e536ea4997 (diff) | |
| download | ATCD-2f07894e38530ebc50073fc738c6f38f428cb9d4.tar.gz | |
ChangeLogTag:Wed Jun 2 00:37:17 2004 Ossama Othman <ossama@dre.vanderbilt.edu>
70 files changed, 1052 insertions, 983 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 2a14b2d9e97..cb025f13180 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,109 @@ +Wed Jun 2 00:04:14 2004 Ossama Othman <ossama@dre.vanderbilt.edu> + + * TAO/tao/Acceptor_Registry.cpp: + * TAO/tao/Any.cpp: + * TAO/tao/Any_Array_Impl_T.cpp: + * TAO/tao/Any_Basic_Impl_T.cpp: + * TAO/tao/Any_Dual_Impl_T.cpp: + * TAO/tao/Any_Impl.cpp: + * TAO/tao/Any_Impl_T.cpp: + * TAO/tao/Any_Special_Impl_T.cpp: + * TAO/tao/Any_SystemException.cpp: + * TAO/tao/Array_VarOut_T.cpp: + * TAO/tao/Array_VarOut_T.inl: + * TAO/tao/Base_Transport_Property.cpp: + * TAO/tao/CDR.i: + * TAO/tao/CDR_Encaps_Codec.cpp: + * TAO/tao/CORBALOC_Parser.cpp: + * TAO/tao/CORBA_String.cpp: + * TAO/tao/ClientRequestInfo_i.cpp: + * TAO/tao/Fixed_Array_Argument_T.inl: + * TAO/tao/GIOP_Message_Generator_Parser_10.cpp: + * TAO/tao/GIOP_Message_Generator_Parser_12.cpp: + * TAO/tao/GIOP_Message_State.cpp: + * TAO/tao/IIOP_Connection_Handler.cpp: + * TAO/tao/IIOP_Connector.cpp: + * TAO/tao/IIOP_Endpoint.cpp: + * TAO/tao/IIOP_Profile.cpp: + * TAO/tao/Invocation_Base.cpp: + * TAO/tao/LocalObject.cpp: + * TAO/tao/MCAST_Parser.cpp: + * TAO/tao/NVList.i: + * TAO/tao/ORB_Core.cpp: + * TAO/tao/ORB_Table.cpp: + * TAO/tao/Object.cpp: + * TAO/tao/Object_Ref_Table.cpp: + * TAO/tao/ParameterMode.cpp: + * TAO/tao/Sequence.i: + * TAO/tao/Sequence_T.i: + * TAO/tao/Service_Context.cpp: + * TAO/tao/Sync_Strategies.cpp: + * TAO/tao/Tagged_Components.cpp: + * TAO/tao/Tagged_Profile.i: + * TAO/tao/TimeBaseC.cpp: + * TAO/tao/Transport.cpp: + * TAO/tao/Transport_Connector.cpp: + * TAO/tao/Var_Array_Argument_T.inl: + * TAO/tao/orbconf.h: + * TAO/tao/target_specification.i: + + Converted all ACE cast macro calls to their ANSI C++ cast + counterparts. + + * TAO/tao/Array_VarOut_T.h (nocopy_): + + Made this attribute "const." Its value never changes. + + * TAO/tao/Asynch_Queued_Message.cpp: + * TAO/tao/Codeset_Manager.cpp: + * TAO/tao/Exception.cpp: + * TAO/tao/IIOP_Transport.cpp: + * TAO/tao/Incoming_Message_Queue.cpp: + * TAO/tao/ORB.cpp: + * TAO/tao/Object_KeyC.cpp: + * TAO/tao/Synch_Queued_Message.cpp: + * TAO/tao/Transport_Cache_Manager.cpp: + * TAO/tao/UTF16_BOM_Translator.cpp: + * TAO/tao/append.cpp: + * TAO/tao/skip.cpp: + + Converted all ACE cast macro calls to their ANSI C++ cast + counterparts. + + Use prefix {in,dec}rement operators where applicable instead of + postfix operators. The former are more efficient. + + * TAO/tao/CORBA_String.h (operator CORBA::WChar *): + * TAO/tao/CORBA_String.inl (operator CORBA::WChar *): + + Corrected this conversion operator. The latest C++ mapping + requires that the conversion return "CORBA::WChar *&" instead. + + * TAO/tao/GIOPC.h: + + No need to include "tao/Any.h". + + * TAO/tao/PortableInterceptorC.h: + + No need to include "tao/Any.h", nor "tao/PolicyC.h". Include + the much lighterweight "tao/Policy_ForwardC.h" instead. + + * TAO/tao/Var_Array_Argument_T.cpp: + + Nuked trailing whitespace. + + * TAO/tao/default_resource.cpp: + * TAO/tao/default_server.cpp: + + Use prefix {in,dec}rement operators where applicable instead of + postfix operators. The former are more efficient. + + * TAO/tao/Messaging/Asynch_Invocation.cpp: + * TAO/tao/Messaging/Asynch_Timeout_Handler.cpp: + * TAO/tao/Messaging/Messaging_PolicyFactory.cpp: + + Corrected ACE_RCSID macro arguments. "tao" -> "Messaging". + Tue Jun 1 23:20:18 2004 Ossama Othman <ossama@dre.vanderbilt.edu> * docs/interceptors.html: diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp index 91ed7f91dc4..f78488bafc8 100644 --- a/TAO/tao/Acceptor_Registry.cpp +++ b/TAO/tao/Acceptor_Registry.cpp @@ -71,7 +71,7 @@ TAO_Acceptor_Registry::is_collocated (const TAO_MProfile &mprofile) // @@ We need to invoke a nonconst <endpoint> method on // <profile>. The content of profile/endpoint will not // be modified. - TAO_Profile *pf = ACE_const_cast (TAO_Profile *, profile); + TAO_Profile *pf = const_cast<TAO_Profile *> (profile); // Check all endpoints for address equality. if ((*i)->tag () == pf->tag ()) @@ -467,8 +467,7 @@ TAO_Acceptor_Registry::extract_endpoint_options (ACE_CString &addrs, const int options_index = addrs.find (factory->options_delimiter ()); - if (options_index == ACE_static_cast (int, - addrs.length () - 1)) + if (options_index == static_cast<int> (addrs.length () - 1)) { // Get rid of trailing option delimiter. addrs = addrs.substring (0, addrs.length () - 1); diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp index 888cfb82d3f..1ff27056605 100644 --- a/TAO/tao/Any.cpp +++ b/TAO/tao/Any.cpp @@ -170,7 +170,7 @@ CORBA::Any::type (CORBA::TypeCode_ptr tc void CORBA::Any::_tao_any_destructor (void *x) { - CORBA::Any *tmp = ACE_static_cast (CORBA::Any *, x); + CORBA::Any *tmp = static_cast<CORBA::Any *> (x); delete tmp; } diff --git a/TAO/tao/Any_Array_Impl_T.cpp b/TAO/tao/Any_Array_Impl_T.cpp index 39674ab6cf5..fadc63d4691 100644 --- a/TAO/tao/Any_Array_Impl_T.cpp +++ b/TAO/tao/Any_Array_Impl_T.cpp @@ -122,7 +122,7 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any, if (result == 1) { _tao_elem = reinterpret_cast <const T_slice*> (replacement->value_); - ACE_const_cast (CORBA::Any &, any).replace (replacement); + const_cast<CORBA::Any &> (any).replace (replacement); replacement_safety.release (); return 1; } @@ -164,4 +164,3 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::_tao_decode (TAO_InputCDR &cdr } #endif /* TAO_ANY_ARRAY_IMPL_T_C */ - diff --git a/TAO/tao/Any_Basic_Impl_T.cpp b/TAO/tao/Any_Basic_Impl_T.cpp index a807c4da176..adb1b4d0dcf 100644 --- a/TAO/tao/Any_Basic_Impl_T.cpp +++ b/TAO/tao/Any_Basic_Impl_T.cpp @@ -103,7 +103,7 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any, if (result == 1) { _tao_elem = replacement->value_; - ACE_const_cast (CORBA::Any &, any).replace (replacement); + const_cast<CORBA::Any &> (any).replace (replacement); replacement_safety.release (); return 1; } @@ -126,7 +126,7 @@ TAO::Any_Basic_Impl_T<T>::create_empty (CORBA::TypeCode_ptr tc) TAO::Any_Basic_Impl_T<T> * retval = 0; ACE_NEW_RETURN (retval, TAO::Any_Basic_Impl_T<T> (tc, - ACE_static_cast (T, 0)), + static_cast<T> (0)), 0); return retval; } diff --git a/TAO/tao/Any_Dual_Impl_T.cpp b/TAO/tao/Any_Dual_Impl_T.cpp index 618c22efa29..57e1928f960 100644 --- a/TAO/tao/Any_Dual_Impl_T.cpp +++ b/TAO/tao/Any_Dual_Impl_T.cpp @@ -163,7 +163,7 @@ TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any, if (result == 1) { _tao_elem = replacement->value_; - ACE_const_cast (CORBA::Any &, any).replace (replacement); + const_cast<CORBA::Any &> (any).replace (replacement); replacement_safety.release (); return 1; } diff --git a/TAO/tao/Any_Impl.cpp b/TAO/tao/Any_Impl.cpp index 4effc47f08f..bf1ba96f614 100644 --- a/TAO/tao/Any_Impl.cpp +++ b/TAO/tao/Any_Impl.cpp @@ -85,14 +85,14 @@ TAO::Any_Impl::_tao_byte_order (void) const void TAO::Any_Impl::_tao_any_string_destructor (void *x) { - char *tmp = ACE_static_cast (char *, x); + char *tmp = static_cast<char *> (x); CORBA::string_free (tmp); } void TAO::Any_Impl::_tao_any_wstring_destructor (void *x) { - CORBA::WChar *tmp = ACE_static_cast (CORBA::WChar *, x); + CORBA::WChar *tmp = static_cast<CORBA::WChar *> (x); CORBA::wstring_free (tmp); } diff --git a/TAO/tao/Any_Impl_T.cpp b/TAO/tao/Any_Impl_T.cpp index 79488f41411..9c0f2b18110 100644 --- a/TAO/tao/Any_Impl_T.cpp +++ b/TAO/tao/Any_Impl_T.cpp @@ -118,8 +118,8 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any, if (result == 1) { - _tao_elem = ACE_const_cast (T *, replacement->value_); - ACE_const_cast (CORBA::Any &, any).replace (replacement); + _tao_elem = const_cast<T *> (replacement->value_); + const_cast<CORBA::Any &> (any).replace (replacement); replacement_safety.release (); return 1; } diff --git a/TAO/tao/Any_Special_Impl_T.cpp b/TAO/tao/Any_Special_Impl_T.cpp index 479f6280704..0255682cc26 100644 --- a/TAO/tao/Any_Special_Impl_T.cpp +++ b/TAO/tao/Any_Special_Impl_T.cpp @@ -51,12 +51,11 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::insert (CORBA::Any & any, if (bound > 0) { - CORBA::TCKind kind = ACE_static_cast (CORBA::TCKind, - tc->kind_); + CORBA::TCKind kind = static_cast<CORBA::TCKind> (tc->kind_); static CORBA::Long _oc_buffer [] = { TAO_ENCAP_BYTE_ORDER, - ACE_static_cast (CORBA::Long, bound) + static_cast<CORBA::Long> (bound) }; ACE_NEW (bounded_tc, @@ -171,7 +170,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any, if (result == 1) { _tao_elem = replacement->value_; - ACE_const_cast (CORBA::Any &, any).replace (replacement); + const_cast<CORBA::Any &> (any).replace (replacement); replacement_safety.release (); return 1; } diff --git a/TAO/tao/Any_SystemException.cpp b/TAO/tao/Any_SystemException.cpp index 5321e8fb8cc..b398583f18c 100644 --- a/TAO/tao/Any_SystemException.cpp +++ b/TAO/tao/Any_SystemException.cpp @@ -142,7 +142,7 @@ TAO::Any_SystemException::extract (const CORBA::Any & any, if (result == 1) { _tao_elem = replacement->value_; - ACE_const_cast (CORBA::Any &, any).replace (replacement); + const_cast<CORBA::Any &> (any).replace (replacement); replacement_safety.release (); return 1; } diff --git a/TAO/tao/Array_VarOut_T.cpp b/TAO/tao/Array_VarOut_T.cpp index e6dc273dde9..a2a49674086 100644 --- a/TAO/tao/Array_VarOut_T.cpp +++ b/TAO/tao/Array_VarOut_T.cpp @@ -9,8 +9,8 @@ #include "tao/Array_VarOut_T.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - Array_VarOut_T, +ACE_RCSID (tao, + Array_VarOut_T, "$Id$") template<typename T, typename T_slice, typename TAG> @@ -24,7 +24,7 @@ TAO_FixedArray_Var_T<T,T_slice,TAG>::operator= (T_slice * p) TAO::Array_Traits<T,T_slice,TAG>::tao_free (this->ptr_); this->ptr_ = p; } - + return *this; } @@ -37,11 +37,11 @@ TAO_FixedArray_Var_T<T,T_slice,TAG>::operator= ( if (this != &p) { TAO::Array_Traits<T,T_slice,TAG>::tao_free (this->ptr_); - + // Deep copy. this->ptr_ = TAO::Array_Traits<T,T_slice,TAG>::tao_dup (p.in ()); } - + return *this; } @@ -58,7 +58,7 @@ TAO_VarArray_Var_T<T,T_slice,TAG>::operator= (T_slice * p) TAO::Array_Traits<T,T_slice,TAG>::tao_free (this->ptr_); this->ptr_ = p; } - + return *this; } @@ -71,11 +71,11 @@ TAO_VarArray_Var_T<T,T_slice,TAG>::operator= ( if (this != &p) { TAO::Array_Traits<T,T_slice,TAG>::tao_free (this->ptr_); - + // Deep copy. this->ptr_ = TAO::Array_Traits<T,T_slice,TAG>::tao_dup (p.in ()); } - + return *this; } @@ -87,7 +87,7 @@ TAO_Array_Forany_T<T,T_slice,TAG>::_tao_any_destructor ( void * _tao_void_pointer ) { - T_slice * tmp = ACE_static_cast (T_slice *, _tao_void_pointer); + T_slice * tmp = static_cast<T_slice *> (_tao_void_pointer); TAO::Array_Traits<T,T_slice,TAG>::tao_free (tmp); } diff --git a/TAO/tao/Array_VarOut_T.h b/TAO/tao/Array_VarOut_T.h index ee495f345c4..c55e07de677 100644 --- a/TAO/tao/Array_VarOut_T.h +++ b/TAO/tao/Array_VarOut_T.h @@ -191,7 +191,7 @@ public: static T_slice * tao_alloc (void); private: T_slice * ptr_; - CORBA::Boolean nocopy_; + const CORBA::Boolean nocopy_; }; #if defined (__ACE_INLINE__) diff --git a/TAO/tao/Array_VarOut_T.inl b/TAO/tao/Array_VarOut_T.inl index ebee9b3b180..a99de0d8c2b 100644 --- a/TAO/tao/Array_VarOut_T.inl +++ b/TAO/tao/Array_VarOut_T.inl @@ -1,3 +1,5 @@ +// -*- C++ -*- +// //$Id$ template<typename T, typename T_slice, typename TAG> ACE_INLINE @@ -167,7 +169,7 @@ ACE_INLINE TAO_Array_Out_T<T,T_var,T_slice,TAG>::TAO_Array_Out_T ( const TAO_Array_Out_T<T,T_var,T_slice,TAG> & p ) - : ptr_ (ACE_const_cast (THIS_OUT_TYPE &, p).ptr_) + : ptr_ (const_cast<THIS_OUT_TYPE &> (p).ptr_) {} template<typename T, typename T_var, typename T_slice, typename TAG> @@ -177,7 +179,7 @@ TAO_Array_Out_T<T,T_var,T_slice,TAG>::operator= ( const TAO_Array_Out_T<T,T_var,T_slice,TAG> & p ) { - this->ptr_ = ACE_const_cast (THIS_OUT_TYPE &, p).ptr_; + this->ptr_ = const_cast<THIS_OUT_TYPE &> (p).ptr_; return *this; } @@ -237,9 +239,9 @@ ACE_INLINE TAO_Array_Forany_T<T,T_slice,TAG>::TAO_Array_Forany_T ( const TAO_Array_Forany_T<T,T_slice,TAG> & p ) + : ptr_ (p.ptr_), + nocopy_ (p.nocopy_) { - this->ptr_ = p.ptr_; - this->nocopy_ = p.nocopy_; } template<typename T, typename T_slice, typename TAG> @@ -289,10 +291,7 @@ const T_slice & TAO_Array_Forany_T<T,T_slice,TAG>::operator[] (CORBA::ULong index) const { #if defined (ACE_HAS_BROKEN_IMPLICIT_CONST_CAST) - return ACE_const_cast ( - const T_slice &, - this->ptr_[index] - ); + return const_cast<const T_slice &> (this->ptr_[index]); #else const T_slice & tmp = this->ptr_[index]; return tmp; @@ -314,8 +313,7 @@ TAO_Array_Forany_T<T,T_slice,TAG>::in (void) const { // @@@ (JP) This looks scary I know but it helps MSVC understand // things better when the array is multi-dimensional. - return ACE_const_cast (const T_slice *, - this->ptr_); + return const_cast<const T_slice *> (this->ptr_); } template<typename T, typename T_slice, typename TAG> diff --git a/TAO/tao/Asynch_Queued_Message.cpp b/TAO/tao/Asynch_Queued_Message.cpp index 1b19cf6ecdd..daf6c0fd264 100644 --- a/TAO/tao/Asynch_Queued_Message.cpp +++ b/TAO/tao/Asynch_Queued_Message.cpp @@ -74,9 +74,8 @@ TAO_Asynch_Queued_Message::fill_iov (int iovcnt_max, ACE_UNUSED_ARG (iovcnt_max); // not used if ACE_ASSERT() is empty iov[iovcnt].iov_base = this->buffer_ + this->offset_; - iov[iovcnt].iov_len = ACE_static_cast (u_long, - this->size_ - this->offset_); - iovcnt++; + iov[iovcnt].iov_len = static_cast<u_long> (this->size_ - this->offset_); + ++iovcnt; } void @@ -124,7 +123,7 @@ TAO_Asynch_Queued_Message::clone (ACE_Allocator *alloc) if (alloc) { ACE_NEW_MALLOC_RETURN (qm, - ACE_static_cast (TAO_Asynch_Queued_Message *, + static_cast<TAO_Asynch_Queued_Message *> ( alloc->malloc (sizeof (TAO_Asynch_Queued_Message))), TAO_Asynch_Queued_Message (buf, sz, diff --git a/TAO/tao/Base_Transport_Property.cpp b/TAO/tao/Base_Transport_Property.cpp index 8895392e0a3..75b3d08349c 100644 --- a/TAO/tao/Base_Transport_Property.cpp +++ b/TAO/tao/Base_Transport_Property.cpp @@ -7,8 +7,8 @@ # include "tao/Base_Transport_Property.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - Base_Transport_Property, +ACE_RCSID (tao, + Base_Transport_Property, "$Id$") TAO_Base_Transport_Property::~TAO_Base_Transport_Property (void) @@ -38,14 +38,8 @@ CORBA::Boolean TAO_Base_Transport_Property::is_equivalent ( const TAO_Transport_Descriptor_Interface *rhs) { - // Do away with const. - TAO_Transport_Descriptor_Interface *r = - ACE_const_cast (TAO_Transport_Descriptor_Interface *, - rhs); - - TAO_Base_Transport_Property *other_desc = - ACE_dynamic_cast (TAO_Base_Transport_Property *, - r); + const TAO_Base_Transport_Property *other_desc = + dynamic_cast<const TAO_Base_Transport_Property *> (rhs); if (other_desc == 0) return 0; diff --git a/TAO/tao/CDR.i b/TAO/tao/CDR.i index 6c7a400ff3d..1d14f037f1d 100644 --- a/TAO/tao/CDR.i +++ b/TAO/tao/CDR.i @@ -1,4 +1,5 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- +// // $Id$ ACE_INLINE @@ -139,67 +140,67 @@ TAO_InputCDR::orb_core (void) const ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, CORBA::Short x) { - return ACE_static_cast (ACE_OutputCDR &, os) << x; + return static_cast<ACE_OutputCDR &> (os) << x; } ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, CORBA::UShort x) { - return ACE_static_cast (ACE_OutputCDR &, os) << x; + return static_cast<ACE_OutputCDR &> (os) << x; } ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, CORBA::Long x) { - return ACE_static_cast (ACE_OutputCDR &, os) << x; + return static_cast<ACE_OutputCDR &> (os) << x; } ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, CORBA::ULong x) { - return ACE_static_cast (ACE_OutputCDR &, os) << x; + return static_cast<ACE_OutputCDR &> (os) << x; } ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, CORBA::LongLong x) { - return ACE_static_cast (ACE_OutputCDR &, os) << x; + return static_cast<ACE_OutputCDR &> (os) << x; } ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, CORBA::ULongLong x) { - return ACE_static_cast (ACE_OutputCDR &, os) << x; + return static_cast<ACE_OutputCDR &> (os) << x; } ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR& os, CORBA::LongDouble x) { - return ACE_static_cast (ACE_OutputCDR &, os) << x; + return static_cast<ACE_OutputCDR &> (os) << x; } ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, CORBA::Float x) { - return ACE_static_cast (ACE_OutputCDR &, os) << x; + return static_cast<ACE_OutputCDR &> (os) << x; } ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, CORBA::Double x) { - return ACE_static_cast (ACE_OutputCDR &, os) << x; + return static_cast<ACE_OutputCDR &> (os) << x; } ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, const CORBA::Char* x) { - return ACE_static_cast (ACE_OutputCDR &, os) << x; + return static_cast<ACE_OutputCDR &> (os) << x; } ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, const CORBA::WChar* x) { - return ACE_static_cast (ACE_OutputCDR &, os) << x; + return static_cast<ACE_OutputCDR &> (os) << x; } // **************************************************************** @@ -207,66 +208,65 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is, CORBA::Short &x) { - return ACE_static_cast (ACE_InputCDR &, is) >> x; + return static_cast<ACE_InputCDR &> (is) >> x; } ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is, CORBA::UShort &x) { - return ACE_static_cast (ACE_InputCDR &, is) >> x; + return static_cast<ACE_InputCDR &> (is) >> x; } ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is, CORBA::Long &x) { - return ACE_static_cast(ACE_InputCDR&,is) >> x; + return static_cast<ACE_InputCDR&> (is) >> x; } ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is, CORBA::ULong &x) { - return ACE_static_cast (ACE_InputCDR &, is) >> x; + return static_cast<ACE_InputCDR &> (is) >> x; } ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is, CORBA::LongLong &x) { - return ACE_static_cast (ACE_InputCDR &, is) >> x; + return static_cast<ACE_InputCDR &> (is) >> x; } ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is, CORBA::ULongLong &x) { - return ACE_static_cast (ACE_InputCDR &, is) >> x; + return static_cast<ACE_InputCDR &> (is) >> x; } ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is, CORBA::LongDouble &x) { - return ACE_static_cast (ACE_InputCDR &, is) >> x; + return static_cast<ACE_InputCDR &> (is) >> x; } ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is, CORBA::Float &x) { - return ACE_static_cast (ACE_InputCDR &, is) >> x; + return static_cast<ACE_InputCDR &> (is) >> x; } ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is, CORBA::Double &x) { - return ACE_static_cast (ACE_InputCDR &, is) >> x; + return static_cast<ACE_InputCDR &> (is) >> x; } ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is, CORBA::Char* &x) { - return ACE_static_cast (ACE_InputCDR &, is) >> x; + return static_cast<ACE_InputCDR &> (is) >> x; } ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is, CORBA::WChar* &x) { - return ACE_static_cast (ACE_InputCDR &, is) >> x; + return static_cast<ACE_InputCDR &> (is) >> x; } - diff --git a/TAO/tao/CDR_Encaps_Codec.cpp b/TAO/tao/CDR_Encaps_Codec.cpp index c76e10f576a..c5c604c8f37 100644 --- a/TAO/tao/CDR_Encaps_Codec.cpp +++ b/TAO/tao/CDR_Encaps_Codec.cpp @@ -69,7 +69,7 @@ TAO_CDR_Encaps_Codec::encode (const CORBA::Any & data CORBA::OctetSeq_var safe_octet_seq = octet_seq; - octet_seq->length (ACE_static_cast (CORBA::ULong, cdr.total_length ())); + octet_seq->length (static_cast<CORBA::ULong> (cdr.total_length ())); CORBA::Octet *buf = octet_seq->get_buffer (); for (const ACE_Message_Block *i = cdr.begin (); @@ -121,7 +121,7 @@ TAO_CDR_Encaps_Codec::decode (const CORBA::OctetSeq & data CORBA::Boolean byte_order; if (cdr >> TAO_InputCDR::to_boolean (byte_order)) { - cdr.reset_byte_order (ACE_static_cast (int, byte_order)); + cdr.reset_byte_order (static_cast<int> (byte_order)); CORBA::Any * any = 0; ACE_NEW_THROW_EX (any, @@ -210,7 +210,7 @@ TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data CORBA::OctetSeq_var safe_octet_seq = octet_seq; - octet_seq->length (ACE_static_cast (CORBA::ULong, cdr.total_length ())); + octet_seq->length (static_cast<CORBA::ULong> (cdr.total_length ())); CORBA::Octet *buf = octet_seq->get_buffer (); for (const ACE_Message_Block *i = cdr.begin (); @@ -283,7 +283,7 @@ TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data, if (cdr >> TAO_InputCDR::to_boolean (byte_order)) { - cdr.reset_byte_order (ACE_static_cast (int, byte_order)); + cdr.reset_byte_order (static_cast<int> (byte_order)); // @@ (JP) The following code depends on the fact that // TAO_InputCDR does not contain chained message blocks, diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp index 4d9081eb03f..89209b05011 100644 --- a/TAO/tao/CORBALOC_Parser.cpp +++ b/TAO/tao/CORBALOC_Parser.cpp @@ -123,7 +123,7 @@ TAO_CORBALOC_Parser::assign_key_string (char *& cloc_name_ptr, + 1 // Object key separator + 3 // "://" + sizeof (def_port) - 1 - + ACE_static_cast (CORBA::ULong, + + static_cast<CORBA::ULong> ( key_string.length ())); // Copy the default <iiop> prefix. @@ -145,7 +145,7 @@ TAO_CORBALOC_Parser::assign_key_string (char *& cloc_name_ptr, + 1 // Object key separator + 3 // "://" + sizeof (def_port) - 1 - + ACE_static_cast (CORBA::ULong, + + static_cast<CORBA::ULong> ( key_string.length ())); ACE_CString prot_name = cloc_name_cstring.substring (0, @@ -231,14 +231,14 @@ TAO_CORBALOC_Parser::parse_string_assign_helper ( char *last_addr = 0; cloc_name_ptr = - ACE_OS::strtok_r (ACE_const_cast (char *, cloc_name.c_str ()), + ACE_OS::strtok_r (const_cast<char *> (cloc_name.c_str ()), ",", &last_addr); CORBA::ULong length; while (cloc_name_ptr != 0) { - length = ACE_static_cast (CORBA::ULong, ACE_OS::strlen (cloc_name_ptr)); + length = static_cast<CORBA::ULong> (ACE_OS::strlen (cloc_name_ptr)); // Forms the endpoint and calls the mprofile_helper. this->assign_key_string (cloc_name_ptr, key_string, diff --git a/TAO/tao/CORBA_String.cpp b/TAO/tao/CORBA_String.cpp index 3cbbeff6ec6..4e1858ca54a 100644 --- a/TAO/tao/CORBA_String.cpp +++ b/TAO/tao/CORBA_String.cpp @@ -28,7 +28,7 @@ CORBA::string_dup (const char *str) size_t len = ACE_OS::strlen (str); // This allocates an extra byte for the '\0'; - char * copy = CORBA::string_alloc (ACE_static_cast (CORBA::ULong, len)); + char * copy = CORBA::string_alloc (static_cast<CORBA::ULong> (len)); // The memcpy() below assumes that the destination is a valid buffer. if (copy == 0) @@ -297,7 +297,7 @@ operator>> (istream &is, CORBA::WString_var &wsv) // Unformatted input is used to work around overloaded // extraction operator (>>) ambiguities on some platforms. - is.read (ACE_reinterpret_cast (char *, &wc), sizeof (wc)); + is.read (reinterpret_cast<char *> (&wc), sizeof (wc)); wsv[i] = wc; } @@ -336,7 +336,7 @@ operator>> (istream &is, CORBA::WString_out &wso) // Unformatted input is used to work around overloaded // extraction operator (>>) ambiguities on some platforms. - is.read (ACE_reinterpret_cast (char *, &wc), sizeof (wc)); + is.read (reinterpret_cast<char *> (&wc), sizeof (wc)); wso.ptr ()[i] = wc; } diff --git a/TAO/tao/CORBA_String.h b/TAO/tao/CORBA_String.h index 46b926a0d4a..50e3564e806 100644 --- a/TAO/tao/CORBA_String.h +++ b/TAO/tao/CORBA_String.h @@ -208,7 +208,7 @@ namespace CORBA WString_var &operator= (const WString_var &s); /// access and modify. - operator CORBA::WChar *(); + operator CORBA::WChar *&(); /// only read privileges. operator const CORBA::WChar *() const; diff --git a/TAO/tao/CORBA_String.inl b/TAO/tao/CORBA_String.inl index 4212f2cd565..af595f91619 100644 --- a/TAO/tao/CORBA_String.inl +++ b/TAO/tao/CORBA_String.inl @@ -168,7 +168,7 @@ CORBA::WString_var::operator[] (CORBA::ULong slot) const } ACE_INLINE -CORBA::WString_var::operator CORBA::WChar *() +CORBA::WString_var::operator CORBA::WChar *&() { return this->ptr_; } diff --git a/TAO/tao/ClientRequestInfo_i.cpp b/TAO/tao/ClientRequestInfo_i.cpp index f54a8290bd5..a74aee08e15 100644 --- a/TAO/tao/ClientRequestInfo_i.cpp +++ b/TAO/tao/ClientRequestInfo_i.cpp @@ -404,9 +404,9 @@ TAO_ClientRequestInfo_i::request_id (ACE_ENV_SINGLE_ARG_DECL) // 32 bit address if (sizeof (this) == 4) - id = ACE_static_cast (CORBA::ULong, - ACE_reinterpret_cast (ptrdiff_t, - this->invocation_)); + id = + static_cast<CORBA::ULong> ( + reinterpret_cast<ptrdiff_t> (this->invocation_)); // 64 bit address -- bits 8 through 39 (see notes above!) // In this case, we make sure this object is large enough to safely @@ -415,16 +415,14 @@ TAO_ClientRequestInfo_i::request_id (ACE_ENV_SINGLE_ARG_DECL) else if (sizeof (this) == 8 && sizeof (*(this->invocation_)) > 256 /* 2 << 8 */) id = - (ACE_static_cast (CORBA::ULong, - ACE_reinterpret_cast (ptrdiff_t, - this->invocation_)) >> 8) & 0xFFFFFFFFu; + (static_cast<CORBA::ULong> ( + reinterpret_cast<ptrdiff_t> (this->invocation_)) >> 8) & 0xFFFFFFFFu; // 64 bit address -- lower 32 bits else if (sizeof (this) == 8) - id = ACE_static_cast (CORBA::ULong, - ACE_reinterpret_cast (ptrdiff_t, - this->invocation_)) & - 0xFFFFFFFFu; + id = + static_cast<CORBA::ULong> ( + reinterpret_cast<ptrdiff_t> (this->invocation_)) & 0xFFFFFFFFu; // @@ The following request ID generator prevents the // PortableInterceptor::ClientRequestInterceptor::send_request() diff --git a/TAO/tao/Codeset_Manager.cpp b/TAO/tao/Codeset_Manager.cpp index 5d1f4419aaf..6ab711ac37d 100644 --- a/TAO/tao/Codeset_Manager.cpp +++ b/TAO/tao/Codeset_Manager.cpp @@ -168,14 +168,14 @@ TAO_Codeset_Manager::process_service_context (TAO_ServerRequest &request) { // Convert the Service Context to Codeset Context const char *buffer = - ACE_reinterpret_cast (const char*,context.context_data.get_buffer ()); + reinterpret_cast<const char*> (context.context_data.get_buffer ()); TAO_InputCDR cdr (buffer,context.context_data.length ()); CORBA::Boolean byte_order; if (cdr >> TAO_InputCDR::to_boolean (byte_order)) { - cdr.reset_byte_order (ACE_static_cast (int, byte_order)); + cdr.reset_byte_order (static_cast<int> (byte_order)); cdr >> tcs_c; cdr >> tcs_w; } @@ -407,11 +407,11 @@ TAO_Codeset_Manager::init_codeset_factories_i ( TAO_CodesetFactorySetItor iter = factset.begin (); CONV_FRAME::CodeSetId ncs = cs_comp.native_code_set; - cs_comp.conversion_code_sets.length(ACE_static_cast (CORBA::ULong, - factset.size())); + cs_comp.conversion_code_sets.length ( + static_cast<CORBA::ULong> (factset.size())); CORBA::ULong index; - for (index = 0; iter != end; iter++) + for (index = 0; iter != end; ++iter) { const char *name = (*iter)->codeset_name (); TAO_Codeset_Translator_Factory *trans = @@ -486,14 +486,13 @@ TAO_Codeset_Translator_Factory * TAO_Codeset_Manager::get_translator_i (TAO_CodesetFactorySet& factset, CONV_FRAME::CodeSetId tcs) { - TAO_CodesetFactorySetItor end = factset.end (); - TAO_CodesetFactorySetItor iter = factset.begin (); + const TAO_CodesetFactorySetItor end = factset.end (); - for (; iter != end; iter++) + for (TAO_CodesetFactorySetItor iter = factset.begin (); iter != end; ++iter) { TAO_Codeset_Translator_Factory *fact = (*iter)->factory (); - if (fact && tcs == fact->tcs()) + if (fact && tcs == fact->tcs ()) { return fact; } diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp index 2cb030494eb..9d30ac66064 100644 --- a/TAO/tao/Exception.cpp +++ b/TAO/tao/Exception.cpp @@ -31,7 +31,7 @@ #include "ace/OS_NS_stdio.h" -ACE_RCSID (TAO, +ACE_RCSID (tao, Exception, "$Id$") @@ -164,10 +164,10 @@ CORBA::Exception::_tao_print_exception (const char *user_provided_info, FILE *) const { ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT("(%P|%t) EXCEPTION, %s\n") - ACE_LIB_TEXT("%s\n"), - ACE_TEXT_CHAR_TO_TCHAR(user_provided_info), - ACE_TEXT_CHAR_TO_TCHAR(this->_info ().c_str ()))); + ACE_LIB_TEXT ("(%P|%t) EXCEPTION, %s\n") + ACE_LIB_TEXT ("%s\n"), + ACE_TEXT_CHAR_TO_TCHAR (user_provided_info), + ACE_TEXT_CHAR_TO_TCHAR (this->_info ().c_str ()))); } #if defined (ACE_USES_WCHAR) @@ -185,7 +185,7 @@ CORBA::Exception::_tao_print_exception (const ACE_WCHAR_T *info, void CORBA::Exception::_tao_any_destructor (void *x) { - CORBA::Exception *tmp = ACE_static_cast (CORBA::Exception *, x); + CORBA::Exception *tmp = static_cast<CORBA::Exception *> (x); delete tmp; } @@ -249,8 +249,7 @@ CORBA::UserException::_downcast (CORBA::Exception* exception) { if (exception->_is_a ("IDL:omg.org/CORBA/UserException:1.0")) { - return ACE_dynamic_cast (CORBA::UserException *, - exception); + return dynamic_cast<CORBA::UserException *> (exception); } return 0; @@ -261,8 +260,7 @@ CORBA::UserException::_downcast (const CORBA::Exception *exception) { if (exception->_is_a ("IDL:omg.org/CORBA/UserException:1.0")) { - return ACE_dynamic_cast (const CORBA::UserException *, - exception); + return dynamic_cast<const CORBA::UserException *> (exception); } return 0; @@ -350,8 +348,7 @@ CORBA::SystemException::_downcast (CORBA::Exception* exception) { if (exception->_is_a ("IDL:omg.org/CORBA/SystemException:1.0")) { - return ACE_dynamic_cast (CORBA::SystemException *, - exception); + return dynamic_cast<CORBA::SystemException *> (exception); } return 0; @@ -362,8 +359,7 @@ CORBA::SystemException::_downcast (const CORBA::Exception *exception) { if (exception->_is_a ("IDL:omg.org/CORBA/SystemException:1.0")) { - return ACE_dynamic_cast (const CORBA::SystemException *, - exception); + return dynamic_cast<const CORBA::SystemException *> (exception); } return 0; @@ -478,7 +474,7 @@ CORBA::SystemException::_tao_print_system_exception (FILE *) const { ACE_DEBUG ((LM_ERROR, ACE_LIB_TEXT("(%P|%t) system exception, ID '%s'\n"), - ACE_TEXT_CHAR_TO_TCHAR(this->_info ().c_str ()))); + ACE_TEXT_CHAR_TO_TCHAR (this->_info ().c_str ()))); } ACE_CString @@ -639,7 +635,7 @@ CORBA::SystemException::_info (void) const // 7 bits of some other errno. ACE_OS::sprintf (unknown_errno, "low 7 bits of errno: %3u %s", - minor_code, ACE_OS::strerror(minor_code)); + minor_code, ACE_OS::strerror (minor_code)); errno_indication = unknown_errno; } @@ -965,10 +961,10 @@ TAO_Exceptions::make_unknown_user_typecode (CORBA::TypeCode_ptr &tcp TAO_Exceptions::global_allocator_, ACE_DEFAULT_CDR_MEMCPY_TRADEOFF); - const char *interface_id = + static const char * interface_id = "IDL:omg.org/CORBA/UnknownUserException:1.0"; - const char *name = "UnknownUserException"; - const char *field_name = "exception"; + static const char * name = "UnknownUserException"; + static const char * field_name = "exception"; const CORBA::Boolean result = (stream.write_octet (TAO_ENCAP_BYTE_ORDER) == 0 @@ -1039,12 +1035,11 @@ TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr &tcp, // - number of members (2) [4 bytes ] // - foreach member, { name string, typecode } [~40 bytes] - const char prefix[] = "IDL:omg.org/CORBA/"; - const char suffix[] = ":1.0"; + static const char prefix[] = "IDL:omg.org/CORBA/"; + static const char suffix[] = ":1.0"; char * full_id = CORBA::string_alloc (sizeof prefix - + ACE_static_cast (CORBA::ULong, - ACE_OS::strlen (name)) + + static_cast<CORBA::ULong> (ACE_OS::strlen (name)) + sizeof suffix); CORBA::String_var safe_full_id = full_id; @@ -1158,7 +1153,6 @@ TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr &tcp, static CORBA::Long tc_buf_CORBA[TAO_TC_BUF_LEN / sizeof (CORBA::Long)]; -// static CORBA::Long tc_buf_CORBA_ ## name[TAO_TC_BUF_LEN / sizeof (CORBA::Long)]; #define TAO_SYSTEM_EXCEPTION(name) \ CORBA::TypeCode_ptr CORBA::_tc_ ## name = 0; STANDARD_EXCEPTION_LIST @@ -1172,10 +1166,10 @@ static CORBA::Long tc_buf_CORBA[TAO_TC_BUF_LEN / sizeof (CORBA::Long)]; &CORBA::_tc_null}; // Since we add an extra element subtract 1 -static CORBA::ULong array_sz = +static const CORBA::ULong array_sz = (sizeof (type_code_array) / sizeof (CORBA::TypeCode_ptr)) - 1; -static char *repo_id_array [] = { +static const char *repo_id_array [] = { #define TAO_SYSTEM_EXCEPTION(name) \ (char *) "IDL:omg.org/CORBA/" #name ":1.0", STANDARD_EXCEPTION_LIST @@ -1239,9 +1233,7 @@ CORBA::SystemException * TAO_Exceptions::create_system_exception (const char *id ACE_ENV_ARG_DECL_NOT_USED) { - for (CORBA::ULong i = 0; - i < array_sz; - ++i) + for (CORBA::ULong i = 0; i < array_sz; ++i) { if (ACE_OS::strcmp (id, repo_id_array[i]) == 0) return (*(excp_array[i])) (); @@ -1253,9 +1245,7 @@ TAO_Exceptions::create_system_exception (const char *id void TAO_Exceptions::fini (void) { - for (CORBA::ULong i = 0; - i < array_sz; - ++i) + for (CORBA::ULong i = 0; i < array_sz; ++i) { CORBA::release (*type_code_array[i]); *type_code_array[i] = 0; @@ -1273,7 +1263,7 @@ CORBA::name * \ CORBA::name ::_downcast (CORBA::Exception* exception) \ { \ if (exception->_is_a ("IDL:omg.org/CORBA/" #name ":1.0")) \ - return ACE_dynamic_cast (CORBA::name *, exception); \ + return dynamic_cast<CORBA::name *> (exception); \ return 0; \ } @@ -1325,7 +1315,7 @@ STANDARD_EXCEPTION_LIST void \ CORBA::name ::_tao_any_destructor (void *x) \ { \ - CORBA::name *tmp = ACE_static_cast (CORBA::name *, x); \ + CORBA::name *tmp = static_cast<CORBA::name *> (x); \ delete tmp; \ } diff --git a/TAO/tao/Fixed_Array_Argument_T.inl b/TAO/tao/Fixed_Array_Argument_T.inl index b446420b1af..d33c0c3ce7b 100644 --- a/TAO/tao/Fixed_Array_Argument_T.inl +++ b/TAO/tao/Fixed_Array_Argument_T.inl @@ -1,10 +1,12 @@ +// -*- C++ -*- +// // $Id$ template<typename S, typename S_slice, typename S_forany> ACE_INLINE TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany>:: In_Fixed_Array_Argument_T (const S_slice * x) - : x_ (ACE_const_cast (S_slice *, x)) + : x_ (const_cast<S_slice *> (x)) {} template<typename S, typename S_slice, typename S_forany> @@ -50,20 +52,20 @@ TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany>::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_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>:: Ret_Fixed_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 *& @@ -72,10 +74,10 @@ TAO::Ret_Fixed_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 * @@ -84,10 +86,10 @@ TAO::Ret_Fixed_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 * @@ -95,4 +97,3 @@ TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::retn (void) { return this->x_._retn (); } - diff --git a/TAO/tao/GIOPC.h b/TAO/tao/GIOPC.h index 4b992b3ec5a..7d8feec8158 100644 --- a/TAO/tao/GIOPC.h +++ b/TAO/tao/GIOPC.h @@ -43,7 +43,6 @@ #include "tao/Environment.h" #include "tao/VarOut_T.h" -#include "tao/Any.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -73,111 +72,111 @@ namespace GIOP { - + // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:342 - + typedef CORBA::Short AddressingDisposition; typedef CORBA::Short_out AddressingDisposition_out; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AddressingDisposition; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const CORBA::Short KeyAddr = 0; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const CORBA::Short ProfileAddr = 1; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const CORBA::Short ReferenceAddr = 2; - + // TAO_IDL - Generated from // be\be_type.cpp:258 - + struct Version; - + typedef TAO_Fixed_Var_T< Version > Version_var; - + typedef Version & Version_out; - + // TAO_IDL - Generated from // be\be_visitor_structure/structure_ch.cpp:52 - + struct TAO_Export Version { typedef Version_var _var_type; - + static void _tao_any_destructor (void *); CORBA::Octet major; CORBA::Octet minor; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Version; - + // TAO_IDL - Generated from // be\be_type.cpp:258 - + struct IORAddressingInfo; - + typedef TAO_Var_Var_T< IORAddressingInfo > IORAddressingInfo_var; - + typedef TAO_Out_T< IORAddressingInfo, IORAddressingInfo_var > IORAddressingInfo_out; - + // TAO_IDL - Generated from // be\be_visitor_structure/structure_ch.cpp:52 - + struct TAO_Export IORAddressingInfo { typedef IORAddressingInfo_var _var_type; - + static void _tao_any_destructor (void *); CORBA::ULong selected_profile_index; IOP::IOR ior; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IORAddressingInfo; - + // TAO_IDL - Generated from // be\be_type.cpp:258 - + class TargetAddress; - + typedef TAO_Var_Var_T< TargetAddress > TargetAddress_var; - + typedef TAO_Out_T< TargetAddress, @@ -187,7 +186,7 @@ namespace GIOP #if !defined (_GIOP_TARGETADDRESS_CH_) #define _GIOP_TARGETADDRESS_CH_ - + class TAO_Export TargetAddress { public: @@ -195,49 +194,49 @@ namespace GIOP TargetAddress (const TargetAddress &); ~TargetAddress (void); static void _tao_any_destructor (void*); - + TargetAddress &operator= (const TargetAddress &); - + // TAO_IDL - Generated from // be\be_visitor_union/discriminant_ch.cpp:114 - + void _d (CORBA::Short); CORBA::Short _d (void) const; - + // TAO_IDL - Generated from // be\be_visitor_union/union_ch.cpp:108 - + typedef TargetAddress_var _var_type; - + // TAO_IDL - Generated from // be\be_visitor_union_branch/public_ch.cpp:507 - + void object_key (const CORBA::OctetSeq &); const CORBA::OctetSeq &object_key (void) const; CORBA::OctetSeq &object_key (void); - + // TAO_IDL - Generated from // be\be_visitor_union_branch/public_ch.cpp:615 - + void profile (const IOP::TaggedProfile &); const IOP::TaggedProfile &profile (void) const; IOP::TaggedProfile &profile (void); - + // TAO_IDL - Generated from // be\be_visitor_union_branch/public_ch.cpp:615 - + void ior (const ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &); const ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &ior (void) const; ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &ior (void); - + // TAO_IDL - Generated from // be\be_visitor_union/union_ch.cpp:142 - + void _default (void); private: CORBA::Short disc_; CORBA::Short holder_; - + union { // TAO_IDL - Generated from @@ -250,14 +249,14 @@ namespace GIOP // be\be_visitor_union_branch/private_ch.cpp:482 ACE_NESTED_CLASS (GIOP, IORAddressingInfo) *ior_; } u_; - + // TAO extension - frees any allocated storage. void _reset (CORBA::Short, CORBA::Boolean /* finalize */); }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TargetAddress; #endif /* end #if !defined */ @@ -335,4 +334,3 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::TargetAddress &); #include /**/ "ace/post.h" #endif /* ifndef */ - diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp index 3aed6adc2a2..0166a4baa2c 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp @@ -85,9 +85,8 @@ TAO_GIOP_Message_Generator_Parser_10::write_request_header ( if (result != 0) { - CORBA::ULong username_size = - ACE_static_cast (CORBA::ULong, - ACE_OS::strlen (username)); + const CORBA::ULong username_size = + static_cast<CORBA::ULong> (ACE_OS::strlen (username)); CORBA::Octet *buffer = CORBA::OctetSeq::allocbuf (username_size + 1); diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp index 13620e25766..cd0f2a63969 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp @@ -556,9 +556,8 @@ TAO_GIOP_Message_Generator_Parser_12::process_bidir_context ( ACE_TEXT ("(%P|%t) Context info not found \n")), -1); - TAO_InputCDR cdr (ACE_reinterpret_cast - (const char*, - context.context_data.get_buffer ()), + TAO_InputCDR cdr (reinterpret_cast<const char*> ( + context.context_data.get_buffer ()), context.context_data.length ()); return transport->tear_listen_point_list (cdr); diff --git a/TAO/tao/GIOP_Message_State.cpp b/TAO/tao/GIOP_Message_State.cpp index 7155026c59d..0e8edbf224d 100644 --- a/TAO/tao/GIOP_Message_State.cpp +++ b/TAO/tao/GIOP_Message_State.cpp @@ -284,14 +284,14 @@ TAO_GIOP_Message_State::read_ulong (char *rd_ptr) #if !defined (ACE_DISABLE_SWAP_ON_READ) if (!(this->byte_order_ != ACE_CDR_BYTE_ORDER)) { - x = *ACE_reinterpret_cast (ACE_CDR::ULong*, buf); + x = *reinterpret_cast<ACE_CDR::ULong*> (buf); } else { - ACE_CDR::swap_4 (buf, ACE_reinterpret_cast (char*, &x)); + ACE_CDR::swap_4 (buf, reinterpret_cast<char*> (&x)); } #else - x = *ACE_reinterpret_cast(ACE_CDR::ULong*, buf); + x = *reinterpret_cast<ACE_CDR::ULong*> (buf); #endif /* ACE_DISABLE_SWAP_ON_READ */ return x; diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp index 3ad4d721b64..6857c682c54 100644 --- a/TAO/tao/IIOP_Connection_Handler.cpp +++ b/TAO/tao/IIOP_Connection_Handler.cpp @@ -41,8 +41,7 @@ TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler ( void *arg) : TAO_IIOP_SVC_HANDLER (orb_core->thr_mgr (), 0, 0), TAO_Connection_Handler (orb_core), - tcp_properties_ (*(ACE_static_cast - (TAO_IIOP_Properties *, arg))), + tcp_properties_ (*(static_cast<TAO_IIOP_Properties *> (arg))), dscp_codepoint_ (0) { TAO_IIOP_Transport* specific_transport = 0; @@ -57,8 +56,7 @@ TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (TAO_ORB_Core *orb_core void *arg) : TAO_IIOP_SVC_HANDLER (orb_core->thr_mgr (), 0, 0), TAO_Connection_Handler (orb_core), - tcp_properties_ (*(ACE_static_cast - (TAO_IIOP_Properties *, arg))), + tcp_properties_ (*(static_cast<TAO_IIOP_Properties *> (arg))), dscp_codepoint_ (0) { } diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index 9bbac24177e..fc231811317 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -483,8 +483,7 @@ TAO_IIOP_Connector::remote_endpoint (TAO_Endpoint *endpoint) return 0; TAO_IIOP_Endpoint *iiop_endpoint = - ACE_dynamic_cast (TAO_IIOP_Endpoint *, - endpoint ); + dynamic_cast<TAO_IIOP_Endpoint *> (endpoint ); if (iiop_endpoint == 0) return 0; diff --git a/TAO/tao/IIOP_Endpoint.cpp b/TAO/tao/IIOP_Endpoint.cpp index f09277123a9..0d887056521 100644 --- a/TAO/tao/IIOP_Endpoint.cpp +++ b/TAO/tao/IIOP_Endpoint.cpp @@ -209,16 +209,14 @@ TAO_IIOP_Endpoint::object_addr_i (void) const CORBA::Boolean TAO_IIOP_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint) { - TAO_Endpoint *endpt = - ACE_const_cast (TAO_Endpoint *, other_endpoint); + const TAO_IIOP_Endpoint *endpoint = + dynamic_cast<const TAO_IIOP_Endpoint *> (other_endpoint); - TAO_IIOP_Endpoint *endpoint = - ACE_dynamic_cast (TAO_IIOP_Endpoint *, endpt); if (endpoint == 0) return 0; return (this->port_ == endpoint->port_ - && (ACE_OS::strcmp(this->host(), endpoint->host()) == 0)); + && (ACE_OS::strcmp (this->host (), endpoint->host ()) == 0)); } CORBA::ULong diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp index fcdb8699726..a19999c8d7f 100644 --- a/TAO/tao/IIOP_Profile.cpp +++ b/TAO/tao/IIOP_Profile.cpp @@ -155,7 +155,7 @@ TAO_IIOP_Profile::parse_string_i (const char *ior if (ACE_OS::strspn (tmp.in (), "1234567890") == length_port) { this->endpoint_.port_ = - ACE_static_cast (CORBA::UShort, ACE_OS::atoi (tmp.in ())); + static_cast<CORBA::UShort> (ACE_OS::atoi (tmp.in ())); } else { @@ -231,7 +231,7 @@ CORBA::Boolean TAO_IIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile) { const TAO_IIOP_Profile *op = - ACE_dynamic_cast (const TAO_IIOP_Profile *, other_profile); + dynamic_cast<const TAO_IIOP_Profile *> (other_profile); // Make sure we have a TAO_IIOP_Profile. if (op == 0) @@ -324,7 +324,7 @@ TAO_IIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) 1 /* object key separator */ + ACE_OS::strlen (key.in ())); - char * buf = CORBA::string_alloc (ACE_static_cast (CORBA::ULong, buflen)); + char * buf = CORBA::string_alloc (static_cast<CORBA::ULong> (buflen)); static const char digits [] = "0123456789"; @@ -426,14 +426,14 @@ TAO_IIOP_Profile::decode_endpoints (void) const CORBA::Octet *buf = tagged_component.component_data.get_buffer (); - TAO_InputCDR in_cdr (ACE_reinterpret_cast (const char*, buf), + TAO_InputCDR in_cdr (reinterpret_cast<const char *> (buf), tagged_component.component_data.length ()); // Extract the Byte Order. CORBA::Boolean byte_order; if ((in_cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0) return -1; - in_cdr.reset_byte_order (ACE_static_cast(int, byte_order)); + in_cdr.reset_byte_order (static_cast<int> (byte_order)); // Extract endpoints sequence. TAO::IIOPEndpointSequence endpoints; diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp index a6ea31841a7..16ee8dd018a 100644 --- a/TAO/tao/IIOP_Transport.cpp +++ b/TAO/tao/IIOP_Transport.cpp @@ -285,7 +285,7 @@ TAO_IIOP_Transport::tear_listen_point_list (TAO_InputCDR &cdr) if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0) return -1; - cdr.reset_byte_order (ACE_static_cast (int, byte_order)); + cdr.reset_byte_order (static_cast<int> (byte_order)); IIOP::ListenPointList listen_list; if ((cdr >> listen_list) == 0) @@ -305,24 +305,23 @@ TAO_IIOP_Transport::set_bidir_context_info (TAO_Operation_Details &opdetails) TAO_Acceptor_Registry &ar = this->orb_core ()->lane_resources ().acceptor_registry (); - // Get the first acceptor in the registry - TAO_AcceptorSetIterator acceptor = ar.begin (); - IIOP::ListenPointList listen_point_list; - for (; - acceptor != ar.end (); - acceptor++) + const TAO_AcceptorSetIterator end = ar.end (); + + for (TAO_AcceptorSetIterator acceptor = ar.begin (); + acceptor != end; + ++acceptor) { // Check whether it is a IIOP acceptor if ((*acceptor)->tag () == IOP::TAG_INTERNET_IOP) { - if (this->get_listen_point (listen_point_list, - *acceptor) == -1) + if (this->get_listen_point (listen_point_list, *acceptor) == -1) { - ACE_ERROR ((LM_ERROR, - "TAO (%P|%t) - IIOP_Transport::set_bidir_info, " - "error getting listen_point \n")); + if (TAO_debug_level > 0) + ACE_ERROR ((LM_ERROR, + "TAO (%P|%t) - IIOP_Transport::set_bidir_info, " + "error getting listen_point \n")); return; } @@ -333,7 +332,7 @@ TAO_IIOP_Transport::set_bidir_context_info (TAO_Operation_Details &opdetails) // stream at this point TAO_OutputCDR cdr; - // Marshall the information into the stream + // Marshal the information into the stream if ((cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER) == 0) || (cdr << listen_point_list) == 0) return; @@ -351,8 +350,7 @@ TAO_IIOP_Transport::get_listen_point ( TAO_Acceptor *acceptor) { TAO_IIOP_Acceptor *iiop_acceptor = - ACE_dynamic_cast (TAO_IIOP_Acceptor *, - acceptor); + dynamic_cast<TAO_IIOP_Acceptor *> (acceptor); if (iiop_acceptor == 0) return -1; @@ -395,8 +393,8 @@ TAO_IIOP_Transport::get_listen_point ( } for (size_t index = 0; - index != count; - index++) + index < count; + ++index) { if (local_addr.get_ip_address() == endpoint_addr[index].get_ip_address ()) diff --git a/TAO/tao/Incoming_Message_Queue.cpp b/TAO/tao/Incoming_Message_Queue.cpp index 9a86e62bf9d..662ee3afbec 100644 --- a/TAO/tao/Incoming_Message_Queue.cpp +++ b/TAO/tao/Incoming_Message_Queue.cpp @@ -23,12 +23,12 @@ TAO_Incoming_Message_Queue::TAO_Incoming_Message_Queue (TAO_ORB_Core *orb_core) TAO_Incoming_Message_Queue::~TAO_Incoming_Message_Queue (void) { - int sz = this->size_; + const int sz = this->size_; // Delete all the nodes left behind for (int i = 0; i < sz; - i++) + ++i) { TAO_Queued_Data *qd = this->dequeue_head (); TAO_Queued_Data::release (qd); @@ -184,10 +184,10 @@ TAO_Queued_Data::get_queued_data (ACE_Allocator *alloc) if (alloc) { ACE_NEW_MALLOC_RETURN (qd, - ACE_static_cast (TAO_Queued_Data *, - alloc->malloc (sizeof (TAO_Queued_Data))), - TAO_Queued_Data (alloc), - 0); + static_cast<TAO_Queued_Data *> ( + alloc->malloc (sizeof (TAO_Queued_Data))), + TAO_Queued_Data (alloc), + 0); return qd; } @@ -260,10 +260,10 @@ TAO_Queued_Data::duplicate (TAO_Queued_Data &sqd) if (sqd.allocator_) { ACE_NEW_MALLOC_RETURN (qd, - ACE_static_cast(TAO_Queued_Data *, + static_cast<TAO_Queued_Data *> ( sqd.allocator_->malloc (sizeof (TAO_Queued_Data))), TAO_Queued_Data (sqd), - 0); + 0); return qd; } diff --git a/TAO/tao/Invocation_Base.cpp b/TAO/tao/Invocation_Base.cpp index a736f017225..3cb5bea60f8 100644 --- a/TAO/tao/Invocation_Base.cpp +++ b/TAO/tao/Invocation_Base.cpp @@ -61,7 +61,7 @@ namespace TAO char * Invocation_Base::operation_name (void) { - return ACE_const_cast (char *, this->details_.opname ()); + return const_cast<char *> (this->details_.opname ()); } Dynamic::ParameterList * @@ -105,7 +105,7 @@ namespace TAO ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. - CORBA::Boolean tk_void_any = 0; + static const CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); diff --git a/TAO/tao/LocalObject.cpp b/TAO/tao/LocalObject.cpp index 8f28082a317..3d752b69478 100644 --- a/TAO/tao/LocalObject.cpp +++ b/TAO/tao/LocalObject.cpp @@ -47,9 +47,8 @@ CORBA::LocalObject::_hash (CORBA::ULong maximum // enough to hold an address to avoid compile-time warnings on some // 64-bit platforms. - CORBA::ULong hash = - ACE_static_cast (CORBA::ULong, - ACE_reinterpret_cast (ptrdiff_t, this)); + const CORBA::ULong hash = + static_cast<CORBA::ULong> (reinterpret_cast<ptrdiff_t> (this)); return hash % maximum; } diff --git a/TAO/tao/MCAST_Parser.cpp b/TAO/tao/MCAST_Parser.cpp index 915e89f2312..1861059ef62 100644 --- a/TAO/tao/MCAST_Parser.cpp +++ b/TAO/tao/MCAST_Parser.cpp @@ -217,8 +217,8 @@ TAO_MCAST_Parser::multicast_query (char *&buf, // The service name string. iovp[2].iov_base = (char *) service_name; - iovp[2].iov_len = ACE_static_cast (u_long, - ACE_OS::strlen (service_name) + 1); + iovp[2].iov_len = + static_cast<u_long> (ACE_OS::strlen (service_name) + 1); // Send the multicast. result = dgram.send (iovp, diff --git a/TAO/tao/Messaging/Asynch_Invocation.cpp b/TAO/tao/Messaging/Asynch_Invocation.cpp index 467360f5b6b..4444cb1b7e7 100644 --- a/TAO/tao/Messaging/Asynch_Invocation.cpp +++ b/TAO/tao/Messaging/Asynch_Invocation.cpp @@ -1,4 +1,5 @@ //$Id$ + #include "Asynch_Invocation.h" #include "Asynch_Reply_Dispatcher.h" @@ -11,8 +12,8 @@ #include "tao/Pluggable_Messaging.h" #include "tao/ORB_Constants.h" -ACE_RCSID (tao, - Synch_Invocation, +ACE_RCSID (Messaging, + Asynch_Invocation, "$Id$") namespace TAO diff --git a/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp b/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp index c16a8903d1f..b3fecff6a83 100644 --- a/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp +++ b/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp @@ -7,7 +7,9 @@ #include "tao/Transport_Mux_Strategy.h" #include "ace/Reactor.h" -ACE_RCSID(tao, Asynch_Timeout_Handler, "$Id$") +ACE_RCSID (Messaging, + Asynch_Timeout_Handler, + "$Id$") TAO_Asynch_Timeout_Handler::TAO_Asynch_Timeout_Handler ( diff --git a/TAO/tao/Messaging/Messaging_PolicyFactory.cpp b/TAO/tao/Messaging/Messaging_PolicyFactory.cpp index 847fbeeffa6..50499dc94b0 100644 --- a/TAO/tao/Messaging/Messaging_PolicyFactory.cpp +++ b/TAO/tao/Messaging/Messaging_PolicyFactory.cpp @@ -1,6 +1,6 @@ #include "Messaging_PolicyFactory.h" -ACE_RCSID (tao, +ACE_RCSID (Messaging, Messaging_PolicyFactory, "$Id$") diff --git a/TAO/tao/NVList.i b/TAO/tao/NVList.i index 01b6d08a3eb..035279feaf6 100644 --- a/TAO/tao/NVList.i +++ b/TAO/tao/NVList.i @@ -36,7 +36,7 @@ ACE_INLINE CORBA::Any_ptr CORBA::NamedValue::value (void) const { - return ACE_const_cast (CORBA::Any_ptr, &this->any_); + return const_cast<CORBA::Any_ptr> (&this->any_); } ACE_INLINE @@ -99,8 +99,8 @@ ACE_INLINE CORBA::ULong CORBA::NVList::count (ACE_ENV_SINGLE_ARG_DECL) const { - (ACE_const_cast (CORBA::NVList *, - this))->evaluate (ACE_ENV_SINGLE_ARG_PARAMETER); + (const_cast<CORBA::NVList *> (this))->evaluate ( + ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return this->max_; diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 832fd2460aa..eff8071dda2 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -87,7 +87,7 @@ CORBA::ORB::InvalidName::_downcast (CORBA::Exception *exc) if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/ORB/InvalidName:1.0", exc->_rep_id ())) { - return ACE_dynamic_cast (InvalidName *, exc); + return dynamic_cast<InvalidName *> (exc); } else { @@ -300,7 +300,7 @@ CORBA::ORB::create_list (CORBA::Long count, { new_list->max_ = (CORBA::ULong) count; - for (CORBA::Long i = 0; i < count; i++) + for (CORBA::Long i = 0; i < count; ++i) { CORBA::NamedValue_ptr nv = 0; ACE_NEW_THROW_EX (nv, @@ -1070,16 +1070,15 @@ CORBA::ORB::resolve_service (TAO_MCAST_SERVICEID mcast_service_id 10); CORBA::String_var port_ptr = - CORBA::string_alloc (ACE_static_cast (CORBA::ULong, - ACE_OS::strlen ((const char *) port_char))); + CORBA::string_alloc (static_cast<CORBA::ULong> ( + ACE_OS::strlen ((const char *) port_char))); port_ptr = (const char *) port_char; CORBA::String_var def_init_ref = - CORBA::string_alloc (sizeof (prefix) + - ACE_static_cast (CORBA::ULong, - ACE_OS::strlen (port_ptr.in ())) + - 2); + CORBA::string_alloc (sizeof (prefix) + + static_cast<CORBA::ULong> ( + ACE_OS::strlen (port_ptr.in ())) + 2); ACE_OS::strcpy (def_init_ref.inout (), prefix); ACE_OS::strcat (def_init_ref.inout (), port_ptr.in ()); @@ -1308,7 +1307,7 @@ CORBA::ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_DECL) } else { - CORBA::ORB::orb_init_count_++; + ++CORBA::ORB::orb_init_count_; } // initialize the system TypeCodes @@ -1761,10 +1760,10 @@ CORBA::ORB::object_to_string (CORBA::Object_ptr obj char *cp; ACE_ALLOCATOR_RETURN (cp, - CORBA::string_alloc (sizeof ior_prefix - + 2 * - ACE_static_cast (CORBA::ULong, - total_len)), + CORBA::string_alloc ( + sizeof ior_prefix + + 2 + * static_cast<CORBA::ULong> (total_len)), 0); CORBA::String_var string = cp; @@ -1783,7 +1782,7 @@ CORBA::ORB::object_to_string (CORBA::Object_ptr obj { *cp++ = ACE::nibble2hex ((*bytes) >> 4); *cp++ = ACE::nibble2hex (*bytes); - bytes++; + ++bytes; } } // Null terminate the string.. diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 1b3b0429af8..c6aaa0d3604 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -1018,7 +1018,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) 10); CORBA::String_var ns_port_ptr = - CORBA::string_alloc (ACE_static_cast (CORBA::ULong, + CORBA::string_alloc (static_cast<CORBA::ULong> ( ACE_OS::strlen ((const char *) ns_port_char))); ns_port_ptr = (const char *) ns_port_char; @@ -1027,7 +1027,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) CORBA::String_var def_init_ref = CORBA::string_alloc (sizeof (prefix) + - ACE_static_cast (CORBA::ULong, + static_cast<CORBA::ULong> ( ACE_OS::strlen (ns_port_ptr.in ())) + 2); @@ -2307,12 +2307,12 @@ TAO_ORB_Core::list_initial_references (ACE_ENV_SINGLE_ARG_DECL) ACE_NEW_THROW_EX (tmp, CORBA::ORB::ObjectIdList ( - ACE_static_cast (CORBA::ULong, total_size)), + static_cast<CORBA::ULong> (total_size)), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); CORBA::ORB::ObjectIdList_var list = tmp; - list->length (ACE_static_cast (CORBA::ULong, total_size)); + list->length (static_cast<CORBA::ULong> (total_size)); CORBA::ULong index = 0; // Index for ObjectIdList members. @@ -2444,8 +2444,8 @@ TAO_ORB_Core::create_data_block_i (size_t size, ACE_NEW_MALLOC_RETURN ( nb, - ACE_static_cast(ACE_Data_Block*, - dblock_allocator->malloc (sizeof (ACE_Data_Block))), + static_cast<ACE_Data_Block*> ( + dblock_allocator->malloc (sizeof (ACE_Data_Block))), ACE_Data_Block (size, ACE_Message_Block::MB_DATA, 0, diff --git a/TAO/tao/ORB_Table.cpp b/TAO/tao/ORB_Table.cpp index 202a9a8b583..523a742148d 100644 --- a/TAO/tao/ORB_Table.cpp +++ b/TAO/tao/ORB_Table.cpp @@ -27,12 +27,11 @@ TAO_ORB_Table::TAO_ORB_Table (void) TAO_ORB_Table::~TAO_ORB_Table (void) { - for (Iterator i = this->begin (); - i != this->end (); - ++i) + const Iterator end = this->end (); + for (Iterator i = this->begin (); i != end; ++i) { // Deallocate the ORBid. - CORBA::string_free (ACE_const_cast (char *, (*i).ext_id_)); + CORBA::string_free (const_cast<char *> ((*i).ext_id_)); // Destroy the ORB_Core (void) (*i).int_id_->_decr_refcnt (); @@ -123,7 +122,7 @@ TAO_ORB_Table::unbind (const char *orb_id) // Deallocate the external ID and obtain the ORB core pointer // before unbinding the entry since the entry is deallocated // during the call to unbind(). - CORBA::string_free (ACE_const_cast (char *, entry->ext_id_)); + CORBA::string_free (const_cast<char *> (entry->ext_id_)); TAO_ORB_Core *orb_core = entry->int_id_; result = this->table_.unbind (entry); diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index 0b37ade707d..3b4a08e4639 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -151,7 +151,7 @@ CORBA::Object::_remove_ref (void) void CORBA::Object::_tao_any_destructor (void *x) { - CORBA::Object_ptr tmp = ACE_static_cast (CORBA::Object_ptr, x); + CORBA::Object_ptr tmp = static_cast<CORBA::Object_ptr> (x); CORBA::release (tmp); } @@ -257,8 +257,8 @@ CORBA::Object::_hash (CORBA::ULong maximum // of CORBA::ULong since we need to first cast to an integer // large enough to hold an address to avoid compile-time // warnings on some 64-bit platforms. - CORBA::ULong hash = ACE_static_cast (CORBA::ULong, - ACE_reinterpret_cast (ptrdiff_t, this)); + const CORBA::ULong hash = + static_cast<CORBA::ULong> (reinterpret_cast<ptrdiff_t> (this)); return hash % maximum; } @@ -632,8 +632,7 @@ operator<< (TAO_OutputCDR& cdr, const CORBA::Object* x) { // @@ This is too inefficient. Need to speed this up if this is // a bottle neck. - cdr << ACE_const_cast (IOP::IOR &, - x->ior ()); + cdr << const_cast<IOP::IOR &> (x->ior ()); return cdr.good_bit (); } diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp index f0ffce87059..a8f7b2d4a29 100644 --- a/TAO/tao/Object_KeyC.cpp +++ b/TAO/tao/Object_KeyC.cpp @@ -173,7 +173,7 @@ TAO::ObjectKey::decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> u_int i = 0; for (; cp < eos && i < seq.length (); - i++) + ++i) { if (*cp == '%') { @@ -254,27 +254,27 @@ CORBA::Boolean operator<< ( ) { CORBA::ULong _tao_seq_len = _tao_sequence.length (); - + if (strm << _tao_seq_len) { // Encode all elements. - + #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) { - TAO_Unbounded_Sequence<CORBA::Octet> *oseq = + TAO_Unbounded_Sequence<CORBA::Octet> *oseq = ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (TAO::ObjectKey *)&_tao_sequence); if (oseq->mb ()) return strm.write_octet_array_mb (oseq->mb ()); else return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); } - + #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - + #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ } - + return 0; } @@ -284,7 +284,7 @@ CORBA::Boolean operator>> ( ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -294,18 +294,18 @@ CORBA::Boolean operator>> ( { return 0; } - + // Set the length of the sequence. _tao_sequence.length (_tao_seq_len); - + // If length is 0 we return true. - if (0 >= _tao_seq_len) + if (0 >= _tao_seq_len) { return 1; } - + // Retrieve all the elements. - + #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) if (ACE_BIT_DISABLED (strm.start ()->flags (), ACE_Message_Block::DONT_DELETE)) @@ -315,7 +315,7 @@ CORBA::Boolean operator>> ( strm.orb_core ()->resource_factory ()-> input_cdr_allocator_type_locked () == 1) { - TAO_Unbounded_Sequence<CORBA::Octet> *oseq = + TAO_Unbounded_Sequence<CORBA::Octet> *oseq = ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence); oseq->replace (_tao_seq_len, strm.start ()); oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len); @@ -326,11 +326,11 @@ CORBA::Boolean operator>> ( return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len); #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - + #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ - + } - + return 0; } @@ -381,5 +381,4 @@ CORBA::Boolean operator>> ( CORBA::Octet \ > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Object_Ref_Table.cpp b/TAO/tao/Object_Ref_Table.cpp index 4f9e8c8565e..aea28df830c 100644 --- a/TAO/tao/Object_Ref_Table.cpp +++ b/TAO/tao/Object_Ref_Table.cpp @@ -84,7 +84,7 @@ TAO_Object_Ref_Table::destroy (void) ++i) { // Deallocate the id. - CORBA::string_free (ACE_const_cast (char *, (*i).ext_id_)); + CORBA::string_free (const_cast<char *> ((*i).ext_id_)); // Release the Object. CORBA::release ((*i).int_id_); @@ -161,7 +161,7 @@ TAO_Object_Ref_Table::unbind (const char *id) // Deallocate the external ID and obtain the ORB core pointer // before unbinding the entry since the entry is deallocated // during the call to unbind(). - CORBA::string_free (ACE_const_cast (char *, entry->ext_id_)); + CORBA::string_free (const_cast<char *> (entry->ext_id_)); CORBA::Object_ptr obj = entry->int_id_; result = this->table_.unbind (entry); diff --git a/TAO/tao/ParameterMode.cpp b/TAO/tao/ParameterMode.cpp index db2949672b0..bdf3eb44645 100644 --- a/TAO/tao/ParameterMode.cpp +++ b/TAO/tao/ParameterMode.cpp @@ -22,7 +22,7 @@ operator>> (TAO_InputCDR &strm, CORBA::ParameterMode &_tao_enumval) if (_tao_result == 1) { - _tao_enumval = ACE_static_cast (CORBA::ParameterMode, _tao_temp); + _tao_enumval = static_cast<CORBA::ParameterMode> (_tao_temp); } return _tao_result; diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h index 5f557bf0f77..677abef7e62 100644 --- a/TAO/tao/PortableInterceptorC.h +++ b/TAO/tao/PortableInterceptorC.h @@ -41,13 +41,12 @@ #include "tao/Environment.h" #include "tao/Object.h" -#include "tao/Any.h" #include "tao/Objref_VarOut_T.h" #include "PI_ForwardC.h" #include "tao/Messaging_SyncScopeC.h" #include "tao/IOP_CodecC.h" -#include "tao/PolicyC.h" +#include "tao/Policy_ForwardC.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -81,13 +80,13 @@ namespace Dynamic typedef CORBA::StringSeq RequestContext; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_root/root_ch.cpp:63 namespace TAO { class Collocation_Proxy_Broker; - + template<typename T> class Narrow_Utils; template<typename T> class AbstractBase_Narrow_Utils; } @@ -97,22 +96,22 @@ namespace TAO namespace PortableInterceptor { - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_INTERCEPTOR__VAR_OUT_CH_ - + class Interceptor; typedef Interceptor *Interceptor_ptr; - + typedef TAO_Objref_Var_T< Interceptor > Interceptor_var; - + typedef TAO_Objref_Out_T< Interceptor @@ -120,101 +119,101 @@ namespace PortableInterceptor Interceptor_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR_CH_) #define _PORTABLEINTERCEPTOR_INTERCEPTOR_CH_ - + class TAO_Export Interceptor : public virtual CORBA::Object { public: typedef Interceptor_ptr _ptr_type; typedef Interceptor_var _var_type; - + // The static operations. static Interceptor_ptr _duplicate (Interceptor_ptr obj); - + static Interceptor_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Interceptor_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Interceptor_ptr _nil (void) { return (Interceptor_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual char * name ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void destroy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:208 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. Interceptor (void); - + virtual ~Interceptor (void); - + private: // Private and unimplemented for concrete interfaces. Interceptor (const Interceptor &); - + void operator= (const Interceptor &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Interceptor; - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_PORTABLEINTERCEPTOR_FORWARDREQUEST_CH_) #define _PORTABLEINTERCEPTOR_FORWARDREQUEST_CH_ - + class TAO_Export ForwardRequest : public CORBA::UserException { public: - + CORBA::Object_var forward; CORBA::Boolean permanent; ForwardRequest (void); @@ -222,9 +221,9 @@ namespace PortableInterceptor ~ForwardRequest (void); ForwardRequest &operator= (const ForwardRequest &); - + static void _tao_any_destructor (void *); - + static ForwardRequest *_downcast (CORBA::Exception *); static CORBA::Exception *_alloc (void); @@ -236,108 +235,108 @@ namespace PortableInterceptor TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ctor.cpp:66 - + ForwardRequest ( const CORBA::Object_ptr _tao_forward, CORBA::Boolean _tao_permanent ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:125 - + virtual CORBA::TypeCode_ptr _type (void) const; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ForwardRequest; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:342 - + typedef CORBA::Short ReplyStatus; typedef CORBA::Short_out ReplyStatus_out; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ReplyStatus; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const PortableInterceptor::ReplyStatus SUCCESSFUL = 0; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const PortableInterceptor::ReplyStatus SYSTEM_EXCEPTION = 1; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const PortableInterceptor::ReplyStatus USER_EXCEPTION = 2; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const PortableInterceptor::ReplyStatus LOCATION_FORWARD = 3; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const PortableInterceptor::ReplyStatus LOCATION_FORWARD_PERMANENT = 4; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const PortableInterceptor::ReplyStatus TRANSPORT_RETRY = 5; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const PortableInterceptor::ReplyStatus UNKNOWN = 6; - + // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:342 - + typedef CORBA::ULong SlotId; typedef CORBA::ULong_out SlotId_out; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SlotId; - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_PORTABLEINTERCEPTOR_INVALIDSLOT_CH_) #define _PORTABLEINTERCEPTOR_INVALIDSLOT_CH_ - + class TAO_Export InvalidSlot : public CORBA::UserException { public: - + InvalidSlot (void); InvalidSlot (const InvalidSlot &); ~InvalidSlot (void); InvalidSlot &operator= (const InvalidSlot &); - + static void _tao_any_destructor (void *); - + static InvalidSlot *_downcast (CORBA::Exception *); static CORBA::Exception *_alloc (void); @@ -349,40 +348,40 @@ namespace PortableInterceptor TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:125 - + virtual CORBA::TypeCode_ptr _type (void) const; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_PORTABLEINTERCEPTOR_CURRENT__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_CURRENT__VAR_OUT_CH_ - + class Current; typedef Current *Current_ptr; - + typedef TAO_Objref_Var_T< Current > Current_var; - + typedef TAO_Objref_Out_T< Current @@ -390,43 +389,43 @@ namespace PortableInterceptor Current_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLEINTERCEPTOR_CURRENT_CH_) #define _PORTABLEINTERCEPTOR_CURRENT_CH_ - + class TAO_Export Current : public virtual CORBA::Current { public: typedef Current_ptr _ptr_type; typedef Current_var _var_type; - + // The static operations. static Current_ptr _duplicate (Current_ptr obj); - + static Current_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Current_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Current_ptr _nil (void) { return (Current_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Any * get_slot ( PortableInterceptor::SlotId id ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -435,10 +434,10 @@ namespace PortableInterceptor CORBA::SystemException , PortableInterceptor::InvalidSlot )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void set_slot ( PortableInterceptor::SlotId id, const CORBA::Any & data @@ -448,53 +447,53 @@ namespace PortableInterceptor CORBA::SystemException , PortableInterceptor::InvalidSlot )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:208 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. Current (void); - + virtual ~Current (void); - + private: // Private and unimplemented for concrete interfaces. Current (const Current &); - + void operator= (const Current &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current; - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_REQUESTINFO__VAR_OUT_CH_ - + class RequestInfo; typedef RequestInfo *RequestInfo_ptr; - + typedef TAO_Objref_Var_T< RequestInfo > RequestInfo_var; - + typedef TAO_Objref_Out_T< RequestInfo @@ -502,153 +501,153 @@ namespace PortableInterceptor RequestInfo_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO_CH_) #define _PORTABLEINTERCEPTOR_REQUESTINFO_CH_ - + class TAO_Export RequestInfo : public virtual CORBA::Object { public: typedef RequestInfo_ptr _ptr_type; typedef RequestInfo_var _var_type; - + // The static operations. static RequestInfo_ptr _duplicate (RequestInfo_ptr obj); - + static RequestInfo_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static RequestInfo_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static RequestInfo_ptr _nil (void) { return (RequestInfo_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::ULong request_id ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual char * operation ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::Dynamic::ParameterList * arguments ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::Dynamic::ExceptionList * exceptions ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::Dynamic::ContextList * contexts ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::Dynamic::RequestContext * operation_context ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Any * result ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Boolean response_expected ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual Messaging::SyncScope sync_scope ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual PortableInterceptor::ReplyStatus reply_status ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Object_ptr forward_reference ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Any * get_slot ( PortableInterceptor::SlotId id ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -657,10 +656,10 @@ namespace PortableInterceptor CORBA::SystemException , PortableInterceptor::InvalidSlot )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::IOP::ServiceContext * get_request_service_context ( IOP::ServiceId id ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -668,10 +667,10 @@ namespace PortableInterceptor ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::IOP::ServiceContext * get_reply_service_context ( IOP::ServiceId id ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -679,53 +678,53 @@ namespace PortableInterceptor ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:208 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. RequestInfo (void); - + virtual ~RequestInfo (void); - + private: // Private and unimplemented for concrete interfaces. RequestInfo (const RequestInfo &); - + void operator= (const RequestInfo &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RequestInfo; - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__VAR_OUT_CH_ - + class ClientRequestInfo; typedef ClientRequestInfo *ClientRequestInfo_ptr; - + typedef TAO_Objref_Var_T< ClientRequestInfo > ClientRequestInfo_var; - + typedef TAO_Objref_Out_T< ClientRequestInfo @@ -733,93 +732,93 @@ namespace PortableInterceptor ClientRequestInfo_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO_CH_) #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO_CH_ - + class TAO_Export ClientRequestInfo : public virtual PortableInterceptor::RequestInfo { public: typedef ClientRequestInfo_ptr _ptr_type; typedef ClientRequestInfo_var _var_type; - + // The static operations. static ClientRequestInfo_ptr _duplicate (ClientRequestInfo_ptr obj); - + static ClientRequestInfo_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ClientRequestInfo_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ClientRequestInfo_ptr _nil (void) { return (ClientRequestInfo_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Object_ptr target ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Object_ptr effective_target ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::IOP::TaggedProfile * effective_profile ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Any * received_exception ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual char * received_exception_id ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::IOP::TaggedComponent * get_effective_component ( IOP::ComponentId id ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -827,10 +826,10 @@ namespace PortableInterceptor ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::IOP::TaggedComponentSeq * get_effective_components ( IOP::ComponentId id ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -838,10 +837,10 @@ namespace PortableInterceptor ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::Policy_ptr get_request_policy ( CORBA::PolicyType type ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -849,10 +848,10 @@ namespace PortableInterceptor ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void add_request_service_context ( const IOP::ServiceContext & service_context, CORBA::Boolean replace @@ -861,53 +860,53 @@ namespace PortableInterceptor ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:208 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. ClientRequestInfo (void); - + virtual ~ClientRequestInfo (void); - + private: // Private and unimplemented for concrete interfaces. ClientRequestInfo (const ClientRequestInfo &); - + void operator= (const ClientRequestInfo &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ClientRequestInfo; - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_ - + class ServerRequestInfo; typedef ServerRequestInfo *ServerRequestInfo_ptr; - + typedef TAO_Objref_Var_T< ServerRequestInfo > ServerRequestInfo_var; - + typedef TAO_Objref_Out_T< ServerRequestInfo @@ -915,113 +914,113 @@ namespace PortableInterceptor ServerRequestInfo_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO_CH_) #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO_CH_ - + class TAO_Export ServerRequestInfo : public virtual PortableInterceptor::RequestInfo { public: typedef ServerRequestInfo_ptr _ptr_type; typedef ServerRequestInfo_var _var_type; - + // The static operations. static ServerRequestInfo_ptr _duplicate (ServerRequestInfo_ptr obj); - + static ServerRequestInfo_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ServerRequestInfo_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ServerRequestInfo_ptr _nil (void) { return (ServerRequestInfo_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Any * sending_exception ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual char * server_id ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual char * orb_id ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::PortableInterceptor::AdapterName * adapter_name ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::OctetSeq * object_id ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::OctetSeq * adapter_id ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual char * target_most_derived_interface ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::Policy_ptr get_server_policy ( CORBA::PolicyType type ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1029,10 +1028,10 @@ namespace PortableInterceptor ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void set_slot ( PortableInterceptor::SlotId id, const CORBA::Any & data @@ -1042,10 +1041,10 @@ namespace PortableInterceptor CORBA::SystemException , PortableInterceptor::InvalidSlot )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Boolean target_is_a ( const char * id ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1053,10 +1052,10 @@ namespace PortableInterceptor ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void add_reply_service_context ( const IOP::ServiceContext & service_context, CORBA::Boolean replace @@ -1065,53 +1064,53 @@ namespace PortableInterceptor ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:208 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. ServerRequestInfo (void); - + virtual ~ServerRequestInfo (void); - + private: // Private and unimplemented for concrete interfaces. ServerRequestInfo (const ServerRequestInfo &); - + void operator= (const ServerRequestInfo &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerRequestInfo; - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__VAR_OUT_CH_ - + class ClientRequestInterceptor; typedef ClientRequestInterceptor *ClientRequestInterceptor_ptr; - + typedef TAO_Objref_Var_T< ClientRequestInterceptor > ClientRequestInterceptor_var; - + typedef TAO_Objref_Out_T< ClientRequestInterceptor @@ -1119,43 +1118,43 @@ namespace PortableInterceptor ClientRequestInterceptor_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR_CH_) #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR_CH_ - + class TAO_Export ClientRequestInterceptor : public virtual PortableInterceptor::Interceptor { public: typedef ClientRequestInterceptor_ptr _ptr_type; typedef ClientRequestInterceptor_var _var_type; - + // The static operations. static ClientRequestInterceptor_ptr _duplicate (ClientRequestInterceptor_ptr obj); - + static ClientRequestInterceptor_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ClientRequestInterceptor_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ClientRequestInterceptor_ptr _nil (void) { return (ClientRequestInterceptor_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void send_request ( PortableInterceptor::ClientRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1164,10 +1163,10 @@ namespace PortableInterceptor CORBA::SystemException , PortableInterceptor::ForwardRequest )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void send_poll ( PortableInterceptor::ClientRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1175,10 +1174,10 @@ namespace PortableInterceptor ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1186,10 +1185,10 @@ namespace PortableInterceptor ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1198,10 +1197,10 @@ namespace PortableInterceptor CORBA::SystemException , PortableInterceptor::ForwardRequest )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void receive_other ( PortableInterceptor::ClientRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1210,53 +1209,53 @@ namespace PortableInterceptor CORBA::SystemException , PortableInterceptor::ForwardRequest )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:208 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. ClientRequestInterceptor (void); - + virtual ~ClientRequestInterceptor (void); - + private: // Private and unimplemented for concrete interfaces. ClientRequestInterceptor (const ClientRequestInterceptor &); - + void operator= (const ClientRequestInterceptor &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ClientRequestInterceptor; - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__VAR_OUT_CH_ - + class ServerRequestInterceptor; typedef ServerRequestInterceptor *ServerRequestInterceptor_ptr; - + typedef TAO_Objref_Var_T< ServerRequestInterceptor > ServerRequestInterceptor_var; - + typedef TAO_Objref_Out_T< ServerRequestInterceptor @@ -1264,47 +1263,47 @@ namespace PortableInterceptor ServerRequestInterceptor_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR_CH_) #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR_CH_ - + class TAO_Export ServerRequestInterceptor : public virtual PortableInterceptor::Interceptor { public: typedef ServerRequestInterceptor_ptr _ptr_type; typedef ServerRequestInterceptor_var _var_type; - + // The static operations. static ServerRequestInterceptor_ptr _duplicate (ServerRequestInterceptor_ptr obj); - + static ServerRequestInterceptor_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ServerRequestInterceptor_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ServerRequestInterceptor_ptr _nil (void) { return (ServerRequestInterceptor_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 #if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1 virtual void tao_ft_interception_point ( PortableInterceptor::ServerRequestInfo_ptr , - CORBA::OctetSeq_out + CORBA::OctetSeq_out ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC (( @@ -1315,7 +1314,7 @@ namespace PortableInterceptor #endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/ // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1324,10 +1323,10 @@ namespace PortableInterceptor CORBA::SystemException , PortableInterceptor::ForwardRequest )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void receive_request ( PortableInterceptor::ServerRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1336,10 +1335,10 @@ namespace PortableInterceptor CORBA::SystemException , PortableInterceptor::ForwardRequest )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void send_reply ( PortableInterceptor::ServerRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1347,10 +1346,10 @@ namespace PortableInterceptor ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void send_exception ( PortableInterceptor::ServerRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1359,10 +1358,10 @@ namespace PortableInterceptor CORBA::SystemException , PortableInterceptor::ForwardRequest )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void send_other ( PortableInterceptor::ServerRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1371,53 +1370,53 @@ namespace PortableInterceptor CORBA::SystemException , PortableInterceptor::ForwardRequest )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:208 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. ServerRequestInterceptor (void); - + virtual ~ServerRequestInterceptor (void); - + private: // Private and unimplemented for concrete interfaces. ServerRequestInterceptor (const ServerRequestInterceptor &); - + void operator= (const ServerRequestInterceptor &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerRequestInterceptor; - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_POLICYFACTORY__VAR_OUT_CH_ - + class PolicyFactory; typedef PolicyFactory *PolicyFactory_ptr; - + typedef TAO_Objref_Var_T< PolicyFactory > PolicyFactory_var; - + typedef TAO_Objref_Out_T< PolicyFactory @@ -1425,43 +1424,43 @@ namespace PortableInterceptor PolicyFactory_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY_CH_) #define _PORTABLEINTERCEPTOR_POLICYFACTORY_CH_ - + class TAO_Export PolicyFactory : public virtual CORBA::Object { public: typedef PolicyFactory_ptr _ptr_type; typedef PolicyFactory_var _var_type; - + // The static operations. static PolicyFactory_ptr _duplicate (PolicyFactory_ptr obj); - + static PolicyFactory_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static PolicyFactory_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static PolicyFactory_ptr _nil (void) { return (PolicyFactory_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::Policy_ptr create_policy ( CORBA::PolicyType type, const CORBA::Any & value @@ -1471,7 +1470,7 @@ namespace PortableInterceptor CORBA::SystemException , CORBA::PolicyError )) = 0; - + // Hand-crafted addition. virtual ::CORBA::Policy_ptr _create_policy ( CORBA::PolicyType type @@ -1484,50 +1483,50 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:208 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. PolicyFactory (void); - + virtual ~PolicyFactory (void); - + private: // Private and unimplemented for concrete interfaces. PolicyFactory (const PolicyFactory &); - + void operator= (const PolicyFactory &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyFactory; - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_ - + class IORInterceptor; typedef IORInterceptor *IORInterceptor_ptr; - + typedef TAO_Objref_Var_T< IORInterceptor > IORInterceptor_var; - + typedef TAO_Objref_Out_T< IORInterceptor @@ -1535,22 +1534,22 @@ namespace PortableInterceptor IORInterceptor_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_ORBINITINFO__VAR_OUT_CH_ - + class ORBInitInfo; typedef ORBInitInfo *ORBInitInfo_ptr; - + typedef TAO_Objref_Var_T< ORBInitInfo > ORBInitInfo_var; - + typedef TAO_Objref_Out_T< ORBInitInfo @@ -1558,71 +1557,71 @@ namespace PortableInterceptor ORBInitInfo_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_CH_) #define _PORTABLEINTERCEPTOR_ORBINITINFO_CH_ - + class TAO_Export ORBInitInfo : public virtual CORBA::Object { public: typedef ORBInitInfo_ptr _ptr_type; typedef ORBInitInfo_var _var_type; - + // The static operations. static ORBInitInfo_ptr _duplicate (ORBInitInfo_ptr obj); - + static ORBInitInfo_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ORBInitInfo_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ORBInitInfo_ptr _nil (void) { return (ORBInitInfo_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:376 - + typedef char * ObjectId; typedef CORBA::String_var ObjectId_var; typedef CORBA::String_out ObjectId_out; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + static ::CORBA::TypeCode_ptr _tc_ObjectId; - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_DUPLICATENAME_CH_) #define _PORTABLEINTERCEPTOR_ORBINITINFO_DUPLICATENAME_CH_ - + class TAO_Export DuplicateName : public CORBA::UserException { public: - + TAO_String_Manager name; DuplicateName (void); DuplicateName (const DuplicateName &); ~DuplicateName (void); DuplicateName &operator= (const DuplicateName &); - + static void _tao_any_destructor (void *); - + static DuplicateName *_downcast (CORBA::Exception *); static CORBA::Exception *_alloc (void); @@ -1634,50 +1633,50 @@ namespace PortableInterceptor TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ctor.cpp:66 - + DuplicateName ( const char * _tao_name ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:125 - + virtual CORBA::TypeCode_ptr _type (void) const; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + static ::CORBA::TypeCode_ptr _tc_DuplicateName; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_INVALIDNAME_CH_) #define _PORTABLEINTERCEPTOR_ORBINITINFO_INVALIDNAME_CH_ - + class TAO_Export InvalidName : public CORBA::UserException { public: - + InvalidName (void); InvalidName (const InvalidName &); ~InvalidName (void); InvalidName &operator= (const InvalidName &); - + static void _tao_any_destructor (void *); - + static InvalidName *_downcast (CORBA::Exception *); static CORBA::Exception *_alloc (void); @@ -1689,58 +1688,58 @@ namespace PortableInterceptor TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:125 - + virtual CORBA::TypeCode_ptr _type (void) const; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + static ::CORBA::TypeCode_ptr _tc_InvalidName; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::StringSeq * arguments ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual char * orb_id ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::IOP::CodecFactory_ptr codec_factory ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void register_initial_reference ( const char * id, CORBA::Object_ptr obj @@ -1750,10 +1749,10 @@ namespace PortableInterceptor CORBA::SystemException , PortableInterceptor::ORBInitInfo::InvalidName )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Object_ptr resolve_initial_references ( const char * id ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1762,10 +1761,10 @@ namespace PortableInterceptor CORBA::SystemException , PortableInterceptor::ORBInitInfo::InvalidName )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void add_client_request_interceptor ( PortableInterceptor::ClientRequestInterceptor_ptr interceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1774,10 +1773,10 @@ namespace PortableInterceptor CORBA::SystemException , PortableInterceptor::ORBInitInfo::DuplicateName )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void add_server_request_interceptor ( PortableInterceptor::ServerRequestInterceptor_ptr interceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1786,10 +1785,10 @@ namespace PortableInterceptor CORBA::SystemException , PortableInterceptor::ORBInitInfo::DuplicateName )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void add_ior_interceptor ( PortableInterceptor::IORInterceptor_ptr interceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1798,20 +1797,20 @@ namespace PortableInterceptor CORBA::SystemException , PortableInterceptor::ORBInitInfo::DuplicateName )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual PortableInterceptor::SlotId allocate_slot_id ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void register_policy_factory ( CORBA::PolicyType type, PortableInterceptor::PolicyFactory_ptr policy_factory @@ -1820,53 +1819,53 @@ namespace PortableInterceptor ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:208 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. ORBInitInfo (void); - + virtual ~ORBInitInfo (void); - + private: // Private and unimplemented for concrete interfaces. ORBInitInfo (const ORBInitInfo &); - + void operator= (const ORBInitInfo &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORBInitInfo; - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_ORBINITIALIZER__VAR_OUT_CH_ - + class ORBInitializer; typedef ORBInitializer *ORBInitializer_ptr; - + typedef TAO_Objref_Var_T< ORBInitializer > ORBInitializer_var; - + typedef TAO_Objref_Out_T< ORBInitializer @@ -1874,43 +1873,43 @@ namespace PortableInterceptor ORBInitializer_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER_CH_) #define _PORTABLEINTERCEPTOR_ORBINITIALIZER_CH_ - + class TAO_Export ORBInitializer : public virtual CORBA::Object { public: typedef ORBInitializer_ptr _ptr_type; typedef ORBInitializer_var _var_type; - + // The static operations. static ORBInitializer_ptr _duplicate (ORBInitializer_ptr obj); - + static ORBInitializer_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ORBInitializer_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ORBInitializer_ptr _nil (void) { return (ORBInitializer_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void pre_init ( PortableInterceptor::ORBInitInfo_ptr info ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1918,10 +1917,10 @@ namespace PortableInterceptor ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void post_init ( PortableInterceptor::ORBInitInfo_ptr info ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1929,36 +1928,36 @@ namespace PortableInterceptor ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:208 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. ORBInitializer (void); - + virtual ~ORBInitializer (void); - + private: // Private and unimplemented for concrete interfaces. ORBInitializer (const ORBInitializer &); - + void operator= (const ORBInitializer &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORBInitializer; // TAO_IDL - Generated from @@ -1975,7 +1974,7 @@ namespace TAO #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR__TRAITS_CH_) #define _PORTABLEINTERCEPTOR_INTERCEPTOR__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<PortableInterceptor::Interceptor> { @@ -1996,7 +1995,7 @@ namespace TAO #if !defined (_PORTABLEINTERCEPTOR_CURRENT__TRAITS_CH_) #define _PORTABLEINTERCEPTOR_CURRENT__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<PortableInterceptor::Current> { @@ -2017,7 +2016,7 @@ namespace TAO #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO__TRAITS_CH_) #define _PORTABLEINTERCEPTOR_REQUESTINFO__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<PortableInterceptor::RequestInfo> { @@ -2038,7 +2037,7 @@ namespace TAO #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_CH_) #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<PortableInterceptor::ClientRequestInfo> { @@ -2059,7 +2058,7 @@ namespace TAO #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_) #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<PortableInterceptor::ServerRequestInfo> { @@ -2080,7 +2079,7 @@ namespace TAO #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_CH_) #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<PortableInterceptor::ClientRequestInterceptor> { @@ -2101,7 +2100,7 @@ namespace TAO #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_CH_) #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<PortableInterceptor::ServerRequestInterceptor> { @@ -2122,7 +2121,7 @@ namespace TAO #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_CH_) #define _PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<PortableInterceptor::PolicyFactory> { @@ -2143,7 +2142,7 @@ namespace TAO #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_CH_) #define _PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<PortableInterceptor::ORBInitInfo> { @@ -2164,7 +2163,7 @@ namespace TAO #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER__TRAITS_CH_) #define _PORTABLEINTERCEPTOR_ORBINITIALIZER__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<PortableInterceptor::ORBInitializer> { @@ -2330,4 +2329,3 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::IORIn #include /**/ "ace/post.h" #endif /* ifndef */ - diff --git a/TAO/tao/Sequence.i b/TAO/tao/Sequence.i index 91d08b223c0..655bf0f4741 100644 --- a/TAO/tao/Sequence.i +++ b/TAO/tao/Sequence.i @@ -265,8 +265,7 @@ ACE_INLINE const CORBA::Octet * TAO_Unbounded_Sequence<CORBA::Octet>::get_buffer (void) const { - return ACE_reinterpret_cast (const CORBA::Octet * ACE_CAST_CONST, - this->buffer_); + return reinterpret_cast<const CORBA::Octet * ACE_CAST_CONST> (this->buffer_); } ACE_INLINE @@ -274,7 +273,7 @@ CORBA::Octet & TAO_Unbounded_Sequence<CORBA::Octet>::operator[] (CORBA::ULong i) { TAO_SEQUENCE_ASSERT (i, this->maximum_); - CORBA::Octet * tmp = ACE_reinterpret_cast(CORBA::Octet *, this->buffer_); + CORBA::Octet * tmp = reinterpret_cast<CORBA::Octet *> (this->buffer_); return tmp[i]; } @@ -284,7 +283,7 @@ TAO_Unbounded_Sequence<CORBA::Octet>::operator[] (CORBA::ULong i) const { TAO_SEQUENCE_ASSERT (i, this->maximum_); CORBA::Octet * const tmp = - ACE_reinterpret_cast (CORBA::Octet * ACE_CAST_CONST, this->buffer_); + reinterpret_cast<CORBA::Octet * ACE_CAST_CONST> (this->buffer_); return tmp[i]; } diff --git a/TAO/tao/Sequence_T.i b/TAO/tao/Sequence_T.i index 334130b9b0f..1575fbf085a 100644 --- a/TAO/tao/Sequence_T.i +++ b/TAO/tao/Sequence_T.i @@ -50,7 +50,7 @@ ACE_INLINE const T * TAO_Unbounded_Sequence<T>::get_buffer (void) const { - return ACE_reinterpret_cast (const T * ACE_CAST_CONST, this->buffer_); + return reinterpret_cast<const T * ACE_CAST_CONST> (this->buffer_); } // *************************************************** @@ -94,7 +94,7 @@ ACE_INLINE const T * TAO_Bounded_Sequence<T, MAX>::get_buffer (void) const { - return ACE_reinterpret_cast (const T * ACE_CAST_CONST, this->buffer_); + return reinterpret_cast<const T * ACE_CAST_CONST> (this->buffer_); } template <class T, size_t MAX> @@ -103,7 +103,7 @@ T & TAO_Bounded_Sequence<T, MAX>::operator[] (CORBA::ULong i) { TAO_SEQUENCE_ASSERT (i, this->maximum_); - T * tmp = ACE_reinterpret_cast (T *,this->buffer_); + T * tmp = reinterpret_cast<T *> (this->buffer_); return tmp[i]; } @@ -113,7 +113,7 @@ const T & TAO_Bounded_Sequence<T, MAX>::operator[] (CORBA::ULong i) const { TAO_SEQUENCE_ASSERT (i, this->maximum_); - const T * tmp = ACE_reinterpret_cast (const T * ACE_CAST_CONST,this->buffer_); + const T * tmp = reinterpret_cast<const T * ACE_CAST_CONST> (this->buffer_); return tmp[i]; } @@ -311,8 +311,7 @@ TAO_Unbounded_Object_Sequence<T,T_var>::operator[] ( ) const { TAO_SEQUENCE_ASSERT (slot, this->maximum_); - T ** const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST, - this->buffer_); + T ** const tmp = reinterpret_cast<T ** ACE_CAST_CONST> (this->buffer_); return TAO_Object_Manager<T,T_var> (tmp + slot, this->release_); } @@ -347,8 +346,7 @@ TAO_Bounded_Object_Sequence<T, T_var,MAX>::operator[] ( ) const { TAO_SEQUENCE_ASSERT (slot, this->maximum_); - T ** const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST, - this->buffer_); + T ** const tmp = reinterpret_cast<T ** ACE_CAST_CONST> (this->buffer_); return TAO_Object_Manager<T,T_var> (tmp + slot, this->release_ ); } @@ -381,7 +379,7 @@ TAO_Pseudo_Object_Manager<T> TAO_Unbounded_Pseudo_Sequence<T>::operator[] (CORBA::ULong slot) const { TAO_SEQUENCE_ASSERT (slot, this->maximum_); - T ** const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST, this->buffer_); + T ** const tmp = reinterpret_cast<T ** ACE_CAST_CONST> (this->buffer_); return TAO_Pseudo_Object_Manager<T> (tmp + slot, this->release_); } @@ -413,8 +411,7 @@ TAO_Pseudo_Object_Manager<T> TAO_Bounded_Pseudo_Sequence<T,MAX>::operator[] (CORBA::ULong slot) const { TAO_SEQUENCE_ASSERT (slot, this->maximum_); - T ** const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST, - this->buffer_); + T ** const tmp = reinterpret_cast<T ** ACE_CAST_CONST> (this->buffer_); return TAO_Pseudo_Object_Manager<T> (tmp + slot, this->release_); } @@ -476,7 +473,7 @@ TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::operator[] (CORBA::ULong i) #if defined (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) return ((T *) this->buffer_)[i]; #else /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */ - return (ACE_reinterpret_cast (T *, this->buffer_))[i]; + return (reinterpret_cast<T *> (this->buffer_))[i]; #endif /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */ } @@ -490,7 +487,7 @@ TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::operator[] (CORBA::ULong i) const #if defined (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) return ((const T * ACE_CAST_CONST) this->buffer_)[i]; #else /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */ - return (ACE_reinterpret_cast (const T * ACE_CAST_CONST, this->buffer_))[i]; + return (reinterpret_cast<const T * ACE_CAST_CONST> (this->buffer_))[i]; #endif /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */ } @@ -499,8 +496,7 @@ ACE_INLINE const T * TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::get_buffer (void) const { - return ACE_reinterpret_cast (const T * ACE_CAST_CONST, - this->buffer_); + return reinterpret_cast<const T * ACE_CAST_CONST> (this->buffer_); } // ************************************************************* @@ -535,7 +531,7 @@ TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::operator[] (CORBA::ULong i) #if defined (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) return ((T *) this->buffer_)[i]; #else /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */ - return (ACE_reinterpret_cast (T *, this->buffer_))[i]; + return (reinterpret_cast<T *> (this->buffer_))[i]; #endif /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */ } @@ -551,7 +547,7 @@ TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::operator[] ( #if defined (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) return ((const T * ACE_CAST_CONST) this->buffer_)[i]; #else /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */ - return (ACE_reinterpret_cast (const T * ACE_CAST_CONST, this->buffer_))[i]; + return (reinterpret_cast<const T * ACE_CAST_CONST> (this->buffer_))[i]; #endif /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */ } @@ -560,8 +556,7 @@ ACE_INLINE const T * TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::get_buffer (void) const { - return ACE_reinterpret_cast (const T * ACE_CAST_CONST, - this->buffer_); + return reinterpret_cast<const T * ACE_CAST_CONST> (this->buffer_); } // ************************************************************* diff --git a/TAO/tao/Service_Context.cpp b/TAO/tao/Service_Context.cpp index a81e7076a56..b2708c3f4ce 100644 --- a/TAO/tao/Service_Context.cpp +++ b/TAO/tao/Service_Context.cpp @@ -24,7 +24,7 @@ TAO_Service_Context::set_context_i (IOP::ServiceId id, // Make a *copy* of the CDR stream... size_t length = cdr.total_length (); - context.context_data.length (ACE_static_cast (CORBA::ULong, length)); + context.context_data.length (static_cast<CORBA::ULong> (length)); CORBA::Octet *buf = context.context_data.get_buffer (); for (const ACE_Message_Block *i = cdr.begin (); @@ -44,7 +44,7 @@ TAO_Service_Context::set_context_i (IOP::ServiceContext &context, { // Make a *copy* of the CDR stream... size_t length = cdr.total_length (); - context.context_data.length (ACE_static_cast (CORBA::ULong, length)); + context.context_data.length (static_cast<CORBA::ULong> (length)); CORBA::Octet *buf = context.context_data.get_buffer (); for (const ACE_Message_Block *i = cdr.begin (); diff --git a/TAO/tao/Sync_Strategies.cpp b/TAO/tao/Sync_Strategies.cpp index a03f39a84fc..994f9ff0fb9 100644 --- a/TAO/tao/Sync_Strategies.cpp +++ b/TAO/tao/Sync_Strategies.cpp @@ -71,7 +71,7 @@ TAO_Eager_Buffering_Sync_Strategy::buffering_constraints_reached ( TAO::BufferingConstraintPolicy::_narrow (bcp_policy.in()); TAO_Buffering_Constraint_Policy *buffering_constraint_policy = - ACE_dynamic_cast (TAO_Buffering_Constraint_Policy *, bcp.in ()); + dynamic_cast<TAO_Buffering_Constraint_Policy *> (bcp.in ()); if (buffering_constraint_policy == 0) { diff --git a/TAO/tao/Synch_Queued_Message.cpp b/TAO/tao/Synch_Queued_Message.cpp index 1f41ecc331d..b024fffc314 100644 --- a/TAO/tao/Synch_Queued_Message.cpp +++ b/TAO/tao/Synch_Queued_Message.cpp @@ -15,7 +15,7 @@ TAO_Synch_Queued_Message:: ACE_Allocator *alloc, int is_heap_allocated) : TAO_Queued_Message (alloc, is_heap_allocated) - , contents_ (ACE_const_cast (ACE_Message_Block*,contents)) + , contents_ (const_cast<ACE_Message_Block*> (contents)) , current_block_ (contents_) { } @@ -66,10 +66,10 @@ TAO_Synch_Queued_Message::fill_iov (int iovcnt_max, { // Collect the data in the iovec. iov[iovcnt].iov_base = message_block->rd_ptr (); - iov[iovcnt].iov_len = ACE_static_cast (u_long, message_block_length); + iov[iovcnt].iov_len = static_cast<u_long> (message_block_length); // Increment iovec counter. - iovcnt++; + ++iovcnt; } } } @@ -122,8 +122,8 @@ TAO_Synch_Queued_Message::clone (ACE_Allocator *alloc) if (alloc) { ACE_NEW_MALLOC_RETURN (qm, - ACE_static_cast (TAO_Synch_Queued_Message *, - alloc->malloc (sizeof (TAO_Synch_Queued_Message))), + static_cast<TAO_Synch_Queued_Message *> ( + alloc->malloc (sizeof (TAO_Synch_Queued_Message))), TAO_Synch_Queued_Message (mb, alloc), 0); diff --git a/TAO/tao/Tagged_Components.cpp b/TAO/tao/Tagged_Components.cpp index 5bf66ad180d..925a6f4d9d8 100644 --- a/TAO/tao/Tagged_Components.cpp +++ b/TAO/tao/Tagged_Components.cpp @@ -79,7 +79,7 @@ TAO_Tagged_Components::set_component_i (IOP::ComponentId tag, // Make a *copy* of the CDR stream... size_t length = cdr.total_length (); - component.component_data.length (ACE_static_cast (CORBA::ULong, length)); + component.component_data.length (static_cast<CORBA::ULong> (length)); CORBA::Octet *buf = component.component_data.get_buffer (); for (const ACE_Message_Block *i = cdr.begin (); @@ -133,9 +133,10 @@ void TAO_Tagged_Components::set_known_component_i ( const IOP::TaggedComponent& component) { - TAO_InputCDR cdr (ACE_reinterpret_cast (const char*, - component.component_data.get_buffer ()), + TAO_InputCDR cdr (reinterpret_cast<const char*> ( + component.component_data.get_buffer ()), component.component_data.length ()); + CORBA::Boolean byte_order; if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0) @@ -143,7 +144,7 @@ TAO_Tagged_Components::set_known_component_i ( return; } - cdr.reset_byte_order (ACE_static_cast(int,byte_order)); + cdr.reset_byte_order (static_cast<int> (byte_order)); if (component.tag == IOP::TAG_ORB_TYPE) { diff --git a/TAO/tao/Tagged_Profile.i b/TAO/tao/Tagged_Profile.i index c134318766e..52e7b34fae1 100644 --- a/TAO/tao/Tagged_Profile.i +++ b/TAO/tao/Tagged_Profile.i @@ -35,7 +35,7 @@ TAO_Tagged_Profile::object_key (TAO::ObjectKey &object_key) ACE_INLINE const TAO::ObjectKey & TAO_Tagged_Profile::object_key (void) const { - return ACE_const_cast(TAO_Tagged_Profile *, this)->object_key (); + return const_cast<TAO_Tagged_Profile *> (this)->object_key (); } ACE_INLINE const IOP::TaggedProfile & diff --git a/TAO/tao/TimeBaseC.cpp b/TAO/tao/TimeBaseC.cpp index e964e8a07bd..683a23dffad 100644 --- a/TAO/tao/TimeBaseC.cpp +++ b/TAO/tao/TimeBaseC.cpp @@ -50,10 +50,10 @@ namespace TAO } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/structure_cs.cpp:66 -void +void TimeBase::UtcT::_tao_any_destructor ( void *_tao_void_pointer ) @@ -63,16 +63,15 @@ TimeBase::UtcT::_tao_any_destructor ( delete _tao_tmp_pointer; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/structure_cs.cpp:66 -void +void TimeBase::IntervalT::_tao_any_destructor ( void *_tao_void_pointer ) { - IntervalT *_tao_tmp_pointer = - ACE_static_cast (IntervalT *, _tao_void_pointer); + IntervalT *_tao_tmp_pointer = static_cast<IntervalT *> (_tao_void_pointer); delete _tao_tmp_pointer; } @@ -173,5 +172,4 @@ CORBA::Boolean operator>> ( TimeBase::IntervalT \ > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp index 09903c40691..4dbae368ac2 100644 --- a/TAO/tao/Transport.cpp +++ b/TAO/tao/Transport.cpp @@ -89,7 +89,7 @@ dump_iov (iovec *iov, int iovcnt, size_t id, } ACE_HEX_DUMP ((LM_DEBUG, - ACE_static_cast(char*,iov[i].iov_base) + offset, + static_cast<char*> (iov[i].iov_base) + offset, len, header)); } diff --git a/TAO/tao/Transport_Cache_Manager.cpp b/TAO/tao/Transport_Cache_Manager.cpp index ca8feb07e71..64f0be150b1 100644 --- a/TAO/tao/Transport_Cache_Manager.cpp +++ b/TAO/tao/Transport_Cache_Manager.cpp @@ -21,7 +21,7 @@ ACE_RCSID (tao, TAO_Transport_Cache_Manager::TAO_Transport_Cache_Manager (TAO_ORB_Core &orb_core) : percent_ (orb_core.resource_factory ()->purge_percentage ()), purging_strategy_ (orb_core.resource_factory ()->create_purging_strategy ()), - cache_map_ (ACE_static_cast (size_t, ACE::max_handles ())), + cache_map_ (static_cast<size_t> (ACE::max_handles ())), condition_ (0), cache_lock_ (0), muxed_number_ (orb_core.resource_factory ()->max_muxed_connections ()), @@ -465,7 +465,7 @@ TAO_Transport_Cache_Manager::purge (void) int count = 0; - for(int i = 0; count < amount && i < sorted_size; i++) + for(int i = 0; count < amount && i < sorted_size; ++i) { if (this->is_entry_idle (sorted_set[i])) { @@ -529,7 +529,7 @@ TAO_Transport_Cache_Manager::sort_set (DESCRIPTOR_SET& entries, { #if defined (ACE_LACKS_QSORT) // Use insertion sort if we don't have qsort - for(int i = 1; i < current_size; i++) + for(int i = 1; i < current_size; ++i) { if (entries[i]->int_id_.transport ()->purging_order () < entries[i - 1]->int_id_.transport ()->purging_order ()) @@ -538,7 +538,7 @@ TAO_Transport_Cache_Manager::sort_set (DESCRIPTOR_SET& entries, for(int j = i; j > 0 && entries[j - 1]->int_id_.transport ()->purging_order () > - entry->int_id_.transport ()->purging_order (); j--) + entry->int_id_.transport ()->purging_order (); --j) { HASH_MAP_ENTRY* holder = entries[j]; entries[j] = entries[j - 1]; @@ -565,7 +565,7 @@ TAO_Transport_Cache_Manager::fill_set_i (DESCRIPTOR_SET& sorted_set) // Do we need to worry about cache purging? if (cache_maximum >= 0) { - current_size = ACE_static_cast (int, this->cache_map_.current_size ()); + current_size = static_cast<int> (this->cache_map_.current_size ()); if (TAO_debug_level > 0) { @@ -581,7 +581,7 @@ TAO_Transport_Cache_Manager::fill_set_i (DESCRIPTOR_SET& sorted_set) HASH_MAP_ITER iter = this->cache_map_.begin (); - for (int i = 0; i < current_size; i++) + for (int i = 0; i < current_size; ++i) { sorted_set[i] = &(*iter); iter++; diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp index 0f9ce946f3e..00783bcd224 100644 --- a/TAO/tao/Transport_Connector.cpp +++ b/TAO/tao/Transport_Connector.cpp @@ -123,7 +123,7 @@ TAO_Connector::make_mprofile (const char *string, // Tell the MProfile object how many Profiles it should hold. // MProfile::set(size) returns the number profiles it can hold. - if (mprofile.set (profile_count) != ACE_static_cast (int, profile_count)) + if (mprofile.set (profile_count) != static_cast<int> (profile_count)) { ACE_THROW_RETURN (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( @@ -160,7 +160,7 @@ TAO_Connector::make_mprofile (const char *string, end = objkey_index; // Handle last endpoint differently } - if (end < ACE_static_cast (int, ior.length ()) && end != ior.npos) + if (end < static_cast<int> (ior.length ()) && end != ior.npos) { ACE_CString endpoint = ior.substring (begin, end - begin); diff --git a/TAO/tao/UTF16_BOM_Translator.cpp b/TAO/tao/UTF16_BOM_Translator.cpp index 12a5ef44ac3..10318168834 100644 --- a/TAO/tao/UTF16_BOM_Translator.cpp +++ b/TAO/tao/UTF16_BOM_Translator.cpp @@ -1,22 +1,13 @@ -// -*- C++ -*- // $Id$ // ============================================================================ -// -// = LIBRARY -// tao -// -// = FILENAME -// UTF16_BOM_Translator.cpp -// -// = DESCRIPTION // Manages the transformation between native and transmitted UTF-16. It is // Required because transmitted UTF-16 may carry a byte order marker (BOM) // that is not part of the data contents. If no BOM is present, then the // serialized UTF-16 data is big-endian, regardless of the byte order of // the containing encapsulation. // -// = AUTHOR +// AUTHOR // Phil Mesnier <mesnier_p@ociweb.com> // // ============================================================================ @@ -24,11 +15,17 @@ #include "UTF16_BOM_Translator.h" #include "ace/OS_Memory.h" + +ACE_RCSID (tao, + UTF16_BOM_Translator, + "$Id$") + + // **************************************************************** typedef ACE_CDR::UShort ACE_UTF16_T; -static const size_t ACE_UTF16_CODEPOINT_SIZE = sizeof(ACE_UTF16_T); +static const size_t ACE_UTF16_CODEPOINT_SIZE = sizeof (ACE_UTF16_T); static const unsigned short ACE_UNICODE_BOM_CORRECT = 0xFEFFU; static const unsigned short ACE_UNICODE_BOM_SWAPPED = 0xFFFEU; @@ -49,8 +46,8 @@ UTF16_BOM_Translator::~UTF16_BOM_Translator (void) ACE_CDR::Boolean UTF16_BOM_Translator::read_wchar (ACE_InputCDR &cdr, ACE_CDR::WChar &x) { - if (ACE_static_cast (ACE_CDR::Short, this->major_version(cdr)) == 1 && - ACE_static_cast (ACE_CDR::Short, this->minor_version(cdr)) == 2) + if (static_cast<ACE_CDR::Short> (this->major_version (cdr)) == 1 && + static_cast<ACE_CDR::Short> (this->minor_version (cdr)) == 2) { ACE_CDR::Octet len; if (! this->read_1 (cdr, &len)) @@ -61,23 +58,23 @@ UTF16_BOM_Translator::read_wchar (ACE_InputCDR &cdr, ACE_CDR::WChar &x) ACE_CDR::Short sx; if (!this->read_array (cdr, - ACE_reinterpret_cast (char *,&sx),1,1,2)) + reinterpret_cast<char *> (&sx), 1,1,2)) return 0; #if defined (ACE_LITTLE_ENDIAN) ACE_CDR::Short ux; - ACE_CDR::swap_2 (ACE_reinterpret_cast (const char*,&sx), - ACE_reinterpret_cast(char *,&ux)); - x = ACE_static_cast (ACE_CDR::WChar, ux); + ACE_CDR::swap_2 (reinterpret_cast<const char*> (&sx), + reinterpret_cast<char *> (&ux)); + x = static_cast<ACE_CDR::WChar> (ux); #else - x = ACE_static_cast(ACE_CDR::WChar, sx); + x = static_cast<ACE_CDR::WChar> (sx); #endif // ACE_LITTLE_ENDIAN return 1; } ACE_UTF16_T buf[2]; if (len != 4 || !this->read_array (cdr, - ACE_reinterpret_cast(char *,buf), + reinterpret_cast<char *> (buf), 1,1,4)) // get BO & payload return 0; // Check for byte order mark, if found, consume and honor it. @@ -89,12 +86,12 @@ UTF16_BOM_Translator::read_wchar (ACE_InputCDR &cdr, ACE_CDR::WChar &x) if (buf[0] == ACE_UNICODE_BOM_SWAPPED) { ACE_CDR::Short ux; - ACE_CDR::swap_2 (ACE_reinterpret_cast (const char*,&buf[1]), - ACE_reinterpret_cast(char *,&ux)); - x = ACE_static_cast (ACE_CDR::WChar, ux); + ACE_CDR::swap_2 (reinterpret_cast<const char*> (&buf[1]), + reinterpret_cast<char *> (&ux)); + x = static_cast<ACE_CDR::WChar> (ux); } else - x = ACE_static_cast(ACE_CDR::WChar, buf[1]); + x = static_cast<ACE_CDR::WChar> (buf[1]); return 1; } // What do we do here? The length is > 2 but the first word @@ -105,7 +102,7 @@ UTF16_BOM_Translator::read_wchar (ACE_InputCDR &cdr, ACE_CDR::WChar &x) ACE_UTF16_T sx; if (this->read_2 (cdr, &sx)) { - x = ACE_static_cast(ACE_CDR::WChar, sx); + x = static_cast<ACE_CDR::WChar> (sx); return 1; } return 0; @@ -122,10 +119,10 @@ UTF16_BOM_Translator::read_wstring (ACE_InputCDR &cdr, // A check for the length being too great is done later in the // call to read_char_array but we want to have it done before // the memory is allocated. - if (len > 0 && len <= cdr.length()) + if (len > 0 && len <= cdr.length ()) { - if (ACE_static_cast (ACE_CDR::Short, this->major_version(cdr)) == 1 - && ACE_static_cast (ACE_CDR::Short, this->minor_version(cdr)) > 1) + if (static_cast<ACE_CDR::Short> (this->major_version (cdr)) == 1 + && static_cast<ACE_CDR::Short> (this->minor_version (cdr)) > 1) { len /= ACE_UTF16_CODEPOINT_SIZE; @@ -135,7 +132,7 @@ UTF16_BOM_Translator::read_wstring (ACE_InputCDR &cdr, 0); x[len] = L'\x00'; - if (this->read_wchar_array_i (cdr, x, len,1)) + if (this->read_wchar_array_i (cdr, x, len, 1)) { // Since reading the array may have adjusted the length, // we simply rewrite the null terminator @@ -176,11 +173,11 @@ UTF16_BOM_Translator::read_wchar_array_i (ACE_InputCDR & cdr, int has_bom = 0; int must_swap = 0; char* buf; - size_t align = ACE_CDR::SHORT_ALIGN; + static const size_t align = ACE_CDR::SHORT_ALIGN; if (cdr.adjust (ACE_UTF16_CODEPOINT_SIZE * length, align, buf) == 0) { // check for byte order mark. If found, honor it then discard it - ACE_UTF16_T *sb = ACE_reinterpret_cast(ACE_UTF16_T *, buf); + ACE_UTF16_T *sb = reinterpret_cast<ACE_UTF16_T *> (buf); if (*sb == ACE_UNICODE_BOM_CORRECT || *sb == ACE_UNICODE_BOM_SWAPPED) { must_swap = (*sb == ACE_UNICODE_BOM_SWAPPED); @@ -196,24 +193,25 @@ UTF16_BOM_Translator::read_wchar_array_i (ACE_InputCDR & cdr, if (has_bom) { buf += ACE_UTF16_CODEPOINT_SIZE; - sb++; + ++sb; + if (adjust_len) length -= 1; } - for (size_t i = 0; i < length; i++) + for (size_t i = 0; i < length; ++i) #if defined (ACE_DISABLE_SWAP_ON_READ) - x[i] = ACE_static_cast (ACE_CDR::WChar, sb[i]); + x[i] = static_cast<ACE_CDR::WChar> (sb[i]); #else if (!must_swap) { - x[i] = ACE_static_cast (ACE_CDR::WChar, sb[i]); + x[i] = static_cast<ACE_CDR::WChar> (sb[i]); } else { ACE_CDR::UShort sx; - ACE_CDR::swap_2 (&buf[i*2], ACE_reinterpret_cast(char *,&sx)); - x[i] = ACE_static_cast (ACE_CDR::WChar,sx); + ACE_CDR::swap_2 (&buf[i*2], reinterpret_cast<char *> (&sx)); + x[i] = static_cast<ACE_CDR::WChar> (sx); } #endif /* ACE_DISABLE_SWAP_ON_READ */ @@ -234,23 +232,24 @@ UTF16_BOM_Translator::read_wchar_array (ACE_InputCDR & cdr, if (length == 0) return 1; - if (ACE_static_cast (ACE_CDR::Short, this->major_version(cdr)) == 1 - && ACE_static_cast (ACE_CDR::Short, this->minor_version(cdr)) > 1) + if (static_cast<ACE_CDR::Short> (this->major_version (cdr)) == 1 + && static_cast<ACE_CDR::Short> (this->minor_version (cdr)) > 1) { - for (size_t i = 0; i < length; i++) - if (!this->read_wchar(cdr,x[i])) + for (size_t i = 0; i < length; ++i) + if (!this->read_wchar (cdr, x[i])) return 0; + return 1; } else - return this->read_wchar_array_i(cdr,x,length); + return this->read_wchar_array_i (cdr, x, length); } ACE_CDR::Boolean UTF16_BOM_Translator::write_wchar (ACE_OutputCDR &cdr, ACE_CDR::WChar x) { - return this->write_wchar_i (cdr,x,1); + return this->write_wchar_i (cdr, x, 1); } ACE_CDR::Boolean @@ -258,8 +257,8 @@ UTF16_BOM_Translator::write_wchar_i (ACE_OutputCDR &cdr, ACE_CDR::WChar x, int use_BOM) { - if (ACE_static_cast (ACE_CDR::Short, this->major_version(cdr)) == 1 - && ACE_static_cast (ACE_CDR::Short, this->minor_version(cdr)) > 1) + if (static_cast<ACE_CDR::Short> (this->major_version (cdr)) == 1 + && static_cast<ACE_CDR::Short> (this->minor_version (cdr)) > 1) { int len = 0; ACE_CDR::UShort buffer[2]; @@ -267,28 +266,30 @@ UTF16_BOM_Translator::write_wchar_i (ACE_OutputCDR &cdr, { len = 2; buffer[0] = ACE_UNICODE_BOM_CORRECT; - buffer[1] = ACE_static_cast(ACE_CDR::Short,x); + buffer[1] = static_cast<ACE_CDR::Short> (x); } else { len = 1; - if (cdr.byte_order()) - ACE_CDR::swap_2 (ACE_reinterpret_cast (const char *,&x), - ACE_reinterpret_cast (char *,buffer)); + if (cdr.byte_order ()) + ACE_CDR::swap_2 (reinterpret_cast<const char *> (&x), + reinterpret_cast<char *> (buffer)); else - buffer[0] = ACE_static_cast(ACE_CDR::Short,x); + buffer[0] = static_cast<ACE_CDR::Short> (x); } - unsigned char tcsize = ACE_static_cast (unsigned char, - len * ACE_UTF16_CODEPOINT_SIZE); + + unsigned char tcsize = + static_cast<unsigned char> (len * ACE_UTF16_CODEPOINT_SIZE); + if (this->write_1 (cdr, &tcsize)) return this->write_array(cdr, &buffer, tcsize, 1, 1); else return 0; } - else if (ACE_static_cast (ACE_CDR::Short, this->minor_version(cdr)) != 0) + else if (static_cast<ACE_CDR::Short> (this->minor_version (cdr)) != 0) { // GIOP 1.1 simple support - ACE_UTF16_T sx = ACE_static_cast (ACE_UTF16_T, x); + ACE_UTF16_T sx = static_cast<ACE_UTF16_T> (x); return this->write_2 (cdr, &sx); } else @@ -303,8 +304,8 @@ UTF16_BOM_Translator::write_wstring (ACE_OutputCDR & cdr, ACE_CDR::ULong len, const ACE_CDR::WChar *x) { - if (ACE_static_cast (ACE_CDR::Short, this->major_version(cdr)) == 1 - && ACE_static_cast (ACE_CDR::Short, this->minor_version(cdr)) > 1) + if (static_cast<ACE_CDR::Short> (this->major_version (cdr)) == 1 + && static_cast<ACE_CDR::Short> (this->minor_version (cdr)) > 1) { ACE_CDR::ULong l = (len+1) * ACE_UTF16_CODEPOINT_SIZE; if (this->write_4 (cdr, &l) && @@ -324,6 +325,7 @@ UTF16_BOM_Translator::write_wstring (ACE_OutputCDR & cdr, return this->write_2 (cdr,&s); } } + return 0; } @@ -332,14 +334,16 @@ UTF16_BOM_Translator::write_wchar_array (ACE_OutputCDR & cdr, const ACE_CDR::WChar *x, ACE_CDR::ULong length) { - if (ACE_static_cast (ACE_CDR::Short, this->major_version(cdr)) == 1 - && ACE_static_cast (ACE_CDR::Short, this->minor_version(cdr)) > 1) + if (static_cast<ACE_CDR::Short> (this->major_version (cdr)) == 1 + && static_cast<ACE_CDR::Short> (this->minor_version (cdr)) > 1) { - for (size_t i = 0; i < length; i++) - if (this->write_wchar_i (cdr,x[i]) == 0) + for (size_t i = 0; i < length; ++i) + if (this->write_wchar_i (cdr, x[i]) == 0) return 0; + return 1; } + return this->write_wchar_array_i (cdr, x, length); } @@ -351,18 +355,18 @@ UTF16_BOM_Translator::write_wchar_array_i (ACE_OutputCDR & cdr, if (length == 0) return 1; char* buf; - size_t align = ACE_CDR::SHORT_ALIGN; + static const size_t align = ACE_CDR::SHORT_ALIGN; if (cdr.adjust (ACE_UTF16_CODEPOINT_SIZE * length, align, buf) != 0) { return 0; } - ACE_UTF16_T *sb = ACE_reinterpret_cast(ACE_UTF16_T *, buf); + ACE_UTF16_T *sb = reinterpret_cast<ACE_UTF16_T *> (buf); - for (size_t i = 0; i < length; i++) + for (size_t i = 0; i < length; ++i) { - sb[i] = ACE_static_cast (ACE_UTF16_T,x[i]); + sb[i] = static_cast<ACE_UTF16_T> (x[i]); } return 1; diff --git a/TAO/tao/Var_Array_Argument_T.cpp b/TAO/tao/Var_Array_Argument_T.cpp index 46356a756e2..c7f04620b0a 100644 --- a/TAO/tao/Var_Array_Argument_T.cpp +++ b/TAO/tao/Var_Array_Argument_T.cpp @@ -65,10 +65,10 @@ TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany>::interceptor_param ( // ============================================================== -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> CORBA::Boolean @@ -84,10 +84,10 @@ TAO::Out_Var_Array_Argument_T<S,S_slice,S_var,S_out,S_forany,S_tag>::demarshal ( return cdr >> tmp; } -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> void @@ -100,10 +100,10 @@ interceptor_param (Dynamic::Parameter & p) // ============================================================ -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> CORBA::Boolean TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::demarshal ( @@ -120,10 +120,10 @@ TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::demarshal ( return cdr >> tmp; } -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> void TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>:: diff --git a/TAO/tao/Var_Array_Argument_T.inl b/TAO/tao/Var_Array_Argument_T.inl index 7f3b034077e..a5f1521a87f 100644 --- a/TAO/tao/Var_Array_Argument_T.inl +++ b/TAO/tao/Var_Array_Argument_T.inl @@ -1,10 +1,12 @@ +// -*- C++ -*- +// // $Id$ template<typename S, typename S_slice, typename S_forany> ACE_INLINE TAO::In_Var_Array_Argument_T<S,S_slice,S_forany>:: In_Var_Array_Argument_T (const S_slice * x) - : x_ (ACE_const_cast (S_slice *, x)) + : x_ (const_cast<S_slice *> (x)) {} template<typename S, typename S_slice, typename S_forany> diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp index fe11e768442..96ee1c2cc71 100644 --- a/TAO/tao/append.cpp +++ b/TAO/tao/append.cpp @@ -358,12 +358,13 @@ TAO_Marshal_Struct::append (CORBA::TypeCode_ptr tc, CORBA::TypeCode_var param; // Number of fields in the struct. - int member_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); + const CORBA::ULong member_count = + tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); - for (int i = 0; + for (CORBA::ULong i = 0; i < member_count && retval == TAO::TRAVERSE_CONTINUE; - i++) + ++i) { // get member type param = tc->member_type (i ACE_ENV_ARG_PARAMETER); @@ -373,7 +374,7 @@ TAO_Marshal_Struct::append (CORBA::TypeCode_ptr tc, TAO_Marshal_Object::perform_append (param.in (), src, dest - ACE_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); } @@ -483,17 +484,17 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, return TAO::TRAVERSE_STOP; } - CORBA::ULong member_count = + const CORBA::ULong member_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); - const CORBA::ULong null_member = ~ACE_static_cast (CORBA::ULong, 0U); + const CORBA::ULong null_member = ~static_cast<CORBA::ULong> (0U); CORBA::ULong current_member = null_member; CORBA::ULong default_member = null_member; for (CORBA::ULong i = 0; - i != member_count && current_member == null_member; + i < member_count && current_member == null_member; ++i) { CORBA::Any_var any = tc->member_label (i @@ -567,7 +568,7 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, ACE_CDR::consolidate (mb, out.begin ()); type_known = true; } - + TAO_InputCDR cdr (mb->data_block (), ACE_Message_Block::DONT_DELETE, mb->rd_ptr () - mb->base (), @@ -577,7 +578,7 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, TAO_DEF_GIOP_MINOR); cdr.read_ulong (d); - + if (type_known) { mb->release (); @@ -1146,12 +1147,15 @@ TAO_Marshal_Except::append (CORBA::TypeCode_ptr tc, continue_append = dest->append_string (*src); // Number of fields in the struct. - int member_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); + const CORBA::ULong int member_count = + tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); - for (int i = 0; i < member_count + for (CORBA::ULong i = 0; + i < member_count && retval == TAO::TRAVERSE_CONTINUE - && continue_append == 1; i++) + && continue_append == 1; + ++i) { param = tc->member_type (i ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); @@ -1159,7 +1163,7 @@ TAO_Marshal_Except::append (CORBA::TypeCode_ptr tc, retval = TAO_Marshal_Object::perform_append (param.in (), src, dest - ACE_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } if (retval == TAO::TRAVERSE_CONTINUE @@ -1169,6 +1173,7 @@ TAO_Marshal_Except::append (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Except::append detected error\n"))); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); @@ -1198,6 +1203,7 @@ TAO_Marshal_WString::append (CORBA::TypeCode_ptr, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_WString::append detected error\n"))); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); @@ -1218,9 +1224,9 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr tc, // first-time/nested appends so that we won't attempt to // append rep_id several times. // - if (nested_processing_ == 0) + if (this->nested_processing_ == 0) { - nested_processing_ = 1; + this->nested_processing_ = 1; CORBA::ULong value_tag; @@ -1277,12 +1283,13 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr tc, } // Number of fields in the struct. - int member_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); + const CORBA::ULong member_count = + tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); - for (int i = 0; + for (CORBA::ULong i = 0; i < member_count && retval == TAO::TRAVERSE_CONTINUE; - i++) + ++i) { // get member type param = tc->member_type (i ACE_ENV_ARG_PARAMETER); @@ -1292,7 +1299,7 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr tc, TAO_Marshal_Object::perform_append (param.in (), src, dest - ACE_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); } diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index 5c29d9a679e..fb20ea9f587 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -126,7 +126,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) if (ACE_OS::strcasecmp (argv[curarg], ACE_LIB_TEXT("-ORBResources")) == 0) { - curarg++; + ++curarg; ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%P|%t) This option has been deprecated \n"))); @@ -135,7 +135,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) else if (ACE_OS::strcasecmp (argv[curarg], ACE_LIB_TEXT("-ORBReactorMaskSignals")) == 0) { - curarg++; + ++curarg; if (curarg < argc) { ACE_TCHAR* name = argv[curarg]; @@ -153,7 +153,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) ACE_LIB_TEXT("-ORBProtocolFactory")) == 0) { TAO_ProtocolFactorySet *pset = this->get_protocol_factories (); - curarg++; + ++curarg; if (curarg < argc) { TAO_Protocol_Item *item = 0; @@ -171,7 +171,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) else if (ACE_OS::strcasecmp (argv[curarg], ACE_LIB_TEXT("-ORBNativeCharCodeSet")) == 0) { - curarg++; + ++curarg; CONV_FRAME::CodeSetId ncs; if (ACE_Codeset_Registry::locale_to_registry (ACE_TEXT_ALWAYS_CHAR(argv[curarg]), ncs) == 0) @@ -197,18 +197,18 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) else if (ACE_OS::strcasecmp (argv[curarg], ACE_LIB_TEXT("-ORBNativeWCharCodeSet")) == 0) { - curarg++; + ++curarg; CONV_FRAME::CodeSetId ncs; - if (ACE_Codeset_Registry::locale_to_registry( ACE_TEXT_ALWAYS_CHAR (argv[curarg]), + if (ACE_Codeset_Registry::locale_to_registry (ACE_TEXT_ALWAYS_CHAR (argv[curarg]), ncs) == 0) { char **endPtr = 0; - ncs = ACE_OS::strtoul(ACE_TEXT_ALWAYS_CHAR(argv[curarg]), + ncs = ACE_OS::strtoul (ACE_TEXT_ALWAYS_CHAR(argv[curarg]), endPtr, 0); } // Validate the CodesetId int mb = ACE_Codeset_Registry::get_max_bytes(ncs); - if (mb == 0 || ACE_static_cast(size_t,mb) > sizeof (ACE_CDR::WChar)) + if (mb == 0 || static_cast<size_t> (mb) > sizeof (ACE_CDR::WChar)) { if (TAO_debug_level > 0) ACE_ERROR((LM_ERROR, @@ -224,7 +224,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) else if (ACE_OS::strcasecmp (argv[curarg], ACE_LIB_TEXT("-ORBCharCodesetTranslator")) == 0) { - curarg++; + ++curarg; if (curarg < argc) { TAO_Codeset_Manager *csm = this->get_codeset_manager(); @@ -238,7 +238,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) else if (ACE_OS::strcasecmp (argv[curarg], ACE_LIB_TEXT("-ORBWCharCodesetTranslator")) == 0) { - curarg++; + ++curarg; if (curarg < argc) { TAO_Codeset_Manager *csm = this->get_codeset_manager(); @@ -251,7 +251,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) else if (ACE_OS::strcasecmp (argv[curarg], ACE_LIB_TEXT("-ORBConnectionCachingStrategy")) == 0) { - curarg++; + ++curarg; // @@todo: This needs to be removed after a few betas. The // note is being written during 1.2.3 timeframe. @@ -286,7 +286,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) else if (ACE_OS::strcasecmp (argv[curarg], ACE_LIB_TEXT("-ORBConnectionPurgingStrategy")) == 0) { - curarg++; + ++curarg; if (curarg < argc) { @@ -315,7 +315,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) else if (ACE_OS::strcasecmp (argv[curarg], ACE_LIB_TEXT("-ORBConnectionCacheMax")) == 0) { - curarg++; + ++curarg; if (curarg < argc) this->cache_maximum_ = ACE_OS::atoi (argv[curarg]); else @@ -325,7 +325,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) else if (ACE_OS::strcasecmp (argv[curarg], ACE_LIB_TEXT("-ORBConnectionCachePurgePercentage")) == 0) { - curarg++; + ++curarg; if (curarg < argc) this->purge_percentage_ = ACE_OS::atoi (argv[curarg]); else @@ -335,7 +335,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) else if (ACE_OS::strcasecmp (argv[curarg], ACE_LIB_TEXT("-ORBIORParser")) == 0) { - curarg++; + ++curarg; if (curarg < argc) { @@ -346,7 +346,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) else if (ACE_OS::strcasecmp (argv[curarg], ACE_LIB_TEXT("-ORBConnectionCacheLock")) == 0) { - curarg++; + ++curarg; if (curarg < argc) { ACE_TCHAR* name = argv[curarg]; @@ -370,7 +370,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) else if (ACE_OS::strcasecmp (argv[curarg], ACE_LIB_TEXT("-ORBObjectKeyTableLock")) == 0) { - curarg++; + ++curarg; if (curarg < argc) { ACE_TCHAR* name = argv[curarg]; @@ -393,7 +393,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) else if (ACE_OS::strcasecmp (argv[curarg], ACE_LIB_TEXT("-ORBCorbaObjectLock")) == 0) { - curarg++; + ++curarg; if (curarg < argc) { ACE_TCHAR* name = argv[curarg]; @@ -416,7 +416,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) else if (ACE_OS::strcasecmp (argv[curarg], ACE_LIB_TEXT("-ORBResourceUsage")) == 0) { - curarg++; + ++curarg; if (curarg < argc) { ACE_TCHAR* name = argv[curarg]; @@ -436,7 +436,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) else if (ACE_OS::strcasecmp (argv[curarg], ACE_LIB_TEXT("-ORBFlushingStrategy")) == 0) { - curarg++; + ++curarg; if (curarg < argc) { ACE_TCHAR* name = argv[curarg]; @@ -457,7 +457,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) else if (ACE_OS::strcasecmp (argv[curarg], ACE_LIB_TEXT ("-ORBMuxedConnectionMax")) == 0) { - curarg++; + ++curarg; if (curarg < argc) this->max_muxed_connections_ = ACE_OS::atoi (argv[curarg]); @@ -470,7 +470,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) 4) == 0) { // Can we assume there is an argument after the option? - // curarg++; + // ++curarg; ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("Default_Resource_Factory - ") ACE_LIB_TEXT ("unknown option <%s>\n"), @@ -512,19 +512,19 @@ TAO_Default_Resource_Factory::get_parser_names (char **&names, CORBA::ULong index = 0; this->parser_names_[index] = CORBA::string_dup ("DLL_Parser"); - index++; + ++index; this->parser_names_[index] = CORBA::string_dup ("FILE_Parser"); - index++; + ++index; this->parser_names_[index] = CORBA::string_dup ("CORBALOC_Parser"); - index++; + ++index; this->parser_names_[index] = CORBA::string_dup ("CORBANAME_Parser"); - index++; + ++index; this->parser_names_[index] = CORBA::string_dup ("MCAST_Parser"); - index++; + ++index; names = this->parser_names_; @@ -655,7 +655,7 @@ TAO_Default_Resource_Factory::load_default_protocols (void) int TAO_Default_Resource_Factory::init_protocol_factories (void) { - TAO_ProtocolFactorySetItor end = protocol_factories_.end (); + const TAO_ProtocolFactorySetItor end = protocol_factories_.end (); TAO_ProtocolFactorySetItor factory = protocol_factories_.begin (); if (factory == end) @@ -663,7 +663,7 @@ TAO_Default_Resource_Factory::init_protocol_factories (void) return this->load_default_protocols (); } - for (; factory != end; factory++) + for (; factory != end; ++factory) { const ACE_CString &name = (*factory)->protocol_name (); (*factory)->factory ( @@ -689,15 +689,6 @@ TAO_Default_Resource_Factory::init_protocol_factories (void) return 0; } -#if 0 -// @@todo: Need to go at a later date! -int -TAO_Default_Resource_Factory::use_tss_resources (void) const -{ - return 0; -} -#endif /*if 0*/ - int TAO_Default_Resource_Factory::use_locked_data_blocks (void) const { diff --git a/TAO/tao/default_server.cpp b/TAO/tao/default_server.cpp index 80f3152398f..f0773d51b0b 100644 --- a/TAO/tao/default_server.cpp +++ b/TAO/tao/default_server.cpp @@ -118,11 +118,11 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[]) int curarg; - for (curarg = 0; curarg < argc && argv[curarg]; curarg++) + for (curarg = 0; curarg < argc && argv[curarg]; ++curarg) if (ACE_OS::strcasecmp (argv[curarg], ACE_LIB_TEXT("-ORBConcurrency")) == 0) { - curarg++; + ++curarg; if (curarg < argc) { ACE_TCHAR* name = argv[curarg]; @@ -141,7 +141,7 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (argv[curarg], ACE_LIB_TEXT("-ORBThreadPerConnectionTimeout")) == 0) { - curarg++; + ++curarg; if (curarg < argc) { ACE_TCHAR* name = argv[curarg]; @@ -166,7 +166,7 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[]) || ACE_OS::strcasecmp (argv[curarg], ACE_LIB_TEXT("-ORBActiveObjectMapSize")) == 0) { - curarg++; + ++curarg; if (curarg < argc) this->active_object_map_creation_parameters_.active_object_map_size_ = ACE_OS::strtoul (argv[curarg], @@ -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], @@ -186,7 +186,7 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (argv[curarg], ACE_LIB_TEXT("-ORBActiveHintInIds")) == 0) { - curarg++; + ++curarg; if (curarg < argc) { ACE_TCHAR* value = argv[curarg]; @@ -198,7 +198,7 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (argv[curarg], ACE_LIB_TEXT("-ORBActiveHintInPOANames")) == 0) { - curarg++; + ++curarg; if (curarg < argc) { ACE_TCHAR* value = argv[curarg]; @@ -210,7 +210,7 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (argv[curarg], ACE_LIB_TEXT("-ORBAllowReactivationOfSystemids")) == 0) { - curarg++; + ++curarg; if (curarg < argc) { ACE_TCHAR* value = argv[curarg]; @@ -222,7 +222,7 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (argv[curarg], ACE_LIB_TEXT("-ORBUseridPolicyDemuxStrategy")) == 0) { - curarg++; + ++curarg; if (curarg < argc) { ACE_TCHAR* name = argv[curarg]; @@ -243,7 +243,7 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (argv[curarg], ACE_LIB_TEXT("-ORBSystemidPolicyDemuxStrategy")) == 0) { - curarg++; + ++curarg; if (curarg < argc) { ACE_TCHAR* name = argv[curarg]; @@ -267,7 +267,7 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (argv[curarg], ACE_LIB_TEXT("-ORBPersistentidPolicyDemuxStrategy")) == 0) { - curarg++; + ++curarg; if (curarg < argc) { ACE_TCHAR* name = argv[curarg]; @@ -288,7 +288,7 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (argv[curarg], ACE_LIB_TEXT("-ORBTransientidPolicyDemuxStrategy")) == 0) { - curarg++; + ++curarg; if (curarg < argc) { ACE_TCHAR* name = argv[curarg]; @@ -312,7 +312,7 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (argv[curarg], ACE_LIB_TEXT("-ORBUniqueidPolicyReverseDemuxStrategy")) == 0) { - curarg++; + ++curarg; if (curarg < argc) { ACE_TCHAR* name = argv[curarg]; @@ -332,7 +332,7 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (argv[curarg], ACE_LIB_TEXT("-ORBPOALock")) == 0) { - curarg++; + ++curarg; if (curarg < argc) { ACE_TCHAR* name = argv[curarg]; @@ -350,7 +350,7 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (argv[curarg], ACE_LIB_TEXT("-ORBThreadFlags")) == 0) { - curarg++; + ++curarg; if (curarg < argc) this->tokenize (argv[curarg]); @@ -359,7 +359,7 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strncmp (argv[curarg], ACE_LIB_TEXT("-ORB"), 4) == 0) { // Can we assume there is an argument after the option? - // curarg++; + // ++curarg; ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT("Server_Strategy_Factory - ") ACE_LIB_TEXT("unknown option <%s>\n"), diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h index 6e67a7588d8..0fdddbf567d 100644 --- a/TAO/tao/orbconf.h +++ b/TAO/tao/orbconf.h @@ -814,7 +814,7 @@ enum TAO_Policy_Scope }; #define TAO_POLICY_DEFAULT_SCOPE \ - (ACE_static_cast(TAO_Policy_Scope, \ + (static_cast<TAO_Policy_Scope> ( \ TAO_POLICY_OBJECT_SCOPE | \ TAO_POLICY_THREAD_SCOPE | \ TAO_POLICY_ORB_SCOPE | \ diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp index 0f72534cdda..00e613ea836 100644 --- a/TAO/tao/skip.cpp +++ b/TAO/tao/skip.cpp @@ -109,7 +109,7 @@ TAO_Marshal_Any::skip (CORBA::TypeCode_ptr, return TAO_Marshal_Object::perform_skip (elem_tc.in (), stream - ACE_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } TAO::traverse_status @@ -312,17 +312,17 @@ TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream ACE_ENV_ARG_DECL) { - TAO::traverse_status retval = - TAO::TRAVERSE_CONTINUE; + TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE; CORBA::TypeCode_var param; // Number of fields in the struct. - int member_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); + const CORBA::ULong member_count = + tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); - for (int i = 0; i < member_count - && retval == TAO::TRAVERSE_CONTINUE; - i++) + for (CORBA::ULong i = 0; + i < member_count && retval == TAO::TRAVERSE_CONTINUE; + ++i) { param = tc->member_type (i ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); @@ -339,6 +339,7 @@ TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Struct::skip detected error\n"))); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); @@ -429,17 +430,17 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr tc, return TAO::TRAVERSE_STOP; } - CORBA::ULong member_count = + const CORBA::ULong member_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); - const CORBA::ULong null_member = ~ACE_static_cast (CORBA::ULong, 0U); + const CORBA::ULong null_member = ~static_cast<CORBA::ULong> (0U); CORBA::ULong current_member = null_member; CORBA::ULong default_member = null_member; for (CORBA::ULong i = 0; - i != member_count && current_member == null_member; + i < member_count && current_member == null_member; ++i) { CORBA::Any_var any = tc->member_label (i ACE_ENV_ARG_PARAMETER); @@ -511,7 +512,7 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr tc, ACE_CDR::consolidate (mb, out.begin ()); type_known = true; } - + TAO_InputCDR cdr (mb->data_block (), ACE_Message_Block::DONT_DELETE, mb->rd_ptr () - mb->base (), @@ -521,7 +522,7 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr tc, TAO_DEF_GIOP_MINOR); cdr.read_ulong (d); - + if (type_known) { mb->release (); @@ -588,6 +589,7 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr tc, CORBA::TypeCode_var member_tc = tc->member_type (current_member ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); + return TAO_Marshal_Object::perform_skip (member_tc.in (), src ACE_ENV_ARG_PARAMETER); @@ -724,6 +726,7 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Sequence::skip detected error\n"))); + ACE_THROW_RETURN (CORBA::MARSHAL (), TAO::TRAVERSE_STOP); } @@ -802,7 +805,7 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr tc, int stop = TAO_Marshal_Object::perform_skip (tc2.in (), stream - ACE_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); if (stop == TAO::TRAVERSE_STOP) continue_skipping = 0; @@ -817,6 +820,7 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Sequence::skip detected error\n"))); + ACE_THROW_RETURN (CORBA::MARSHAL (), TAO::TRAVERSE_STOP); } @@ -850,6 +854,7 @@ TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Alias::skip detected error\n"))); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); @@ -876,19 +881,20 @@ TAO_Marshal_Except::skip (CORBA::TypeCode_ptr tc, return TAO::TRAVERSE_STOP; // Number of fields in the exception - int member_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); + const CORBA::ULong member_count = + tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); - for (int i = 0; i < member_count - && retval == TAO::TRAVERSE_CONTINUE; - i++) + for (CORBA::ULong i = 0; + i < member_count && retval == TAO::TRAVERSE_CONTINUE; + ++i) { param = tc->member_type (i ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); retval = TAO_Marshal_Object::perform_skip (param.in (), stream - ACE_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); } @@ -898,6 +904,7 @@ TAO_Marshal_Except::skip (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Except::skip detected error\n"))); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); @@ -939,8 +946,7 @@ TAO_Marshal_Value::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream ACE_ENV_ARG_DECL) { - TAO::traverse_status retval = - TAO::TRAVERSE_CONTINUE; + TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE; CORBA::TypeCode_var param; // Use the same method to skip over our base valuetype. @@ -948,9 +954,9 @@ TAO_Marshal_Value::skip (CORBA::TypeCode_ptr tc, // first-time/nested skips so that we won't attempt to // skip rep_id several times. // - if (nested_processing_ == 0) + if (this->nested_processing_ == 0) { - nested_processing_ = 1; + this->nested_processing_ = 1; CORBA::ULong value_tag; @@ -1003,19 +1009,20 @@ TAO_Marshal_Value::skip (CORBA::TypeCode_ptr tc, } // Number of fields in the valuetype. - int member_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); + const CORBA::ULong member_count = + tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); - for (int i = 0; i < member_count - && retval == TAO::TRAVERSE_CONTINUE; - i++) + for (CORBA::ULong i = 0; + i < member_count && retval == TAO::TRAVERSE_CONTINUE; + ++i) { param = tc->member_type (i ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); retval = TAO_Marshal_Object::perform_skip (param.in (), stream - ACE_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); } @@ -1025,6 +1032,7 @@ TAO_Marshal_Value::skip (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Value::skip detected error\n"))); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); diff --git a/TAO/tao/target_specification.i b/TAO/tao/target_specification.i index 75fd8e7af24..e427b1dd9be 100644 --- a/TAO/tao/target_specification.i +++ b/TAO/tao/target_specification.i @@ -23,8 +23,7 @@ TAO_Target_Specification::target_specifier (const TAO::ObjectKey &key) // general is better.... but you are probably right in this case, i // suspect this stuff goes right in the critical path, right? So // making a copy of the object key would be too expensive.. - this->u_.object_key_ = ACE_const_cast (TAO::ObjectKey *, - &key); + this->u_.object_key_ = const_cast<TAO::ObjectKey *> (&key); } ACE_INLINE void @@ -32,20 +31,18 @@ TAO_Target_Specification::target_specifier (IOP::TaggedProfile &profile) { this->specifier_ = TAO_Target_Specification::Profile_Addr; - this->u_.profile_ = ACE_const_cast (IOP::TaggedProfile *, - &profile); - + this->u_.profile_ = const_cast<IOP::TaggedProfile *> (&profile); + } ACE_INLINE void TAO_Target_Specification::target_specifier (IOP::IOR &ior, CORBA::ULong prof_index) -{ +{ this->specifier_ = TAO_Target_Specification::Reference_Addr; - this->u_.ior_ = ACE_const_cast (IOP::IOR *, - &ior); + this->u_.ior_ = const_cast<IOP::IOR *> (&ior); this->profile_index_ = prof_index; - + } ACE_INLINE const TAO::ObjectKey* |