diff options
Diffstat (limited to 'TAO/tao')
352 files changed, 14642 insertions, 10735 deletions
diff --git a/TAO/tao/Acceptor_Impl.cpp b/TAO/tao/Acceptor_Impl.cpp index 60de99f4815..3b9c88e9f32 100644 --- a/TAO/tao/Acceptor_Impl.cpp +++ b/TAO/tao/Acceptor_Impl.cpp @@ -1,7 +1,5 @@ -// -*- C++ -*- -// +// This may look like C, but it's really -*- C++ -*- // $Id$ - // ============================================================================ // // = LIBRARY @@ -30,7 +28,6 @@ #include "ORB_Core.h" #include "Transport_Cache_Manager.h" #include "Thread_Lane_Resources.h" -#include "Transport.h" #include "debug.h" #if !defined(__ACE_INLINE__) @@ -41,13 +38,12 @@ ACE_RCSID (tao, Acceptor_Impl, "$Id$") -////////////////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////// template <class SVC_HANDLER> -TAO_Creation_Strategy<SVC_HANDLER>::TAO_Creation_Strategy ( - TAO_ORB_Core *orb_core, - void *arg, - CORBA::Boolean flag) +TAO_Creation_Strategy<SVC_HANDLER>::TAO_Creation_Strategy (TAO_ORB_Core *orb_core, + void *arg, + CORBA::Boolean flag) : ACE_Creation_Strategy<SVC_HANDLER> (0, orb_core->reactor()), orb_core_ (orb_core), arg_ (arg), @@ -73,7 +69,7 @@ TAO_Creation_Strategy<SVC_HANDLER>::make_svc_handler (SVC_HANDLER *&sh) return 0; } -////////////////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////// template <class SVC_HANDLER> TAO_Concurrency_Strategy<SVC_HANDLER>::TAO_Concurrency_Strategy (TAO_ORB_Core *orb_core) @@ -85,14 +81,6 @@ template <class SVC_HANDLER> int TAO_Concurrency_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *sh, void *arg) { - sh->transport ()->opened_as (TAO::TAO_SERVER_ROLE); - - // Indicate that this transport was opened in the server role - if (TAO_debug_level > 6) - ACE_DEBUG ((LM_DEBUG, - "(%P|%t) - TAO_Concurrency_Strategy::activate_svc_handler " - "opened as TAO_SERVER_ROLE\n")); - // Here the service handler has been created and the new connection // has been accepted. #REFCOUNT# is one at this point. @@ -194,7 +182,7 @@ TAO_Concurrency_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *sh, return result; } -////////////////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////// template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> TAO_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::TAO_Accept_Strategy (TAO_ORB_Core *orb_core) diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp index 0508d97bbc8..3d0e03ee4b9 100644 --- a/TAO/tao/Acceptor_Registry.cpp +++ b/TAO/tao/Acceptor_Registry.cpp @@ -12,7 +12,6 @@ #include "tao/Acceptor_Filter.h" #include "tao/Endpoint.h" #include "tao/ORB_Constants.h" -#include "tao/SystemException.h" #include "ace/Auto_Ptr.h" #include "ace/OS_NS_string.h" @@ -118,7 +117,8 @@ int TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core, ACE_Reactor *reactor, int ignore_address - ACE_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)) { // protocol_factories is in the following form // IOP1://addr1,addr2,...,addrN/;IOP2://addr1,...addrM/;... diff --git a/TAO/tao/Acceptor_Registry.h b/TAO/tao/Acceptor_Registry.h index 6c3e0694ffa..bdee4795fef 100644 --- a/TAO/tao/Acceptor_Registry.h +++ b/TAO/tao/Acceptor_Registry.h @@ -68,7 +68,8 @@ public: int open (TAO_ORB_Core *orb_core, ACE_Reactor *reactor, int ignore_address - ACE_ENV_ARG_DECL); + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)); /// Close all open acceptors. int close_all (void); diff --git a/TAO/tao/Adapter.cpp b/TAO/tao/Adapter.cpp index 4b9199cdcf1..60d70e90e00 100644 --- a/TAO/tao/Adapter.cpp +++ b/TAO/tao/Adapter.cpp @@ -1,7 +1,6 @@ // $Id$ #include "Object.h" #include "Adapter.h" -#include "SystemException.h" #include "debug.h" #include "ace/Dynamic_Service.h" diff --git a/TAO/tao/Adapter.h b/TAO/tao/Adapter.h index a3723a868f3..6e6dd7ed1ef 100644 --- a/TAO/tao/Adapter.h +++ b/TAO/tao/Adapter.h @@ -21,7 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/SystemException.h" +#include "tao/Exception.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) diff --git a/TAO/tao/Any_Basic_Impl.cpp b/TAO/tao/Any_Basic_Impl.cpp index 66aeedb132c..5a08003b1df 100644 --- a/TAO/tao/Any_Basic_Impl.cpp +++ b/TAO/tao/Any_Basic_Impl.cpp @@ -4,7 +4,6 @@ #include "tao/Typecode.h" #include "tao/Any.h" #include "tao/CDR.h" -#include "tao/SystemException.h" #include "ace/Auto_Ptr.h" #include "ace/OS_NS_string.h" @@ -20,48 +19,49 @@ namespace TAO : Any_Impl (0, tc), kind_ (tc ? tc->kind_ : CORBA::tk_null) { - CORBA::TCKind const tckind = static_cast<CORBA::TCKind> (this->kind_); + CORBA::TCKind tckind = ACE_static_cast (CORBA::TCKind, + this->kind_); switch (tckind) { case CORBA::tk_short: - this->u_.s = *static_cast<CORBA::Short *> (value); + this->u_.s = *ACE_static_cast (CORBA::Short *, value); break; case CORBA::tk_ushort: - this->u_.us = *static_cast<CORBA::UShort *> (value); + this->u_.us = *ACE_static_cast (CORBA::UShort *, value); break; case CORBA::tk_long: - this->u_.l = *static_cast<CORBA::Long *> (value); + this->u_.l = *ACE_static_cast (CORBA::Long *, value); break; case CORBA::tk_ulong: - this->u_.ul = *static_cast<CORBA::ULong *> (value); + this->u_.ul = *ACE_static_cast (CORBA::ULong *, value); break; case CORBA::tk_float: - this->u_.f = *static_cast<CORBA::Float *> (value); + this->u_.f = *ACE_static_cast (CORBA::Float *, value); break; case CORBA::tk_double: - this->u_.d = *static_cast<CORBA::Double *> (value); + this->u_.d = *ACE_static_cast (CORBA::Double *, value); break; case CORBA::tk_boolean: - this->u_.b = *static_cast<CORBA::Boolean *> (value); + this->u_.b = *ACE_static_cast (CORBA::Boolean *, value); break; case CORBA::tk_char: - this->u_.c = *static_cast<CORBA::Char *> (value); + this->u_.c = *ACE_static_cast (CORBA::Char *, value); break; case CORBA::tk_octet: - this->u_.o = *static_cast<CORBA::Octet *> (value); + this->u_.o = *ACE_static_cast (CORBA::Octet *, value); break; case CORBA::tk_longlong: - this->u_.ll = *static_cast<CORBA::LongLong *> (value); + this->u_.ll = *ACE_static_cast (CORBA::LongLong *, value); break; case CORBA::tk_ulonglong: - this->u_.ull = *static_cast<CORBA::ULongLong *> (value); + this->u_.ull = *ACE_static_cast (CORBA::ULongLong *, value); break; case CORBA::tk_longdouble: - this->u_.ld = *static_cast<CORBA::LongDouble *> (value); + this->u_.ld = *ACE_static_cast (CORBA::LongDouble *, value); break; case CORBA::tk_wchar: - this->u_.wc = *static_cast<CORBA::WChar *> (value); + this->u_.wc = *ACE_static_cast (CORBA::WChar *, value); break; default: break; @@ -80,7 +80,7 @@ namespace TAO Any_Basic_Impl *new_impl = 0; ACE_NEW (new_impl, Any_Basic_Impl (tc, - const_cast<void *> (value))); + ACE_const_cast (void *, value))); any.replace (new_impl); } @@ -150,7 +150,7 @@ namespace TAO Any_Basic_Impl::assign_value (_tao_elem, replacement, tck); - const_cast<CORBA::Any &> (any).replace (replacement); + ACE_const_cast (CORBA::Any &, any).replace (replacement); replacement_safety.release (); return 1; } @@ -169,7 +169,8 @@ namespace TAO CORBA::Boolean Any_Basic_Impl::marshal_value (TAO_OutputCDR &cdr) { - CORBA::TCKind tckind = static_cast<CORBA::TCKind> (this->kind_); + CORBA::TCKind tckind = ACE_static_cast (CORBA::TCKind, + this->kind_); switch (tckind) { @@ -215,7 +216,9 @@ namespace TAO Any_Basic_Impl::demarshal_value (TAO_InputCDR &cdr, CORBA::Long tck) { - CORBA::TCKind const tckind = static_cast<CORBA::TCKind> (tck); + CORBA::TCKind tckind = + ACE_static_cast (CORBA::TCKind, + tck); switch (tckind) { case CORBA::tk_short: @@ -262,7 +265,7 @@ namespace TAO Any_Basic_Impl * Any_Basic_Impl::create_empty (CORBA::TypeCode_ptr tc) { - CORBA::TCKind const kind = static_cast<CORBA::TCKind> (tc->kind_); + CORBA::TCKind kind = ACE_static_cast (CORBA::TCKind, tc->kind_); TAO::Any_Basic_Impl * retval = 0; switch (kind) @@ -312,48 +315,49 @@ namespace TAO Any_Basic_Impl *src, CORBA::Long tck) { - CORBA::TCKind const kind = static_cast<CORBA::TCKind> (tck); + CORBA::TCKind kind = + ACE_static_cast (CORBA::TCKind, tck); switch (kind) { case CORBA::tk_short: - *static_cast<CORBA::Short *> (dest) = src->u_.s; + *ACE_static_cast (CORBA::Short *, dest) = src->u_.s; break; case CORBA::tk_ushort: - *static_cast<CORBA::UShort *> (dest) = src->u_.us; + *ACE_static_cast (CORBA::UShort *, dest) = src->u_.us; break; case CORBA::tk_long: - *static_cast<CORBA::Long *> (dest) = src->u_.l; + *ACE_static_cast (CORBA::Long *, dest) = src->u_.l; break; case CORBA::tk_ulong: - *static_cast<CORBA::ULong *> (dest) = src->u_.ul; + *ACE_static_cast (CORBA::ULong *, dest) = src->u_.ul; break; case CORBA::tk_float: - *static_cast<CORBA::Float *> (dest) = src->u_.f; + *ACE_static_cast (CORBA::Float *, dest) = src->u_.f; break; case CORBA::tk_double: - *static_cast<CORBA::Double *> (dest) = src->u_.d; + *ACE_static_cast (CORBA::Double *, dest) = src->u_.d; break; case CORBA::tk_boolean: - *static_cast<CORBA::Boolean *> (dest) = src->u_.b; + *ACE_static_cast (CORBA::Boolean *, dest) = src->u_.b; break; case CORBA::tk_char: - *static_cast<CORBA::Char *> (dest) = src->u_.c; + *ACE_static_cast (CORBA::Char *, dest) = src->u_.c; break; case CORBA::tk_octet: - *static_cast<CORBA::Octet *> (dest) = src->u_.o; + *ACE_static_cast (CORBA::Octet *, dest) = src->u_.o; break; case CORBA::tk_longlong: - *static_cast<CORBA::LongLong *> (dest) = src->u_.ll; + *ACE_static_cast (CORBA::LongLong *, dest) = src->u_.ll; break; case CORBA::tk_ulonglong: - *static_cast<CORBA::ULongLong *> (dest) = src->u_.ull; + *ACE_static_cast (CORBA::ULongLong *, dest) = src->u_.ull; break; case CORBA::tk_longdouble: - *static_cast<CORBA::LongDouble *> (dest) = src->u_.ld; + *ACE_static_cast (CORBA::LongDouble *, dest) = src->u_.ld; break; case CORBA::tk_wchar: - *static_cast<CORBA::WChar *> (dest) = src->u_.wc; + *ACE_static_cast (CORBA::WChar *, dest) = src->u_.wc; break; default: break; diff --git a/TAO/tao/Any_Dual_Impl_T.cpp b/TAO/tao/Any_Dual_Impl_T.cpp index 2e453f93ede..57e1928f960 100644 --- a/TAO/tao/Any_Dual_Impl_T.cpp +++ b/TAO/tao/Any_Dual_Impl_T.cpp @@ -8,7 +8,7 @@ #include "tao/Marshal.h" #include "tao/CORBA_String.h" #include "tao/Environment.h" -#include "tao/SystemException.h" +#include "tao/Exception.h" #include "tao/CDR.h" #include "tao/Typecode.h" diff --git a/TAO/tao/Any_Impl.cpp b/TAO/tao/Any_Impl.cpp index 2a139aeeebc..bf1ba96f614 100644 --- a/TAO/tao/Any_Impl.cpp +++ b/TAO/tao/Any_Impl.cpp @@ -3,10 +3,8 @@ #include "Any_Impl.h" #include "Marshal.h" #include "CORBA_String.h" -#include "SystemException.h" #include "Typecode.h" - #include "ace/Guard_T.h" diff --git a/TAO/tao/Any_Impl_T.cpp b/TAO/tao/Any_Impl_T.cpp index 7f432b92c30..9c0f2b18110 100644 --- a/TAO/tao/Any_Impl_T.cpp +++ b/TAO/tao/Any_Impl_T.cpp @@ -8,7 +8,7 @@ #include "tao/Marshal.h" #include "tao/CDR.h" #include "tao/Environment.h" -#include "tao/SystemException.h" +#include "tao/Exception.h" #include "tao/Typecode.h" #include "ace/CORBA_macros.h" diff --git a/TAO/tao/Any_SystemException.cpp b/TAO/tao/Any_SystemException.cpp index 0f5794c2225..b398583f18c 100644 --- a/TAO/tao/Any_SystemException.cpp +++ b/TAO/tao/Any_SystemException.cpp @@ -7,19 +7,16 @@ #include "Environment.h" #include "Marshal.h" #include "CORBA_String.h" -#include "SystemException.h" #include "Typecode.h" #include "ace/Auto_Ptr.h" #include "ace/CORBA_macros.h" #include "ace/Auto_Ptr.h" - ACE_RCSID (tao, Any_SystemException, "$Id$") - TAO::Any_SystemException::Any_SystemException (_tao_destructor destructor, CORBA::TypeCode_ptr tc, CORBA::SystemException * const val) diff --git a/TAO/tao/Any_Unknown_IDL_Type.cpp b/TAO/tao/Any_Unknown_IDL_Type.cpp index 65b61162a2a..6e9f5ab53b4 100644 --- a/TAO/tao/Any_Unknown_IDL_Type.cpp +++ b/TAO/tao/Any_Unknown_IDL_Type.cpp @@ -3,7 +3,6 @@ #include "tao/Any_Unknown_IDL_Type.h" #include "tao/Valuetype_Adapter.h" #include "tao/ORB_Core.h" -#include "tao/SystemException.h" #include "tao/Marshal.h" #include "tao/Typecode.h" #include "tao/CDR.h" diff --git a/TAO/tao/Argument.cpp b/TAO/tao/Argument.cpp index e038eeec2d7..51327b316a5 100644 --- a/TAO/tao/Argument.cpp +++ b/TAO/tao/Argument.cpp @@ -19,8 +19,6 @@ TAO::Argument::demarshal (TAO_InputCDR &) return 1; } -#if TAO_HAS_INTERCEPTORS == 1 - void TAO::Argument::interceptor_param (Dynamic::Parameter &) { @@ -31,5 +29,3 @@ TAO::Argument::interceptor_result (CORBA::Any *) { } -#endif /* TAO_HAS_INTERCEPTORS */ - diff --git a/TAO/tao/Argument.h b/TAO/tao/Argument.h index 647b26a1685..28b6db65ed2 100644 --- a/TAO/tao/Argument.h +++ b/TAO/tao/Argument.h @@ -21,7 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/orbconf.h" #include "tao/TAO_Export.h" namespace Dynamic @@ -51,10 +50,8 @@ namespace TAO virtual ~Argument (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); virtual void interceptor_result (CORBA::Any *); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ }; } diff --git a/TAO/tao/Array_VarOut_T.cpp b/TAO/tao/Array_VarOut_T.cpp index 63093981053..a2a49674086 100644 --- a/TAO/tao/Array_VarOut_T.cpp +++ b/TAO/tao/Array_VarOut_T.cpp @@ -21,7 +21,7 @@ TAO_FixedArray_Var_T<T,T_slice,TAG>::operator= (T_slice * p) if (this->ptr_ != p) { // Delete our stuff and assume ownership of p. - TAO::Array_Traits<T,T_slice,TAG>::free (this->ptr_); + TAO::Array_Traits<T,T_slice,TAG>::tao_free (this->ptr_); this->ptr_ = p; } @@ -36,10 +36,10 @@ TAO_FixedArray_Var_T<T,T_slice,TAG>::operator= ( { if (this != &p) { - TAO::Array_Traits<T,T_slice,TAG>::free (this->ptr_); + TAO::Array_Traits<T,T_slice,TAG>::tao_free (this->ptr_); // Deep copy. - this->ptr_ = TAO::Array_Traits<T,T_slice,TAG>::dup (p.in ()); + this->ptr_ = TAO::Array_Traits<T,T_slice,TAG>::tao_dup (p.in ()); } return *this; @@ -55,7 +55,7 @@ TAO_VarArray_Var_T<T,T_slice,TAG>::operator= (T_slice * p) if (this->ptr_ != p) { // Delete our stuff and assume ownership of p. - TAO::Array_Traits<T,T_slice,TAG>::free (this->ptr_); + TAO::Array_Traits<T,T_slice,TAG>::tao_free (this->ptr_); this->ptr_ = p; } @@ -70,10 +70,10 @@ TAO_VarArray_Var_T<T,T_slice,TAG>::operator= ( { if (this != &p) { - TAO::Array_Traits<T,T_slice,TAG>::free (this->ptr_); + TAO::Array_Traits<T,T_slice,TAG>::tao_free (this->ptr_); // Deep copy. - this->ptr_ = TAO::Array_Traits<T,T_slice,TAG>::dup (p.in ()); + this->ptr_ = TAO::Array_Traits<T,T_slice,TAG>::tao_dup (p.in ()); } return *this; @@ -88,7 +88,7 @@ TAO_Array_Forany_T<T,T_slice,TAG>::_tao_any_destructor ( ) { T_slice * tmp = static_cast<T_slice *> (_tao_void_pointer); - TAO::Array_Traits<T,T_slice,TAG>::free (tmp); + TAO::Array_Traits<T,T_slice,TAG>::tao_free (tmp); } #endif /* TAO_ARRAY_VAROUT_T_C */ diff --git a/TAO/tao/Array_VarOut_T.h b/TAO/tao/Array_VarOut_T.h index e036dd6bb79..c55e07de677 100644 --- a/TAO/tao/Array_VarOut_T.h +++ b/TAO/tao/Array_VarOut_T.h @@ -31,11 +31,11 @@ namespace TAO template<typename T, typename T_slice, typename TAG> struct Array_Traits { - static T_slice * alloc (void); - static void free (T_slice * _tao_slice); - static T_slice * dup (const T_slice * _tao_slice); - static void copy (T_slice * _tao_to, - const T_slice * _tao_from); + static T_slice * tao_alloc (void); + static void tao_free (T_slice * _tao_slice); + static T_slice * tao_dup (const T_slice * _tao_slice); + static void tao_copy (T_slice * _tao_to, + const T_slice * _tao_from); }; } diff --git a/TAO/tao/Array_VarOut_T.inl b/TAO/tao/Array_VarOut_T.inl index 4a4809ee8f7..d8354544595 100644 --- a/TAO/tao/Array_VarOut_T.inl +++ b/TAO/tao/Array_VarOut_T.inl @@ -20,14 +20,14 @@ TAO_Array_Var_Base_T<T,T_slice,TAG>::TAO_Array_Var_Base_T ( const TAO_Array_Var_Base_T & p ) { - this->ptr_ = TAO::Array_Traits<T,T_slice,TAG>::dup (p.in ()); + this->ptr_ = TAO::Array_Traits<T,T_slice,TAG>::tao_dup (p.in ()); } template<typename T, typename T_slice, typename TAG> ACE_INLINE TAO_Array_Var_Base_T<T,T_slice,TAG>::~TAO_Array_Var_Base_T (void) { - TAO::Array_Traits<T,T_slice,TAG>::free (this->ptr_); + TAO::Array_Traits<T,T_slice,TAG>::tao_free (this->ptr_); } template<typename T, typename T_slice, typename TAG> @@ -74,7 +74,7 @@ ACE_INLINE T_slice *& TAO_Array_Var_Base_T<T,T_slice,TAG>::out (void) { - TAO::Array_Traits<T,T_slice,TAG>::free (this->ptr_); + TAO::Array_Traits<T,T_slice,TAG>::tao_free (this->ptr_); this->ptr_ = 0; return this->ptr_; } @@ -161,7 +161,7 @@ ACE_INLINE TAO_Array_Out_T<T,T_var,T_slice,TAG>::TAO_Array_Out_T (T_var & p) : ptr_ (p.out ()) { - TAO::Array_Traits<T,T_slice,TAG>::free (this->ptr_); + TAO::Array_Traits<T,T_slice,TAG>::tao_free (this->ptr_); this->ptr_ = 0; } @@ -386,5 +386,5 @@ ACE_INLINE T_slice * TAO_Array_Forany_T<T,T_slice,TAG>::tao_alloc (void) { - return TAO::Array_Traits<T,T_slice,TAG>::alloc (); + return TAO::Array_Traits<T,T_slice,TAG>::tao_alloc (); } diff --git a/TAO/tao/BD_String_Argument_T.cpp b/TAO/tao/BD_String_Argument_T.cpp index cd1625d1ced..0c5adc5590e 100644 --- a/TAO/tao/BD_String_Argument_T.cpp +++ b/TAO/tao/BD_String_Argument_T.cpp @@ -23,8 +23,6 @@ TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND>::marshal ( return cdr << from_S (this->x_, BOUND); } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename to_S, typename from_S, size_t BOUND> void TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND>::interceptor_param ( @@ -35,8 +33,6 @@ TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND>::interceptor_param ( p.mode = CORBA::PARAM_IN; } -#endif /* TAO_HAS_INTERCEPTORS */ - // =========================================================== template<typename S, typename to_S, typename from_S, size_t BOUND> @@ -58,8 +54,6 @@ TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND>::demarshal ( return cdr >> to_S (this->x_, BOUND); } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename to_S, typename from_S, size_t BOUND> void TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND>::interceptor_param ( @@ -70,8 +64,6 @@ TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND>::interceptor_param ( p.mode = CORBA::PARAM_INOUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================== template<typename S, @@ -87,8 +79,6 @@ TAO::Out_BD_String_Argument_T<S,S_out,to_S,from_S,BOUND>::demarshal ( return cdr >> to_S (this->x_, BOUND); } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename S_out, typename to_S, @@ -103,8 +93,6 @@ TAO::Out_BD_String_Argument_T<S,S_out,to_S,from_S,BOUND>::interceptor_param ( p.mode = CORBA::PARAM_OUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================ template<typename S, @@ -120,8 +108,6 @@ TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND>::demarshal ( return cdr >> to_S (this->x_.out (), BOUND); } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename S_var, typename to_S, @@ -135,6 +121,4 @@ TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND>::interceptor_result ( (*any) <<= from_S (this->x_.in (), BOUND); } -#endif /* TAO_HAS_INTERCEPTORS */ - #endif /* TAO_BD_STRING_ARGUMENT_T_C */ diff --git a/TAO/tao/BD_String_Argument_T.h b/TAO/tao/BD_String_Argument_T.h index 43502f0b869..0d6c0b390a7 100644 --- a/TAO/tao/BD_String_Argument_T.h +++ b/TAO/tao/BD_String_Argument_T.h @@ -38,9 +38,9 @@ namespace TAO In_BD_String_Argument_T (const S * x); virtual CORBA::Boolean marshal (TAO_OutputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + const S * arg (void) const; private: @@ -61,9 +61,9 @@ namespace TAO virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S *& arg (void); private: @@ -87,9 +87,9 @@ namespace TAO Out_BD_String_Argument_T (S_out x); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S *& arg (void); private: @@ -113,9 +113,9 @@ namespace TAO Ret_BD_String_Argument_T (void); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_result (CORBA::Any *); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S *& arg (void); S * excp (void); diff --git a/TAO/tao/BD_String_SArgument_T.cpp b/TAO/tao/BD_String_SArgument_T.cpp index d428442272a..cdc0eabb792 100644 --- a/TAO/tao/BD_String_SArgument_T.cpp +++ b/TAO/tao/BD_String_SArgument_T.cpp @@ -27,8 +27,6 @@ TAO::In_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::demarshal ( return cdr >> to_S (this->x_.out (), BOUND); } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename S_var, typename to_S, @@ -43,8 +41,6 @@ TAO::In_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::interceptor_param ( p.mode = CORBA::PARAM_IN; } -#endif /* TAO_HAS_INTERCEPTORS */ - // =========================================================== template<typename S, @@ -73,8 +69,6 @@ TAO::Inout_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::demarshal ( return cdr >> to_S (this->x_.out (), BOUND); } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename S_var, typename to_S, @@ -88,8 +82,6 @@ interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_INOUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================== template<typename S, @@ -106,8 +98,6 @@ TAO::Out_BD_String_SArgument_T<S,S_var,S_out,to_S,from_S,BOUND>::marshal ( return cdr << from_S (this->x_.in (), BOUND); } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename S_var, typename S_out, @@ -122,8 +112,6 @@ interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_OUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================ template<typename S, @@ -139,8 +127,6 @@ TAO::Ret_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::marshal ( return cdr << from_S (this->x_.in (), BOUND); } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename S_var, typename to_S, @@ -153,6 +139,4 @@ interceptor_result (CORBA::Any * any) (*any) <<= from_S (this->x_.in (), BOUND); } -#endif /* TAO_HAS_INTERCEPTORS */ - #endif /* TAO_BD_STRING_SARGUMENT_T_C */ diff --git a/TAO/tao/BD_String_SArgument_T.h b/TAO/tao/BD_String_SArgument_T.h index 829fd3dc548..ff37eb463d6 100644 --- a/TAO/tao/BD_String_SArgument_T.h +++ b/TAO/tao/BD_String_SArgument_T.h @@ -42,9 +42,9 @@ namespace TAO In_BD_String_SArgument_T (void); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + const S * arg (void) const; private: @@ -69,9 +69,9 @@ namespace TAO virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S *& arg (void); private: @@ -96,9 +96,9 @@ namespace TAO Out_BD_String_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S *& arg (void); private: @@ -122,9 +122,9 @@ namespace TAO Ret_BD_String_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_result (CORBA::Any *); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S *& arg (void); private: diff --git a/TAO/tao/Basic_Argument_T.cpp b/TAO/tao/Basic_Argument_T.cpp index 353d125e7a8..5bade0f3c2d 100644 --- a/TAO/tao/Basic_Argument_T.cpp +++ b/TAO/tao/Basic_Argument_T.cpp @@ -21,8 +21,6 @@ TAO::In_Basic_Argument_T<S>::marshal (TAO_OutputCDR & cdr) return cdr << this->x_; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S> void TAO::In_Basic_Argument_T<S>::interceptor_param (Dynamic::Parameter & p) @@ -31,8 +29,6 @@ TAO::In_Basic_Argument_T<S>::interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_IN; } -#endif /* TAO_HAS_INTERCEPTORS */ - // =========================================================== template<typename S> @@ -49,8 +45,6 @@ TAO::Inout_Basic_Argument_T<S>::demarshal (TAO_InputCDR & cdr) return cdr >> this->x_; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S> void TAO::Inout_Basic_Argument_T<S>::interceptor_param (Dynamic::Parameter & p) @@ -59,8 +53,6 @@ TAO::Inout_Basic_Argument_T<S>::interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_INOUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================== template<typename S> @@ -70,8 +62,6 @@ TAO::Out_Basic_Argument_T<S>::demarshal (TAO_InputCDR & cdr) return cdr >> this->x_; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S> void TAO::Out_Basic_Argument_T<S>::interceptor_param (Dynamic::Parameter & p) @@ -80,8 +70,6 @@ TAO::Out_Basic_Argument_T<S>::interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_OUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================ template<typename S> @@ -91,8 +79,6 @@ TAO::Ret_Basic_Argument_T<S>::demarshal (TAO_InputCDR & cdr) return cdr >> this->x_; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S> void TAO::Ret_Basic_Argument_T<S>::interceptor_result (CORBA::Any * any) @@ -100,6 +86,4 @@ TAO::Ret_Basic_Argument_T<S>::interceptor_result (CORBA::Any * any) (*any) <<= this->x_; } -#endif /* TAO_HAS_INTERCEPTORS */ - #endif /* TAO_BASIC_ARGUMENT_T_C */ diff --git a/TAO/tao/Basic_Argument_T.h b/TAO/tao/Basic_Argument_T.h index 101aa3d94c5..61a7cbbf946 100644 --- a/TAO/tao/Basic_Argument_T.h +++ b/TAO/tao/Basic_Argument_T.h @@ -37,9 +37,9 @@ namespace TAO In_Basic_Argument_T (S const & x); virtual CORBA::Boolean marshal (TAO_OutputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S arg (void) const; private: @@ -60,9 +60,9 @@ namespace TAO virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S & arg (void); private: @@ -82,9 +82,9 @@ namespace TAO Out_Basic_Argument_T (S & x); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S & arg (void); private: @@ -104,9 +104,9 @@ namespace TAO Ret_Basic_Argument_T (void); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_result (CORBA::Any *); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S & arg (void); S excp (void); diff --git a/TAO/tao/Basic_SArgument_T.cpp b/TAO/tao/Basic_SArgument_T.cpp index 2bfd618f9a6..afa1323b7df 100644 --- a/TAO/tao/Basic_SArgument_T.cpp +++ b/TAO/tao/Basic_SArgument_T.cpp @@ -21,8 +21,6 @@ TAO::In_Basic_SArgument_T<S>::demarshal (TAO_InputCDR &cdr) return cdr >> this->x_; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S> void TAO::In_Basic_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p) @@ -31,8 +29,6 @@ TAO::In_Basic_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_IN; } -#endif /* TAO_HAS_INTERCEPTORS */ - // =========================================================== template<typename S> @@ -49,8 +45,6 @@ TAO::Inout_Basic_SArgument_T<S>::demarshal (TAO_InputCDR & cdr) return cdr >> this->x_; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S> void TAO::Inout_Basic_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p) @@ -59,8 +53,6 @@ TAO::Inout_Basic_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_INOUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================== template<typename S> @@ -70,8 +62,6 @@ TAO::Out_Basic_SArgument_T<S>::marshal (TAO_OutputCDR &cdr) return cdr << this->x_; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S> void TAO::Out_Basic_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p) @@ -80,8 +70,6 @@ TAO::Out_Basic_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_OUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================ template<typename S> @@ -91,8 +79,6 @@ TAO::Ret_Basic_SArgument_T<S>::marshal (TAO_OutputCDR & cdr) return cdr << this->x_; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S> void TAO::Ret_Basic_SArgument_T<S>::interceptor_result (CORBA::Any * any) @@ -100,6 +86,4 @@ TAO::Ret_Basic_SArgument_T<S>::interceptor_result (CORBA::Any * any) (*any) <<= this->x_; } -#endif /* TAO_HAS_INTERCEPTORS */ - #endif /* TAO_BASIC_SARGUMENT_T_C */ diff --git a/TAO/tao/Basic_SArgument_T.h b/TAO/tao/Basic_SArgument_T.h index f4eaf282bf0..28db20c6f25 100644 --- a/TAO/tao/Basic_SArgument_T.h +++ b/TAO/tao/Basic_SArgument_T.h @@ -37,9 +37,9 @@ namespace TAO In_Basic_SArgument_T (void); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S arg (void) const; private: @@ -60,9 +60,9 @@ namespace TAO virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S & arg (void); private: @@ -82,9 +82,9 @@ namespace TAO Out_Basic_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S & arg (void); private: @@ -104,9 +104,9 @@ namespace TAO Ret_Basic_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_result (CORBA::Any *); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S & arg (void); private: diff --git a/TAO/tao/BiDir_Adapter.h b/TAO/tao/BiDir_Adapter.h index f28ca8f2107..2ecd74e9285 100644 --- a/TAO/tao/BiDir_Adapter.h +++ b/TAO/tao/BiDir_Adapter.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/SystemException.h" +#include "tao/Exception.h" class TAO_ORB_Core; class TAO_Policy_Validator; diff --git a/TAO/tao/BiDir_GIOP.mpc b/TAO/tao/BiDir_GIOP.mpc index f01b598b7d1..d18feb65a60 100644 --- a/TAO/tao/BiDir_GIOP.mpc +++ b/TAO/tao/BiDir_GIOP.mpc @@ -22,8 +22,4 @@ project : taolib, core { Resource_Files { BiDir_GIOP } - - PIDL_Files { - BiDir_GIOP - } } diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.h b/TAO/tao/BiDir_GIOP/BiDirGIOP.h index 8fa5d711a18..6c744c3e0a7 100644 --- a/TAO/tao/BiDir_GIOP/BiDirGIOP.h +++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.h @@ -94,4 +94,4 @@ TAO_Requires_BiDirGIOP_Initializer = TAO_BiDirGIOP_Loader::Initializer (); #undef TAO_BIDIRGIOP_SAFE_INCLUDE #include /**/ "ace/post.h" -#endif /* TAO_BIDIR_GIOP_H */ +#endif /* TAO_DYNAMICANY_H */ diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp index 419f2a4f64b..309ff9b2a5d 100644 --- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp +++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp @@ -57,7 +57,7 @@ namespace TAO ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION BiDirPolicy::BidirectionalPolicy_ptr -TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::duplicate ( +TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::tao_duplicate ( BiDirPolicy::BidirectionalPolicy_ptr p ) { @@ -66,7 +66,7 @@ TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::release ( +TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::tao_release ( BiDirPolicy::BidirectionalPolicy_ptr p ) { @@ -75,14 +75,14 @@ TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION BiDirPolicy::BidirectionalPolicy_ptr -TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::nil (void) +TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::tao_nil (void) { return BiDirPolicy::BidirectionalPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::marshal ( +TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::tao_marshal ( BiDirPolicy::BidirectionalPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -91,7 +91,7 @@ TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*BiDirPolicy__TAO_BidirectionalPolicy_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -112,10 +112,10 @@ BiDirPolicy::BidirectionalPolicy::_narrow ( { return BidirectionalPolicy::_nil (); } - + BidirectionalPolicy_ptr proxy = dynamic_cast<BidirectionalPolicy_ptr> (_tao_objref); - + return BidirectionalPolicy::_duplicate (proxy); } @@ -129,10 +129,10 @@ BiDirPolicy::BidirectionalPolicy::_unchecked_narrow ( { return BidirectionalPolicy::_nil (); } - + BidirectionalPolicy_ptr proxy = dynamic_cast<BidirectionalPolicy_ptr> (_tao_objref); - + return BidirectionalPolicy::_duplicate (proxy); } @@ -143,7 +143,7 @@ BiDirPolicy::BidirectionalPolicy::_duplicate (BidirectionalPolicy_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -205,7 +205,7 @@ BiDirPolicy::BidirectionalPolicy::marshal (TAO_OutputCDR &) TAO_Objref_Var_T< BiDirPolicy::BidirectionalPolicy >; - + template class TAO_Objref_Out_T< BiDirPolicy::BidirectionalPolicy @@ -222,10 +222,11 @@ BiDirPolicy::BidirectionalPolicy::marshal (TAO_OutputCDR &) TAO_Objref_Var_T< \ BiDirPolicy::BidirectionalPolicy > - + # pragma instantiate \ TAO_Objref_Out_T< \ BiDirPolicy::BidirectionalPolicy > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.h b/TAO/tao/BiDir_GIOP/BiDirPolicyC.h index cdc1291dc3f..8d090854786 100644 --- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.h +++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.h @@ -73,13 +73,13 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// 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; } @@ -89,43 +89,43 @@ namespace TAO namespace BiDirPolicy { - + // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:342 - + typedef CORBA::UShort BidirectionalPolicyValue; typedef CORBA::UShort_out BidirectionalPolicyValue_out; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const BiDirPolicy::BidirectionalPolicyValue NORMAL = 0U; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const BiDirPolicy::BidirectionalPolicyValue BOTH = 1U; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const CORBA::PolicyType BIDIRECTIONAL_POLICY_TYPE = 37U; - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY__VAR_OUT_CH_) #define _BIDIRPOLICY_BIDIRECTIONALPOLICY__VAR_OUT_CH_ - + class BidirectionalPolicy; typedef BidirectionalPolicy *BidirectionalPolicy_ptr; - + typedef TAO_Objref_Var_T< BidirectionalPolicy > BidirectionalPolicy_var; - + typedef TAO_Objref_Out_T< BidirectionalPolicy @@ -133,91 +133,91 @@ namespace BiDirPolicy BidirectionalPolicy_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY_CH_) #define _BIDIRPOLICY_BIDIRECTIONALPOLICY_CH_ - + class TAO_BiDirGIOP_Export BidirectionalPolicy : public virtual CORBA::Policy { public: typedef BidirectionalPolicy_ptr _ptr_type; typedef BidirectionalPolicy_var _var_type; - + // The static operations. static BidirectionalPolicy_ptr _duplicate (BidirectionalPolicy_ptr obj); - + static BidirectionalPolicy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static BidirectionalPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static BidirectionalPolicy_ptr _nil (void) { return (BidirectionalPolicy_ptr)0; } - - - + + + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual BiDirPolicy::BidirectionalPolicyValue value ( 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 copy ( 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. BidirectionalPolicy (void); - + virtual ~BidirectionalPolicy (void); - + private: // Private and unimplemented for concrete interfaces. BidirectionalPolicy (const BidirectionalPolicy &); - + void operator= (const BidirectionalPolicy &); }; @@ -237,18 +237,18 @@ namespace TAO #if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY__TRAITS_CH_) #define _BIDIRPOLICY_BIDIRECTIONALPOLICY__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_BiDirGIOP_Export Objref_Traits<BiDirPolicy::BidirectionalPolicy> { - static BiDirPolicy::BidirectionalPolicy_ptr duplicate ( + static BiDirPolicy::BidirectionalPolicy_ptr tao_duplicate ( BiDirPolicy::BidirectionalPolicy_ptr ); - static void release ( + static void tao_release ( BiDirPolicy::BidirectionalPolicy_ptr ); - static BiDirPolicy::BidirectionalPolicy_ptr nil (void); - static CORBA::Boolean marshal ( + static BiDirPolicy::BidirectionalPolicy_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( BiDirPolicy::BidirectionalPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -275,3 +275,4 @@ namespace TAO #include /**/ "ace/post.h" #endif /* ifndef */ + diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h index a91220671d8..82bc7329a0d 100644 --- a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h +++ b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h @@ -12,8 +12,8 @@ */ //============================================================================= -#ifndef TAO_BIDIR_POLICY_VALIDATOR_H_ -#define TAO_BIDIR_POLICY_VALIDATOR_H_ +#ifndef TAO_POLICY_VALIDATOR_H_ +#define TAO_POLICY_VALIDATOR_H_ #include /**/ "ace/pre.h" #include "bidirgiop_export.h" @@ -53,4 +53,4 @@ private: }; #include /**/ "ace/post.h" -#endif /* TAO_BIDIR_POLICY_VALIDATOR_H_ */ +#endif /**/ diff --git a/TAO/tao/Blocked_Connect_Strategy.cpp b/TAO/tao/Blocked_Connect_Strategy.cpp index a7d50c3d307..445daf1d21d 100644 --- a/TAO/tao/Blocked_Connect_Strategy.cpp +++ b/TAO/tao/Blocked_Connect_Strategy.cpp @@ -45,11 +45,3 @@ TAO_Blocked_Connect_Strategy::wait (TAO_Connection_Handler *, // We cannot wait for connection completion return -1; } - -int -TAO_Blocked_Connect_Strategy::wait (TAO_Transport *, - ACE_Time_Value *) -{ - // We cannot wait for connection completion - return -1; -} diff --git a/TAO/tao/Blocked_Connect_Strategy.h b/TAO/tao/Blocked_Connect_Strategy.h index 87016f0470f..4e04945b255 100644 --- a/TAO/tao/Blocked_Connect_Strategy.h +++ b/TAO/tao/Blocked_Connect_Strategy.h @@ -45,10 +45,8 @@ public: ACE_Synch_Options &opt); virtual int wait (TAO_Connection_Handler *ch, - ACE_Time_Value *val); + ACE_Time_Value *val); - virtual int wait (TAO_Transport *t, - ACE_Time_Value *val); }; diff --git a/TAO/tao/BoundsC.cpp b/TAO/tao/BoundsC.cpp index e5c5c7f8c12..4b169d34ac3 100644 --- a/TAO/tao/BoundsC.cpp +++ b/TAO/tao/BoundsC.cpp @@ -30,7 +30,6 @@ #include "BoundsC.h" -#include "tao/SystemException.h" #include "tao/CDR.h" #include "tao/Typecode.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/Buffer_Allocator_T.h b/TAO/tao/Buffer_Allocator_T.h index 59684723965..e32b474d2fb 100644 --- a/TAO/tao/Buffer_Allocator_T.h +++ b/TAO/tao/Buffer_Allocator_T.h @@ -32,7 +32,7 @@ namespace TAO * of allocator to be used to allocate the object. */ template <typename handler_type, typename alloc_type> - class TAO_Buffer_Allocator : public TAO_Allocator<handler_type> + class TAO_Buffer_Allocator : TAO_Allocator<handler_type> { public: typedef handler_type HANDLER_TYPE; diff --git a/TAO/tao/Buffering_Constraint_Policy.cpp b/TAO/tao/Buffering_Constraint_Policy.cpp index dc11eeedd16..cde985310cb 100644 --- a/TAO/tao/Buffering_Constraint_Policy.cpp +++ b/TAO/tao/Buffering_Constraint_Policy.cpp @@ -6,12 +6,8 @@ #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) #include "TAOC.h" -#include "SystemException.h" - -ACE_RCSID (tao, - Buffering_Constraint_Policy, - "$Id$") +ACE_RCSID(TAO, Buffering_Constraint_Policy, "$Id$") #if ! defined (__ACE_INLINE__) #include "tao/Buffering_Constraint_Policy.i" diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp index 3c62df4c3e5..daf72e720ee 100644 --- a/TAO/tao/CDR.cpp +++ b/TAO/tao/CDR.cpp @@ -36,7 +36,6 @@ #include "tao/Timeprobe.h" #include "tao/ORB_Core.h" #include "tao/Environment.h" -#include "tao/SystemException.h" #if !defined (__ACE_INLINE__) # include "tao/CDR.i" @@ -173,7 +172,7 @@ TAO_OutputCDR::throw_skel_exception (int error_num ACE_ENV_ARG_DECL) ACE_NOTREACHED(break); default : - ACE_THROW (CORBA::MARSHAL(0, CORBA::COMPLETED_YES)); + ACE_THROW (CORBA::MARSHAL(TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); } } @@ -221,7 +220,7 @@ TAO_InputCDR::throw_stub_exception (int error_num ACE_ENV_ARG_DECL) ACE_THROW (CORBA::INV_OBJREF (CORBA::OMGVMCID | 2, CORBA::COMPLETED_YES)); ACE_NOTREACHED(break); default : - ACE_THROW (CORBA::MARSHAL (0, CORBA::COMPLETED_YES)); + ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); } } diff --git a/TAO/tao/CDR_Encaps_Codec.cpp b/TAO/tao/CDR_Encaps_Codec.cpp index a73f43bc43e..c5c604c8f37 100644 --- a/TAO/tao/CDR_Encaps_Codec.cpp +++ b/TAO/tao/CDR_Encaps_Codec.cpp @@ -11,12 +11,10 @@ #include "Typecode.h" #include "Marshal.h" #include "Any_Unknown_IDL_Type.h" -#include "SystemException.h" #include "ORB_Constants.h" - #include "ace/OS_NS_string.h" -ACE_RCSID (tao, +ACE_RCSID (TAO_CodecFactory, CDR_Encaps_Codec, "$Id$") @@ -64,7 +62,7 @@ TAO_CDR_Encaps_Codec::encode (const CORBA::Any & data CORBA::OctetSeq, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); @@ -130,7 +128,7 @@ TAO_CDR_Encaps_Codec::decode (const CORBA::OctetSeq & data CORBA::Any, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); @@ -203,7 +201,7 @@ TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data CORBA::OctetSeq, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOMEM ), CORBA::COMPLETED_NO @@ -341,7 +339,7 @@ TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data, CORBA::Any, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOMEM ), CORBA::COMPLETED_NO diff --git a/TAO/tao/CORBA.pidl b/TAO/tao/CORBA.pidl new file mode 100644 index 00000000000..b6ce0f6987f --- /dev/null +++ b/TAO/tao/CORBA.pidl @@ -0,0 +1,13 @@ +// $Id$ + +// This will have all new definitions that will go in to CORBA from +// now on. + +#ifndef TAO_CORBA_IDL +#define TAO_CORBA_IDL + +#include <orb.idl> + +// This file is deprecated. + +#endif diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp index cd64090e2b4..89209b05011 100644 --- a/TAO/tao/CORBALOC_Parser.cpp +++ b/TAO/tao/CORBALOC_Parser.cpp @@ -2,7 +2,6 @@ #include "ORB_Core.h" #include "Stub.h" #include "Connector_Registry.h" -#include "SystemException.h" #include "tao/debug.h" #include "ace/OS_NS_strings.h" #include "ace/OS_NS_string.h" @@ -281,7 +280,7 @@ TAO_CORBALOC_Parser::parse_string_mprofile_helper ( { ACE_THROW (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, EINVAL), CORBA::COMPLETED_NO)); } diff --git a/TAO/tao/CORBANAME_Parser.cpp b/TAO/tao/CORBANAME_Parser.cpp index 43ebeb0c0b8..2950c75a6c7 100644 --- a/TAO/tao/CORBANAME_Parser.cpp +++ b/TAO/tao/CORBANAME_Parser.cpp @@ -3,7 +3,6 @@ #include "CORBANAME_Parser.h" #include "ORB.h" #include "Object.h" -#include "SystemException.h" #include "UB_String_Arguments.h" #include "Invocation_Adapter.h" #include "debug.h" diff --git a/TAO/tao/ClientRequestInfo.cpp b/TAO/tao/ClientRequestInfo.cpp index a1d64942028..7f836fd3000 100644 --- a/TAO/tao/ClientRequestInfo.cpp +++ b/TAO/tao/ClientRequestInfo.cpp @@ -1,18 +1,13 @@ -// $Id$ - +// -*- C++ -*- #include "ClientRequestInfo.h" - -#if TAO_HAS_INTERCEPTORS == 1 - - -ACE_RCSID (tao, +ACE_RCSID (TAO, ClientRequestInfo, "$Id$") +#if TAO_HAS_INTERCEPTORS == 1 #include "ClientRequestInfo_i.h" #include "Any.h" -#include "PolicyC.h" # if !defined (__ACE_INLINE__) # include "ClientRequestInfo.inl" diff --git a/TAO/tao/ClientRequestInfo.inl b/TAO/tao/ClientRequestInfo.inl index 07eaef27c7f..7359e828ff9 100644 --- a/TAO/tao/ClientRequestInfo.inl +++ b/TAO/tao/ClientRequestInfo.inl @@ -2,8 +2,6 @@ // // $Id$ -#include "SystemException.h" - ACE_INLINE void TAO_ClientRequestInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL) { diff --git a/TAO/tao/ClientRequestInfo_i.inl b/TAO/tao/ClientRequestInfo_i.inl index 877493b58dd..28e783606a5 100644 --- a/TAO/tao/ClientRequestInfo_i.inl +++ b/TAO/tao/ClientRequestInfo_i.inl @@ -2,8 +2,6 @@ // // $Id$ -#include "SystemException.h" - ACE_INLINE void TAO_ClientRequestInfo_i::exception (CORBA::Exception *exception) { diff --git a/TAO/tao/CodecFactory.cpp b/TAO/tao/CodecFactory.cpp index ff1ba26d9f8..f919cb0454d 100644 --- a/TAO/tao/CodecFactory.cpp +++ b/TAO/tao/CodecFactory.cpp @@ -4,7 +4,6 @@ #include "CodecFactory.h" #include "CDR_Encaps_Codec.h" -#include "SystemException.h" #include "ORB_Constants.h" ACE_RCSID (TAO_CodecFactory, @@ -43,7 +42,7 @@ TAO_CodecFactory::create_codec (const IOP::Encoding & enc // There is no such thing as a "0.x" CDR encapsulation. ACE_THROW_RETURN (CORBA::BAD_PARAM ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, EINVAL), CORBA::COMPLETED_NO), IOP::Codec::_nil ()); @@ -55,7 +54,7 @@ TAO_CodecFactory::create_codec (const IOP::Encoding & enc this->orb_core_), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOMEM), CORBA::COMPLETED_MAYBE)); ACE_CHECK_RETURN (IOP::Codec::_nil ()); diff --git a/TAO/tao/CodecFactory_ORBInitializer.cpp b/TAO/tao/CodecFactory_ORBInitializer.cpp index c39ec7142b9..fa1c5a4aeac 100644 --- a/TAO/tao/CodecFactory_ORBInitializer.cpp +++ b/TAO/tao/CodecFactory_ORBInitializer.cpp @@ -5,7 +5,6 @@ #include "CodecFactory_ORBInitializer.h" #include "CodecFactory.h" #include "ORBInitInfo.h" -#include "SystemException.h" #include "ORB_Constants.h" ACE_RCSID (TAO_CodecFactory, @@ -30,7 +29,7 @@ TAO_CodecFactory_ORBInitializer::pre_init ( TAO_CodecFactory (orb_core), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; diff --git a/TAO/tao/Codeset_Manager.cpp b/TAO/tao/Codeset_Manager.cpp index 9bdb67d0b9e..945ec05b3e2 100644 --- a/TAO/tao/Codeset_Manager.cpp +++ b/TAO/tao/Codeset_Manager.cpp @@ -6,14 +6,12 @@ #include "tao/Transport.h" #include "tao/Profile.h" #include "tao/Codeset_Translator_Factory.h" -#include "tao/SystemException.h" -#include "tao/UTF16_BOM_Factory.h" #include "tao/debug.h" #include "ace/Dynamic_Service.h" #include "ace/Codeset_Registry.h" #include "ace/OS_NS_string.h" - +#include "tao/UTF16_BOM_Factory.h" ACE_RCSID (tao, Codeset_Manager, @@ -133,8 +131,8 @@ TAO_Codeset_Manager::set_tcs (TAO_Profile &theProfile, this->codeset_info_.ForCharData); if (TAO_debug_level > 2) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("TAO (%P|%t) - Codeset_Manager::set_tcs, ") - ACE_TEXT("setting char translator (%08x)\n"), + ACE_TEXT("TAO (%P|%t) - Codeset_Manager::set_tcs ") + ACE_TEXT("setting char translator(%08x)\n"), tcs)); trans.char_translator(this->get_char_trans (tcs)); @@ -143,7 +141,7 @@ TAO_Codeset_Manager::set_tcs (TAO_Profile &theProfile, if (TAO_debug_level > 2) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("TAO (%P|%t) - Codeset_Manager::set_tcs, ") + ACE_TEXT("TAO (%P|%t) - Codeset_Manager::set_tcs ") ACE_TEXT("setting wchar translator (%08x)\n"), tcs)); trans.wchar_translator(this->get_wchar_trans (tcs)); diff --git a/TAO/tao/Connect_Strategy.h b/TAO/tao/Connect_Strategy.h index 488fe149d93..61b400e4510 100644 --- a/TAO/tao/Connect_Strategy.h +++ b/TAO/tao/Connect_Strategy.h @@ -24,7 +24,6 @@ class TAO_ORB_Core; class TAO_Connector; class TAO_Connection_Handler; -class TAO_Transport; class ACE_Synch_Options; class ACE_Time_Value; @@ -66,9 +65,6 @@ public: * connection handler is set appropriately. */ virtual int wait (TAO_Connection_Handler *ch, - ACE_Time_Value *val) = 0; - - virtual int wait (TAO_Transport *t, ACE_Time_Value *val) = 0; protected: diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp index fdfe3ef99e6..9ae1a7c2583 100644 --- a/TAO/tao/Connection_Handler.cpp +++ b/TAO/tao/Connection_Handler.cpp @@ -209,43 +209,6 @@ TAO_Connection_Handler::handle_output_eh ( int TAO_Connection_Handler::handle_input_eh ( - ACE_HANDLE h, ACE_Event_Handler *eh) -{ - if (this->transport ()->acts_as_server () && - this->orb_core_->get_tss_resources ()->upcalls_temporarily_suspended_on_this_thread_) - { -#if 0 // DON'T IMPLEMENT YET, BUT RECORD THE IDEA FOR POSTERITY - // ACE_Time_Value this->spin_prevention_backoff_delay_; - ACE_OS::usleep (this->spin_prevention_backoff_delay_); - this->spin_prevention_backoff_delay_ = 2 * this->spin_prevention_backoff_delay_ + 1; -#endif - if (TAO_debug_level > 6) - ACE_DEBUG ((LM_DEBUG, - "(%P|%t) Connection_Handler[%d] - not going to handle_input " - "on Transport %d " - "because upcalls temporarily suspended on this thread\n", - this->transport()->id(), - this->transport()->id())); - return 0; - } - -#if 0 - this->spin_prevention_backoff_delay_ = 0; -#endif - - int result = this->handle_input_internal (h, eh); - - if (result == -1) - { - this->close_connection (); - return 0; - } - - return result; -} - -int -TAO_Connection_Handler::handle_input_internal ( ACE_HANDLE h, ACE_Event_Handler * eh) { // Let the transport know that it is used @@ -302,7 +265,7 @@ TAO_Connection_Handler::close_connection_eh (ACE_Event_Handler *eh) { ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Connection_Handler[%d]::" - "close_connection_eh, purging entry from cache\n", + "close_connection, purging entry from cache\n", handle)); } @@ -348,7 +311,7 @@ TAO_Connection_Handler::close_connection_eh (ACE_Event_Handler *eh) { ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Connection_Handler[%d]::" - "close_connection_eh, removing from the reactor\n", + "close_connection, removing from the reactor\n", handle)); } @@ -362,7 +325,7 @@ TAO_Connection_Handler::close_connection_eh (ACE_Event_Handler *eh) { ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Connection_Handler[%d]::" - "close_connection_eh, cancel all timers\n", + "close_connection, cancel all timers\n", handle)); } @@ -386,7 +349,7 @@ TAO_Connection_Handler::close_connection_eh (ACE_Event_Handler *eh) { ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Connection_Handler[%d]::" - "close_connection_eh\n", + "close_connection\n", id)); } @@ -408,11 +371,3 @@ void TAO_Connection_Handler::pos_io_hook (int & ) { } - -int -TAO_Connection_Handler::close_handler (void) -{ - this->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED); - this->transport ()->remove_reference (); - return 0; -} diff --git a/TAO/tao/Connection_Handler.h b/TAO/tao/Connection_Handler.h index 357ea8ab768..e3b348a3b2c 100644 --- a/TAO/tao/Connection_Handler.h +++ b/TAO/tao/Connection_Handler.h @@ -93,10 +93,6 @@ public: */ virtual int open_handler (void *) = 0; - /// A close() hook, called by the Transport Connector when they want to close - /// this handler - virtual int close_handler (void); - protected: /// Return our TAO_ORB_Core pointer @@ -125,12 +121,7 @@ protected: int handle_output_eh (ACE_HANDLE h, ACE_Event_Handler * eh); /// Implement the handle_input() callback - // We're actually going to pull the code from the protocol-specific - // handlers back into this class, because they ALL look exactly the same. - // If some other protocol comes along and needs to do something different, - // it is always free to override handle_input() as it sees fit. int handle_input_eh (ACE_HANDLE h, ACE_Event_Handler * eh); - int handle_input_internal (ACE_HANDLE h, ACE_Event_Handler *eh); /// Implement close_connection() for Connection_Handlers that are /// also Event_Handlers. diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp index 57bc3f9d201..7f81f485e25 100644 --- a/TAO/tao/Connector_Registry.cpp +++ b/TAO/tao/Connector_Registry.cpp @@ -8,7 +8,6 @@ #include "tao/debug.h" #include "tao/ORB_Constants.h" #include "tao/CDR.h" -#include "tao/SystemException.h" #if !defined(__ACE_INLINE__) #include "tao/Connector_Registry.i" @@ -119,7 +118,7 @@ TAO_Connector_Registry::make_mprofile (const char *ior, // Failure: Null IOR string pointer ACE_THROW_RETURN (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, EINVAL), CORBA::COMPLETED_NO), -1); @@ -146,7 +145,7 @@ TAO_Connector_Registry::make_mprofile (const char *ior, // Failure: Null pointer to connector in connector registry. ACE_THROW_RETURN (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, EINVAL), CORBA::COMPLETED_NO), -1); diff --git a/TAO/tao/Current.pidl b/TAO/tao/Current.pidl index a45841ecc88..3b7b8e66c61 100644 --- a/TAO/tao/Current.pidl +++ b/TAO/tao/Current.pidl @@ -33,14 +33,9 @@ // patch < diffs/Current.diff // ================================================================ -#ifndef TAO_CURRENT_PIDL -#define TAO_CURRENT_PIDL - #pragma prefix "omg.org" module CORBA { local interface Current {}; }; - -#endif /* TAO_CURRENT_PIDL */ diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp index dbd3f67136f..913d7394e52 100644 --- a/TAO/tao/CurrentC.cpp +++ b/TAO/tao/CurrentC.cpp @@ -58,7 +58,7 @@ namespace TAO ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Current_ptr -TAO::Objref_Traits<CORBA::Current>::duplicate ( +TAO::Objref_Traits<CORBA::Current>::tao_duplicate ( CORBA::Current_ptr p ) { @@ -67,7 +67,7 @@ TAO::Objref_Traits<CORBA::Current>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::Current>::release ( +TAO::Objref_Traits<CORBA::Current>::tao_release ( CORBA::Current_ptr p ) { @@ -76,14 +76,14 @@ TAO::Objref_Traits<CORBA::Current>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Current_ptr -TAO::Objref_Traits<CORBA::Current>::nil (void) +TAO::Objref_Traits<CORBA::Current>::tao_nil (void) { return CORBA::Current::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::Current>::marshal ( +TAO::Objref_Traits<CORBA::Current>::tao_marshal ( CORBA::Current_ptr p, TAO_OutputCDR & cdr ) @@ -92,7 +92,7 @@ TAO::Objref_Traits<CORBA::Current>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_Current_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -103,7 +103,7 @@ CORBA::Current::Current (void) CORBA::Current::~Current (void) {} -void +void CORBA::Current::_tao_any_destructor (void *_tao_void_pointer) { Current *_tao_tmp_pointer = @@ -121,10 +121,10 @@ CORBA::Current::_narrow ( { return Current::_nil (); } - + Current_ptr proxy = dynamic_cast<Current_ptr> (_tao_objref); - + return Current::_duplicate (proxy); } @@ -138,10 +138,10 @@ CORBA::Current::_unchecked_narrow ( { return Current::_nil (); } - + Current_ptr proxy = dynamic_cast<Current_ptr> (_tao_objref); - + return Current::_duplicate (proxy); } @@ -152,7 +152,7 @@ CORBA::Current::_duplicate (Current_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -210,7 +210,7 @@ CORBA::Current::marshal (TAO_OutputCDR &) TAO_Objref_Var_T< CORBA::Current >; - + template class TAO_Objref_Out_T< CORBA::Current @@ -227,10 +227,11 @@ CORBA::Current::marshal (TAO_OutputCDR &) TAO_Objref_Var_T< \ CORBA::Current > - + # pragma instantiate \ TAO_Objref_Out_T< \ CORBA::Current > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h index bae17f58713..efdb265e360 100644 --- a/TAO/tao/CurrentC.h +++ b/TAO/tao/CurrentC.h @@ -66,13 +66,13 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// 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; } @@ -82,22 +82,22 @@ namespace TAO namespace CORBA { - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_CURRENT__VAR_OUT_CH_) #define _CORBA_CURRENT__VAR_OUT_CH_ - + class Current; typedef Current *Current_ptr; - + typedef TAO_Objref_Var_T< Current > Current_var; - + typedef TAO_Objref_Out_T< Current @@ -105,69 +105,69 @@ namespace CORBA Current_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_CURRENT_CH_) #define _CORBA_CURRENT_CH_ - + class TAO_Export Current : public virtual CORBA::Object { 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_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 @@ -184,18 +184,18 @@ namespace TAO #if !defined (_CORBA_CURRENT__TRAITS_CH_) #define _CORBA_CURRENT__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<CORBA::Current> { - static CORBA::Current_ptr duplicate ( + static CORBA::Current_ptr tao_duplicate ( CORBA::Current_ptr ); - static void release ( + static void tao_release ( CORBA::Current_ptr ); - static CORBA::Current_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::Current_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::Current_ptr p, TAO_OutputCDR & cdr ); @@ -229,3 +229,4 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Current_ptr &) #include /**/ "ace/post.h" #endif /* ifndef */ + diff --git a/TAO/tao/DLL_ORB.cpp b/TAO/tao/DLL_ORB.cpp new file mode 100644 index 00000000000..6873a3a5276 --- /dev/null +++ b/TAO/tao/DLL_ORB.cpp @@ -0,0 +1,181 @@ +// -*- C++ -*- + +#include "tao/DLL_ORB.h" +#include "tao/TAO_Singleton_Manager.h" +#include "tao/Environment.h" +#include "tao/debug.h" +#include "tao/CORBA_methods.h" + +#include "ace/ARGV.h" +#include "ace/Argv_Type_Converter.h" + +ACE_RCSID (tao, + DLL_ORB, + "$Id$") + +#if !defined (__ACE_INLINE__) +# include "tao/DLL_ORB.inl" +#endif /* ! __ACE_INLINE__ */ + +TAO_DLL_ORB::TAO_DLL_ORB (void) + : orb_ () +{ + // Nothing +} + +TAO_DLL_ORB::~TAO_DLL_ORB (void) +{ + // Nothing +} + +int +TAO_DLL_ORB::init (int /*argc*/, ACE_TCHAR *argv[]) +{ + // This class is deprecated. See the class documentation in + // DLL_ORB.h for details explaining why this is so. + if (TAO_debug_level > 0) + { + ACE_DEBUG ((LM_WARNING, + ACE_TEXT ("TAO (%P|%t) - The TAO_DLL_ORB class is ") + ACE_TEXT ("deprecated. See the class documentation\n") + ACE_TEXT ("TAO (%P|%t) - `tao/DLL_ORB.h' for details ") + ACE_TEXT ("explaining why this is so.\n"))); + } + + // Make sure TAO's singleton manager is initialized, and set to not + // register itself with the ACE_Object_Manager since it is under the + // control of the Service Configurator. + int register_with_object_manager = 0; + + if (TAO_Singleton_Manager::instance ()->init (register_with_object_manager) + == -1) + { + return -1; // No exceptions yet. + } + + ACE_TRY_NEW_ENV + { + ACE_ARGV new_argv; + + if (new_argv.add (ACE_TEXT ("dummy")) == -1 + || new_argv.add (argv) == -1) + return -1; + + int new_argc = new_argv.argc (); + +#if defined (ACE_HAS_WINCE) || defined (ACE_USES_WCHAR) + { + // Copy command line parameter from new_argv. + ACE_Argv_Type_Converter command_line(new_argc, new_argv.argv()); + + // Initialize the ORB. + this->orb_ = CORBA::ORB_init (command_line.get_argc(), + command_line.get_ASCII_argv(), + "" + ACE_ENV_ARG_PARAMETER); + // command_line will be destroyed here and new_argv will be updated if necessary + } +#else + // Initialize the ORB. + this->orb_ = CORBA::ORB_init (new_argc, + new_argv.argv (), + "" + ACE_ENV_ARG_PARAMETER); +#endif // ACE_HAS_WINCE + + ACE_TRY_CHECK; + + if (CORBA::is_nil (this->orb_.in ())) + return -1; + } + ACE_CATCHANY + { + if (TAO_debug_level >= 4) + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "TAO_DLL_ORB::init"); + + return -1; + } + ACE_ENDTRY; + +#if defined (ACE_HAS_THREADS) + // Become an Active Object so that the ORB + // will execute in a separate thread. + return this->activate (); +#else + return 0; +#endif /* ACE_HAS_THREADS */ +} + +int +TAO_DLL_ORB::fini (void) +{ + ACE_TRY_NEW_ENV + { + this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + + if (TAO_Singleton_Manager::instance ()->fini () == -1) + return -1; + } + ACE_CATCHANY + { + if (TAO_debug_level >= 4) + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "TAO_DLL_ORB::fini"); + return -1; + } + ACE_ENDTRY; + + return 0; +} + +int +TAO_DLL_ORB::svc (void) +{ + ACE_TRY_NEW_ENV + { + // Run the ORB event loop in its own thread. + this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + if (TAO_debug_level >= 4) + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "TAO_DLL_ORB::svc"); + return -1; + } + ACE_ENDTRY; + + return 0; +} + + +ACE_STATIC_SVC_DEFINE (TAO_DLL_ORB, + ACE_TEXT ("DLL_ORB"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (TAO_DLL_ORB), + ACE_Service_Type::DELETE_THIS + | ACE_Service_Type::DELETE_OBJ, + 0) + +ACE_FACTORY_DEFINE (TAO, TAO_DLL_ORB) + + + +// Template instantiations necessary for use when dynamically load the +// TAO_DLL_ORB. + +#if 0 +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +template class ACE_Dynamic_Service<TAO_DLL_ORB>; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +#pragma instantiate ACE_Dynamic_Service<TAO_DLL_ORB> + +#endif + +#endif /*if 0*/ diff --git a/TAO/tao/DLL_ORB.h b/TAO/tao/DLL_ORB.h new file mode 100644 index 00000000000..dc1f63b46eb --- /dev/null +++ b/TAO/tao/DLL_ORB.h @@ -0,0 +1,88 @@ +// -*- C++ -*- + +//============================================================================= +/** + * @file DLL_ORB.h + * + * $Id$ + * + * Header file for the TAO_DLL_ORB helper class. + * + * + * @author Ossama Othman <ossama@dre.vanderbilt.edu> + */ +//============================================================================= + + +#ifndef TAO_DLL_ORB_H +#define TAO_DLL_ORB_H + +#include /**/ "ace/pre.h" +#include "ace/Task.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "ace/Service_Config.h" + +#include "tao/ORB.h" +/** + * @class TAO_DLL_ORB + * + * @brief @e Deprecated helper class that initializes an ORB when an + * instance of this class is dynamically loaded. + * + * @deprecated This class is deprecated. While it does demonstrate + * how to initialize an ORB in a dynamically loaded object, the fact + * that it is located in the TAO library forces the TAO library to be + * linked to the application binary. This prevents TAO from being + * completely decoupled from an application when dynamic loading is + * used, hence defeating the purpose of dynamically loading the + * object! + * @par + * For an example of how to dynamically load an ORB (actually initialize + * an ORB inside a dynamically loaded object) that is completely + * decoupled from an application binary see the @c TAO/tests/DLL_ORB + * test. + */ +class TAO_Export TAO_DLL_ORB : public ACE_Task_Base +{ + +public: + + /// Constructor + TAO_DLL_ORB (void); + + /// Destructor + ~TAO_DLL_ORB (void); + + /// Initializes ORB when dynamic linking occurs. + virtual int init (int argc, ACE_TCHAR *argv[]); + + /// Terminates ORB when dynamic unlinking occurs. + virtual int fini (void); + + /// Run by a daemon thread to handle deferred processing. + virtual int svc (void); + + /// Returns a duplicate reference to the ORB. + CORBA::ORB_ptr orb (void); + +private: + + /// Reference to the ORB. + CORBA::ORB_var orb_; + +}; + +#if defined (__ACE_INLINE__) +# include "tao/DLL_ORB.inl" +#endif /* ! __ACE_INLINE__ */ + +ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_DLL_ORB) +ACE_FACTORY_DECLARE (TAO, TAO_DLL_ORB) + +#include /**/ "ace/post.h" + +#endif /* TAO_DLL_ORB_H */ diff --git a/TAO/tao/DLL_ORB.inl b/TAO/tao/DLL_ORB.inl new file mode 100644 index 00000000000..b3240cf9ff9 --- /dev/null +++ b/TAO/tao/DLL_ORB.inl @@ -0,0 +1,10 @@ +// -*- C++ -*- +// +// $Id$ + + +ACE_INLINE CORBA::ORB_ptr +TAO_DLL_ORB::orb (void) +{ + return CORBA::ORB::_duplicate (this->orb_.in()); +} diff --git a/TAO/tao/DLL_Parser.cpp b/TAO/tao/DLL_Parser.cpp index 1c9bbd07eca..fbb3ea8c5f4 100644 --- a/TAO/tao/DLL_Parser.cpp +++ b/TAO/tao/DLL_Parser.cpp @@ -5,7 +5,6 @@ #include "Object.h" #include "Environment.h" #include "ORB_Constants.h" -#include "SystemException.h" #include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" @@ -54,7 +53,7 @@ TAO_DLL_Parser::parse_string (const char *ior, ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, EINVAL), CORBA::COMPLETED_NO), CORBA::Object::_nil ()); diff --git a/TAO/tao/Default_Stub_Factory.cpp b/TAO/tao/Default_Stub_Factory.cpp index d6603362980..dc2666670e6 100644 --- a/TAO/tao/Default_Stub_Factory.cpp +++ b/TAO/tao/Default_Stub_Factory.cpp @@ -3,7 +3,6 @@ #include "Default_Stub_Factory.h" #include "Stub.h" #include "ORB_Constants.h" -#include "SystemException.h" #include "ace/Log_Msg.h" @@ -19,15 +18,15 @@ TAO_Default_Stub_Factory::~TAO_Default_Stub_Factory (void) TAO_Stub * TAO_Default_Stub_Factory::create_stub (const char *repository_id, - const TAO_MProfile &profiles, - TAO_ORB_Core *orb_core - ACE_ENV_ARG_DECL) + const TAO_MProfile &profiles, + TAO_ORB_Core *orb_core + ACE_ENV_ARG_DECL) { TAO_Stub *retval = 0; ACE_NEW_THROW_EX (retval, TAO_Stub (repository_id, profiles, orb_core), - CORBA::NO_MEMORY (0, + CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); ACE_CHECK_RETURN (retval); diff --git a/TAO/tao/Domain.mpc b/TAO/tao/Domain.mpc index 23ef70eb3e4..f9a421b103f 100644 --- a/TAO/tao/Domain.mpc +++ b/TAO/tao/Domain.mpc @@ -22,7 +22,4 @@ project : taolib, core, ifr_client, portableserver { Resource_Files { Domain } - - PIDL_Files { - } } diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp index 8da6882f61d..5d57ebb49c7 100644 --- a/TAO/tao/DomainC.cpp +++ b/TAO/tao/DomainC.cpp @@ -65,8 +65,6 @@ namespace CORBA typedef TAO_Objref_Out_T<InterfaceDef> InterfaceDef_out; } -#if TAO_HAS_INTERCEPTORS == 1 - ACE_TEMPLATE_SPECIALIZATION void TAO::In_Object_Argument_T<CORBA::InterfaceDef_ptr>::interceptor_param (Dynamic::Parameter & p) @@ -80,8 +78,6 @@ TAO::In_Object_Argument_T<CORBA::InterfaceDef_ptr>::interceptor_param (Dynamic:: p.mode = CORBA::PARAM_IN; } -#endif /* TAO_HAS_INTERCEPTORS */ - ACE_TEMPLATE_SPECIALIZATION CORBA::Boolean TAO::In_Object_Argument_T<CORBA::InterfaceDef_ptr>::marshal (TAO_OutputCDR & cdr) @@ -100,7 +96,7 @@ namespace TAO #if !defined (_CORBA_POLICY__ARG_TRAITS_CS_) #define _CORBA_POLICY__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_Export Arg_Traits<CORBA::Policy> : public @@ -117,7 +113,7 @@ namespace TAO #if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_CS_) #define _CORBA_INTERFACEDEF__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_Export Arg_Traits<CORBA::InterfaceDef> : public @@ -141,7 +137,7 @@ namespace TAO ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::DomainManager_ptr -TAO::Objref_Traits<CORBA::DomainManager>::duplicate ( +TAO::Objref_Traits<CORBA::DomainManager>::tao_duplicate ( CORBA::DomainManager_ptr p ) { @@ -150,7 +146,7 @@ TAO::Objref_Traits<CORBA::DomainManager>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::DomainManager>::release ( +TAO::Objref_Traits<CORBA::DomainManager>::tao_release ( CORBA::DomainManager_ptr p ) { @@ -159,14 +155,14 @@ TAO::Objref_Traits<CORBA::DomainManager>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::DomainManager_ptr -TAO::Objref_Traits<CORBA::DomainManager>::nil (void) +TAO::Objref_Traits<CORBA::DomainManager>::tao_nil (void) { return CORBA::DomainManager::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::DomainManager>::marshal ( +TAO::Objref_Traits<CORBA::DomainManager>::tao_marshal ( CORBA::DomainManager_ptr p, TAO_OutputCDR & cdr ) @@ -175,7 +171,7 @@ TAO::Objref_Traits<CORBA::DomainManager>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -195,21 +191,21 @@ TAO::Collocation_Proxy_Broker * { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_DomainManager_Proxy_Broker_ == 0) { CORBA_DomainManager_setup_collocation (); } - + TAO::Arg_Traits<CORBA::Policy>::ret_val _tao_retval; TAO::Arg_Traits<CORBA::PolicyType>::in_arg_val _tao_policy_type (policy_type); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_policy_type }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -218,10 +214,10 @@ TAO::Collocation_Proxy_Broker * 17, this->the_TAO_DomainManager_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -244,7 +240,7 @@ CORBA::DomainManager::CORBA_DomainManager_setup_collocation () CORBA::DomainManager::~DomainManager (void) {} -void +void CORBA::DomainManager::_tao_any_destructor (void *_tao_void_pointer) { DomainManager *_tao_tmp_pointer = @@ -289,7 +285,7 @@ CORBA::DomainManager::_duplicate (DomainManager_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -339,7 +335,7 @@ CORBA::DomainManager::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ConstructionPolicy_ptr -TAO::Objref_Traits<CORBA::ConstructionPolicy>::duplicate ( +TAO::Objref_Traits<CORBA::ConstructionPolicy>::tao_duplicate ( CORBA::ConstructionPolicy_ptr p ) { @@ -348,7 +344,7 @@ TAO::Objref_Traits<CORBA::ConstructionPolicy>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ConstructionPolicy>::release ( +TAO::Objref_Traits<CORBA::ConstructionPolicy>::tao_release ( CORBA::ConstructionPolicy_ptr p ) { @@ -357,14 +353,14 @@ TAO::Objref_Traits<CORBA::ConstructionPolicy>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ConstructionPolicy_ptr -TAO::Objref_Traits<CORBA::ConstructionPolicy>::nil (void) +TAO::Objref_Traits<CORBA::ConstructionPolicy>::tao_nil (void) { return CORBA::ConstructionPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ConstructionPolicy>::marshal ( +TAO::Objref_Traits<CORBA::ConstructionPolicy>::tao_marshal ( CORBA::ConstructionPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -373,7 +369,7 @@ TAO::Objref_Traits<CORBA::ConstructionPolicy>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -394,23 +390,23 @@ void CORBA::ConstructionPolicy::make_domain_manager ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_ConstructionPolicy_Proxy_Broker_ == 0) { CORBA_ConstructionPolicy_setup_collocation (); } - + TAO::Arg_Traits<void>::ret_val _tao_retval; TAO::Arg_Traits<CORBA::InterfaceDef>::in_arg_val _tao_object_type (object_type); TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val _tao_constr_policy (constr_policy); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_object_type, &_tao_constr_policy }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -419,7 +415,7 @@ void CORBA::ConstructionPolicy::make_domain_manager ( 19, this->the_TAO_ConstructionPolicy_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -438,14 +434,14 @@ CORBA::ConstructionPolicy::CORBA_ConstructionPolicy_setup_collocation () this->the_TAO_ConstructionPolicy_Proxy_Broker_ = ::CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer (this); } - + this->CORBA_Policy_setup_collocation (); } CORBA::ConstructionPolicy::~ConstructionPolicy (void) {} -void +void CORBA::ConstructionPolicy::_tao_any_destructor (void *_tao_void_pointer) { ConstructionPolicy *_tao_tmp_pointer = @@ -490,7 +486,7 @@ CORBA::ConstructionPolicy::_duplicate (ConstructionPolicy_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -537,7 +533,7 @@ CORBA::ConstructionPolicy::marshal (TAO_OutputCDR &cdr) return (cdr << this); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_DOMAINMANAGERLIST_CS_) @@ -611,21 +607,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if ((strm >> obj.inout ()) == 0) { return 0; } - + typedef ::CORBA::DomainManager RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -647,21 +643,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if ((strm >> obj.inout ()) == 0) { return 0; } - + typedef ::CORBA::ConstructionPolicy RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -677,21 +673,21 @@ CORBA::Boolean operator<< ( ) { CORBA::ULong _tao_seq_len = _tao_sequence.length (); - + if (strm << _tao_seq_len) { // Encode all elements. CORBA::Boolean _tao_marshal_flag = 1; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = _tao_sequence[i].in ()->marshal (strm); } - + return _tao_marshal_flag; } - + return 0; } @@ -701,7 +697,7 @@ CORBA::Boolean operator>> ( ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -711,28 +707,28 @@ 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. CORBA::Boolean _tao_marshal_flag = 1; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = (strm >> _tao_sequence[i].out ()); } - + return _tao_marshal_flag; - + } - + return 0; } @@ -794,7 +790,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< CORBA::DomainManager >; - + template class TAO_Objref_Out_T< CORBA::DomainManager @@ -819,7 +815,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< CORBA::ConstructionPolicy >; - + template class TAO_Objref_Out_T< CORBA::ConstructionPolicy @@ -922,7 +918,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ CORBA::DomainManager > - + # pragma instantiate \ TAO_Objref_Out_T< \ CORBA::DomainManager @@ -947,7 +943,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ CORBA::ConstructionPolicy > - + # pragma instantiate \ TAO_Objref_Out_T< \ CORBA::ConstructionPolicy @@ -997,4 +993,5 @@ CORBA::Boolean operator>> ( #endif /* end #if !defined */ -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h index 4cbee563d39..f17de220707 100644 --- a/TAO/tao/DomainC.h +++ b/TAO/tao/DomainC.h @@ -428,14 +428,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<CORBA::DomainManager> { - static CORBA::DomainManager_ptr duplicate ( + static CORBA::DomainManager_ptr tao_duplicate ( CORBA::DomainManager_ptr ); - static void release ( + static void tao_release ( CORBA::DomainManager_ptr ); - static CORBA::DomainManager_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::DomainManager_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::DomainManager_ptr p, TAO_OutputCDR & cdr ); @@ -449,14 +449,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<CORBA::ConstructionPolicy> { - static CORBA::ConstructionPolicy_ptr duplicate ( + static CORBA::ConstructionPolicy_ptr tao_duplicate ( CORBA::ConstructionPolicy_ptr ); - static void release ( + static void tao_release ( CORBA::ConstructionPolicy_ptr ); - static CORBA::ConstructionPolicy_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::ConstructionPolicy_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::ConstructionPolicy_ptr p, TAO_OutputCDR & cdr ); diff --git a/TAO/tao/DynamicAny.mpc b/TAO/tao/DynamicAny.mpc index 9b3944a1ee1..65031d77de0 100644 --- a/TAO/tao/DynamicAny.mpc +++ b/TAO/tao/DynamicAny.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, core { +project : valuetype, taolib, core { sharedname = TAO_DynamicAny dynamicflags = TAO_DYNAMICANY_BUILD_DLL @@ -22,8 +22,4 @@ project : taolib, core { Resource_Files { DynamicAny } - - PIDL_Files { - DynamicAny - } } diff --git a/TAO/tao/DynamicAny/DynamicAnyC.cpp b/TAO/tao/DynamicAny/DynamicAnyC.cpp index fd1ffe9666d..47dc1ae5dbf 100644 --- a/TAO/tao/DynamicAny/DynamicAnyC.cpp +++ b/TAO/tao/DynamicAny/DynamicAnyC.cpp @@ -57,7 +57,7 @@ namespace TAO ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION DynamicAny::DynAny_ptr -TAO::Objref_Traits<DynamicAny::DynAny>::duplicate ( +TAO::Objref_Traits<DynamicAny::DynAny>::tao_duplicate ( DynamicAny::DynAny_ptr p ) { @@ -66,7 +66,7 @@ TAO::Objref_Traits<DynamicAny::DynAny>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<DynamicAny::DynAny>::release ( +TAO::Objref_Traits<DynamicAny::DynAny>::tao_release ( DynamicAny::DynAny_ptr p ) { @@ -75,14 +75,14 @@ TAO::Objref_Traits<DynamicAny::DynAny>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION DynamicAny::DynAny_ptr -TAO::Objref_Traits<DynamicAny::DynAny>::nil (void) +TAO::Objref_Traits<DynamicAny::DynAny>::tao_nil (void) { return DynamicAny::DynAny::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<DynamicAny::DynAny>::marshal ( +TAO::Objref_Traits<DynamicAny::DynAny>::tao_marshal ( DynamicAny::DynAny_ptr p, TAO_OutputCDR & cdr ) @@ -364,7 +364,7 @@ DynamicAny::DynAny::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION DynamicAny::DynFixed_ptr -TAO::Objref_Traits<DynamicAny::DynFixed>::duplicate ( +TAO::Objref_Traits<DynamicAny::DynFixed>::tao_duplicate ( DynamicAny::DynFixed_ptr p ) { @@ -373,7 +373,7 @@ TAO::Objref_Traits<DynamicAny::DynFixed>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<DynamicAny::DynFixed>::release ( +TAO::Objref_Traits<DynamicAny::DynFixed>::tao_release ( DynamicAny::DynFixed_ptr p ) { @@ -382,14 +382,14 @@ TAO::Objref_Traits<DynamicAny::DynFixed>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION DynamicAny::DynFixed_ptr -TAO::Objref_Traits<DynamicAny::DynFixed>::nil (void) +TAO::Objref_Traits<DynamicAny::DynFixed>::tao_nil (void) { return DynamicAny::DynFixed::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<DynamicAny::DynFixed>::marshal ( +TAO::Objref_Traits<DynamicAny::DynFixed>::tao_marshal ( DynamicAny::DynFixed_ptr p, TAO_OutputCDR & cdr ) @@ -505,7 +505,7 @@ DynamicAny::DynFixed::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION DynamicAny::DynEnum_ptr -TAO::Objref_Traits<DynamicAny::DynEnum>::duplicate ( +TAO::Objref_Traits<DynamicAny::DynEnum>::tao_duplicate ( DynamicAny::DynEnum_ptr p ) { @@ -514,7 +514,7 @@ TAO::Objref_Traits<DynamicAny::DynEnum>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<DynamicAny::DynEnum>::release ( +TAO::Objref_Traits<DynamicAny::DynEnum>::tao_release ( DynamicAny::DynEnum_ptr p ) { @@ -523,14 +523,14 @@ TAO::Objref_Traits<DynamicAny::DynEnum>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION DynamicAny::DynEnum_ptr -TAO::Objref_Traits<DynamicAny::DynEnum>::nil (void) +TAO::Objref_Traits<DynamicAny::DynEnum>::tao_nil (void) { return DynamicAny::DynEnum::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<DynamicAny::DynEnum>::marshal ( +TAO::Objref_Traits<DynamicAny::DynEnum>::tao_marshal ( DynamicAny::DynEnum_ptr p, TAO_OutputCDR & cdr ) @@ -744,7 +744,7 @@ DynamicAny::NameDynAnyPairSeq::~NameDynAnyPairSeq (void) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION DynamicAny::DynStruct_ptr -TAO::Objref_Traits<DynamicAny::DynStruct>::duplicate ( +TAO::Objref_Traits<DynamicAny::DynStruct>::tao_duplicate ( DynamicAny::DynStruct_ptr p ) { @@ -753,7 +753,7 @@ TAO::Objref_Traits<DynamicAny::DynStruct>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<DynamicAny::DynStruct>::release ( +TAO::Objref_Traits<DynamicAny::DynStruct>::tao_release ( DynamicAny::DynStruct_ptr p ) { @@ -762,14 +762,14 @@ TAO::Objref_Traits<DynamicAny::DynStruct>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION DynamicAny::DynStruct_ptr -TAO::Objref_Traits<DynamicAny::DynStruct>::nil (void) +TAO::Objref_Traits<DynamicAny::DynStruct>::tao_nil (void) { return DynamicAny::DynStruct::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<DynamicAny::DynStruct>::marshal ( +TAO::Objref_Traits<DynamicAny::DynStruct>::tao_marshal ( DynamicAny::DynStruct_ptr p, TAO_OutputCDR & cdr ) @@ -885,7 +885,7 @@ DynamicAny::DynStruct::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION DynamicAny::DynUnion_ptr -TAO::Objref_Traits<DynamicAny::DynUnion>::duplicate ( +TAO::Objref_Traits<DynamicAny::DynUnion>::tao_duplicate ( DynamicAny::DynUnion_ptr p ) { @@ -894,7 +894,7 @@ TAO::Objref_Traits<DynamicAny::DynUnion>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<DynamicAny::DynUnion>::release ( +TAO::Objref_Traits<DynamicAny::DynUnion>::tao_release ( DynamicAny::DynUnion_ptr p ) { @@ -903,14 +903,14 @@ TAO::Objref_Traits<DynamicAny::DynUnion>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION DynamicAny::DynUnion_ptr -TAO::Objref_Traits<DynamicAny::DynUnion>::nil (void) +TAO::Objref_Traits<DynamicAny::DynUnion>::tao_nil (void) { return DynamicAny::DynUnion::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<DynamicAny::DynUnion>::marshal ( +TAO::Objref_Traits<DynamicAny::DynUnion>::tao_marshal ( DynamicAny::DynUnion_ptr p, TAO_OutputCDR & cdr ) @@ -1117,7 +1117,7 @@ DynamicAny::DynAnySeq::~DynAnySeq (void) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION DynamicAny::DynSequence_ptr -TAO::Objref_Traits<DynamicAny::DynSequence>::duplicate ( +TAO::Objref_Traits<DynamicAny::DynSequence>::tao_duplicate ( DynamicAny::DynSequence_ptr p ) { @@ -1126,7 +1126,7 @@ TAO::Objref_Traits<DynamicAny::DynSequence>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<DynamicAny::DynSequence>::release ( +TAO::Objref_Traits<DynamicAny::DynSequence>::tao_release ( DynamicAny::DynSequence_ptr p ) { @@ -1135,14 +1135,14 @@ TAO::Objref_Traits<DynamicAny::DynSequence>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION DynamicAny::DynSequence_ptr -TAO::Objref_Traits<DynamicAny::DynSequence>::nil (void) +TAO::Objref_Traits<DynamicAny::DynSequence>::tao_nil (void) { return DynamicAny::DynSequence::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<DynamicAny::DynSequence>::marshal ( +TAO::Objref_Traits<DynamicAny::DynSequence>::tao_marshal ( DynamicAny::DynSequence_ptr p, TAO_OutputCDR & cdr ) @@ -1258,7 +1258,7 @@ DynamicAny::DynSequence::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION DynamicAny::DynArray_ptr -TAO::Objref_Traits<DynamicAny::DynArray>::duplicate ( +TAO::Objref_Traits<DynamicAny::DynArray>::tao_duplicate ( DynamicAny::DynArray_ptr p ) { @@ -1267,7 +1267,7 @@ TAO::Objref_Traits<DynamicAny::DynArray>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<DynamicAny::DynArray>::release ( +TAO::Objref_Traits<DynamicAny::DynArray>::tao_release ( DynamicAny::DynArray_ptr p ) { @@ -1276,14 +1276,14 @@ TAO::Objref_Traits<DynamicAny::DynArray>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION DynamicAny::DynArray_ptr -TAO::Objref_Traits<DynamicAny::DynArray>::nil (void) +TAO::Objref_Traits<DynamicAny::DynArray>::tao_nil (void) { return DynamicAny::DynArray::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<DynamicAny::DynArray>::marshal ( +TAO::Objref_Traits<DynamicAny::DynArray>::tao_marshal ( DynamicAny::DynArray_ptr p, TAO_OutputCDR & cdr ) @@ -1399,7 +1399,7 @@ DynamicAny::DynArray::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION DynamicAny::DynValue_ptr -TAO::Objref_Traits<DynamicAny::DynValue>::duplicate ( +TAO::Objref_Traits<DynamicAny::DynValue>::tao_duplicate ( DynamicAny::DynValue_ptr p ) { @@ -1408,7 +1408,7 @@ TAO::Objref_Traits<DynamicAny::DynValue>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<DynamicAny::DynValue>::release ( +TAO::Objref_Traits<DynamicAny::DynValue>::tao_release ( DynamicAny::DynValue_ptr p ) { @@ -1417,14 +1417,14 @@ TAO::Objref_Traits<DynamicAny::DynValue>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION DynamicAny::DynValue_ptr -TAO::Objref_Traits<DynamicAny::DynValue>::nil (void) +TAO::Objref_Traits<DynamicAny::DynValue>::tao_nil (void) { return DynamicAny::DynValue::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<DynamicAny::DynValue>::marshal ( +TAO::Objref_Traits<DynamicAny::DynValue>::tao_marshal ( DynamicAny::DynValue_ptr p, TAO_OutputCDR & cdr ) @@ -1540,7 +1540,7 @@ DynamicAny::DynValue::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION DynamicAny::DynAnyFactory_ptr -TAO::Objref_Traits<DynamicAny::DynAnyFactory>::duplicate ( +TAO::Objref_Traits<DynamicAny::DynAnyFactory>::tao_duplicate ( DynamicAny::DynAnyFactory_ptr p ) { @@ -1549,7 +1549,7 @@ TAO::Objref_Traits<DynamicAny::DynAnyFactory>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<DynamicAny::DynAnyFactory>::release ( +TAO::Objref_Traits<DynamicAny::DynAnyFactory>::tao_release ( DynamicAny::DynAnyFactory_ptr p ) { @@ -1558,14 +1558,14 @@ TAO::Objref_Traits<DynamicAny::DynAnyFactory>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION DynamicAny::DynAnyFactory_ptr -TAO::Objref_Traits<DynamicAny::DynAnyFactory>::nil (void) +TAO::Objref_Traits<DynamicAny::DynAnyFactory>::tao_nil (void) { return DynamicAny::DynAnyFactory::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<DynamicAny::DynAnyFactory>::marshal ( +TAO::Objref_Traits<DynamicAny::DynAnyFactory>::tao_marshal ( DynamicAny::DynAnyFactory_ptr p, TAO_OutputCDR & cdr ) diff --git a/TAO/tao/DynamicAny/DynamicAnyC.h b/TAO/tao/DynamicAny/DynamicAnyC.h index 686c7a586a8..1d09f559712 100644 --- a/TAO/tao/DynamicAny/DynamicAnyC.h +++ b/TAO/tao/DynamicAny/DynamicAnyC.h @@ -2296,14 +2296,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynAny> { - static DynamicAny::DynAny_ptr duplicate ( + static DynamicAny::DynAny_ptr tao_duplicate ( DynamicAny::DynAny_ptr ); - static void release ( + static void tao_release ( DynamicAny::DynAny_ptr ); - static DynamicAny::DynAny_ptr nil (void); - static CORBA::Boolean marshal ( + static DynamicAny::DynAny_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( DynamicAny::DynAny_ptr p, TAO_OutputCDR & cdr ); @@ -2317,14 +2317,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynFixed> { - static DynamicAny::DynFixed_ptr duplicate ( + static DynamicAny::DynFixed_ptr tao_duplicate ( DynamicAny::DynFixed_ptr ); - static void release ( + static void tao_release ( DynamicAny::DynFixed_ptr ); - static DynamicAny::DynFixed_ptr nil (void); - static CORBA::Boolean marshal ( + static DynamicAny::DynFixed_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( DynamicAny::DynFixed_ptr p, TAO_OutputCDR & cdr ); @@ -2338,14 +2338,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynEnum> { - static DynamicAny::DynEnum_ptr duplicate ( + static DynamicAny::DynEnum_ptr tao_duplicate ( DynamicAny::DynEnum_ptr ); - static void release ( + static void tao_release ( DynamicAny::DynEnum_ptr ); - static DynamicAny::DynEnum_ptr nil (void); - static CORBA::Boolean marshal ( + static DynamicAny::DynEnum_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( DynamicAny::DynEnum_ptr p, TAO_OutputCDR & cdr ); @@ -2359,14 +2359,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynStruct> { - static DynamicAny::DynStruct_ptr duplicate ( + static DynamicAny::DynStruct_ptr tao_duplicate ( DynamicAny::DynStruct_ptr ); - static void release ( + static void tao_release ( DynamicAny::DynStruct_ptr ); - static DynamicAny::DynStruct_ptr nil (void); - static CORBA::Boolean marshal ( + static DynamicAny::DynStruct_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( DynamicAny::DynStruct_ptr p, TAO_OutputCDR & cdr ); @@ -2380,14 +2380,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynUnion> { - static DynamicAny::DynUnion_ptr duplicate ( + static DynamicAny::DynUnion_ptr tao_duplicate ( DynamicAny::DynUnion_ptr ); - static void release ( + static void tao_release ( DynamicAny::DynUnion_ptr ); - static DynamicAny::DynUnion_ptr nil (void); - static CORBA::Boolean marshal ( + static DynamicAny::DynUnion_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( DynamicAny::DynUnion_ptr p, TAO_OutputCDR & cdr ); @@ -2401,14 +2401,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynSequence> { - static DynamicAny::DynSequence_ptr duplicate ( + static DynamicAny::DynSequence_ptr tao_duplicate ( DynamicAny::DynSequence_ptr ); - static void release ( + static void tao_release ( DynamicAny::DynSequence_ptr ); - static DynamicAny::DynSequence_ptr nil (void); - static CORBA::Boolean marshal ( + static DynamicAny::DynSequence_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( DynamicAny::DynSequence_ptr p, TAO_OutputCDR & cdr ); @@ -2422,14 +2422,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynArray> { - static DynamicAny::DynArray_ptr duplicate ( + static DynamicAny::DynArray_ptr tao_duplicate ( DynamicAny::DynArray_ptr ); - static void release ( + static void tao_release ( DynamicAny::DynArray_ptr ); - static DynamicAny::DynArray_ptr nil (void); - static CORBA::Boolean marshal ( + static DynamicAny::DynArray_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( DynamicAny::DynArray_ptr p, TAO_OutputCDR & cdr ); @@ -2443,14 +2443,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynValue> { - static DynamicAny::DynValue_ptr duplicate ( + static DynamicAny::DynValue_ptr tao_duplicate ( DynamicAny::DynValue_ptr ); - static void release ( + static void tao_release ( DynamicAny::DynValue_ptr ); - static DynamicAny::DynValue_ptr nil (void); - static CORBA::Boolean marshal ( + static DynamicAny::DynValue_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( DynamicAny::DynValue_ptr p, TAO_OutputCDR & cdr ); @@ -2464,14 +2464,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynAnyFactory> { - static DynamicAny::DynAnyFactory_ptr duplicate ( + static DynamicAny::DynAnyFactory_ptr tao_duplicate ( DynamicAny::DynAnyFactory_ptr ); - static void release ( + static void tao_release ( DynamicAny::DynAnyFactory_ptr ); - static DynamicAny::DynAnyFactory_ptr nil (void); - static CORBA::Boolean marshal ( + static DynamicAny::DynAnyFactory_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( DynamicAny::DynAnyFactory_ptr p, TAO_OutputCDR & cdr ); diff --git a/TAO/tao/DynamicInterface.mpc b/TAO/tao/DynamicInterface.mpc index 6dbe854fd98..4add99313e9 100644 --- a/TAO/tao/DynamicInterface.mpc +++ b/TAO/tao/DynamicInterface.mpc @@ -1,5 +1,6 @@ //$Id$ -project : taolib, core, messaging, minimum_corba { +project : taolib, core, messaging { + avoids += minimum_corba sharedname = TAO_DynamicInterface dynamicflags = TAO_DYNAMICINTERFACE_BUILD_DLL @@ -22,7 +23,4 @@ project : taolib, core, messaging, minimum_corba { Resource_files { DynamicInterface } - - PIDL_Files { - } } diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp index ed48e85cd35..9ca2232f3f3 100644 --- a/TAO/tao/DynamicInterface/Context.cpp +++ b/TAO/tao/DynamicInterface/Context.cpp @@ -10,7 +10,6 @@ ACE_RCSID (DynamicInterface, #include "tao/NVList.h" #include "tao/Environment.h" #include "tao/CORBA_String.h" -#include "tao/SystemException.h" #include "ace/Guard_T.h" diff --git a/TAO/tao/DynamicInterface/DII_Invocation.cpp b/TAO/tao/DynamicInterface/DII_Invocation.cpp index 4e96ad4bff2..11d43e96011 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation.cpp +++ b/TAO/tao/DynamicInterface/DII_Invocation.cpp @@ -71,7 +71,7 @@ namespace TAO return safe_parameter_list._retn (); } -#endif /* TAO_HAS_INTERCEPTORS == 1 */ +#endif /*TAO_HAS_INTERCEPTORS*/ Invocation_Status DII_Invocation::remote_invocation (ACE_Time_Value *max_wait_time @@ -218,7 +218,7 @@ namespace TAO return safe_parameter_list._retn (); } -#endif /* TAO_HAS_INTERCEPTORS == 1*/ +#endif /*TAO_HAS_INTERCEPTORS*/ Invocation_Status DII_Deferred_Invocation::remote_invocation ( diff --git a/TAO/tao/DynamicInterface/ExceptionList.cpp b/TAO/tao/DynamicInterface/ExceptionList.cpp index 4a2c034b1ea..80061329001 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.cpp +++ b/TAO/tao/DynamicInterface/ExceptionList.cpp @@ -6,7 +6,6 @@ ACE_RCSID (DynamicInterface, #include "tao/Typecode.h" #include "tao/Environment.h" -#include "tao/SystemException.h" #if !defined (__ACE_INLINE__) # include "ExceptionList.inl" diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp index b8de495cfc7..88902f9be16 100644 --- a/TAO/tao/DynamicInterface/Server_Request.cpp +++ b/TAO/tao/DynamicInterface/Server_Request.cpp @@ -13,7 +13,6 @@ ACE_RCSID (DynamicInterface, #include "tao/Marshal.h" #include "tao/Typecode.h" #include "tao/Any_Impl.h" -#include "tao/SystemException.h" #if !defined (__ACE_INLINE__) # include "Server_Request.inl" @@ -245,3 +244,4 @@ CORBA::ServerRequest::gateway_exception_reply (ACE_CString &raw_exception) # pragma instantiate TAO_Pseudo_Out_T<CORBA::ServerRequest, CORBA::ServerRequest_var> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp index e540116ac9d..1e06bf14085 100644 --- a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp +++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp @@ -5,12 +5,9 @@ #include "tao/Any.h" #include "tao/Environment.h" #include "tao/TC_Constants_Forward.h" -#include "tao/SystemException.h" - #include "ace/OS_NS_string.h" #include "ace/OS_Memory.h" - ACE_RCSID (DynamicInterface, Unknown_User_Exception, "$Id$") diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.h b/TAO/tao/DynamicInterface/Unknown_User_Exception.h index e80e61525f8..ba2b41bcc66 100644 --- a/TAO/tao/DynamicInterface/Unknown_User_Exception.h +++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.h @@ -26,7 +26,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/UserException.h" +#include "tao/Exception.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp index 70dd1ecbcb6..d5c5e5a18fb 100644 --- a/TAO/tao/Environment.cpp +++ b/TAO/tao/Environment.cpp @@ -1,6 +1,6 @@ #include "Environment.h" #include "ORB_Core.h" -#include "SystemException.h" +#include "Exception.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp index e8711f28f66..92fbb75ee88 100644 --- a/TAO/tao/Exception.cpp +++ b/TAO/tao/Exception.cpp @@ -1,7 +1,9 @@ -// $Id$ +// $id: Exception.cpp,v 1.182 2003/11/10 20:29:26 dhinton Exp $ + +// THREADING NOTE: calling thread handles mutual exclusion policy +// on all of these data structures. #include "Exception.h" -#include "SystemException.h" #include "Environment.h" #include "Any_SystemException.h" #include "Any_Dual_Impl_T.h" @@ -29,27 +31,70 @@ #include "ace/OS_NS_stdio.h" - ACE_RCSID (tao, Exception, "$Id$") +// Static initializers. + +ACE_Allocator *TAO_Exceptions::global_allocator_; + +// Flag that denotes that the TAO TypeCode constants have been +// initialized. +bool TAO_Exceptions::initialized_ = false; + +namespace TAO +{ + // TAO specific typecode. + extern CORBA::TypeCode_ptr TC_completion_status; +} + + +/** + * @name @c errno Encoding + * + * The @c errno encoding is located in the bottom 7 bits. + */ +//@{ +const CORBA::ULong TAO_UNSPECIFIED_MINOR_CODE = 0x0U; +const CORBA::ULong TAO_ETIMEDOUT_MINOR_CODE = 0x1U; +const CORBA::ULong TAO_ENFILE_MINOR_CODE = 0x2U; +const CORBA::ULong TAO_EMFILE_MINOR_CODE = 0x3U; +const CORBA::ULong TAO_EPIPE_MINOR_CODE = 0x4U; +const CORBA::ULong TAO_ECONNREFUSED_MINOR_CODE = 0x5U; +const CORBA::ULong TAO_ENOENT_MINOR_CODE = 0x6U; +const CORBA::ULong TAO_EBADF_MINOR_CODE = 0x7U; +const CORBA::ULong TAO_ENOSYS_MINOR_CODE = 0x8U; +const CORBA::ULong TAO_EPERM_MINOR_CODE = 0x9U; +const CORBA::ULong TAO_EAFNOSUPPORT_MINOR_CODE = 0xAU; +const CORBA::ULong TAO_EAGAIN_MINOR_CODE = 0xBU; +const CORBA::ULong TAO_ENOMEM_MINOR_CODE = 0xCU; +const CORBA::ULong TAO_EACCES_MINOR_CODE = 0xDU; +const CORBA::ULong TAO_EFAULT_MINOR_CODE = 0xEU; +const CORBA::ULong TAO_EBUSY_MINOR_CODE = 0xFU; +const CORBA::ULong TAO_EEXIST_MINOR_CODE = 0x10U; +const CORBA::ULong TAO_EINVAL_MINOR_CODE = 0x11U; +const CORBA::ULong TAO_ECOMM_MINOR_CODE = 0x12U; +const CORBA::ULong TAO_ECONNRESET_MINOR_CODE = 0x13U; +const CORBA::ULong TAO_ENOTSUP_MINOR_CODE = 0x14U; +// *Don't* use TAO_<errno>_MINOR_CODE greater than 0x7FU! +//@} // **************************************************************** -CORBA::Exception::Exception (const char * repository_id, - const char * local_name) +CORBA::Exception::Exception (const char *repository_id, + const char *local_name) : id_ (CORBA::string_dup (repository_id)), name_ (CORBA::string_dup (local_name)) { - ACE_ASSERT (this->id_.in () != 0 && this->name_.in () != 0); + ACE_ASSERT (this->id_ != 0 && this->name_ != 0); } CORBA::Exception::Exception (const CORBA::Exception &src) : id_ (CORBA::string_dup (src.id_)), name_ (CORBA::string_dup (src.name_)) { - ACE_ASSERT (this->id_.in () != 0 && this->name_.in () != 0); + ACE_ASSERT (this->id_ != 0 && this->name_ != 0); } // NOTE: It's this code, not anything defined in a subclass, which is @@ -57,23 +102,35 @@ CORBA::Exception::Exception (const CORBA::Exception &src) // can do this because it's got the local name and the id. CORBA::Exception::Exception (void) - : id_ (), - name_ () + : id_ (0), + name_ (0) { } CORBA::Exception::~Exception (void) { + CORBA::string_free (this->id_); + CORBA::string_free (this->name_); } CORBA::Exception & CORBA::Exception::operator= (const CORBA::Exception &src) { + if (this->id_) + { + CORBA::string_free (this->id_); + } + this->id_ = CORBA::string_dup (src.id_); - ACE_ASSERT (this->id_.in () != 0); + ACE_ASSERT (this->id_ != 0); + + if (this->name_) + { + CORBA::string_free (this->name_); + } this->name_ = CORBA::string_dup (src.name_); - ACE_ASSERT (this->name_.in () != 0); + ACE_ASSERT (this->name_ != 0); return *this; } @@ -81,13 +138,13 @@ CORBA::Exception::operator= (const CORBA::Exception &src) const char * CORBA::Exception::_rep_id (void) const { - return this->id_.in (); + return this->id_; } const char * CORBA::Exception::_name (void) const { - return this->name_.in (); + return this->name_; } CORBA::TypeCode_ptr @@ -158,6 +215,1186 @@ namespace CORBA #endif /* (ACE_LACKS_IOSTREAM_TOTALLY) */ +// Avoid zillions of not-quite-inlined copies of utilities. + +CORBA::UserException::UserException (void) +{ +} + +CORBA::UserException::UserException (const char *repository_id, + const char *local_name) + : CORBA::Exception (repository_id, + local_name) +{ +} + +CORBA::UserException::~UserException (void) +{ +} + +CORBA::UserException & +CORBA::UserException::operator= (const CORBA::UserException &src) +{ + this->Exception::operator= (src); + return *this; +} + +int +CORBA::UserException::_is_a (const char* interface_id) const +{ + return ACE_OS::strcmp (interface_id, + "IDL:omg.org/CORBA/UserException:1.0") == 0 + || this->Exception::_is_a (interface_id); +} + +CORBA::UserException* +CORBA::UserException::_downcast (CORBA::Exception* exception) +{ + if (exception->_is_a ("IDL:omg.org/CORBA/UserException:1.0")) + { + return dynamic_cast<CORBA::UserException *> (exception); + } + + return 0; +} + +const CORBA::UserException* +CORBA::UserException::_downcast (const CORBA::Exception *exception) +{ + if (exception->_is_a ("IDL:omg.org/CORBA/UserException:1.0")) + { + return dynamic_cast<const CORBA::UserException *> (exception); + } + + return 0; +} + +ACE_CString +CORBA::UserException::_info (void) const +{ + // @@ we can use the exception's typecode to dump all the data held + // within it ... + + ACE_CString user_exception_info = "user exception, ID '"; + user_exception_info += this->_rep_id (); + user_exception_info += "'"; + return user_exception_info; +} + +// **************************************************************** + +namespace CORBA +{ + CORBA::TypeCode_ptr _tc_UnknownUserException = 0; +} + +// **************************************************************** + +CORBA::SystemException::SystemException (void) +{ +} + +CORBA::SystemException::SystemException (const char *repository_id, + const char *local_name, + CORBA::ULong code, + CORBA::CompletionStatus completed) + : CORBA::Exception (repository_id, + local_name), + minor_ (code), + completed_ (completed) +{ +} + +CORBA::SystemException::SystemException (CORBA::ULong code, + CORBA::CompletionStatus completed) + : minor_ (code), + completed_ (completed) +{ +} + + +CORBA::SystemException::SystemException (const CORBA::SystemException &src) + : CORBA::Exception (src), + minor_ (src.minor_), + completed_ (src.completed_) +{ +} + +CORBA::SystemException::~SystemException (void) +{ +} + +CORBA::SystemException & +CORBA::SystemException::operator= (const CORBA::SystemException &src) +{ + this->Exception::operator= (src); + + this->minor_ = src.minor_; + this->completed_ = src.completed_; + + return *this; +} + + +int +CORBA::SystemException::_is_a (const char* interface_id) const +{ + return ((ACE_OS::strcmp (interface_id, this->_rep_id ()) == 0) || + (ACE_OS::strcmp (interface_id, + "IDL:omg.org/CORBA/SystemException:1.0") == 0) + || this->Exception::_is_a (interface_id)); +} + +CORBA::SystemException* +CORBA::SystemException::_downcast (CORBA::Exception* exception) +{ + if (exception->_is_a ("IDL:omg.org/CORBA/SystemException:1.0")) + { + return dynamic_cast<CORBA::SystemException *> (exception); + } + + return 0; +} + +const CORBA::SystemException* +CORBA::SystemException::_downcast (const CORBA::Exception *exception) +{ + if (exception->_is_a ("IDL:omg.org/CORBA/SystemException:1.0")) + { + return dynamic_cast<const CORBA::SystemException *> (exception); + } + + return 0; +} + +void +CORBA::SystemException::_tao_encode (TAO_OutputCDR &cdr + ACE_ENV_ARG_DECL) const +{ + if (cdr.write_string (this->_rep_id ()) + && cdr.write_ulong (this->minor ()) + && cdr.write_ulong (this->completed ())) + { + return; + } + + ACE_THROW (CORBA::MARSHAL ()); +} + +void +CORBA::SystemException::_tao_decode (TAO_InputCDR &cdr + ACE_ENV_ARG_DECL) +{ + // The string is read by the caller, to determine the exact type of + // the exception. We just decode the fields... + // cdr.read_string (this->id ()); + CORBA::ULong tmp; + + if (cdr.read_ulong (this->minor_) + && cdr.read_ulong (tmp)) + { + this->completed_ = CORBA::CompletionStatus (tmp); + return; + } + + ACE_THROW (CORBA::MARSHAL ()); +} + +CORBA::ULong +CORBA::SystemException::_tao_errno (int errno_value) +{ + switch (errno_value) + { + case 0: + return TAO_UNSPECIFIED_MINOR_CODE; + case ETIMEDOUT: + return TAO_ETIMEDOUT_MINOR_CODE; + case ENFILE: + return TAO_ENFILE_MINOR_CODE; + case EPIPE: + return TAO_EPIPE_MINOR_CODE; + case ECONNREFUSED: + return TAO_ECONNREFUSED_MINOR_CODE; + case ENOENT: + return TAO_ENOENT_MINOR_CODE; + +#if !defined (ACE_HAS_WINCE) + case EMFILE: + return TAO_EMFILE_MINOR_CODE; + case EBADF: + return TAO_EBADF_MINOR_CODE; + case EPERM: + return TAO_EPERM_MINOR_CODE; + case EINVAL: + return TAO_EINVAL_MINOR_CODE; +#endif // ACE_HAS_WINCE + +#if (ENOSYS != EFAULT) + case ENOSYS: + return TAO_ENOSYS_MINOR_CODE; +#endif /* ENOSYS != EFAULT */ + case EAFNOSUPPORT: + return TAO_EAFNOSUPPORT_MINOR_CODE; + case EAGAIN: + return TAO_EAGAIN_MINOR_CODE; + case ENOMEM: + return TAO_ENOMEM_MINOR_CODE; + case EACCES: + return TAO_EACCES_MINOR_CODE; + case EFAULT: + return TAO_EFAULT_MINOR_CODE; + case EBUSY: + return TAO_EBUSY_MINOR_CODE; + case EEXIST: + return TAO_EEXIST_MINOR_CODE; + case ECOMM: + return TAO_ECOMM_MINOR_CODE; + case ECONNRESET: + return TAO_ECONNRESET_MINOR_CODE; +#if (ENOTSUP != ENOSYS) + case ENOTSUP: + return TAO_ENOTSUP_MINOR_CODE; +#endif /* ENOSYS != EFAULT */ + default: + // Mask off bottom 7 bits and return them. + return errno_value & 0x7FU; + } +} + +CORBA::ULong +CORBA::SystemException::_tao_minor_code (u_int location, + int errno_value) +{ + return + TAO_DEFAULT_MINOR_CODE + | location + | _tao_errno (errno_value); +} + +void +CORBA::SystemException::_tao_print_system_exception (FILE *) const +{ + ACE_DEBUG ((LM_ERROR, + ACE_TEXT("(%P|%t) system exception, ID '%s'\n"), + ACE_TEXT_CHAR_TO_TCHAR (this->_info ().c_str ()))); +} + +ACE_CString +CORBA::SystemException::_info (void) const +{ + // @@ there are a few other "user exceptions" in the CORBA scope, + // they're not all standard/system exceptions ... really need to + // either compare exhaustively against all those IDs (yeech) or + // (preferably) to represent the exception type directly in the + // exception value so it can be queried. + + ACE_CString info = "system exception, ID '"; + info += this->_rep_id (); + info += "'\n"; + + const CORBA::ULong VMCID = this->minor () & 0xFFFFF000u; + + if (VMCID == TAO_DEFAULT_MINOR_CODE) + { + // @@ Move the following code to a subroutine, it is too long already! + const char *location; + switch (this->minor () & 0x00000F80u) + { + case TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE: + location = "location forward failed"; + break; + case TAO_INVOCATION_SEND_REQUEST_MINOR_CODE: + location = "send request failed"; + break; + case TAO_POA_DISCARDING: + location = "poa in discarding state"; + break; + case TAO_POA_HOLDING: + location = "poa in holding state"; + break; + case TAO_POA_INACTIVE: + location = "poa in inactive state"; + break; + case TAO_UNHANDLED_SERVER_CXX_EXCEPTION: + location = "unhandled c++ exception in server side"; + break; + case TAO_INVOCATION_RECV_REQUEST_MINOR_CODE: + location = "failed to recv request response"; + break; + case TAO_CONNECTOR_REGISTRY_NO_USABLE_PROTOCOL: + location = "all protocols failed to parse the IOR"; + break; + case TAO_MPROFILE_CREATION_ERROR: + location = "error during MProfile creation"; + break; + case TAO_TIMEOUT_CONNECT_MINOR_CODE: + location = "timeout during connect"; + break; + case TAO_TIMEOUT_SEND_MINOR_CODE: + location = "timeout during send"; + break; + case TAO_TIMEOUT_RECV_MINOR_CODE: + location = "timeout during recv"; + break; + case TAO_IMPLREPO_MINOR_CODE: + location = "implrepo server exception"; + break; + case TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE: + location = "endpoint initialization failure in Acceptor Registry"; + break; + case TAO_ORB_CORE_INIT_LOCATION_CODE: + location = "ORB Core initialization failed"; + break; + case TAO_POLICY_NARROW_CODE: + location = "Failure when narrowing a Policy"; + break; + case TAO_GUARD_FAILURE: + location = "Failure when trying to acquire a guard/monitor"; + break; + case TAO_POA_BEING_DESTROYED: + location = "POA has been destroyed or is currently being destroyed"; + break; + case TAO_AMH_REPLY_LOCATION_CODE: + location = "Failure when trying to send AMH reply"; + break; + case TAO_RTCORBA_THREAD_CREATION_LOCATION_CODE: + location = "Failure in thread creation for RTCORBA thread pool"; + break; + default: + location = "unknown location"; + } + + const char *errno_indication; + char unknown_errno [255]; + CORBA::ULong minor_code = this->minor () & 0x7FU; + switch (minor_code) + { + case TAO_UNSPECIFIED_MINOR_CODE: + errno_indication = "unspecified errno"; + break; + case TAO_ETIMEDOUT_MINOR_CODE: + errno_indication = "ETIMEOUT"; + break; + case TAO_ENFILE_MINOR_CODE: + errno_indication = "ENFILE"; + break; + case TAO_EMFILE_MINOR_CODE: + errno_indication = "EMFILE"; + break; + case TAO_EPIPE_MINOR_CODE: + errno_indication = "EPIPE"; + break; + case TAO_ECONNREFUSED_MINOR_CODE: + errno_indication = "ECONNREFUSED"; + break; + case TAO_ENOENT_MINOR_CODE: + errno_indication = "ENOENT"; + break; + case TAO_EBADF_MINOR_CODE: + errno_indication = "EBADF"; + break; + case TAO_ENOSYS_MINOR_CODE: + errno_indication = "ENOSYS"; + break; + case TAO_EPERM_MINOR_CODE: + errno_indication = "EPERM"; + break; + case TAO_EAFNOSUPPORT_MINOR_CODE: + errno_indication = "EAFNOSUPPORT"; + break; + case TAO_EAGAIN_MINOR_CODE: + errno_indication = "EAGAIN"; + break; + case TAO_ENOMEM_MINOR_CODE: + errno_indication = "ENOMEM"; + break; + case TAO_EACCES_MINOR_CODE: + errno_indication = "EACCES"; + break; + case TAO_EFAULT_MINOR_CODE: + errno_indication = "EFAULT"; + break; + case TAO_EBUSY_MINOR_CODE: + errno_indication = "EBUSY"; + break; + case TAO_EEXIST_MINOR_CODE: + errno_indication = "EEXIST"; + break; + case TAO_EINVAL_MINOR_CODE: + errno_indication = "EINVAL"; + break; + case TAO_ECOMM_MINOR_CODE: + errno_indication = "ECOMM"; + break; + case TAO_ECONNRESET_MINOR_CODE: + errno_indication = "ECONNRESET"; + break; + case TAO_ENOTSUP_MINOR_CODE: + errno_indication = "ENOTSUP"; + break; + default: + { + // 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)); + + errno_indication = unknown_errno; + } + } + + char buffer[BUFSIZ]; + ACE_OS::sprintf (buffer, + "TAO exception, " + "minor code = %x (%s; %s), " + "completed = %s\n", + minor_code, + location, + errno_indication, + (completed () == CORBA::COMPLETED_YES) ? "YES" : + (completed () == CORBA::COMPLETED_NO) ? "NO" : + (completed () == CORBA::COMPLETED_MAYBE) ? "MAYBE" : + "garbage"); + + info += buffer; + } + else if (VMCID == CORBA::OMGVMCID) + { + const CORBA::ULong minor_code = this->minor () & 0xFFFU; + + const char *minor_description = 0; + + if (minor_code > 0) + minor_description = + CORBA::SystemException::_tao_get_omg_exception_description ( + *this, + minor_code); + else + minor_description = "*unknown description*"; + + char buffer[BUFSIZ]; + ACE_OS::sprintf (buffer, + "OMG minor code (%d), " + "described as '%s', " + "completed = %s\n", + minor_code, + minor_description, + (completed () == CORBA::COMPLETED_YES) ? "YES" : + (completed () == CORBA::COMPLETED_NO) ? "NO" : + (completed () == CORBA::COMPLETED_MAYBE) ? "MAYBE" : + "garbage"); + + info += buffer; + } + else + { + char buffer[BUFSIZ]; + ACE_OS::sprintf (buffer, + "Unknown vendor minor code id (%x), " + "minor code = %x, completed = %s\n", + VMCID, + this->minor (), // Use the raw minor code + (completed () == CORBA::COMPLETED_YES) ? "YES" : + (completed () == CORBA::COMPLETED_NO) ? "NO" : + (completed () == CORBA::COMPLETED_MAYBE) ? "MAYBE" : + "garbage"); + + info += buffer; + } + + return info; +} + +const char * +CORBA::SystemException::_tao_get_omg_exception_description ( + const CORBA::SystemException &exc, + CORBA::ULong minor_code) +{ +#ifndef ACE_NDEBUG + + static const char *UNKNOWN_TABLE[] = + { + "Unlisted user exception received by client.", // 1 + "Non-standard SystemException not supported.", // 2 + "An unkown user exception received by a portable interceptor." // 3 + }; + + static const char *BAD_PARAM_TABLE[] = + { + "Failure to register, unregister, or lookup value factory.", // 1 + "RID already defined in IFR.", // 2 + "Name already used in the context in IFR.", // 3 + "Target is not a valid container.", // 4 + "Name clash in inherited context.", // 5 + "Incorrect type for abstract interface.", // 6 + "string_to_object conversion failed due to a bad scheme name.", // 7 + "string_to_object conversion failed due to a bad address.", // 8 + "string_to_object conversion failed due to a bad schema specific part.",// 9 + "string_to_object conversion failed due to non specific reason.", // 10 + "Attempt to derive abstract interface from non-abstract base interface in the Interface Repository.", // 11 + "Attempt to let a ValueDef support more than one non-abstract interface in the Interface Repository.", // 12 + "Attempt to use an incomplete TypeCode as a parameter.", // 13 + "Invalid object id passed to POA::create_reference_by_id.", // 14 + "Bad name argument in TypeCode operation.", // 15 + "Bad RepositoryId argument in TypeCode operation.", // 16 + "Invalid member namein TypeCode operation.", // 17 + "Duplicate label value in create_union_tc.", // 18 + "Incompatible TypeCode of label and discriminator in create_union_tc.", // 19 + "Supplied discriminator type illegitimate in create_union_tc.", // 20 + "Any passed to ServerRequest::set_exception does not contain an exception.", // 21 + "Unlisted user exception passed to ServerRequest::set_exception", // 22 + "wchar transmission code set not in service context.", // 23 + "Service context is not in OMG-defined range.", // 24 + "Enum value out of range.", // 25 + "Invalid service context Id in portable interceptor.", // 26 + "Attempt to call register_initial_reference with a null Object.", // 27 + "Invalid component Id in portable interceptor.", // 28 + "Invalid profile Id in portable interceptor.", // 29 + "Two or more Policy objects with the same PolicyType value supplied to Object::set_policy_overrides or PolicyManager::set_policy_overrides." // 30 + "Attempt to define a oneway operation with non-void result, out or inout parameters or user exceptions.", // 31 + "DII asked to create request for an implicit operation.", // 32, + "An OTS/XA integration xa_ call returned XAER_INVAL.", // 33 + "Union branch modifier called with bad case label discriminator.", // 34 + "Illegal IDL context property name.", // 35 + "Illegal IDL property search string.", // 36 + "Illegal IDL context name.", // 37 + "Non-empty IDL context.", // 38 + "Servant not found [ServantManager].", // 39 + "ORB output stream does not support ValueOutputStream interface.", // 40 + "ORB input stream does not support ValueInputStream interface." // 41 + }; + + static const char *IMP_LIMIT_TABLE[] = + { + "Unable to use any profile in IOR." // 1 + }; + + static const char *INITIALIZE_TABLE[] = + { + "Priority range too restricted for ORB." // 1 + }; + + + static const char *INV_OBJREF_TABLE[] = + { + "wchar Code Set support not specified.", // 1 + "Codeset component required for type using wchar or wstring data." // 2 + }; + + static const char *MARSHAL_TABLE[] = + { + "Unable to locate value factory.", // 1 + "ServerRequest::set_result called before ServerRequest::ctx when the operation IDL contains a context clause.", // 2 + "NVList passed to ServerRequest::arguments does not describe all parameters passed by client.", // 3 + "Attempt to marshal Local object.", // 4 + "wchar or wstring data erroneously sent by client over GIOP 1.0 connection.", // 5 + "wchar or wstring data erroneously returned by server over GIOP 1.0 connection." //6 + "Unsupported RMI/IDL custom value type stream format." // 7 + }; + + static const char *BAD_TYPECODE_TABLE[] = + { + "Attempt to marshal incomplete TypeCode.", // 1 + "Member type code illegitimate in TypeCode operation.", // 2 + "Illegal parameter type." // 3 + }; + + static const char *NO_IMPLEMENT_TABLE[] = + { + "Missing local value implementation.", // 1 + "Incompatible value implementation version.", // 2 + "Unable to use any profile in IOR.", // 3 + "Attempt to use DII on Local object.", // 4 + "Biomolecular Sequence Analysis iterator cannot be reset.", // 5 + "Biomolecular Sequence Analysis metadata is not available as XML.", // 6 + "Genomic Maps iterator cannot be rest." // 7 + }; + + static const char *NO_RESOURCE_TABLE[] = + { + "Portable Interceptor operation not support in this binding.", // 1 + "No connection for request's priority." // 2 + }; + + static const char *BAD_INV_ORDER_TABLE[] = + { + "Dependency exists in IFR preventing destruction of this object", // 1 + "Attempt to destroy indestructible objects in IFR.", // 2 + "Operation would deadlock.", // 3 + "ORB has shutdown.", // 4 + "Attempt to invoke \"send\" or \"invoke\" operation of the same \"Request\" object more than once.", // 5 + "Attempt to set a servant manager after one has already been set.", // 6 + "ServerRequest::arguments called more than once or after a call to ServerRequest::set_exception.", // 7 + "ServerRequest::ctx called more than once or before ServerRequest::arguments or after ServerRequest::ctx, ServerRequest::set_result or ServerRequest::set_exception.", // 8 + "ServerRequest::result called more than once or before ServerRequest::arguments or after ServerRequest::set_result or ServerRequest::set_exception.", // 9 + "Attempt to send a DII request after it was sent previously.", // 10 + "Attempt to poll a DII request or to retrieve its result before the request was sent.", // 11 + "Attempt to poll a DII request or to retrieve its result after the result was retrieved previously.", // 12 + "Attempt to poll a synchronous DII request or to retrieve results from a synchronous DII request.", // 13 + "Invalid portable interceptor call", // 14 + "Service context add failed in portable interceptor because a service context with the given id already exists.", // 15 + "Registration of PolicyFactory failed because a factory already exists for the given type.", // 16 + "POA cannot create POAs while undergoing destruction." // 17 + }; + + static const char *TRANSIENT_TABLE[] = + { + "Request discarded due to resource exhaustion in POA, or because POA is in discarding state.", // 1 + "No usable profile in IOR.", // 2 + "Request cancelled.", // 3 + "POA destroyed." // 4 + }; + + static const char *OBJ_ADAPTER_TABLE[] = + { + "System exception in POA::unknown_adapter.", // 1 + "Incorrect servant type returned by servant manager", // 2 + "No default servant available [POA policy].", // 3 + "No servant manager available [POA policy].", // 4 + "Violation of POA policy by ServantActivator::incarnate.",// 5 + "Exception in PortableInterceptor::IORInterceptor::components_established.", // 6 + "Null servant returned by servant manager." // 7 + }; + + static const char *DATA_CONVERSION_TABLE[] = + { + "Character does not map to negotiated transmission code set.", // 1 + "Failure of PriorityMapping object." // 2 + }; + + static const char *OBJECT_NOT_EXIST_TABLE[] = + { + "Attempt to pass an unactivated (unregistered) value as an object reference.", // 1 + "POAManager::incarnate failed to create POA." // 2 + }; + + static const char *INV_POLICY_TABLE[] = + { + "Unable to reconcile IOR specified policy with the effective policy override." // 1 + "Invalid PolicyType.", // 2 + "No PolicyFactory has been registered for the given PolicyType." // 3 + }; + + if (minor_code == 0) + return "*unknown description*"; + + minor_code--; // Adjust to match table offset. + + if (exc._is_a ("IDL:omg.org/CORBA/UNKNOWN:1.0") + && minor_code < sizeof UNKNOWN_TABLE / sizeof (char *)) + return UNKNOWN_TABLE[minor_code]; + + if (exc._is_a ("IDL:omg.org/CORBA/BAD_PARAM:1.0") + && minor_code < sizeof BAD_PARAM_TABLE / sizeof (char *)) + return BAD_PARAM_TABLE[minor_code]; + + if (exc._is_a ("IDL:omg.org/CORBA/IMP_LIMIT:1.0") + && minor_code < sizeof IMP_LIMIT_TABLE / sizeof (char *)) + return IMP_LIMIT_TABLE[minor_code]; + + if (exc._is_a ("IDL:omg.org/CORBA/INITIALIZE:1.0") + && minor_code < sizeof INITIALIZE_TABLE / sizeof (char *)) + return INITIALIZE_TABLE[minor_code]; + + if (exc._is_a ("IDL:omg.org/CORBA/INV_OBJREF:1.0") + && minor_code < sizeof INV_OBJREF_TABLE / sizeof (char *)) + return INV_OBJREF_TABLE[minor_code]; + + if (exc._is_a ("IDL:omg.org/CORBA/MARSHAL:1.0") + && minor_code < sizeof MARSHAL_TABLE / sizeof (char *)) + return MARSHAL_TABLE[minor_code]; + + if (exc._is_a ("IDL:omg.org/CORBA/BAD_TYPECODE:1.0") + && minor_code < sizeof BAD_TYPECODE_TABLE / sizeof (char *)) + return BAD_TYPECODE_TABLE[minor_code]; + + if (exc._is_a ("IDL:omg.org/CORBA/NO_IMPLEMENT:1.0") + && minor_code < sizeof NO_IMPLEMENT_TABLE / sizeof (char *)) + return NO_IMPLEMENT_TABLE[minor_code]; + + if (exc._is_a ("IDL:omg.org/CORBA/NO_RESOURCE:1.0") + && minor_code < sizeof NO_RESOURCE_TABLE / sizeof (char *)) + return NO_RESOURCE_TABLE[minor_code]; + + if (exc._is_a ("IDL:omg.org/CORBA/BAD_INV_ORDER:1.0") + && minor_code < sizeof BAD_INV_ORDER_TABLE / sizeof (char *)) + return BAD_INV_ORDER_TABLE[minor_code]; + + if (exc._is_a ("IDL:omg.org/CORBA/TRANSIENT:1.0") + && minor_code < sizeof TRANSIENT_TABLE / sizeof (char *)) + return TRANSIENT_TABLE[minor_code]; + + if (exc._is_a ("IDL:omg.org/CORBA/OBJ_ADAPTER:1.0") + && minor_code < sizeof OBJ_ADAPTER_TABLE / sizeof (char *)) + return OBJ_ADAPTER_TABLE[minor_code]; + + if (exc._is_a ("IDL:omg.org/CORBA/DATA_CONVERSION:1.0") + && minor_code < sizeof DATA_CONVERSION_TABLE / sizeof (char *)) + return DATA_CONVERSION_TABLE[minor_code]; + + if (exc._is_a ("IDL:omg.org/CORBA/OBJECT_NOT_EXIST:1.0") + && minor_code < sizeof OBJECT_NOT_EXIST_TABLE / sizeof (char *)) + return OBJECT_NOT_EXIST_TABLE[minor_code]; + + if (exc._is_a ("IDL:omg.org/CORBA/INV_POLICY:1.0") + && minor_code < sizeof INV_POLICY_TABLE / sizeof (char *)) + return INV_POLICY_TABLE[minor_code]; + +#else + ACE_UNUSED_ARG (exc); + ACE_UNUSED_ARG (minor_code); +#endif /* !ACE_NDEBUG */ + + return "*unknown description*"; +} + +// Note that "buffer" holds the (unscoped) name originally, and is +// then overwritten. + +void +TAO_Exceptions::make_unknown_user_typecode (CORBA::TypeCode_ptr &tcp + ACE_ENV_ARG_DECL) +{ + // Create the TypeCode for the CORBA::UnknownUserException. + TAO_OutputCDR stream (0, + ACE_CDR_BYTE_ORDER, + TAO_Exceptions::global_allocator_, + TAO_Exceptions::global_allocator_, + TAO_Exceptions::global_allocator_, + ACE_DEFAULT_CDR_MEMCPY_TRADEOFF); + + static const char * interface_id = + "IDL:omg.org/CORBA/UnknownUserException:1.0"; + static const char * name = "UnknownUserException"; + static const char * field_name = "exception"; + + const CORBA::Boolean result = + (stream.write_octet (TAO_ENCAP_BYTE_ORDER) == 0 + || stream.write_string (interface_id) == 0 + || stream.write_string (name) == 0 + || stream.write_ulong (1L) == 0 + || stream.write_string (field_name) == 0); + + if (result) + ACE_THROW (CORBA::INITIALIZE ()); + + if (!(stream << CORBA::_tc_any)) + ACE_THROW (CORBA::INITIALIZE ()); + + ACE_NEW_THROW_EX (tcp, + CORBA::TypeCode (CORBA::tk_except, + stream.length (), + stream.buffer (), + 1, + sizeof (CORBA::UserException)), + CORBA::INITIALIZE ()); +} + +void +TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr &tcp, + const char *name, + char *buffer, + size_t buflen + ACE_ENV_ARG_DECL) +{ + // This function must only be called ONCE, and with a global lock + // held! The <CORBA::ORB_init> method is responsible for ensuring + // this. + static const char *minor = "minor"; + static const char *completed = "completed"; + + // Create a CDR stream ... juggle the alignment here a bit, we know + // it's good enough for the typecode. + +#if defined(ACE_MVS) + // @@ We need to use a translator to make sure that all TypeCodes + // are stored in ISO8859 form, the problem is that this hack does + // not scale as more native sets have to be supported + + ACE_IBM1047_ISO8859 translator; + TAO_OutputCDR stream (buffer, + buflen, + ACE_CDR_BYTE_ORDER, + TAO_Exceptions::global_allocator_, + TAO_Exceptions::global_allocator_, + TAO_Exceptions::global_allocator_, + ACE_DEFAULT_CDR_MEMCPY_TRADEOFF, + &translator); +#else + TAO_OutputCDR stream (buffer, + buflen, + ACE_CDR_BYTE_ORDER, + TAO_Exceptions::global_allocator_, + TAO_Exceptions::global_allocator_, + TAO_Exceptions::global_allocator_, + ACE_DEFAULT_CDR_MEMCPY_TRADEOFF); +#endif /* ACE_MVS */ + + // into CDR stream, stuff (in order): + // - byte order flag [4 bytes] + // - exception ID [27 + N bytes] + // - exception name [4 + N bytes ] + // - number of members (2) [4 bytes ] + // - foreach member, { name string, typecode } [~40 bytes] + + static const char prefix[] = "IDL:omg.org/CORBA/"; + static const char suffix[] = ":1.0"; + char * full_id = + CORBA::string_alloc (sizeof prefix + + static_cast<CORBA::ULong> (ACE_OS::strlen (name)) + + sizeof suffix); + + CORBA::String_var safe_full_id = full_id; + + ACE_OS::strcpy (full_id, prefix); + ACE_OS::strcat (full_id, name); + ACE_OS::strcat (full_id, suffix); + + CORBA::Boolean result = stream.write_octet (TAO_ENCAP_BYTE_ORDER) == 0 + || stream.write_string (full_id) == 0 + || stream.write_string (name) == 0 + || stream.write_ulong (2L) != 1 + || stream.write_string (minor) == 0; + + result = result || !(stream << CORBA::_tc_ulong); + + (void) safe_full_id.out (); // No longer need the string + + result = result || stream.write_string (completed) == 0; + result = result || !(stream << TAO::TC_completion_status); + + if (result) + ACE_THROW (CORBA::INITIALIZE ()); + + // @@ It is possible to throw an exception at this point? + // What if the exception typecode has not been initialized yet? + + // OK, we stuffed the buffer we were given (or grew a bigger one; + // hope to avoid that during initialization). Now build and return + // a TypeCode, saving it away in the list of ones that the ORB will + // always accept as part of any operation response! + + ACE_NEW_THROW_EX (tcp, + CORBA::TypeCode (CORBA::tk_except, + stream.length (), + stream.buffer (), + 1, + sizeof (CORBA::SystemException)), + CORBA::INITIALIZE ()); + ACE_CHECK; + + ACE_ASSERT (tcp->length_ <= buflen); + return; +} + +#if defined (__Lynx__) + +// LynxOS uses macro THREAD_CANCELLED internally, so it must +// be undefined to avoid compilation errors +#if defined (THREAD_CANCELLED) +#undef THREAD_CANCELLED +#endif /* THREAD_CANCELLED */ + +#endif /*__Lynx__ */ + + +// List of standard/system exceptions ... used to create static +// storage for their typecodes, then later to initialize that storage +// using the routine above. (It's just too painful to init these +// typecodes statically in all cases!) + +#define STANDARD_EXCEPTION_LIST \ + TAO_SYSTEM_EXCEPTION (UNKNOWN) \ + TAO_SYSTEM_EXCEPTION (BAD_PARAM) \ + TAO_SYSTEM_EXCEPTION (NO_MEMORY) \ + TAO_SYSTEM_EXCEPTION (IMP_LIMIT) \ + TAO_SYSTEM_EXCEPTION (COMM_FAILURE) \ + TAO_SYSTEM_EXCEPTION (INV_OBJREF) \ + TAO_SYSTEM_EXCEPTION (OBJECT_NOT_EXIST) \ + TAO_SYSTEM_EXCEPTION (NO_PERMISSION) \ + TAO_SYSTEM_EXCEPTION (INTERNAL) \ + TAO_SYSTEM_EXCEPTION (MARSHAL) \ + TAO_SYSTEM_EXCEPTION (INITIALIZE) \ + TAO_SYSTEM_EXCEPTION (NO_IMPLEMENT) \ + TAO_SYSTEM_EXCEPTION (BAD_TYPECODE) \ + TAO_SYSTEM_EXCEPTION (BAD_OPERATION) \ + TAO_SYSTEM_EXCEPTION (NO_RESOURCES) \ + TAO_SYSTEM_EXCEPTION (NO_RESPONSE) \ + TAO_SYSTEM_EXCEPTION (PERSIST_STORE) \ + TAO_SYSTEM_EXCEPTION (BAD_INV_ORDER) \ + TAO_SYSTEM_EXCEPTION (TRANSIENT) \ + TAO_SYSTEM_EXCEPTION (FREE_MEM) \ + TAO_SYSTEM_EXCEPTION (INV_IDENT) \ + TAO_SYSTEM_EXCEPTION (INV_FLAG) \ + TAO_SYSTEM_EXCEPTION (INTF_REPOS) \ + TAO_SYSTEM_EXCEPTION (BAD_CONTEXT) \ + TAO_SYSTEM_EXCEPTION (OBJ_ADAPTER) \ + TAO_SYSTEM_EXCEPTION (DATA_CONVERSION) \ + TAO_SYSTEM_EXCEPTION (INV_POLICY) \ + TAO_SYSTEM_EXCEPTION (REBIND) \ + TAO_SYSTEM_EXCEPTION (TIMEOUT) \ + TAO_SYSTEM_EXCEPTION (TRANSACTION_UNAVAILABLE) \ + TAO_SYSTEM_EXCEPTION (TRANSACTION_MODE) \ + TAO_SYSTEM_EXCEPTION (TRANSACTION_REQUIRED) \ + TAO_SYSTEM_EXCEPTION (TRANSACTION_ROLLEDBACK) \ + TAO_SYSTEM_EXCEPTION (INVALID_TRANSACTION) \ + TAO_SYSTEM_EXCEPTION (CODESET_INCOMPATIBLE) \ + TAO_SYSTEM_EXCEPTION (BAD_QOS) \ + TAO_SYSTEM_EXCEPTION (INVALID_ACTIVITY) \ + TAO_SYSTEM_EXCEPTION (ACTIVITY_COMPLETED) \ + TAO_SYSTEM_EXCEPTION (ACTIVITY_REQUIRED) \ + TAO_SYSTEM_EXCEPTION (THREAD_CANCELLED) + +// Declare static storage for these ... the buffer is "naturally" +// aligned and overwritten. +// +// @@ this actually doesn't guarantee "natural" alignment, but +// it works that way in most systems. + +#define TAO_TC_BUF_LEN 256 + +static CORBA::Long tc_buf_CORBA[TAO_TC_BUF_LEN / sizeof (CORBA::Long)]; + +#define TAO_SYSTEM_EXCEPTION(name) \ + CORBA::TypeCode_ptr CORBA::_tc_ ## name = 0; + STANDARD_EXCEPTION_LIST +#undef TAO_SYSTEM_EXCEPTION + + static CORBA::TypeCode_ptr *type_code_array [] = { +#define TAO_SYSTEM_EXCEPTION(name) \ + &CORBA::_tc_ ## name, + STANDARD_EXCEPTION_LIST +#undef TAO_SYSTEM_EXCEPTION + &CORBA::_tc_null}; + +// Since we add an extra element subtract 1 +static const CORBA::ULong array_sz = + (sizeof (type_code_array) / sizeof (CORBA::TypeCode_ptr)) - 1; + +static const char *repo_id_array[] = { +#define TAO_SYSTEM_EXCEPTION(name) \ + (char *) "IDL:omg.org/CORBA/" #name ":1.0", + STANDARD_EXCEPTION_LIST +#undef TAO_SYSTEM_EXCEPTION + 0 + }; + + +TAO::excp_factory excp_array [] = { +#define TAO_SYSTEM_EXCEPTION(name) \ + &CORBA::name::_tao_create, + STANDARD_EXCEPTION_LIST +#undef TAO_SYSTEM_EXCEPTION + 0 + }; + +void +TAO_Exceptions::init (ACE_ENV_SINGLE_ARG_DECL) +{ + // This routine should only be called once. + + // Not thread safe. Caller must provide synchronization. + + if (TAO_Exceptions::initialized_) + { + return; + } + + // Initialize the start up allocator. + ACE_NEW (TAO_Exceptions::global_allocator_, + ACE_New_Allocator); + + static const char *name_array[] = { +#define TAO_SYSTEM_EXCEPTION(name) \ + # name, + STANDARD_EXCEPTION_LIST +#undef TAO_SYSTEM_EXCEPTION + 0 + }; + + for (CORBA::ULong i = 0; i < array_sz; ++i) + { + TAO_Exceptions::make_standard_typecode (*type_code_array[i], + name_array[i], + (char*) tc_buf_CORBA, + sizeof tc_buf_CORBA + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; + } + + TAO_Exceptions::make_unknown_user_typecode (CORBA::_tc_UnknownUserException + ACE_ENV_ARG_PARAMETER); + + TAO_Exceptions::initialized_ = true; +} + +#undef TAO_TC_BUF_LEN + + +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) + { + if (ACE_OS::strcmp (id, repo_id_array[i]) == 0) + return (*(excp_array[i])) (); + } + + return 0; +} + +void +TAO_Exceptions::fini (void) +{ + for (CORBA::ULong i = 0; i < array_sz; ++i) + { + CORBA::release (*type_code_array[i]); + *type_code_array[i] = 0; + } + + CORBA::release (CORBA::_tc_UnknownUserException); + CORBA::_tc_UnknownUserException = 0; + + delete TAO_Exceptions::global_allocator_; + TAO_Exceptions::global_allocator_ = 0; +} + +#define TAO_SYSTEM_EXCEPTION(name) \ +CORBA::name * \ +CORBA::name ::_downcast (CORBA::Exception* exception) \ +{ \ + if (exception->_is_a ("IDL:omg.org/CORBA/" #name ":1.0")) \ + return dynamic_cast<CORBA::name *> (exception); \ + return 0; \ +} + +STANDARD_EXCEPTION_LIST +#undef TAO_SYSTEM_EXCEPTION + +#define TAO_SYSTEM_EXCEPTION(name) \ +void \ +CORBA::name ::_raise (void) const \ +{ \ + TAO_RAISE (*this); \ +} + +STANDARD_EXCEPTION_LIST +#undef TAO_SYSTEM_EXCEPTION + +// SystemException constructors +#define TAO_SYSTEM_EXCEPTION(name) \ +CORBA::name ::name (void) \ + : CORBA::SystemException ("IDL:omg.org/CORBA/" #name ":1.0", \ + #name, \ + TAO_DEFAULT_MINOR_CODE, \ + CORBA::COMPLETED_NO) \ +{ \ +} \ +\ +CORBA::name ::name (CORBA::ULong code, CORBA::CompletionStatus completed) \ + : CORBA::SystemException ("IDL:omg.org/CORBA/" #name ":1.0", \ + #name, \ + code, \ + completed) \ +{ \ +} + +STANDARD_EXCEPTION_LIST +#undef TAO_SYSTEM_EXCEPTION + +#define TAO_SYSTEM_EXCEPTION(name) \ +CORBA::TypeCode_ptr \ +CORBA::name ::_type (void) const \ +{ \ + return CORBA::_tc_ ## name; \ +} + +STANDARD_EXCEPTION_LIST +#undef TAO_SYSTEM_EXCEPTION + +#define TAO_SYSTEM_EXCEPTION(name) \ +void \ +CORBA::name ::_tao_any_destructor (void *x) \ +{ \ + CORBA::name *tmp = static_cast<CORBA::name *> (x); \ + delete tmp; \ +} + +STANDARD_EXCEPTION_LIST +#undef TAO_SYSTEM_EXCEPTION + +#define TAO_SYSTEM_EXCEPTION(name) \ +CORBA::Exception * \ +CORBA::name ::_tao_duplicate (void) const \ +{ \ + CORBA::Exception *result; \ + ACE_NEW_RETURN (result, CORBA::name (*this), 0); \ + return result; \ +} + +STANDARD_EXCEPTION_LIST +#undef TAO_SYSTEM_EXCEPTION + +#define TAO_SYSTEM_EXCEPTION(name) \ +CORBA::SystemException * \ +CORBA::name ::_tao_create (void) \ +{ \ + CORBA::name *result; \ + ACE_NEW_RETURN (result, CORBA::name (), 0); \ + return result; \ +} + +STANDARD_EXCEPTION_LIST +#undef TAO_SYSTEM_EXCEPTION + +#define TAO_SYSTEM_EXCEPTION(name) \ +void \ +CORBA::operator<<= (CORBA::Any &any, const CORBA::name &ex) \ +{ \ + TAO::Any_SystemException::insert_copy ( \ + any, \ + CORBA::name ::_tao_any_destructor, \ + CORBA::_tc_ ## name, \ + ex \ + ); \ +} + +STANDARD_EXCEPTION_LIST +#undef TAO_SYSTEM_EXCEPTION + +#define TAO_SYSTEM_EXCEPTION(name) \ +void \ +CORBA::operator<<= (CORBA::Any &any, CORBA::name *ex) \ +{ \ + TAO::Any_SystemException::insert ( \ + any, \ + CORBA::name ::_tao_any_destructor, \ + CORBA::_tc_ ## name, \ + ex \ + ); \ +} + +STANDARD_EXCEPTION_LIST +#undef TAO_SYSTEM_EXCEPTION + +#define TAO_SYSTEM_EXCEPTION(name) \ +CORBA::Boolean operator>>= (const CORBA::Any &any, \ + const CORBA::name *&ex) \ +{ \ + return \ + TAO::Any_SystemException::extract ( \ + any, \ + CORBA::name ::_tao_any_destructor, \ + CORBA::_tc_ ## name, \ + (const CORBA::SystemException *&) ex, \ + &CORBA::name ::_tao_create); \ +} + +STANDARD_EXCEPTION_LIST +#undef TAO_SYSTEM_EXCEPTION + + #if defined (TAO_DONT_CATCH_DOT_DOT_DOT) TAO_DONT_CATCH::TAO_DONT_CATCH (void) diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index 9a6cff3dd5c..76759a0e755 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -8,13 +8,13 @@ * * This file defines way in which CORBA exceptions are reported. * + * @author Copyright 1994-1995 by Sun Microsystems Inc. * @author DOC Group at Vanderbilt U., Wash U, and UCI */ //============================================================================= #ifndef TAO_EXCEPTION_H #define TAO_EXCEPTION_H - #include /**/ "ace/pre.h" // Do not try removing this. If you remove this for subsetting lots of @@ -32,12 +32,11 @@ #define TAO_RAISE(EXCEPTION) #endif /* ACE_HAS_EXCEPTIONS */ -#include "tao/TAO_Export.h" -#include "tao/Basic_Types.h" -#include "tao/CORBA_String.h" #include "ace/SStringfwd.h" #include "ace/iosfwd.h" #include "ace/CORBA_macros.h" +#include "tao/TAO_Export.h" +#include "tao/Basic_Types.h" class ACE_Allocator; @@ -64,26 +63,26 @@ class TAO_InputCDR; namespace CORBA { class TypeCode; - typedef TypeCode * TypeCode_ptr; + typedef TypeCode *TypeCode_ptr; class Environment; class Any; - typedef Any * Any_ptr; + typedef Any *Any_ptr; + + enum CompletionStatus + { + // = Completion Status for System exceptions - class SystemException; + COMPLETED_YES, // successful or exceptional completion + COMPLETED_NO, // didn't change any state; retry is OK + COMPLETED_MAYBE // can't say what happened; retry unsafe + }; - /** - * @enum exception_type - * - * @brief Enumeration used to identify the type of CORBA exception. - * - * CORBA exceptions generally fall into two categories, user - * exceptions and system exceptions. This enumeration is used when - * identifying the type of CORBA exception. - */ enum exception_type { + // = Exception type. + NO_EXCEPTION, USER_EXCEPTION, SYSTEM_EXCEPTION @@ -97,18 +96,25 @@ namespace CORBA * @brief Exception * * CORBA2-specified exception hierarchy. All exceptions have a - * type (represented by a @c TypeCode) and a widely scoped type ID - * (in the @c TypeCode) that are generated by any OMG-IDL compiler - * and available through the Interface Repository. Think of it as a + * type (represented by a TypeCode) and a widely scoped type ID + * (in the TypeCode) that generated by any OMG-IDL compiler and + * available through the Interface Repositories. Think of it as a * "globally scoped" name distinguishing each exception. - * - * @todo According to the OMG CORBA C++ Mapping version 1.1, all - * constructors, copy constructors and assignment operators - * should be moved to "protected" section in class - * declarations. Since the current MS Visual C++ 6.0 compiler - * will cause some problems to TAO's exception mechanism, we - * defer doing this until we drop support for MSVC++ 6. */ + + /* NOTE: + According to the OMG CORBA C++ Mapping version 1.1, all + constructors, copy constructors and assignment operators + should be moved to "protected" section in class declarations + + Since the current MS Visual C++ 6.0 compiler will cause some + problems to TAO's exception mechanism, so we defer doing this until + we full migrate from VC 6.0 to VC 7.0 and higher version. + + This later change only affect the "Exception.h" file and won't + affect the "Exception.cpp" file. + */ + class TAO_Export Exception { public: @@ -142,14 +148,12 @@ namespace CORBA // = To implement the narrow method. virtual int _is_a (const char* repository_id) const; - /// Construct from a respository id. + /// Constructor from a respository id. Exception (const char *repository_id, const char *local_name); - /// Print the exception to output determined by @a f. - /** - * @note This method is TAO-specific. - */ + /// Print the exception <ex> to output determined by <f>. This + /// function is not CORBA compliant. void _tao_print_exception (const char *info, FILE *f = stdout) const; @@ -191,20 +195,234 @@ namespace CORBA virtual CORBA::Exception *_tao_duplicate (void) const = 0; protected: - - /// Default constructor. + /// Default constructor is protected. Exception (void); private: + /// Storage of our repository id and local name. + char *id_; + char *name_; + }; + + /** + * @class UserException + * + * @brief User exceptions are those defined by application developers + * using OMG-IDL. + */ + class TAO_Export UserException : public Exception + { + public: + + /// Copy constructor. + UserException (const UserException &src); + + /// Destructor. + ~UserException (void); + + /// Assignment operator. + UserException &operator= (const UserException &src); + + /// The narrow operation. + static UserException *_downcast (CORBA::Exception *exception); + + /// The const version of narrow operation + static const UserException *_downcast (const CORBA::Exception *exception); + + virtual void _raise (void) const = 0; + + // = TAO specific extension. + + /// Constructor from a repository id. + UserException (const char *repository_id, + const char *local_name); + + virtual int _is_a (const char *interface_id) const; + + // Used for narrowing + + /// Returns a string containing information about the exception. This + /// function is not CORBA compliant. + virtual ACE_CString _info (void) const; + + //protected: + /// Default constructor. + UserException (void); + }; + + + + /** + * @class SystemException + * + * @brief SystemException + * + * System exceptions are those defined in the CORBA spec; OMG-IDL + * defines these. + */ + class TAO_Export SystemException : public Exception + { + public: + /// Default constructtor + SystemException (void); + + + /// Copy constructor. + SystemException (const SystemException &src); + + /// Destructor. + ~SystemException (void); + + /// Assignment operator. + SystemException &operator= (const SystemException &src); + + /// Get the minor status. + ULong minor (void) const; + + /// Set the minor status. + void minor (ULong m); + + /// Get the completion status. + CORBA::CompletionStatus completed (void) const; + + /// Set the operation completion status. + void completed (CORBA::CompletionStatus c); + + /// Narrow to a SystemException. + static SystemException *_downcast (CORBA::Exception *exception); + + /// The const version of narrow operation to a SystemException + static const SystemException *_downcast(const CORBA::Exception *exception); - /// Repository Id - CORBA::String_var id_; + virtual void _raise (void) const = 0; + + // = TAO-specific extension. + + /// Helper for the _downcast operation. + virtual int _is_a (const char *type_id) const; + + /// Print the system exception @c ex to output determined by @c f. + /// This function is not CORBA compliant. + void _tao_print_system_exception (FILE *f = stdout) const; + + /// Create an exception from the available exception + /// virtual CORBA::Exception *_tao_duplicate (void) const; + + /// Returns a string containing information about the exception. This + /// function is not CORBA compliant. + virtual ACE_CString _info (void) const; + + virtual void _tao_encode (TAO_OutputCDR &cdr + ACE_ENV_ARG_DECL_NOT_USED) const; + virtual void _tao_decode (TAO_InputCDR &cdr + ACE_ENV_ARG_DECL_NOT_USED); + + /// Helper to create a minor status value. + static CORBA::ULong _tao_minor_code (u_int location, + int errno_value); - /// Local name. - CORBA::String_var name_; + /// Helper to translate a platform-specific errno to a TAO errno + /// value. + static CORBA::ULong _tao_errno (int errno_value); + + /// Overridden base class method to help compilers that use + /// explicit template instantiations going + virtual CORBA::Exception *_tao_duplicate (void) const {return 0;} + + protected: + + /// Constructor using a repository id. + SystemException (CORBA::ULong code, + CORBA::CompletionStatus completed); + + /// Constructor using a repository id. + SystemException (const char *repository_id, + const char *local_name, + CORBA::ULong code, + CORBA::CompletionStatus completed); + + /// Return the exception description associated with the given OMG + /// minor code. + static const char *_tao_get_omg_exception_description ( + const CORBA::SystemException &exc, + CORBA::ULong minor_code); + + private: + /// Minor code. + CORBA::ULong minor_; + + /// Completion status. + CORBA::CompletionStatus completed_; }; + // Declarations for all of the CORBA standard exceptions. + // + // @@ - shouldn't have a default minor code, at least for code that's + // inside the ORB. All minor codes should be symbolically catalogued. + +#define TAO_SYSTEM_EXCEPTION(name) \ + class TAO_Export name : public SystemException \ + { \ + public: \ + name (void); \ + name (CORBA::ULong code, \ + CORBA::CompletionStatus completed); \ + static name * _downcast (CORBA::Exception* exception); \ + virtual void _raise (void) const; \ + virtual CORBA::TypeCode_ptr _type (void) const; \ + static void _tao_any_destructor (void*); \ + virtual CORBA::Exception *_tao_duplicate (void) const; \ + static CORBA::SystemException *_tao_create (void); \ + }; \ + TAO_Export void operator<<= (CORBA::Any &, const CORBA::name &); \ + TAO_Export void operator<<= (CORBA::Any &, CORBA::name *); \ + TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, \ + const CORBA::name *&) + + TAO_SYSTEM_EXCEPTION(UNKNOWN); // the unknown exception + TAO_SYSTEM_EXCEPTION(BAD_PARAM); // an invalid parameter was passed + TAO_SYSTEM_EXCEPTION(NO_MEMORY); // memory allocation failure + TAO_SYSTEM_EXCEPTION(IMP_LIMIT); // violated implementation limit + TAO_SYSTEM_EXCEPTION(COMM_FAILURE); // communication failure + TAO_SYSTEM_EXCEPTION(INV_OBJREF); // invalid object reference + TAO_SYSTEM_EXCEPTION(OBJECT_NOT_EXIST); // no such object + TAO_SYSTEM_EXCEPTION(NO_PERMISSION); // no permission for operation + TAO_SYSTEM_EXCEPTION(INTERNAL); // ORB internal error + TAO_SYSTEM_EXCEPTION(MARSHAL); // error marshaling param/result + TAO_SYSTEM_EXCEPTION(INITIALIZE); // ORB initialization failure + TAO_SYSTEM_EXCEPTION(NO_IMPLEMENT); // implementation unavailable + TAO_SYSTEM_EXCEPTION(BAD_TYPECODE); // bad typecode + TAO_SYSTEM_EXCEPTION(BAD_OPERATION); // invalid operation + TAO_SYSTEM_EXCEPTION(NO_RESOURCES); // out of resources for request + TAO_SYSTEM_EXCEPTION(NO_RESPONSE); // response not yet available + TAO_SYSTEM_EXCEPTION(PERSIST_STORE); // persistent storage failure + TAO_SYSTEM_EXCEPTION(BAD_INV_ORDER); // routine invocations out of order + TAO_SYSTEM_EXCEPTION(TRANSIENT); // transient error, try again later + TAO_SYSTEM_EXCEPTION(FREE_MEM); // cannot free memory + TAO_SYSTEM_EXCEPTION(INV_IDENT); // invalid identifier syntax + TAO_SYSTEM_EXCEPTION(INV_FLAG); // invalid flag was specified + TAO_SYSTEM_EXCEPTION(INTF_REPOS); // interface repository unavailable + TAO_SYSTEM_EXCEPTION(BAD_CONTEXT); // error processing context object + TAO_SYSTEM_EXCEPTION(OBJ_ADAPTER); // object adapter failure + TAO_SYSTEM_EXCEPTION(DATA_CONVERSION); // data conversion error + TAO_SYSTEM_EXCEPTION(INV_POLICY); // invalid policies present + TAO_SYSTEM_EXCEPTION(REBIND); // rebind needed + TAO_SYSTEM_EXCEPTION(TIMEOUT); // operation timed out + TAO_SYSTEM_EXCEPTION(TRANSACTION_UNAVAILABLE); // no transaction + TAO_SYSTEM_EXCEPTION(TRANSACTION_MODE); // invalid transaction mode + TAO_SYSTEM_EXCEPTION(TRANSACTION_REQUIRED); // operation needs transaction + TAO_SYSTEM_EXCEPTION(TRANSACTION_ROLLEDBACK); // operation was a no-op + TAO_SYSTEM_EXCEPTION(INVALID_TRANSACTION); // invalid TP context passed + TAO_SYSTEM_EXCEPTION(CODESET_INCOMPATIBLE); // incompatible code set + TAO_SYSTEM_EXCEPTION(BAD_QOS); // bad quality of service + TAO_SYSTEM_EXCEPTION(INVALID_ACTIVITY); + TAO_SYSTEM_EXCEPTION(ACTIVITY_COMPLETED); + TAO_SYSTEM_EXCEPTION(ACTIVITY_REQUIRED); + TAO_SYSTEM_EXCEPTION(THREAD_CANCELLED); + +#undef TAO_SYSTEM_EXCEPTION + #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) // Required by C++ mapping. @@ -243,7 +461,7 @@ public: ACE_ENV_ARG_DECL); /// Runtime initialization of all standard exception typecodes. - /// Called from @c CORBA::ORB_init. + /// Called from <CORBA::ORB_init>. static void init (ACE_ENV_SINGLE_ARG_DECL); /// Runtime finalization of all standard exception typecodes. @@ -275,8 +493,6 @@ private: * * @brief This class is only used internally in TAO as an exception * that never gets thrown. Never use this class anywhere. - * - * @internal */ class TAO_Export TAO_DONT_CATCH { @@ -293,5 +509,4 @@ TAO_Export void operator<<= (CORBA::Any &, CORBA::Exception *); #endif /* __ACE_INLINE__ */ #include /**/"ace/post.h" - #endif /* TAO_EXCEPTION_H */ diff --git a/TAO/tao/Exception.i b/TAO/tao/Exception.i index 7fc06f9f2ad..56bf7a1e6a9 100644 --- a/TAO/tao/Exception.i +++ b/TAO/tao/Exception.i @@ -2,8 +2,38 @@ // // $Id$ -ACE_INLINE CORBA::Exception * -CORBA::Exception::_downcast (CORBA::Exception * x) +ACE_INLINE CORBA::Exception* +CORBA::Exception::_downcast (CORBA::Exception* x) { return x; } + +ACE_INLINE +CORBA::UserException::UserException (const CORBA::UserException &src) + : CORBA::Exception (src) +{ +} + +ACE_INLINE CORBA::ULong +CORBA::SystemException::minor (void) const +{ + return this->minor_; +} + +ACE_INLINE void +CORBA::SystemException::minor (CORBA::ULong m) +{ + this->minor_ = m; +} + +ACE_INLINE CORBA::CompletionStatus +CORBA::SystemException::completed (void) const +{ + return this->completed_; +} + +ACE_INLINE void +CORBA::SystemException::completed (CORBA::CompletionStatus c) +{ + this->completed_ = c; +} diff --git a/TAO/tao/FILE_Parser.cpp b/TAO/tao/FILE_Parser.cpp index d0ba65b8959..197bc1275c1 100644 --- a/TAO/tao/FILE_Parser.cpp +++ b/TAO/tao/FILE_Parser.cpp @@ -3,7 +3,6 @@ #include "FILE_Parser.h" #include "tao/ORB.h" #include "tao/Environment.h" -#include "tao/Object.h" #include "ace/Read_Buffer.h" diff --git a/TAO/tao/Fixed_Array_Argument_T.cpp b/TAO/tao/Fixed_Array_Argument_T.cpp index 4d02a03d3bf..64cb1090356 100644 --- a/TAO/tao/Fixed_Array_Argument_T.cpp +++ b/TAO/tao/Fixed_Array_Argument_T.cpp @@ -23,8 +23,6 @@ TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany>::marshal ( return cdr << this->x_; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename S_slice, typename S_forany> void TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany>::interceptor_param ( @@ -35,8 +33,6 @@ TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany>::interceptor_param ( p.mode = CORBA::PARAM_IN; } -#endif /* TAO_HAS_INTERCEPTORS */ - // =========================================================== template<typename S, typename S_slice, typename S_forany> @@ -57,8 +53,6 @@ TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany>::demarshal ( return cdr >> this->x_; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename S_slice, typename S_forany> void TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany>::interceptor_param ( @@ -69,8 +63,6 @@ TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany>::interceptor_param ( p.mode = CORBA::PARAM_INOUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================== template<typename S, typename S_slice, typename S_forany> @@ -82,8 +74,6 @@ TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany>::demarshal ( return cdr >> this->x_; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename S_slice, typename S_forany> void TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany>::interceptor_param ( @@ -94,14 +84,12 @@ TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany>::interceptor_param ( p.mode = CORBA::PARAM_OUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================ -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_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::demarshal ( @@ -111,19 +99,17 @@ TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::demarshal ( typedef TAO::Array_Traits<S,S_slice,S_tag> ARRAY_TRAITS; S_slice * tmp_ptr = 0; ACE_ALLOCATOR_RETURN (tmp_ptr, - ARRAY_TRAITS::alloc (), + ARRAY_TRAITS::tao_alloc (), 0); this->x_ = tmp_ptr; S_forany tmp (this->x_.ptr ()); return cdr >> tmp; } -#if TAO_HAS_INTERCEPTORS == 1 - -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_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>:: @@ -132,6 +118,4 @@ interceptor_result (CORBA::Any * any) (*any) <<= S_forany (this->x_.ptr ()); } -#endif /* TAO_HAS_INTERCEPTORS */ - #endif /* TAO_FIXED_ARRAY_ARGUMENT_T_C */ diff --git a/TAO/tao/Fixed_Array_Argument_T.h b/TAO/tao/Fixed_Array_Argument_T.h index e4506ec5d8c..e6afe22871e 100644 --- a/TAO/tao/Fixed_Array_Argument_T.h +++ b/TAO/tao/Fixed_Array_Argument_T.h @@ -36,9 +36,9 @@ namespace TAO In_Fixed_Array_Argument_T (const S_slice * x); virtual CORBA::Boolean marshal (TAO_OutputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + const S_slice * arg (void) const; private: @@ -59,9 +59,9 @@ namespace TAO virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S_slice * arg (void); private: @@ -81,9 +81,9 @@ namespace TAO Out_Fixed_Array_Argument_T (S_slice *& x); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S_slice *& arg (void); private: @@ -107,9 +107,9 @@ namespace TAO Ret_Fixed_Array_Argument_T (void); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_result (CORBA::Any *); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S_slice *& arg (void); S_slice * excp (void); diff --git a/TAO/tao/Fixed_Array_SArgument_T.cpp b/TAO/tao/Fixed_Array_SArgument_T.cpp index 48c9cda74c8..cd59b4db789 100644 --- a/TAO/tao/Fixed_Array_SArgument_T.cpp +++ b/TAO/tao/Fixed_Array_SArgument_T.cpp @@ -22,8 +22,6 @@ TAO::In_Fixed_Array_SArgument_T<S,S_forany>::demarshal (TAO_InputCDR &cdr) return cdr >> tmp; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename S_forany> void TAO::In_Fixed_Array_SArgument_T<S,S_forany>::interceptor_param ( @@ -34,8 +32,6 @@ TAO::In_Fixed_Array_SArgument_T<S,S_forany>::interceptor_param ( p.mode = CORBA::PARAM_IN; } -#endif /* TAO_HAS_INTERCEPTORS */ - // =========================================================== template<typename S, typename S_forany> @@ -53,8 +49,6 @@ TAO::Inout_Fixed_Array_SArgument_T<S,S_forany>::demarshal (TAO_InputCDR & cdr) return cdr >> tmp; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename S_forany> void TAO::Inout_Fixed_Array_SArgument_T<S,S_forany>::interceptor_param ( @@ -65,8 +59,6 @@ TAO::Inout_Fixed_Array_SArgument_T<S,S_forany>::interceptor_param ( p.mode = CORBA::PARAM_INOUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================== template<typename S, typename S_forany> @@ -76,8 +68,6 @@ TAO::Out_Fixed_Array_SArgument_T<S,S_forany>::marshal (TAO_OutputCDR &cdr) return cdr << S_forany (this->x_); } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename S_forany> void TAO::Out_Fixed_Array_SArgument_T<S,S_forany>::interceptor_param ( @@ -88,8 +78,6 @@ TAO::Out_Fixed_Array_SArgument_T<S,S_forany>::interceptor_param ( p.mode = CORBA::PARAM_OUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================ template<typename S_slice, typename S_var, typename S_forany> @@ -101,8 +89,6 @@ TAO::Ret_Fixed_Array_SArgument_T<S_slice,S_var,S_forany>::marshal ( return cdr << S_forany (this->x_.inout ()); } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S_slice, typename S_var, typename S_forany> void TAO::Ret_Fixed_Array_SArgument_T<S_slice,S_var,S_forany>::interceptor_result ( @@ -112,6 +98,4 @@ TAO::Ret_Fixed_Array_SArgument_T<S_slice,S_var,S_forany>::interceptor_result ( (*any) <<= S_forany (this->x_.ptr ()); } -#endif /* TAO_HAS_INTERCEPTORS */ - #endif /* TAO_FIXED_ARRAY_SARGUMENT_T_C */ diff --git a/TAO/tao/Fixed_Array_SArgument_T.h b/TAO/tao/Fixed_Array_SArgument_T.h index 6e6fb9a52f7..beef979efcb 100644 --- a/TAO/tao/Fixed_Array_SArgument_T.h +++ b/TAO/tao/Fixed_Array_SArgument_T.h @@ -36,9 +36,9 @@ namespace TAO In_Fixed_Array_SArgument_T (void); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + const S & arg (void) const; private: @@ -59,9 +59,9 @@ namespace TAO virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S & arg (void); private: @@ -81,9 +81,9 @@ namespace TAO Out_Fixed_Array_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S & arg (void); private: @@ -103,9 +103,9 @@ namespace TAO Ret_Fixed_Array_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_result (CORBA::Any *); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S_slice *& arg (void); private: diff --git a/TAO/tao/Fixed_Size_Argument_T.cpp b/TAO/tao/Fixed_Size_Argument_T.cpp index 0819eabf688..8d13d7f0fe2 100644 --- a/TAO/tao/Fixed_Size_Argument_T.cpp +++ b/TAO/tao/Fixed_Size_Argument_T.cpp @@ -21,8 +21,6 @@ TAO::In_Fixed_Size_Argument_T<S>::marshal (TAO_OutputCDR & cdr) return cdr << *this->x_; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S> void TAO::In_Fixed_Size_Argument_T<S>::interceptor_param (Dynamic::Parameter & p) @@ -31,8 +29,6 @@ TAO::In_Fixed_Size_Argument_T<S>::interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_IN; } -#endif /* TAO_HAS_INTERCEPTORS */ - // =========================================================== template<typename S> @@ -49,8 +45,6 @@ TAO::Inout_Fixed_Size_Argument_T<S>::demarshal (TAO_InputCDR & cdr) return cdr >> *this->x_; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S> void TAO::Inout_Fixed_Size_Argument_T<S>::interceptor_param ( @@ -61,8 +55,6 @@ TAO::Inout_Fixed_Size_Argument_T<S>::interceptor_param ( p.mode = CORBA::PARAM_INOUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================== template<typename S> @@ -72,8 +64,6 @@ TAO::Out_Fixed_Size_Argument_T<S>::demarshal (TAO_InputCDR & cdr) return cdr >> this->x_; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S> void TAO::Out_Fixed_Size_Argument_T<S>::interceptor_param ( @@ -84,8 +74,6 @@ TAO::Out_Fixed_Size_Argument_T<S>::interceptor_param ( p.mode = CORBA::PARAM_OUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================ template<typename S> @@ -95,8 +83,6 @@ TAO::Ret_Fixed_Size_Argument_T<S>::demarshal (TAO_InputCDR & cdr) return cdr >> this->x_; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S> void TAO::Ret_Fixed_Size_Argument_T<S>::interceptor_result (CORBA::Any * any) @@ -104,6 +90,4 @@ TAO::Ret_Fixed_Size_Argument_T<S>::interceptor_result (CORBA::Any * any) (*any) <<= this->x_; } -#endif /* TAO_HAS_INTERCEPTORS */ - #endif /* TAO_FIXED_SIZE_ARGUMENT_T_C */ diff --git a/TAO/tao/Fixed_Size_Argument_T.h b/TAO/tao/Fixed_Size_Argument_T.h index c2cabced3e4..1ba209d9cf8 100644 --- a/TAO/tao/Fixed_Size_Argument_T.h +++ b/TAO/tao/Fixed_Size_Argument_T.h @@ -36,9 +36,9 @@ namespace TAO In_Fixed_Size_Argument_T (S const & x); virtual CORBA::Boolean marshal (TAO_OutputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + const S & arg (void) const; private: @@ -59,9 +59,9 @@ namespace TAO virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S & arg (void); private: @@ -81,9 +81,9 @@ namespace TAO Out_Fixed_Size_Argument_T (S & x); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S & arg (void); private: @@ -103,9 +103,9 @@ namespace TAO Ret_Fixed_Size_Argument_T (void); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_result (CORBA::Any *); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S & arg (void); S excp (void); diff --git a/TAO/tao/Fixed_Size_SArgument_T.cpp b/TAO/tao/Fixed_Size_SArgument_T.cpp index 28408a12af2..cebb409762c 100644 --- a/TAO/tao/Fixed_Size_SArgument_T.cpp +++ b/TAO/tao/Fixed_Size_SArgument_T.cpp @@ -21,8 +21,6 @@ TAO::In_Fixed_Size_SArgument_T<S>::demarshal (TAO_InputCDR &cdr) return cdr >> *this->x_; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S> void TAO::In_Fixed_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p) @@ -31,8 +29,6 @@ TAO::In_Fixed_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_IN; } -#endif /* TAO_HAS_INTERCEPTORS */ - // =========================================================== template<typename S> @@ -49,8 +45,6 @@ TAO::Inout_Fixed_Size_SArgument_T<S>::demarshal (TAO_InputCDR & cdr) return cdr >> *this->x_; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S> void TAO::Inout_Fixed_Size_SArgument_T<S>::interceptor_param ( @@ -61,8 +55,6 @@ TAO::Inout_Fixed_Size_SArgument_T<S>::interceptor_param ( p.mode = CORBA::PARAM_INOUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================== template<typename S> @@ -72,8 +64,6 @@ TAO::Out_Fixed_Size_SArgument_T<S>::marshal (TAO_OutputCDR &cdr) return cdr << this->x_; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S> void TAO::Out_Fixed_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p) @@ -82,8 +72,6 @@ TAO::Out_Fixed_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_OUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================ template<typename S> @@ -93,8 +81,6 @@ TAO::Ret_Fixed_Size_SArgument_T<S>::marshal (TAO_OutputCDR & cdr) return cdr << *this->x_; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S> void TAO::Ret_Fixed_Size_SArgument_T<S>::interceptor_result (CORBA::Any * any) @@ -102,6 +88,4 @@ TAO::Ret_Fixed_Size_SArgument_T<S>::interceptor_result (CORBA::Any * any) (*any) <<= *this->x_; } -#endif /* TAO_HAS_INTERCEPTORS */ - #endif /* TAO_FIXED_SIZE_SARGUMENT_T_C */ diff --git a/TAO/tao/Fixed_Size_SArgument_T.h b/TAO/tao/Fixed_Size_SArgument_T.h index 4ba6e2f0bfa..8b485656896 100644 --- a/TAO/tao/Fixed_Size_SArgument_T.h +++ b/TAO/tao/Fixed_Size_SArgument_T.h @@ -36,9 +36,9 @@ namespace TAO In_Fixed_Size_SArgument_T (void); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + const S & arg (void) const; private: @@ -59,9 +59,9 @@ namespace TAO virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S & arg (void); private: @@ -81,9 +81,9 @@ namespace TAO Out_Fixed_Size_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S & arg (void); private: @@ -103,9 +103,9 @@ namespace TAO Ret_Fixed_Size_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_result (CORBA::Any *); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S & arg (void); private: diff --git a/TAO/tao/GIOP.pidl b/TAO/tao/GIOP.pidl index 2e08b31438a..f2ec15529f2 100644 --- a/TAO/tao/GIOP.pidl +++ b/TAO/tao/GIOP.pidl @@ -23,9 +23,6 @@ // // ================================================================ -#ifndef TAO_GIOP_PIDL -#define TAO_GIOP_PIDL - #include "IOP.pidl" #pragma prefix "omg.org" @@ -56,5 +53,3 @@ module GIOP case ReferenceAddr: IORAddressingInfo ior; }; }; - -#endif /* TAO_GIOP_PIDL */ diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp index dfdd5db0474..45704752f66 100644 --- a/TAO/tao/GIOP_Message_Base.cpp +++ b/TAO/tao/GIOP_Message_Base.cpp @@ -11,18 +11,15 @@ #include "LF_Strategy.h" #include "Request_Dispatcher.h" #include "Codeset_Manager.h" -#include "SystemException.h" #if !defined (__ACE_INLINE__) # include "GIOP_Message_Base.i" #endif /* __ACE_INLINE__ */ - ACE_RCSID (tao, GIOP_Message_Base, "$Id$") - TAO_GIOP_Message_Base::TAO_GIOP_Message_Base (TAO_ORB_Core *orb_core, size_t /*input_cdr_size*/) : orb_core_ (orb_core) @@ -906,7 +903,7 @@ TAO_GIOP_Message_Base::process_request (TAO_Transport *transport, // Throw an exception if the if (parse_error != 0) - ACE_TRY_THROW (CORBA::MARSHAL (0, + ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); request_id = request.request_id (); @@ -995,7 +992,7 @@ TAO_GIOP_Message_Base::process_request (TAO_Transport *transport, } else if (TAO_debug_level > 0) { - // It is unfortunate that an exception (probably a system + // It is unfotunate that an exception (probably a system // exception) was thrown by the upcall code (even by the // user) when the client was not expecting a response. // However, in this case, we cannot close the connection @@ -1040,8 +1037,7 @@ TAO_GIOP_Message_Base::process_request (TAO_Transport *transport, if (TAO_debug_level > 0) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::process_request[3], ") - ACE_TEXT ("%p: ") + ACE_TEXT ("TAO: (%P|%t|%N|%l) %p: ") ACE_TEXT ("cannot send exception\n"), ACE_TEXT ("process_request ()"))); ACE_PRINT_EXCEPTION ( @@ -1097,7 +1093,7 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport, if (parse_error != 0) { - ACE_TRY_THROW (CORBA::MARSHAL (0, + ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } @@ -1126,7 +1122,7 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport, if (parse_error != 0) { - ACE_TRY_THROW (CORBA::MARSHAL (0, + ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } @@ -1144,8 +1140,7 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport, status_info.status = TAO_GIOP_OBJECT_FORWARD; status_info.forward_location_var = forward_to; ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::process_locate_request, ") - ACE_TEXT ("called: forwarding\n"))); + ACE_TEXT ("handle_locate has been called: forwarding\n"))); } else if (server_request.exception_type () == TAO_GIOP_NO_EXCEPTION) { @@ -1153,8 +1148,7 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport, status_info.status = TAO_GIOP_OBJECT_HERE; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::process_locate_request, ") - ACE_TEXT ("found\n"))); + ACE_TEXT ("TAO: (%P|%t) handle_locate() : found\n"))); } else { @@ -1164,16 +1158,14 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport, { status_info.status = TAO_GIOP_OBJECT_FORWARD; ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::process_locate_request, ") - ACE_TEXT ("forwarding\n"))); + ACE_TEXT ("handle_locate has been called: forwarding\n"))); } else { // Normal exception, so the object is not here status_info.status = TAO_GIOP_UNKNOWN_OBJECT; ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::process_locate_request, ") - ACE_TEXT ("not here\n"))); + ACE_TEXT ("handle_locate has been called: not here\n"))); } } } @@ -1184,7 +1176,7 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport, status_info.status = TAO_GIOP_UNKNOWN_OBJECT; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::process_locate_request, ") + ACE_TEXT ("TAO (%P|%t) TAO_GIOP_Message_Base::process_locate_request - ") ACE_TEXT ("CORBA exception raised\n"))); } #if defined (TAO_HAS_EXCEPTIONS) diff --git a/TAO/tao/GIOP_Message_Generator_Parser.h b/TAO/tao/GIOP_Message_Generator_Parser.h index 8f844d1437b..eef8198c352 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser.h +++ b/TAO/tao/GIOP_Message_Generator_Parser.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/SystemException.h" +#include "tao/Exception.h" class TAO_Operation_Details; class TAO_Target_Specification; diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp index eae1ef62b41..0166a4baa2c 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp @@ -9,7 +9,6 @@ #include "tao/TAO_Server_Request.h" #include "tao/ORB_Constants.h" #include "tao/CDR.h" -#include "tao/SystemException.h" #include "ace/Log_Msg.h" diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp index 344e84a3388..e9cddab3989 100644 --- a/TAO/tao/GIOP_Message_Lite.cpp +++ b/TAO/tao/GIOP_Message_Lite.cpp @@ -13,18 +13,15 @@ #include "Transport.h" #include "Transport_Mux_Strategy.h" #include "Codeset_Manager.h" -#include "SystemException.h" #if !defined (__ACE_INLINE__) # include "tao/GIOP_Message_Lite.i" #endif /* __ACE_INLINE__ */ - ACE_RCSID (tao, GIOP_Message_Lite, "$Id$") - static const size_t TAO_GIOP_LITE_HEADER_LEN = 5; static const size_t TAO_GIOP_LITE_MESSAGE_SIZE_OFFSET = 0; static const size_t TAO_GIOP_LITE_MESSAGE_TYPE_OFFSET = 4; @@ -740,7 +737,7 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport, // Throw an exception if the if (parse_error != 0) - ACE_TRY_THROW (CORBA::MARSHAL (0, + ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); request_id = request.request_id (); @@ -925,7 +922,7 @@ TAO_GIOP_Message_Lite::process_locate_request (TAO_Transport *transport, if (parse_error != 0) { - ACE_TRY_THROW (CORBA::MARSHAL (0, + ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } @@ -961,7 +958,7 @@ TAO_GIOP_Message_Lite::process_locate_request (TAO_Transport *transport, if (parse_error != 0) { - ACE_TRY_THROW (CORBA::MARSHAL (0, + ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } diff --git a/TAO/tao/GIOP_Message_Lite.h b/TAO/tao/GIOP_Message_Lite.h index 3393e074da0..54c9ff7aea0 100644 --- a/TAO/tao/GIOP_Message_Lite.h +++ b/TAO/tao/GIOP_Message_Lite.h @@ -24,7 +24,7 @@ #include "tao/Pluggable_Messaging_Utils.h" #include "tao/GIOP_Utils.h" -#include "tao/SystemException.h" +#include "tao/Exception.h" #include "tao/CDR.h" class TAO_Operation_Details; diff --git a/TAO/tao/IFR_Client.mpc b/TAO/tao/IFR_Client.mpc index 2d2bf2ea84b..cf3cb841bce 100644 --- a/TAO/tao/IFR_Client.mpc +++ b/TAO/tao/IFR_Client.mpc @@ -22,8 +22,4 @@ project : taolib, core { Resource_Files { IFR_Client } - - PIDL_Files { - IFR_Client - } } diff --git a/TAO/tao/IFR_Client/IFR_BaseC.cpp b/TAO/tao/IFR_Client/IFR_BaseC.cpp index 78ed2bb2abf..a2e550c60c8 100644 --- a/TAO/tao/IFR_Client/IFR_BaseC.cpp +++ b/TAO/tao/IFR_Client/IFR_BaseC.cpp @@ -616,7 +616,7 @@ namespace TAO ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::IRObject_ptr -TAO::Objref_Traits<CORBA::IRObject>::duplicate ( +TAO::Objref_Traits<CORBA::IRObject>::tao_duplicate ( CORBA::IRObject_ptr p ) { @@ -625,7 +625,7 @@ TAO::Objref_Traits<CORBA::IRObject>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::IRObject>::release ( +TAO::Objref_Traits<CORBA::IRObject>::tao_release ( CORBA::IRObject_ptr p ) { @@ -634,14 +634,14 @@ TAO::Objref_Traits<CORBA::IRObject>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::IRObject_ptr -TAO::Objref_Traits<CORBA::IRObject>::nil (void) +TAO::Objref_Traits<CORBA::IRObject>::tao_nil (void) { return CORBA::IRObject::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::IRObject>::marshal ( +TAO::Objref_Traits<CORBA::IRObject>::tao_marshal ( CORBA::IRObject_ptr p, TAO_OutputCDR & cdr ) @@ -851,7 +851,7 @@ CORBA::IRObject::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Contained_ptr -TAO::Objref_Traits<CORBA::Contained>::duplicate ( +TAO::Objref_Traits<CORBA::Contained>::tao_duplicate ( CORBA::Contained_ptr p ) { @@ -860,7 +860,7 @@ TAO::Objref_Traits<CORBA::Contained>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::Contained>::release ( +TAO::Objref_Traits<CORBA::Contained>::tao_release ( CORBA::Contained_ptr p ) { @@ -869,14 +869,14 @@ TAO::Objref_Traits<CORBA::Contained>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Contained_ptr -TAO::Objref_Traits<CORBA::Contained>::nil (void) +TAO::Objref_Traits<CORBA::Contained>::tao_nil (void) { return CORBA::Contained::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::Contained>::marshal ( +TAO::Objref_Traits<CORBA::Contained>::tao_marshal ( CORBA::Contained_ptr p, TAO_OutputCDR & cdr ) @@ -2376,7 +2376,7 @@ void CORBA::EnumMemberSeq::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Container_ptr -TAO::Objref_Traits<CORBA::Container>::duplicate ( +TAO::Objref_Traits<CORBA::Container>::tao_duplicate ( CORBA::Container_ptr p ) { @@ -2385,7 +2385,7 @@ TAO::Objref_Traits<CORBA::Container>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::Container>::release ( +TAO::Objref_Traits<CORBA::Container>::tao_release ( CORBA::Container_ptr p ) { @@ -2394,14 +2394,14 @@ TAO::Objref_Traits<CORBA::Container>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Container_ptr -TAO::Objref_Traits<CORBA::Container>::nil (void) +TAO::Objref_Traits<CORBA::Container>::tao_nil (void) { return CORBA::Container::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::Container>::marshal ( +TAO::Objref_Traits<CORBA::Container>::tao_marshal ( CORBA::Container_ptr p, TAO_OutputCDR & cdr ) @@ -3591,7 +3591,7 @@ CORBA::Container::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::IDLType_ptr -TAO::Objref_Traits<CORBA::IDLType>::duplicate ( +TAO::Objref_Traits<CORBA::IDLType>::tao_duplicate ( CORBA::IDLType_ptr p ) { @@ -3600,7 +3600,7 @@ TAO::Objref_Traits<CORBA::IDLType>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::IDLType>::release ( +TAO::Objref_Traits<CORBA::IDLType>::tao_release ( CORBA::IDLType_ptr p ) { @@ -3609,14 +3609,14 @@ TAO::Objref_Traits<CORBA::IDLType>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::IDLType_ptr -TAO::Objref_Traits<CORBA::IDLType>::nil (void) +TAO::Objref_Traits<CORBA::IDLType>::tao_nil (void) { return CORBA::IDLType::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::IDLType>::marshal ( +TAO::Objref_Traits<CORBA::IDLType>::tao_marshal ( CORBA::IDLType_ptr p, TAO_OutputCDR & cdr ) @@ -3792,7 +3792,7 @@ CORBA::IDLType::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::TypedefDef_ptr -TAO::Objref_Traits<CORBA::TypedefDef>::duplicate ( +TAO::Objref_Traits<CORBA::TypedefDef>::tao_duplicate ( CORBA::TypedefDef_ptr p ) { @@ -3801,7 +3801,7 @@ TAO::Objref_Traits<CORBA::TypedefDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::TypedefDef>::release ( +TAO::Objref_Traits<CORBA::TypedefDef>::tao_release ( CORBA::TypedefDef_ptr p ) { @@ -3810,14 +3810,14 @@ TAO::Objref_Traits<CORBA::TypedefDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::TypedefDef_ptr -TAO::Objref_Traits<CORBA::TypedefDef>::nil (void) +TAO::Objref_Traits<CORBA::TypedefDef>::tao_nil (void) { return CORBA::TypedefDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::TypedefDef>::marshal ( +TAO::Objref_Traits<CORBA::TypedefDef>::tao_marshal ( CORBA::TypedefDef_ptr p, TAO_OutputCDR & cdr ) @@ -4104,7 +4104,7 @@ CORBA::Boolean operator<< ( for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = - TAO::Objref_Traits<CORBA::InterfaceDef>::marshal ( + TAO::Objref_Traits<CORBA::InterfaceDef>::tao_marshal ( _tao_sequence[i].in (), strm ); } @@ -4179,7 +4179,7 @@ CORBA::Boolean operator<< ( for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = - TAO::Objref_Traits<CORBA::ValueDef>::marshal ( + TAO::Objref_Traits<CORBA::ValueDef>::tao_marshal ( _tao_sequence[i].in (), strm ); } @@ -4254,7 +4254,7 @@ CORBA::Boolean operator<< ( for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = - TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::marshal ( + TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::tao_marshal ( _tao_sequence[i].in (), strm ); } @@ -4329,7 +4329,7 @@ CORBA::Boolean operator<< ( for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = - TAO::Objref_Traits<CORBA::LocalInterfaceDef>::marshal ( + TAO::Objref_Traits<CORBA::LocalInterfaceDef>::tao_marshal ( _tao_sequence[i].in (), strm ); } @@ -4404,7 +4404,7 @@ CORBA::Boolean operator<< ( for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = - TAO::Objref_Traits<CORBA::ExtInterfaceDef>::marshal ( + TAO::Objref_Traits<CORBA::ExtInterfaceDef>::tao_marshal ( _tao_sequence[i].in (), strm ); } @@ -4479,7 +4479,7 @@ CORBA::Boolean operator<< ( for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = - TAO::Objref_Traits<CORBA::ExtValueDef>::marshal ( + TAO::Objref_Traits<CORBA::ExtValueDef>::tao_marshal ( _tao_sequence[i].in (), strm ); } @@ -4554,7 +4554,7 @@ CORBA::Boolean operator<< ( for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = - TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::marshal ( + TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::tao_marshal ( _tao_sequence[i].in (), strm ); } @@ -4629,7 +4629,7 @@ CORBA::Boolean operator<< ( for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = - TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::marshal ( + TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::tao_marshal ( _tao_sequence[i].in (), strm ); } diff --git a/TAO/tao/IFR_Client/IFR_BaseC.h b/TAO/tao/IFR_Client/IFR_BaseC.h index c5f7c5e03bf..7df03151ae5 100644 --- a/TAO/tao/IFR_Client/IFR_BaseC.h +++ b/TAO/tao/IFR_Client/IFR_BaseC.h @@ -41,7 +41,6 @@ #include "ifr_client_export.h" #include "tao/Environment.h" -#include "tao/SystemException.h" #include "tao/Object.h" #include "tao/Typecode.h" #include "tao/Any.h" @@ -74,13 +73,13 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// 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; } @@ -90,22 +89,22 @@ namespace TAO namespace CORBA { - + // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:376 - + typedef char * ScopedName; typedef CORBA::String_var ScopedName_var; typedef CORBA::String_out ScopedName_out; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ScopedName; - + // TAO_IDL - Generated from // be\be_visitor_enum/enum_ch.cpp:57 - + enum DefinitionKind { dk_none, @@ -145,29 +144,29 @@ namespace CORBA dk_Uses, dk_Event }; - + typedef DefinitionKind &DefinitionKind_out; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_DefinitionKind; - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_IROBJECT__VAR_OUT_CH_) #define _CORBA_IROBJECT__VAR_OUT_CH_ - + class IRObject; typedef IRObject *IRObject_ptr; - + typedef TAO_Objref_Var_T< IRObject > IRObject_var; - + typedef TAO_Objref_Out_T< IRObject @@ -175,13 +174,13 @@ namespace CORBA IRObject_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_IROBJECT_CH_) #define _CORBA_IROBJECT_CH_ - + class TAO_IFR_Client_Export IRObject : public virtual CORBA::Object { @@ -189,74 +188,74 @@ namespace CORBA friend class TAO::Narrow_Utils<IRObject>; typedef IRObject_ptr _ptr_type; typedef IRObject_var _var_type; - + // The static operations. static IRObject_ptr _duplicate (IRObject_ptr obj); - + static IRObject_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static IRObject_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static IRObject_ptr _nil (void) { return (IRObject_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::DefinitionKind def_kind ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // 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 )); - + // 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); private: TAO::Collocation_Proxy_Broker *the_TAO_IRObject_Proxy_Broker_; - + protected: // Concrete interface only. IRObject (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_IRObject_setup_collocation (void); - + // Concrete non-local interface only. IRObject ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. IRObject ( TAO_Stub *objref, @@ -264,50 +263,50 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~IRObject (void); - + private: // Private and unimplemented for concrete interfaces. IRObject (const IRObject &); - + void operator= (const IRObject &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IRObject; - + // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:376 - + typedef char * VersionSpec; typedef CORBA::String_var VersionSpec_var; typedef CORBA::String_out VersionSpec_out; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_VersionSpec; - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_CONTAINED__VAR_OUT_CH_) #define _CORBA_CONTAINED__VAR_OUT_CH_ - + class Contained; typedef Contained *Contained_ptr; - + typedef TAO_Objref_Var_T< Contained > Contained_var; - + typedef TAO_Objref_Out_T< Contained @@ -315,22 +314,22 @@ namespace CORBA Contained_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_REPOSITORY__VAR_OUT_CH_) #define _CORBA_REPOSITORY__VAR_OUT_CH_ - + class Repository; typedef Repository *Repository_ptr; - + typedef TAO_Objref_Var_T< Repository > Repository_var; - + typedef TAO_Objref_Out_T< Repository @@ -338,22 +337,22 @@ namespace CORBA Repository_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_CONTAINER__VAR_OUT_CH_) #define _CORBA_CONTAINER__VAR_OUT_CH_ - + class Container; typedef Container *Container_ptr; - + typedef TAO_Objref_Var_T< Container > Container_var; - + typedef TAO_Objref_Out_T< Container @@ -361,13 +360,13 @@ namespace CORBA Container_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_CONTAINED_CH_) #define _CORBA_CONTAINED_CH_ - + class TAO_IFR_Client_Export Contained : public virtual CORBA::IRObject { @@ -375,40 +374,40 @@ namespace CORBA friend class TAO::Narrow_Utils<Contained>; typedef Contained_ptr _ptr_type; typedef Contained_var _var_type; - + // The static operations. static Contained_ptr _duplicate (Contained_ptr obj); - + static Contained_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Contained_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Contained_ptr _nil (void) { return (Contained_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual char * id ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void id ( const char * id ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -416,20 +415,20 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // 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 )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void name ( const char * name ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -437,20 +436,20 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual char * version ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void version ( const char * version ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -458,85 +457,85 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::Container_ptr defined_in ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual char * absolute_name ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::Repository_ptr containing_repository ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_type.cpp:258 - + struct Description; - + typedef TAO_Var_Var_T< Description > Description_var; - + typedef TAO_Out_T< Description, Description_var > Description_out; - + // TAO_IDL - Generated from // be\be_visitor_structure/structure_ch.cpp:52 - + struct TAO_IFR_Client_Export Description { typedef Description_var _var_type; - + static void _tao_any_destructor (void *); ACE_NESTED_CLASS (CORBA, DefinitionKind) kind; CORBA::Any value; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + static ::CORBA::TypeCode_ptr _tc_Description; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::Contained::Description * describe ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void move ( CORBA::Container_ptr new_container, const char * new_name, @@ -546,34 +545,34 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // 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); private: TAO::Collocation_Proxy_Broker *the_TAO_Contained_Proxy_Broker_; - + protected: // Concrete interface only. Contained (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_Contained_setup_collocation (void); - + // Concrete non-local interface only. Contained ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. Contained ( TAO_Stub *objref, @@ -581,38 +580,38 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~Contained (void); - + private: // Private and unimplemented for concrete interfaces. Contained (const Contained &); - + void operator= (const Contained &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Contained; - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_MODULEDEF__VAR_OUT_CH_) #define _CORBA_MODULEDEF__VAR_OUT_CH_ - + class ModuleDef; typedef ModuleDef *ModuleDef_ptr; - + typedef TAO_Objref_Var_T< ModuleDef > ModuleDef_var; - + typedef TAO_Objref_Out_T< ModuleDef @@ -620,22 +619,22 @@ namespace CORBA ModuleDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_CONSTANTDEF__VAR_OUT_CH_) #define _CORBA_CONSTANTDEF__VAR_OUT_CH_ - + class ConstantDef; typedef ConstantDef *ConstantDef_ptr; - + typedef TAO_Objref_Var_T< ConstantDef > ConstantDef_var; - + typedef TAO_Objref_Out_T< ConstantDef @@ -643,22 +642,22 @@ namespace CORBA ConstantDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_IDLTYPE__VAR_OUT_CH_) #define _CORBA_IDLTYPE__VAR_OUT_CH_ - + class IDLType; typedef IDLType *IDLType_ptr; - + typedef TAO_Objref_Var_T< IDLType > IDLType_var; - + typedef TAO_Objref_Out_T< IDLType @@ -666,22 +665,22 @@ namespace CORBA IDLType_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_STRUCTDEF__VAR_OUT_CH_) #define _CORBA_STRUCTDEF__VAR_OUT_CH_ - + class StructDef; typedef StructDef *StructDef_ptr; - + typedef TAO_Objref_Var_T< StructDef > StructDef_var; - + typedef TAO_Objref_Out_T< StructDef @@ -689,22 +688,22 @@ namespace CORBA StructDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_UNIONDEF__VAR_OUT_CH_) #define _CORBA_UNIONDEF__VAR_OUT_CH_ - + class UnionDef; typedef UnionDef *UnionDef_ptr; - + typedef TAO_Objref_Var_T< UnionDef > UnionDef_var; - + typedef TAO_Objref_Out_T< UnionDef @@ -712,22 +711,22 @@ namespace CORBA UnionDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_ENUMDEF__VAR_OUT_CH_) #define _CORBA_ENUMDEF__VAR_OUT_CH_ - + class EnumDef; typedef EnumDef *EnumDef_ptr; - + typedef TAO_Objref_Var_T< EnumDef > EnumDef_var; - + typedef TAO_Objref_Out_T< EnumDef @@ -735,22 +734,22 @@ namespace CORBA EnumDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_ALIASDEF__VAR_OUT_CH_) #define _CORBA_ALIASDEF__VAR_OUT_CH_ - + class AliasDef; typedef AliasDef *AliasDef_ptr; - + typedef TAO_Objref_Var_T< AliasDef > AliasDef_var; - + typedef TAO_Objref_Out_T< AliasDef @@ -758,22 +757,22 @@ namespace CORBA AliasDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_INTERFACEDEF__VAR_OUT_CH_) #define _CORBA_INTERFACEDEF__VAR_OUT_CH_ - + class InterfaceDef; typedef InterfaceDef *InterfaceDef_ptr; - + typedef TAO_Objref_Var_T< InterfaceDef > InterfaceDef_var; - + typedef TAO_Objref_Out_T< InterfaceDef @@ -781,15 +780,15 @@ namespace CORBA InterfaceDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_INTERFACEDEFSEQ_CH_) #define _CORBA_INTERFACEDEFSEQ_CH_ - + class InterfaceDefSeq; - + typedef TAO_MngSeq_Var_T< InterfaceDefSeq, @@ -799,7 +798,7 @@ namespace CORBA > > InterfaceDefSeq_var; - + typedef TAO_MngSeq_Out_T< InterfaceDefSeq, @@ -810,7 +809,7 @@ namespace CORBA > > InterfaceDefSeq_out; - + class TAO_IFR_Client_Export InterfaceDefSeq : public TAO_Unbounded_Object_Sequence< @@ -824,39 +823,39 @@ namespace CORBA InterfaceDefSeq ( CORBA::ULong max, CORBA::ULong length, - InterfaceDef_ptr* buffer, + InterfaceDef_ptr* buffer, CORBA::Boolean release = 0 ); InterfaceDefSeq (const InterfaceDefSeq &); ~InterfaceDefSeq (void); - + static void _tao_any_destructor (void *); - + typedef InterfaceDefSeq_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InterfaceDefSeq; - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_EXCEPTIONDEF__VAR_OUT_CH_) #define _CORBA_EXCEPTIONDEF__VAR_OUT_CH_ - + class ExceptionDef; typedef ExceptionDef *ExceptionDef_ptr; - + typedef TAO_Objref_Var_T< ExceptionDef > ExceptionDef_var; - + typedef TAO_Objref_Out_T< ExceptionDef @@ -864,22 +863,22 @@ namespace CORBA ExceptionDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_NATIVEDEF__VAR_OUT_CH_) #define _CORBA_NATIVEDEF__VAR_OUT_CH_ - + class NativeDef; typedef NativeDef *NativeDef_ptr; - + typedef TAO_Objref_Var_T< NativeDef > NativeDef_var; - + typedef TAO_Objref_Out_T< NativeDef @@ -887,22 +886,22 @@ namespace CORBA NativeDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_VALUEDEF__VAR_OUT_CH_) #define _CORBA_VALUEDEF__VAR_OUT_CH_ - + class ValueDef; typedef ValueDef *ValueDef_ptr; - + typedef TAO_Objref_Var_T< ValueDef > ValueDef_var; - + typedef TAO_Objref_Out_T< ValueDef @@ -910,15 +909,15 @@ namespace CORBA ValueDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_VALUEDEFSEQ_CH_) #define _CORBA_VALUEDEFSEQ_CH_ - + class ValueDefSeq; - + typedef TAO_MngSeq_Var_T< ValueDefSeq, @@ -928,7 +927,7 @@ namespace CORBA > > ValueDefSeq_var; - + typedef TAO_MngSeq_Out_T< ValueDefSeq, @@ -939,7 +938,7 @@ namespace CORBA > > ValueDefSeq_out; - + class TAO_IFR_Client_Export ValueDefSeq : public TAO_Unbounded_Object_Sequence< @@ -953,39 +952,39 @@ namespace CORBA ValueDefSeq ( CORBA::ULong max, CORBA::ULong length, - ValueDef_ptr* buffer, + ValueDef_ptr* buffer, CORBA::Boolean release = 0 ); ValueDefSeq (const ValueDefSeq &); ~ValueDefSeq (void); - + static void _tao_any_destructor (void *); - + typedef ValueDefSeq_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ValueDefSeq; - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_VALUEBOXDEF__VAR_OUT_CH_) #define _CORBA_VALUEBOXDEF__VAR_OUT_CH_ - + class ValueBoxDef; typedef ValueBoxDef *ValueBoxDef_ptr; - + typedef TAO_Objref_Var_T< ValueBoxDef > ValueBoxDef_var; - + typedef TAO_Objref_Out_T< ValueBoxDef @@ -993,22 +992,22 @@ namespace CORBA ValueBoxDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_ABSTRACTINTERFACEDEF__VAR_OUT_CH_) #define _CORBA_ABSTRACTINTERFACEDEF__VAR_OUT_CH_ - + class AbstractInterfaceDef; typedef AbstractInterfaceDef *AbstractInterfaceDef_ptr; - + typedef TAO_Objref_Var_T< AbstractInterfaceDef > AbstractInterfaceDef_var; - + typedef TAO_Objref_Out_T< AbstractInterfaceDef @@ -1016,15 +1015,15 @@ namespace CORBA AbstractInterfaceDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ_CH_) #define _CORBA_ABSTRACTINTERFACEDEFSEQ_CH_ - + class AbstractInterfaceDefSeq; - + typedef TAO_MngSeq_Var_T< AbstractInterfaceDefSeq, @@ -1034,7 +1033,7 @@ namespace CORBA > > AbstractInterfaceDefSeq_var; - + typedef TAO_MngSeq_Out_T< AbstractInterfaceDefSeq, @@ -1045,7 +1044,7 @@ namespace CORBA > > AbstractInterfaceDefSeq_out; - + class TAO_IFR_Client_Export AbstractInterfaceDefSeq : public TAO_Unbounded_Object_Sequence< @@ -1059,39 +1058,39 @@ namespace CORBA AbstractInterfaceDefSeq ( CORBA::ULong max, CORBA::ULong length, - AbstractInterfaceDef_ptr* buffer, + AbstractInterfaceDef_ptr* buffer, CORBA::Boolean release = 0 ); AbstractInterfaceDefSeq (const AbstractInterfaceDefSeq &); ~AbstractInterfaceDefSeq (void); - + static void _tao_any_destructor (void *); - + typedef AbstractInterfaceDefSeq_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AbstractInterfaceDefSeq; - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_LOCALINTERFACEDEF__VAR_OUT_CH_) #define _CORBA_LOCALINTERFACEDEF__VAR_OUT_CH_ - + class LocalInterfaceDef; typedef LocalInterfaceDef *LocalInterfaceDef_ptr; - + typedef TAO_Objref_Var_T< LocalInterfaceDef > LocalInterfaceDef_var; - + typedef TAO_Objref_Out_T< LocalInterfaceDef @@ -1099,15 +1098,15 @@ namespace CORBA LocalInterfaceDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_LOCALINTERFACEDEFSEQ_CH_) #define _CORBA_LOCALINTERFACEDEFSEQ_CH_ - + class LocalInterfaceDefSeq; - + typedef TAO_MngSeq_Var_T< LocalInterfaceDefSeq, @@ -1117,7 +1116,7 @@ namespace CORBA > > LocalInterfaceDefSeq_var; - + typedef TAO_MngSeq_Out_T< LocalInterfaceDefSeq, @@ -1128,7 +1127,7 @@ namespace CORBA > > LocalInterfaceDefSeq_out; - + class TAO_IFR_Client_Export LocalInterfaceDefSeq : public TAO_Unbounded_Object_Sequence< @@ -1142,39 +1141,39 @@ namespace CORBA LocalInterfaceDefSeq ( CORBA::ULong max, CORBA::ULong length, - LocalInterfaceDef_ptr* buffer, + LocalInterfaceDef_ptr* buffer, CORBA::Boolean release = 0 ); LocalInterfaceDefSeq (const LocalInterfaceDefSeq &); ~LocalInterfaceDefSeq (void); - + static void _tao_any_destructor (void *); - + typedef LocalInterfaceDefSeq_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_LocalInterfaceDefSeq; - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_EXTINTERFACEDEF__VAR_OUT_CH_) #define _CORBA_EXTINTERFACEDEF__VAR_OUT_CH_ - + class ExtInterfaceDef; typedef ExtInterfaceDef *ExtInterfaceDef_ptr; - + typedef TAO_Objref_Var_T< ExtInterfaceDef > ExtInterfaceDef_var; - + typedef TAO_Objref_Out_T< ExtInterfaceDef @@ -1182,15 +1181,15 @@ namespace CORBA ExtInterfaceDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_EXTINTERFACEDEFSEQ_CH_) #define _CORBA_EXTINTERFACEDEFSEQ_CH_ - + class ExtInterfaceDefSeq; - + typedef TAO_MngSeq_Var_T< ExtInterfaceDefSeq, @@ -1200,7 +1199,7 @@ namespace CORBA > > ExtInterfaceDefSeq_var; - + typedef TAO_MngSeq_Out_T< ExtInterfaceDefSeq, @@ -1211,7 +1210,7 @@ namespace CORBA > > ExtInterfaceDefSeq_out; - + class TAO_IFR_Client_Export ExtInterfaceDefSeq : public TAO_Unbounded_Object_Sequence< @@ -1225,39 +1224,39 @@ namespace CORBA ExtInterfaceDefSeq ( CORBA::ULong max, CORBA::ULong length, - ExtInterfaceDef_ptr* buffer, + ExtInterfaceDef_ptr* buffer, CORBA::Boolean release = 0 ); ExtInterfaceDefSeq (const ExtInterfaceDefSeq &); ~ExtInterfaceDefSeq (void); - + static void _tao_any_destructor (void *); - + typedef ExtInterfaceDefSeq_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtInterfaceDefSeq; - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_EXTVALUEDEF__VAR_OUT_CH_) #define _CORBA_EXTVALUEDEF__VAR_OUT_CH_ - + class ExtValueDef; typedef ExtValueDef *ExtValueDef_ptr; - + typedef TAO_Objref_Var_T< ExtValueDef > ExtValueDef_var; - + typedef TAO_Objref_Out_T< ExtValueDef @@ -1265,15 +1264,15 @@ namespace CORBA ExtValueDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_EXTVALUEDEFSEQ_CH_) #define _CORBA_EXTVALUEDEFSEQ_CH_ - + class ExtValueDefSeq; - + typedef TAO_MngSeq_Var_T< ExtValueDefSeq, @@ -1283,7 +1282,7 @@ namespace CORBA > > ExtValueDefSeq_var; - + typedef TAO_MngSeq_Out_T< ExtValueDefSeq, @@ -1294,7 +1293,7 @@ namespace CORBA > > ExtValueDefSeq_out; - + class TAO_IFR_Client_Export ExtValueDefSeq : public TAO_Unbounded_Object_Sequence< @@ -1308,39 +1307,39 @@ namespace CORBA ExtValueDefSeq ( CORBA::ULong max, CORBA::ULong length, - ExtValueDef_ptr* buffer, + ExtValueDef_ptr* buffer, CORBA::Boolean release = 0 ); ExtValueDefSeq (const ExtValueDefSeq &); ~ExtValueDefSeq (void); - + static void _tao_any_destructor (void *); - + typedef ExtValueDefSeq_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtValueDefSeq; - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_EXTABSTRACTINTERFACEDEF__VAR_OUT_CH_) #define _CORBA_EXTABSTRACTINTERFACEDEF__VAR_OUT_CH_ - + class ExtAbstractInterfaceDef; typedef ExtAbstractInterfaceDef *ExtAbstractInterfaceDef_ptr; - + typedef TAO_Objref_Var_T< ExtAbstractInterfaceDef > ExtAbstractInterfaceDef_var; - + typedef TAO_Objref_Out_T< ExtAbstractInterfaceDef @@ -1348,15 +1347,15 @@ namespace CORBA ExtAbstractInterfaceDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_EXTABSTRACTINTERFACEDEFSEQ_CH_) #define _CORBA_EXTABSTRACTINTERFACEDEFSEQ_CH_ - + class ExtAbstractInterfaceDefSeq; - + typedef TAO_MngSeq_Var_T< ExtAbstractInterfaceDefSeq, @@ -1366,7 +1365,7 @@ namespace CORBA > > ExtAbstractInterfaceDefSeq_var; - + typedef TAO_MngSeq_Out_T< ExtAbstractInterfaceDefSeq, @@ -1377,7 +1376,7 @@ namespace CORBA > > ExtAbstractInterfaceDefSeq_out; - + class TAO_IFR_Client_Export ExtAbstractInterfaceDefSeq : public TAO_Unbounded_Object_Sequence< @@ -1391,39 +1390,39 @@ namespace CORBA ExtAbstractInterfaceDefSeq ( CORBA::ULong max, CORBA::ULong length, - ExtAbstractInterfaceDef_ptr* buffer, + ExtAbstractInterfaceDef_ptr* buffer, CORBA::Boolean release = 0 ); ExtAbstractInterfaceDefSeq (const ExtAbstractInterfaceDefSeq &); ~ExtAbstractInterfaceDefSeq (void); - + static void _tao_any_destructor (void *); - + typedef ExtAbstractInterfaceDefSeq_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtAbstractInterfaceDefSeq; - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_EXTLOCALINTERFACEDEF__VAR_OUT_CH_) #define _CORBA_EXTLOCALINTERFACEDEF__VAR_OUT_CH_ - + class ExtLocalInterfaceDef; typedef ExtLocalInterfaceDef *ExtLocalInterfaceDef_ptr; - + typedef TAO_Objref_Var_T< ExtLocalInterfaceDef > ExtLocalInterfaceDef_var; - + typedef TAO_Objref_Out_T< ExtLocalInterfaceDef @@ -1431,15 +1430,15 @@ namespace CORBA ExtLocalInterfaceDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_EXTLOCALINTERFACEDEFSEQ_CH_) #define _CORBA_EXTLOCALINTERFACEDEFSEQ_CH_ - + class ExtLocalInterfaceDefSeq; - + typedef TAO_MngSeq_Var_T< ExtLocalInterfaceDefSeq, @@ -1449,7 +1448,7 @@ namespace CORBA > > ExtLocalInterfaceDefSeq_var; - + typedef TAO_MngSeq_Out_T< ExtLocalInterfaceDefSeq, @@ -1460,7 +1459,7 @@ namespace CORBA > > ExtLocalInterfaceDefSeq_out; - + class TAO_IFR_Client_Export ExtLocalInterfaceDefSeq : public TAO_Unbounded_Object_Sequence< @@ -1474,32 +1473,32 @@ namespace CORBA ExtLocalInterfaceDefSeq ( CORBA::ULong max, CORBA::ULong length, - ExtLocalInterfaceDef_ptr* buffer, + ExtLocalInterfaceDef_ptr* buffer, CORBA::Boolean release = 0 ); ExtLocalInterfaceDefSeq (const ExtLocalInterfaceDefSeq &); ~ExtLocalInterfaceDefSeq (void); - + static void _tao_any_destructor (void *); - + typedef ExtLocalInterfaceDefSeq_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtLocalInterfaceDefSeq; - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_CONTAINEDSEQ_CH_) #define _CORBA_CONTAINEDSEQ_CH_ - + class ContainedSeq; - + typedef TAO_MngSeq_Var_T< ContainedSeq, @@ -1509,7 +1508,7 @@ namespace CORBA > > ContainedSeq_var; - + typedef TAO_MngSeq_Out_T< ContainedSeq, @@ -1520,7 +1519,7 @@ namespace CORBA > > ContainedSeq_out; - + class TAO_IFR_Client_Export ContainedSeq : public TAO_Unbounded_Object_Sequence< @@ -1534,75 +1533,75 @@ namespace CORBA ContainedSeq ( CORBA::ULong max, CORBA::ULong length, - Contained_ptr* buffer, + Contained_ptr* buffer, CORBA::Boolean release = 0 ); ContainedSeq (const ContainedSeq &); ~ContainedSeq (void); - + static void _tao_any_destructor (void *); - + typedef ContainedSeq_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ContainedSeq; - + // TAO_IDL - Generated from // be\be_type.cpp:258 - + struct StructMember; - + typedef TAO_Var_Var_T< StructMember > StructMember_var; - + typedef TAO_Out_T< StructMember, StructMember_var > StructMember_out; - + // TAO_IDL - Generated from // be\be_visitor_structure/structure_ch.cpp:52 - + struct TAO_IFR_Client_Export StructMember { typedef StructMember_var _var_type; - + static void _tao_any_destructor (void *); TAO_String_Manager name; CORBA::TypeCode_var type; CORBA::IDLType_var type_def; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StructMember; - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_STRUCTMEMBERSEQ_CH_) #define _CORBA_STRUCTMEMBERSEQ_CH_ - + class StructMemberSeq; - + typedef TAO_VarSeq_Var_T< StructMemberSeq, StructMember > StructMemberSeq_var; - + typedef TAO_Seq_Out_T< StructMemberSeq, @@ -1610,7 +1609,7 @@ namespace CORBA StructMember > StructMemberSeq_out; - + class TAO_IFR_Client_Export StructMemberSeq : public TAO_Unbounded_Sequence< @@ -1623,74 +1622,74 @@ namespace CORBA StructMemberSeq ( CORBA::ULong max, CORBA::ULong length, - StructMember* buffer, + StructMember* buffer, CORBA::Boolean release = 0 ); StructMemberSeq (const StructMemberSeq &); ~StructMemberSeq (void); - + static void _tao_any_destructor (void *); - + typedef StructMemberSeq_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StructMemberSeq; - + // TAO_IDL - Generated from // be\be_type.cpp:258 - + struct Initializer; - + typedef TAO_Var_Var_T< Initializer > Initializer_var; - + typedef TAO_Out_T< Initializer, Initializer_var > Initializer_out; - + // TAO_IDL - Generated from // be\be_visitor_structure/structure_ch.cpp:52 - + struct TAO_IFR_Client_Export Initializer { typedef Initializer_var _var_type; - + static void _tao_any_destructor (void *); CORBA::StructMemberSeq members; TAO_String_Manager name; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Initializer; - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_INITIALIZERSEQ_CH_) #define _CORBA_INITIALIZERSEQ_CH_ - + class InitializerSeq; - + typedef TAO_VarSeq_Var_T< InitializerSeq, Initializer > InitializerSeq_var; - + typedef TAO_Seq_Out_T< InitializerSeq, @@ -1698,7 +1697,7 @@ namespace CORBA Initializer > InitializerSeq_out; - + class TAO_IFR_Client_Export InitializerSeq : public TAO_Unbounded_Sequence< @@ -1711,49 +1710,49 @@ namespace CORBA InitializerSeq ( CORBA::ULong max, CORBA::ULong length, - Initializer* buffer, + Initializer* buffer, CORBA::Boolean release = 0 ); InitializerSeq (const InitializerSeq &); ~InitializerSeq (void); - + static void _tao_any_destructor (void *); - + typedef InitializerSeq_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InitializerSeq; - + // TAO_IDL - Generated from // be\be_type.cpp:258 - + struct ExceptionDescription; - + typedef TAO_Var_Var_T< ExceptionDescription > ExceptionDescription_var; - + typedef TAO_Out_T< ExceptionDescription, ExceptionDescription_var > ExceptionDescription_out; - + // TAO_IDL - Generated from // be\be_visitor_structure/structure_ch.cpp:52 - + struct TAO_IFR_Client_Export ExceptionDescription { typedef ExceptionDescription_var _var_type; - + static void _tao_any_destructor (void *); TAO_String_Manager name; TAO_String_Manager id; @@ -1761,27 +1760,27 @@ namespace CORBA TAO_String_Manager version; CORBA::TypeCode_var type; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExceptionDescription; - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_EXCDESCRIPTIONSEQ_CH_) #define _CORBA_EXCDESCRIPTIONSEQ_CH_ - + class ExcDescriptionSeq; - + typedef TAO_VarSeq_Var_T< ExcDescriptionSeq, ExceptionDescription > ExcDescriptionSeq_var; - + typedef TAO_Seq_Out_T< ExcDescriptionSeq, @@ -1789,7 +1788,7 @@ namespace CORBA ExceptionDescription > ExcDescriptionSeq_out; - + class TAO_IFR_Client_Export ExcDescriptionSeq : public TAO_Unbounded_Sequence< @@ -1802,75 +1801,75 @@ namespace CORBA ExcDescriptionSeq ( CORBA::ULong max, CORBA::ULong length, - ExceptionDescription* buffer, + ExceptionDescription* buffer, CORBA::Boolean release = 0 ); ExcDescriptionSeq (const ExcDescriptionSeq &); ~ExcDescriptionSeq (void); - + static void _tao_any_destructor (void *); - + typedef ExcDescriptionSeq_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExcDescriptionSeq; - + // TAO_IDL - Generated from // be\be_type.cpp:258 - + struct ExtInitializer; - + typedef TAO_Var_Var_T< ExtInitializer > ExtInitializer_var; - + typedef TAO_Out_T< ExtInitializer, ExtInitializer_var > ExtInitializer_out; - + // TAO_IDL - Generated from // be\be_visitor_structure/structure_ch.cpp:52 - + struct TAO_IFR_Client_Export ExtInitializer { typedef ExtInitializer_var _var_type; - + static void _tao_any_destructor (void *); CORBA::StructMemberSeq members; CORBA::ExcDescriptionSeq exceptions; TAO_String_Manager name; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtInitializer; - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_EXTINITIALIZERSEQ_CH_) #define _CORBA_EXTINITIALIZERSEQ_CH_ - + class ExtInitializerSeq; - + typedef TAO_VarSeq_Var_T< ExtInitializerSeq, ExtInitializer > ExtInitializerSeq_var; - + typedef TAO_Seq_Out_T< ExtInitializerSeq, @@ -1878,7 +1877,7 @@ namespace CORBA ExtInitializer > ExtInitializerSeq_out; - + class TAO_IFR_Client_Export ExtInitializerSeq : public TAO_Unbounded_Sequence< @@ -1891,76 +1890,76 @@ namespace CORBA ExtInitializerSeq ( CORBA::ULong max, CORBA::ULong length, - ExtInitializer* buffer, + ExtInitializer* buffer, CORBA::Boolean release = 0 ); ExtInitializerSeq (const ExtInitializerSeq &); ~ExtInitializerSeq (void); - + static void _tao_any_destructor (void *); - + typedef ExtInitializerSeq_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtInitializerSeq; - + // TAO_IDL - Generated from // be\be_type.cpp:258 - + struct UnionMember; - + typedef TAO_Var_Var_T< UnionMember > UnionMember_var; - + typedef TAO_Out_T< UnionMember, UnionMember_var > UnionMember_out; - + // TAO_IDL - Generated from // be\be_visitor_structure/structure_ch.cpp:52 - + struct TAO_IFR_Client_Export UnionMember { typedef UnionMember_var _var_type; - + static void _tao_any_destructor (void *); TAO_String_Manager name; CORBA::Any label; CORBA::TypeCode_var type; CORBA::IDLType_var type_def; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UnionMember; - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_UNIONMEMBERSEQ_CH_) #define _CORBA_UNIONMEMBERSEQ_CH_ - + class UnionMemberSeq; - + typedef TAO_VarSeq_Var_T< UnionMemberSeq, UnionMember > UnionMemberSeq_var; - + typedef TAO_Seq_Out_T< UnionMemberSeq, @@ -1968,7 +1967,7 @@ namespace CORBA UnionMember > UnionMemberSeq_out; - + class TAO_IFR_Client_Export UnionMemberSeq : public TAO_Unbounded_Sequence< @@ -1981,39 +1980,39 @@ namespace CORBA UnionMemberSeq ( CORBA::ULong max, CORBA::ULong length, - UnionMember* buffer, + UnionMember* buffer, CORBA::Boolean release = 0 ); UnionMemberSeq (const UnionMemberSeq &); ~UnionMemberSeq (void); - + static void _tao_any_destructor (void *); - + typedef UnionMemberSeq_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UnionMemberSeq; - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_ENUMMEMBERSEQ_CH_) #define _CORBA_ENUMMEMBERSEQ_CH_ - + class EnumMemberSeq; - + typedef TAO_MngSeq_Var_T< EnumMemberSeq, TAO_SeqElem_String_Manager > EnumMemberSeq_var; - + typedef TAO_MngSeq_Out_T< EnumMemberSeq, @@ -2021,7 +2020,7 @@ namespace CORBA TAO_SeqElem_String_Manager > EnumMemberSeq_out; - + class TAO_IFR_Client_Export EnumMemberSeq : public TAO_Unbounded_String_Sequence @@ -2032,30 +2031,30 @@ namespace CORBA EnumMemberSeq ( CORBA::ULong max, CORBA::ULong length, - char ** buffer, + char ** buffer, CORBA::Boolean release = 0 ); EnumMemberSeq (const EnumMemberSeq &); ~EnumMemberSeq (void); - + static void _tao_any_destructor (void *); - + typedef EnumMemberSeq_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EnumMemberSeq; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_CONTAINER_CH_) #define _CORBA_CONTAINER_CH_ - + class TAO_IFR_Client_Export Container : public virtual CORBA::IRObject { @@ -2063,30 +2062,30 @@ namespace CORBA friend class TAO::Narrow_Utils<Container>; typedef Container_ptr _ptr_type; typedef Container_var _var_type; - + // The static operations. static Container_ptr _duplicate (Container_ptr obj); - + static Container_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Container_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Container_ptr _nil (void) { return (Container_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::Contained_ptr lookup ( const char * search_name ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -2094,10 +2093,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ContainedSeq * contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited @@ -2106,10 +2105,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ContainedSeq * lookup_name ( const char * search_name, CORBA::Long levels_to_search, @@ -2120,58 +2119,58 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_type.cpp:258 - + struct Description; - + typedef TAO_Var_Var_T< Description > Description_var; - + typedef TAO_Out_T< Description, Description_var > Description_out; - + // TAO_IDL - Generated from // be\be_visitor_structure/structure_ch.cpp:52 - + struct TAO_IFR_Client_Export Description { typedef Description_var _var_type; - + static void _tao_any_destructor (void *); ACE_NESTED_CLASS (CORBA, Contained_var) contained_object; ACE_NESTED_CLASS (CORBA, DefinitionKind) kind; CORBA::Any value; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + static ::CORBA::TypeCode_ptr _tc_Description; - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ_CH_) #define _CORBA_CONTAINER_DESCRIPTIONSEQ_CH_ - + class DescriptionSeq; - + typedef TAO_VarSeq_Var_T< DescriptionSeq, Description > DescriptionSeq_var; - + typedef TAO_Seq_Out_T< DescriptionSeq, @@ -2179,7 +2178,7 @@ namespace CORBA Description > DescriptionSeq_out; - + class TAO_IFR_Client_Export DescriptionSeq : public TAO_Unbounded_Sequence< @@ -2192,27 +2191,27 @@ namespace CORBA DescriptionSeq ( CORBA::ULong max, CORBA::ULong length, - Description* buffer, + Description* buffer, CORBA::Boolean release = 0 ); DescriptionSeq (const DescriptionSeq &); ~DescriptionSeq (void); - + static void _tao_any_destructor (void *); - + typedef DescriptionSeq_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + static ::CORBA::TypeCode_ptr _tc_DescriptionSeq; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::Container::DescriptionSeq * describe_contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, @@ -2222,10 +2221,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ModuleDef_ptr create_module ( const char * id, const char * name, @@ -2235,10 +2234,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ConstantDef_ptr create_constant ( const char * id, const char * name, @@ -2250,10 +2249,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::StructDef_ptr create_struct ( const char * id, const char * name, @@ -2264,10 +2263,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::UnionDef_ptr create_union ( const char * id, const char * name, @@ -2279,10 +2278,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::EnumDef_ptr create_enum ( const char * id, const char * name, @@ -2293,10 +2292,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::AliasDef_ptr create_alias ( const char * id, const char * name, @@ -2307,10 +2306,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::InterfaceDef_ptr create_interface ( const char * id, const char * name, @@ -2321,10 +2320,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ValueDef_ptr create_value ( const char * id, const char * name, @@ -2341,10 +2340,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ValueBoxDef_ptr create_value_box ( const char * id, const char * name, @@ -2355,10 +2354,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ExceptionDef_ptr create_exception ( const char * id, const char * name, @@ -2369,10 +2368,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::NativeDef_ptr create_native ( const char * id, const char * name, @@ -2382,10 +2381,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface ( const char * id, const char * name, @@ -2396,10 +2395,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::LocalInterfaceDef_ptr create_local_interface ( const char * id, const char * name, @@ -2410,10 +2409,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ExtValueDef_ptr create_ext_value ( const char * id, const char * name, @@ -2430,34 +2429,34 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // 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); private: TAO::Collocation_Proxy_Broker *the_TAO_Container_Proxy_Broker_; - + protected: // Concrete interface only. Container (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_Container_setup_collocation (void); - + // Concrete non-local interface only. Container ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. Container ( TAO_Stub *objref, @@ -2465,29 +2464,29 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~Container (void); - + private: // Private and unimplemented for concrete interfaces. Container (const Container &); - + void operator= (const Container &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Container; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_IDLTYPE_CH_) #define _CORBA_IDLTYPE_CH_ - + class TAO_IFR_Client_Export IDLType : public virtual CORBA::IRObject { @@ -2495,64 +2494,64 @@ namespace CORBA friend class TAO::Narrow_Utils<IDLType>; typedef IDLType_ptr _ptr_type; typedef IDLType_var _var_type; - + // The static operations. static IDLType_ptr _duplicate (IDLType_ptr obj); - + static IDLType_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static IDLType_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static IDLType_ptr _nil (void) { return (IDLType_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::TypeCode_ptr type ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // 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); private: TAO::Collocation_Proxy_Broker *the_TAO_IDLType_Proxy_Broker_; - + protected: // Concrete interface only. IDLType (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_IDLType_setup_collocation (void); - + // Concrete non-local interface only. IDLType ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. IDLType ( TAO_Stub *objref, @@ -2560,38 +2559,38 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~IDLType (void); - + private: // Private and unimplemented for concrete interfaces. IDLType (const IDLType &); - + void operator= (const IDLType &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IDLType; - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_TYPEDEFDEF__VAR_OUT_CH_) #define _CORBA_TYPEDEFDEF__VAR_OUT_CH_ - + class TypedefDef; typedef TypedefDef *TypedefDef_ptr; - + typedef TAO_Objref_Var_T< TypedefDef > TypedefDef_var; - + typedef TAO_Objref_Out_T< TypedefDef @@ -2599,13 +2598,13 @@ namespace CORBA TypedefDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_TYPEDEFDEF_CH_) #define _CORBA_TYPEDEFDEF_CH_ - + class TAO_IFR_Client_Export TypedefDef : public virtual CORBA::Contained, public virtual CORBA::IDLType @@ -2614,54 +2613,54 @@ namespace CORBA friend class TAO::Narrow_Utils<TypedefDef>; typedef TypedefDef_ptr _ptr_type; typedef TypedefDef_var _var_type; - + // The static operations. static TypedefDef_ptr _duplicate (TypedefDef_ptr obj); - + static TypedefDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static TypedefDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static TypedefDef_ptr _nil (void) { return (TypedefDef_ptr)0; } - + static void _tao_any_destructor (void *); - + // 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); private: TAO::Collocation_Proxy_Broker *the_TAO_TypedefDef_Proxy_Broker_; - + protected: // Concrete interface only. TypedefDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_TypedefDef_setup_collocation (void); - + // Concrete non-local interface only. TypedefDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. TypedefDef ( TAO_Stub *objref, @@ -2669,48 +2668,48 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~TypedefDef (void); - + private: // Private and unimplemented for concrete interfaces. TypedefDef (const TypedefDef &); - + void operator= (const TypedefDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TypedefDef; - + // TAO_IDL - Generated from // be\be_type.cpp:258 - + struct TypeDescription; - + typedef TAO_Var_Var_T< TypeDescription > TypeDescription_var; - + typedef TAO_Out_T< TypeDescription, TypeDescription_var > TypeDescription_out; - + // TAO_IDL - Generated from // be\be_visitor_structure/structure_ch.cpp:52 - + struct TAO_IFR_Client_Export TypeDescription { typedef TypeDescription_var _var_type; - + static void _tao_any_destructor (void *); TAO_String_Manager name; TAO_String_Manager id; @@ -2718,10 +2717,10 @@ namespace CORBA TAO_String_Manager version; CORBA::TypeCode_var type; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TypeDescription; // TAO_IDL - Generated from @@ -2773,18 +2772,18 @@ namespace TAO #if !defined (_CORBA_IROBJECT__TRAITS_CH_) #define _CORBA_IROBJECT__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::IRObject> { - static CORBA::IRObject_ptr duplicate ( + static CORBA::IRObject_ptr tao_duplicate ( CORBA::IRObject_ptr ); - static void release ( + static void tao_release ( CORBA::IRObject_ptr ); - static CORBA::IRObject_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::IRObject_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::IRObject_ptr p, TAO_OutputCDR & cdr ); @@ -2794,18 +2793,18 @@ namespace TAO #if !defined (_CORBA_CONTAINED__TRAITS_CH_) #define _CORBA_CONTAINED__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::Contained> { - static CORBA::Contained_ptr duplicate ( + static CORBA::Contained_ptr tao_duplicate ( CORBA::Contained_ptr ); - static void release ( + static void tao_release ( CORBA::Contained_ptr ); - static CORBA::Contained_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::Contained_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::Contained_ptr p, TAO_OutputCDR & cdr ); @@ -2815,18 +2814,18 @@ namespace TAO #if !defined (_CORBA_REPOSITORY__TRAITS_CH_) #define _CORBA_REPOSITORY__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::Repository> { - static CORBA::Repository_ptr duplicate ( + static CORBA::Repository_ptr tao_duplicate ( CORBA::Repository_ptr ); - static void release ( + static void tao_release ( CORBA::Repository_ptr ); - static CORBA::Repository_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::Repository_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::Repository_ptr p, TAO_OutputCDR & cdr ); @@ -2836,18 +2835,18 @@ namespace TAO #if !defined (_CORBA_CONTAINER__TRAITS_CH_) #define _CORBA_CONTAINER__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::Container> { - static CORBA::Container_ptr duplicate ( + static CORBA::Container_ptr tao_duplicate ( CORBA::Container_ptr ); - static void release ( + static void tao_release ( CORBA::Container_ptr ); - static CORBA::Container_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::Container_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::Container_ptr p, TAO_OutputCDR & cdr ); @@ -2857,18 +2856,18 @@ namespace TAO #if !defined (_CORBA_MODULEDEF__TRAITS_CH_) #define _CORBA_MODULEDEF__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ModuleDef> { - static CORBA::ModuleDef_ptr duplicate ( + static CORBA::ModuleDef_ptr tao_duplicate ( CORBA::ModuleDef_ptr ); - static void release ( + static void tao_release ( CORBA::ModuleDef_ptr ); - static CORBA::ModuleDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::ModuleDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::ModuleDef_ptr p, TAO_OutputCDR & cdr ); @@ -2878,18 +2877,18 @@ namespace TAO #if !defined (_CORBA_CONSTANTDEF__TRAITS_CH_) #define _CORBA_CONSTANTDEF__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ConstantDef> { - static CORBA::ConstantDef_ptr duplicate ( + static CORBA::ConstantDef_ptr tao_duplicate ( CORBA::ConstantDef_ptr ); - static void release ( + static void tao_release ( CORBA::ConstantDef_ptr ); - static CORBA::ConstantDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::ConstantDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::ConstantDef_ptr p, TAO_OutputCDR & cdr ); @@ -2899,18 +2898,18 @@ namespace TAO #if !defined (_CORBA_IDLTYPE__TRAITS_CH_) #define _CORBA_IDLTYPE__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::IDLType> { - static CORBA::IDLType_ptr duplicate ( + static CORBA::IDLType_ptr tao_duplicate ( CORBA::IDLType_ptr ); - static void release ( + static void tao_release ( CORBA::IDLType_ptr ); - static CORBA::IDLType_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::IDLType_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::IDLType_ptr p, TAO_OutputCDR & cdr ); @@ -2920,18 +2919,18 @@ namespace TAO #if !defined (_CORBA_STRUCTDEF__TRAITS_CH_) #define _CORBA_STRUCTDEF__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::StructDef> { - static CORBA::StructDef_ptr duplicate ( + static CORBA::StructDef_ptr tao_duplicate ( CORBA::StructDef_ptr ); - static void release ( + static void tao_release ( CORBA::StructDef_ptr ); - static CORBA::StructDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::StructDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::StructDef_ptr p, TAO_OutputCDR & cdr ); @@ -2941,18 +2940,18 @@ namespace TAO #if !defined (_CORBA_UNIONDEF__TRAITS_CH_) #define _CORBA_UNIONDEF__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::UnionDef> { - static CORBA::UnionDef_ptr duplicate ( + static CORBA::UnionDef_ptr tao_duplicate ( CORBA::UnionDef_ptr ); - static void release ( + static void tao_release ( CORBA::UnionDef_ptr ); - static CORBA::UnionDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::UnionDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::UnionDef_ptr p, TAO_OutputCDR & cdr ); @@ -2962,18 +2961,18 @@ namespace TAO #if !defined (_CORBA_ENUMDEF__TRAITS_CH_) #define _CORBA_ENUMDEF__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::EnumDef> { - static CORBA::EnumDef_ptr duplicate ( + static CORBA::EnumDef_ptr tao_duplicate ( CORBA::EnumDef_ptr ); - static void release ( + static void tao_release ( CORBA::EnumDef_ptr ); - static CORBA::EnumDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::EnumDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::EnumDef_ptr p, TAO_OutputCDR & cdr ); @@ -2983,18 +2982,18 @@ namespace TAO #if !defined (_CORBA_ALIASDEF__TRAITS_CH_) #define _CORBA_ALIASDEF__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::AliasDef> { - static CORBA::AliasDef_ptr duplicate ( + static CORBA::AliasDef_ptr tao_duplicate ( CORBA::AliasDef_ptr ); - static void release ( + static void tao_release ( CORBA::AliasDef_ptr ); - static CORBA::AliasDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::AliasDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::AliasDef_ptr p, TAO_OutputCDR & cdr ); @@ -3004,18 +3003,18 @@ namespace TAO #if !defined (_CORBA_INTERFACEDEF__TRAITS_CH_) #define _CORBA_INTERFACEDEF__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::InterfaceDef> { - static CORBA::InterfaceDef_ptr duplicate ( + static CORBA::InterfaceDef_ptr tao_duplicate ( CORBA::InterfaceDef_ptr ); - static void release ( + static void tao_release ( CORBA::InterfaceDef_ptr ); - static CORBA::InterfaceDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::InterfaceDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::InterfaceDef_ptr p, TAO_OutputCDR & cdr ); @@ -3025,18 +3024,18 @@ namespace TAO #if !defined (_CORBA_EXCEPTIONDEF__TRAITS_CH_) #define _CORBA_EXCEPTIONDEF__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExceptionDef> { - static CORBA::ExceptionDef_ptr duplicate ( + static CORBA::ExceptionDef_ptr tao_duplicate ( CORBA::ExceptionDef_ptr ); - static void release ( + static void tao_release ( CORBA::ExceptionDef_ptr ); - static CORBA::ExceptionDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::ExceptionDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::ExceptionDef_ptr p, TAO_OutputCDR & cdr ); @@ -3046,18 +3045,18 @@ namespace TAO #if !defined (_CORBA_NATIVEDEF__TRAITS_CH_) #define _CORBA_NATIVEDEF__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::NativeDef> { - static CORBA::NativeDef_ptr duplicate ( + static CORBA::NativeDef_ptr tao_duplicate ( CORBA::NativeDef_ptr ); - static void release ( + static void tao_release ( CORBA::NativeDef_ptr ); - static CORBA::NativeDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::NativeDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::NativeDef_ptr p, TAO_OutputCDR & cdr ); @@ -3067,18 +3066,18 @@ namespace TAO #if !defined (_CORBA_VALUEDEF__TRAITS_CH_) #define _CORBA_VALUEDEF__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ValueDef> { - static CORBA::ValueDef_ptr duplicate ( + static CORBA::ValueDef_ptr tao_duplicate ( CORBA::ValueDef_ptr ); - static void release ( + static void tao_release ( CORBA::ValueDef_ptr ); - static CORBA::ValueDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::ValueDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::ValueDef_ptr p, TAO_OutputCDR & cdr ); @@ -3088,18 +3087,18 @@ namespace TAO #if !defined (_CORBA_VALUEBOXDEF__TRAITS_CH_) #define _CORBA_VALUEBOXDEF__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ValueBoxDef> { - static CORBA::ValueBoxDef_ptr duplicate ( + static CORBA::ValueBoxDef_ptr tao_duplicate ( CORBA::ValueBoxDef_ptr ); - static void release ( + static void tao_release ( CORBA::ValueBoxDef_ptr ); - static CORBA::ValueBoxDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::ValueBoxDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::ValueBoxDef_ptr p, TAO_OutputCDR & cdr ); @@ -3109,18 +3108,18 @@ namespace TAO #if !defined (_CORBA_ABSTRACTINTERFACEDEF__TRAITS_CH_) #define _CORBA_ABSTRACTINTERFACEDEF__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::AbstractInterfaceDef> { - static CORBA::AbstractInterfaceDef_ptr duplicate ( + static CORBA::AbstractInterfaceDef_ptr tao_duplicate ( CORBA::AbstractInterfaceDef_ptr ); - static void release ( + static void tao_release ( CORBA::AbstractInterfaceDef_ptr ); - static CORBA::AbstractInterfaceDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::AbstractInterfaceDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::AbstractInterfaceDef_ptr p, TAO_OutputCDR & cdr ); @@ -3130,18 +3129,18 @@ namespace TAO #if !defined (_CORBA_LOCALINTERFACEDEF__TRAITS_CH_) #define _CORBA_LOCALINTERFACEDEF__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::LocalInterfaceDef> { - static CORBA::LocalInterfaceDef_ptr duplicate ( + static CORBA::LocalInterfaceDef_ptr tao_duplicate ( CORBA::LocalInterfaceDef_ptr ); - static void release ( + static void tao_release ( CORBA::LocalInterfaceDef_ptr ); - static CORBA::LocalInterfaceDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::LocalInterfaceDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::LocalInterfaceDef_ptr p, TAO_OutputCDR & cdr ); @@ -3151,18 +3150,18 @@ namespace TAO #if !defined (_CORBA_EXTINTERFACEDEF__TRAITS_CH_) #define _CORBA_EXTINTERFACEDEF__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExtInterfaceDef> { - static CORBA::ExtInterfaceDef_ptr duplicate ( + static CORBA::ExtInterfaceDef_ptr tao_duplicate ( CORBA::ExtInterfaceDef_ptr ); - static void release ( + static void tao_release ( CORBA::ExtInterfaceDef_ptr ); - static CORBA::ExtInterfaceDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::ExtInterfaceDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::ExtInterfaceDef_ptr p, TAO_OutputCDR & cdr ); @@ -3172,18 +3171,18 @@ namespace TAO #if !defined (_CORBA_EXTVALUEDEF__TRAITS_CH_) #define _CORBA_EXTVALUEDEF__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExtValueDef> { - static CORBA::ExtValueDef_ptr duplicate ( + static CORBA::ExtValueDef_ptr tao_duplicate ( CORBA::ExtValueDef_ptr ); - static void release ( + static void tao_release ( CORBA::ExtValueDef_ptr ); - static CORBA::ExtValueDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::ExtValueDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::ExtValueDef_ptr p, TAO_OutputCDR & cdr ); @@ -3193,18 +3192,18 @@ namespace TAO #if !defined (_CORBA_EXTABSTRACTINTERFACEDEF__TRAITS_CH_) #define _CORBA_EXTABSTRACTINTERFACEDEF__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExtAbstractInterfaceDef> { - static CORBA::ExtAbstractInterfaceDef_ptr duplicate ( + static CORBA::ExtAbstractInterfaceDef_ptr tao_duplicate ( CORBA::ExtAbstractInterfaceDef_ptr ); - static void release ( + static void tao_release ( CORBA::ExtAbstractInterfaceDef_ptr ); - static CORBA::ExtAbstractInterfaceDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::ExtAbstractInterfaceDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::ExtAbstractInterfaceDef_ptr p, TAO_OutputCDR & cdr ); @@ -3214,18 +3213,18 @@ namespace TAO #if !defined (_CORBA_EXTLOCALINTERFACEDEF__TRAITS_CH_) #define _CORBA_EXTLOCALINTERFACEDEF__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExtLocalInterfaceDef> { - static CORBA::ExtLocalInterfaceDef_ptr duplicate ( + static CORBA::ExtLocalInterfaceDef_ptr tao_duplicate ( CORBA::ExtLocalInterfaceDef_ptr ); - static void release ( + static void tao_release ( CORBA::ExtLocalInterfaceDef_ptr ); - static CORBA::ExtLocalInterfaceDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::ExtLocalInterfaceDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::ExtLocalInterfaceDef_ptr p, TAO_OutputCDR & cdr ); @@ -3235,18 +3234,18 @@ namespace TAO #if !defined (_CORBA_TYPEDEFDEF__TRAITS_CH_) #define _CORBA_TYPEDEFDEF__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::TypedefDef> { - static CORBA::TypedefDef_ptr duplicate ( + static CORBA::TypedefDef_ptr tao_duplicate ( CORBA::TypedefDef_ptr ); - static void release ( + static void tao_release ( CORBA::TypedefDef_ptr ); - static CORBA::TypedefDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::TypedefDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::TypedefDef_ptr p, TAO_OutputCDR & cdr ); @@ -4114,3 +4113,4 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::TypeDesc #include /**/ "ace/post.h" #endif /* ifndef */ + diff --git a/TAO/tao/IFR_Client/IFR_BasicC.cpp b/TAO/tao/IFR_Client/IFR_BasicC.cpp index b1b8ba7ad3e..b3dbdb30acc 100644 --- a/TAO/tao/IFR_Client/IFR_BasicC.cpp +++ b/TAO/tao/IFR_Client/IFR_BasicC.cpp @@ -658,7 +658,7 @@ namespace TAO ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Repository_ptr -TAO::Objref_Traits<CORBA::Repository>::duplicate ( +TAO::Objref_Traits<CORBA::Repository>::tao_duplicate ( CORBA::Repository_ptr p ) { @@ -667,7 +667,7 @@ TAO::Objref_Traits<CORBA::Repository>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::Repository>::release ( +TAO::Objref_Traits<CORBA::Repository>::tao_release ( CORBA::Repository_ptr p ) { @@ -676,14 +676,14 @@ TAO::Objref_Traits<CORBA::Repository>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Repository_ptr -TAO::Objref_Traits<CORBA::Repository>::nil (void) +TAO::Objref_Traits<CORBA::Repository>::tao_nil (void) { return CORBA::Repository::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::Repository>::marshal ( +TAO::Objref_Traits<CORBA::Repository>::tao_marshal ( CORBA::Repository_ptr p, TAO_OutputCDR & cdr ) @@ -1190,7 +1190,7 @@ CORBA::Repository::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ModuleDef_ptr -TAO::Objref_Traits<CORBA::ModuleDef>::duplicate ( +TAO::Objref_Traits<CORBA::ModuleDef>::tao_duplicate ( CORBA::ModuleDef_ptr p ) { @@ -1199,7 +1199,7 @@ TAO::Objref_Traits<CORBA::ModuleDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ModuleDef>::release ( +TAO::Objref_Traits<CORBA::ModuleDef>::tao_release ( CORBA::ModuleDef_ptr p ) { @@ -1208,14 +1208,14 @@ TAO::Objref_Traits<CORBA::ModuleDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ModuleDef_ptr -TAO::Objref_Traits<CORBA::ModuleDef>::nil (void) +TAO::Objref_Traits<CORBA::ModuleDef>::tao_nil (void) { return CORBA::ModuleDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ModuleDef>::marshal ( +TAO::Objref_Traits<CORBA::ModuleDef>::tao_marshal ( CORBA::ModuleDef_ptr p, TAO_OutputCDR & cdr ) @@ -1371,7 +1371,7 @@ CORBA::ModuleDescription::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ConstantDef_ptr -TAO::Objref_Traits<CORBA::ConstantDef>::duplicate ( +TAO::Objref_Traits<CORBA::ConstantDef>::tao_duplicate ( CORBA::ConstantDef_ptr p ) { @@ -1380,7 +1380,7 @@ TAO::Objref_Traits<CORBA::ConstantDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ConstantDef>::release ( +TAO::Objref_Traits<CORBA::ConstantDef>::tao_release ( CORBA::ConstantDef_ptr p ) { @@ -1389,14 +1389,14 @@ TAO::Objref_Traits<CORBA::ConstantDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ConstantDef_ptr -TAO::Objref_Traits<CORBA::ConstantDef>::nil (void) +TAO::Objref_Traits<CORBA::ConstantDef>::tao_nil (void) { return CORBA::ConstantDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ConstantDef>::marshal ( +TAO::Objref_Traits<CORBA::ConstantDef>::tao_marshal ( CORBA::ConstantDef_ptr p, TAO_OutputCDR & cdr ) @@ -1759,7 +1759,7 @@ CORBA::ConstantDescription::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::StructDef_ptr -TAO::Objref_Traits<CORBA::StructDef>::duplicate ( +TAO::Objref_Traits<CORBA::StructDef>::tao_duplicate ( CORBA::StructDef_ptr p ) { @@ -1768,7 +1768,7 @@ TAO::Objref_Traits<CORBA::StructDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::StructDef>::release ( +TAO::Objref_Traits<CORBA::StructDef>::tao_release ( CORBA::StructDef_ptr p ) { @@ -1777,14 +1777,14 @@ TAO::Objref_Traits<CORBA::StructDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::StructDef_ptr -TAO::Objref_Traits<CORBA::StructDef>::nil (void) +TAO::Objref_Traits<CORBA::StructDef>::tao_nil (void) { return CORBA::StructDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::StructDef>::marshal ( +TAO::Objref_Traits<CORBA::StructDef>::tao_marshal ( CORBA::StructDef_ptr p, TAO_OutputCDR & cdr ) @@ -2020,7 +2020,7 @@ CORBA::StructDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::UnionDef_ptr -TAO::Objref_Traits<CORBA::UnionDef>::duplicate ( +TAO::Objref_Traits<CORBA::UnionDef>::tao_duplicate ( CORBA::UnionDef_ptr p ) { @@ -2029,7 +2029,7 @@ TAO::Objref_Traits<CORBA::UnionDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::UnionDef>::release ( +TAO::Objref_Traits<CORBA::UnionDef>::tao_release ( CORBA::UnionDef_ptr p ) { @@ -2038,14 +2038,14 @@ TAO::Objref_Traits<CORBA::UnionDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::UnionDef_ptr -TAO::Objref_Traits<CORBA::UnionDef>::nil (void) +TAO::Objref_Traits<CORBA::UnionDef>::tao_nil (void) { return CORBA::UnionDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::UnionDef>::marshal ( +TAO::Objref_Traits<CORBA::UnionDef>::tao_marshal ( CORBA::UnionDef_ptr p, TAO_OutputCDR & cdr ) @@ -2408,7 +2408,7 @@ CORBA::UnionDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::EnumDef_ptr -TAO::Objref_Traits<CORBA::EnumDef>::duplicate ( +TAO::Objref_Traits<CORBA::EnumDef>::tao_duplicate ( CORBA::EnumDef_ptr p ) { @@ -2417,7 +2417,7 @@ TAO::Objref_Traits<CORBA::EnumDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::EnumDef>::release ( +TAO::Objref_Traits<CORBA::EnumDef>::tao_release ( CORBA::EnumDef_ptr p ) { @@ -2426,14 +2426,14 @@ TAO::Objref_Traits<CORBA::EnumDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::EnumDef_ptr -TAO::Objref_Traits<CORBA::EnumDef>::nil (void) +TAO::Objref_Traits<CORBA::EnumDef>::tao_nil (void) { return CORBA::EnumDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::EnumDef>::marshal ( +TAO::Objref_Traits<CORBA::EnumDef>::tao_marshal ( CORBA::EnumDef_ptr p, TAO_OutputCDR & cdr ) @@ -2664,7 +2664,7 @@ CORBA::EnumDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::AliasDef_ptr -TAO::Objref_Traits<CORBA::AliasDef>::duplicate ( +TAO::Objref_Traits<CORBA::AliasDef>::tao_duplicate ( CORBA::AliasDef_ptr p ) { @@ -2673,7 +2673,7 @@ TAO::Objref_Traits<CORBA::AliasDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::AliasDef>::release ( +TAO::Objref_Traits<CORBA::AliasDef>::tao_release ( CORBA::AliasDef_ptr p ) { @@ -2682,14 +2682,14 @@ TAO::Objref_Traits<CORBA::AliasDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::AliasDef_ptr -TAO::Objref_Traits<CORBA::AliasDef>::nil (void) +TAO::Objref_Traits<CORBA::AliasDef>::tao_nil (void) { return CORBA::AliasDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::AliasDef>::marshal ( +TAO::Objref_Traits<CORBA::AliasDef>::tao_marshal ( CORBA::AliasDef_ptr p, TAO_OutputCDR & cdr ) @@ -2920,7 +2920,7 @@ CORBA::AliasDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::NativeDef_ptr -TAO::Objref_Traits<CORBA::NativeDef>::duplicate ( +TAO::Objref_Traits<CORBA::NativeDef>::tao_duplicate ( CORBA::NativeDef_ptr p ) { @@ -2929,7 +2929,7 @@ TAO::Objref_Traits<CORBA::NativeDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::NativeDef>::release ( +TAO::Objref_Traits<CORBA::NativeDef>::tao_release ( CORBA::NativeDef_ptr p ) { @@ -2938,14 +2938,14 @@ TAO::Objref_Traits<CORBA::NativeDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::NativeDef_ptr -TAO::Objref_Traits<CORBA::NativeDef>::nil (void) +TAO::Objref_Traits<CORBA::NativeDef>::tao_nil (void) { return CORBA::NativeDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::NativeDef>::marshal ( +TAO::Objref_Traits<CORBA::NativeDef>::tao_marshal ( CORBA::NativeDef_ptr p, TAO_OutputCDR & cdr ) @@ -3091,7 +3091,7 @@ CORBA::NativeDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::PrimitiveDef_ptr -TAO::Objref_Traits<CORBA::PrimitiveDef>::duplicate ( +TAO::Objref_Traits<CORBA::PrimitiveDef>::tao_duplicate ( CORBA::PrimitiveDef_ptr p ) { @@ -3100,7 +3100,7 @@ TAO::Objref_Traits<CORBA::PrimitiveDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::PrimitiveDef>::release ( +TAO::Objref_Traits<CORBA::PrimitiveDef>::tao_release ( CORBA::PrimitiveDef_ptr p ) { @@ -3109,14 +3109,14 @@ TAO::Objref_Traits<CORBA::PrimitiveDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::PrimitiveDef_ptr -TAO::Objref_Traits<CORBA::PrimitiveDef>::nil (void) +TAO::Objref_Traits<CORBA::PrimitiveDef>::tao_nil (void) { return CORBA::PrimitiveDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::PrimitiveDef>::marshal ( +TAO::Objref_Traits<CORBA::PrimitiveDef>::tao_marshal ( CORBA::PrimitiveDef_ptr p, TAO_OutputCDR & cdr ) @@ -3296,7 +3296,7 @@ CORBA::PrimitiveDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::StringDef_ptr -TAO::Objref_Traits<CORBA::StringDef>::duplicate ( +TAO::Objref_Traits<CORBA::StringDef>::tao_duplicate ( CORBA::StringDef_ptr p ) { @@ -3305,7 +3305,7 @@ TAO::Objref_Traits<CORBA::StringDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::StringDef>::release ( +TAO::Objref_Traits<CORBA::StringDef>::tao_release ( CORBA::StringDef_ptr p ) { @@ -3314,14 +3314,14 @@ TAO::Objref_Traits<CORBA::StringDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::StringDef_ptr -TAO::Objref_Traits<CORBA::StringDef>::nil (void) +TAO::Objref_Traits<CORBA::StringDef>::tao_nil (void) { return CORBA::StringDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::StringDef>::marshal ( +TAO::Objref_Traits<CORBA::StringDef>::tao_marshal ( CORBA::StringDef_ptr p, TAO_OutputCDR & cdr ) @@ -3544,7 +3544,7 @@ CORBA::StringDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::WstringDef_ptr -TAO::Objref_Traits<CORBA::WstringDef>::duplicate ( +TAO::Objref_Traits<CORBA::WstringDef>::tao_duplicate ( CORBA::WstringDef_ptr p ) { @@ -3553,7 +3553,7 @@ TAO::Objref_Traits<CORBA::WstringDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::WstringDef>::release ( +TAO::Objref_Traits<CORBA::WstringDef>::tao_release ( CORBA::WstringDef_ptr p ) { @@ -3562,14 +3562,14 @@ TAO::Objref_Traits<CORBA::WstringDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::WstringDef_ptr -TAO::Objref_Traits<CORBA::WstringDef>::nil (void) +TAO::Objref_Traits<CORBA::WstringDef>::tao_nil (void) { return CORBA::WstringDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::WstringDef>::marshal ( +TAO::Objref_Traits<CORBA::WstringDef>::tao_marshal ( CORBA::WstringDef_ptr p, TAO_OutputCDR & cdr ) @@ -3792,7 +3792,7 @@ CORBA::WstringDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::SequenceDef_ptr -TAO::Objref_Traits<CORBA::SequenceDef>::duplicate ( +TAO::Objref_Traits<CORBA::SequenceDef>::tao_duplicate ( CORBA::SequenceDef_ptr p ) { @@ -3801,7 +3801,7 @@ TAO::Objref_Traits<CORBA::SequenceDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::SequenceDef>::release ( +TAO::Objref_Traits<CORBA::SequenceDef>::tao_release ( CORBA::SequenceDef_ptr p ) { @@ -3810,14 +3810,14 @@ TAO::Objref_Traits<CORBA::SequenceDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::SequenceDef_ptr -TAO::Objref_Traits<CORBA::SequenceDef>::nil (void) +TAO::Objref_Traits<CORBA::SequenceDef>::tao_nil (void) { return CORBA::SequenceDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::SequenceDef>::marshal ( +TAO::Objref_Traits<CORBA::SequenceDef>::tao_marshal ( CORBA::SequenceDef_ptr p, TAO_OutputCDR & cdr ) @@ -4167,7 +4167,7 @@ CORBA::SequenceDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ArrayDef_ptr -TAO::Objref_Traits<CORBA::ArrayDef>::duplicate ( +TAO::Objref_Traits<CORBA::ArrayDef>::tao_duplicate ( CORBA::ArrayDef_ptr p ) { @@ -4176,7 +4176,7 @@ TAO::Objref_Traits<CORBA::ArrayDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ArrayDef>::release ( +TAO::Objref_Traits<CORBA::ArrayDef>::tao_release ( CORBA::ArrayDef_ptr p ) { @@ -4185,14 +4185,14 @@ TAO::Objref_Traits<CORBA::ArrayDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ArrayDef_ptr -TAO::Objref_Traits<CORBA::ArrayDef>::nil (void) +TAO::Objref_Traits<CORBA::ArrayDef>::tao_nil (void) { return CORBA::ArrayDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ArrayDef>::marshal ( +TAO::Objref_Traits<CORBA::ArrayDef>::tao_marshal ( CORBA::ArrayDef_ptr p, TAO_OutputCDR & cdr ) @@ -4542,7 +4542,7 @@ CORBA::ArrayDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ExceptionDef_ptr -TAO::Objref_Traits<CORBA::ExceptionDef>::duplicate ( +TAO::Objref_Traits<CORBA::ExceptionDef>::tao_duplicate ( CORBA::ExceptionDef_ptr p ) { @@ -4551,7 +4551,7 @@ TAO::Objref_Traits<CORBA::ExceptionDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ExceptionDef>::release ( +TAO::Objref_Traits<CORBA::ExceptionDef>::tao_release ( CORBA::ExceptionDef_ptr p ) { @@ -4560,14 +4560,14 @@ TAO::Objref_Traits<CORBA::ExceptionDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ExceptionDef_ptr -TAO::Objref_Traits<CORBA::ExceptionDef>::nil (void) +TAO::Objref_Traits<CORBA::ExceptionDef>::tao_nil (void) { return CORBA::ExceptionDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ExceptionDef>::marshal ( +TAO::Objref_Traits<CORBA::ExceptionDef>::tao_marshal ( CORBA::ExceptionDef_ptr p, TAO_OutputCDR & cdr ) @@ -4893,7 +4893,7 @@ void CORBA::ExceptionDefSeq::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::AttributeDef_ptr -TAO::Objref_Traits<CORBA::AttributeDef>::duplicate ( +TAO::Objref_Traits<CORBA::AttributeDef>::tao_duplicate ( CORBA::AttributeDef_ptr p ) { @@ -4902,7 +4902,7 @@ TAO::Objref_Traits<CORBA::AttributeDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::AttributeDef>::release ( +TAO::Objref_Traits<CORBA::AttributeDef>::tao_release ( CORBA::AttributeDef_ptr p ) { @@ -4911,14 +4911,14 @@ TAO::Objref_Traits<CORBA::AttributeDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::AttributeDef_ptr -TAO::Objref_Traits<CORBA::AttributeDef>::nil (void) +TAO::Objref_Traits<CORBA::AttributeDef>::tao_nil (void) { return CORBA::AttributeDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::AttributeDef>::marshal ( +TAO::Objref_Traits<CORBA::AttributeDef>::tao_marshal ( CORBA::AttributeDef_ptr p, TAO_OutputCDR & cdr ) @@ -5294,7 +5294,7 @@ CORBA::ExtAttributeDescription::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ExtAttributeDef_ptr -TAO::Objref_Traits<CORBA::ExtAttributeDef>::duplicate ( +TAO::Objref_Traits<CORBA::ExtAttributeDef>::tao_duplicate ( CORBA::ExtAttributeDef_ptr p ) { @@ -5303,7 +5303,7 @@ TAO::Objref_Traits<CORBA::ExtAttributeDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ExtAttributeDef>::release ( +TAO::Objref_Traits<CORBA::ExtAttributeDef>::tao_release ( CORBA::ExtAttributeDef_ptr p ) { @@ -5312,14 +5312,14 @@ TAO::Objref_Traits<CORBA::ExtAttributeDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ExtAttributeDef_ptr -TAO::Objref_Traits<CORBA::ExtAttributeDef>::nil (void) +TAO::Objref_Traits<CORBA::ExtAttributeDef>::tao_nil (void) { return CORBA::ExtAttributeDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ExtAttributeDef>::marshal ( +TAO::Objref_Traits<CORBA::ExtAttributeDef>::tao_marshal ( CORBA::ExtAttributeDef_ptr p, TAO_OutputCDR & cdr ) @@ -5786,7 +5786,7 @@ void CORBA::ContextIdSeq::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::OperationDef_ptr -TAO::Objref_Traits<CORBA::OperationDef>::duplicate ( +TAO::Objref_Traits<CORBA::OperationDef>::tao_duplicate ( CORBA::OperationDef_ptr p ) { @@ -5795,7 +5795,7 @@ TAO::Objref_Traits<CORBA::OperationDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::OperationDef>::release ( +TAO::Objref_Traits<CORBA::OperationDef>::tao_release ( CORBA::OperationDef_ptr p ) { @@ -5804,14 +5804,14 @@ TAO::Objref_Traits<CORBA::OperationDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::OperationDef_ptr -TAO::Objref_Traits<CORBA::OperationDef>::nil (void) +TAO::Objref_Traits<CORBA::OperationDef>::tao_nil (void) { return CORBA::OperationDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::OperationDef>::marshal ( +TAO::Objref_Traits<CORBA::OperationDef>::tao_marshal ( CORBA::OperationDef_ptr p, TAO_OutputCDR & cdr ) @@ -6635,7 +6635,7 @@ void CORBA::ExtAttrDescriptionSeq::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::InterfaceDef_ptr -TAO::Objref_Traits<CORBA::InterfaceDef>::duplicate ( +TAO::Objref_Traits<CORBA::InterfaceDef>::tao_duplicate ( CORBA::InterfaceDef_ptr p ) { @@ -6644,7 +6644,7 @@ TAO::Objref_Traits<CORBA::InterfaceDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::InterfaceDef>::release ( +TAO::Objref_Traits<CORBA::InterfaceDef>::tao_release ( CORBA::InterfaceDef_ptr p ) { @@ -6653,14 +6653,14 @@ TAO::Objref_Traits<CORBA::InterfaceDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::InterfaceDef_ptr -TAO::Objref_Traits<CORBA::InterfaceDef>::nil (void) +TAO::Objref_Traits<CORBA::InterfaceDef>::tao_nil (void) { return CORBA::InterfaceDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::InterfaceDef>::marshal ( +TAO::Objref_Traits<CORBA::InterfaceDef>::tao_marshal ( CORBA::InterfaceDef_ptr p, TAO_OutputCDR & cdr ) @@ -7129,7 +7129,7 @@ CORBA::InterfaceDescription::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::InterfaceAttrExtension_ptr -TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::duplicate ( +TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::tao_duplicate ( CORBA::InterfaceAttrExtension_ptr p ) { @@ -7138,7 +7138,7 @@ TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::release ( +TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::tao_release ( CORBA::InterfaceAttrExtension_ptr p ) { @@ -7147,14 +7147,14 @@ TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::InterfaceAttrExtension_ptr -TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::nil (void) +TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::tao_nil (void) { return CORBA::InterfaceAttrExtension::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::marshal ( +TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::tao_marshal ( CORBA::InterfaceAttrExtension_ptr p, TAO_OutputCDR & cdr ) @@ -7400,7 +7400,7 @@ CORBA::InterfaceAttrExtension::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ExtInterfaceDef_ptr -TAO::Objref_Traits<CORBA::ExtInterfaceDef>::duplicate ( +TAO::Objref_Traits<CORBA::ExtInterfaceDef>::tao_duplicate ( CORBA::ExtInterfaceDef_ptr p ) { @@ -7409,7 +7409,7 @@ TAO::Objref_Traits<CORBA::ExtInterfaceDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ExtInterfaceDef>::release ( +TAO::Objref_Traits<CORBA::ExtInterfaceDef>::tao_release ( CORBA::ExtInterfaceDef_ptr p ) { @@ -7418,14 +7418,14 @@ TAO::Objref_Traits<CORBA::ExtInterfaceDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ExtInterfaceDef_ptr -TAO::Objref_Traits<CORBA::ExtInterfaceDef>::nil (void) +TAO::Objref_Traits<CORBA::ExtInterfaceDef>::tao_nil (void) { return CORBA::ExtInterfaceDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ExtInterfaceDef>::marshal ( +TAO::Objref_Traits<CORBA::ExtInterfaceDef>::tao_marshal ( CORBA::ExtInterfaceDef_ptr p, TAO_OutputCDR & cdr ) @@ -7580,7 +7580,7 @@ CORBA::ExtInterfaceDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::AbstractInterfaceDef_ptr -TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::duplicate ( +TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::tao_duplicate ( CORBA::AbstractInterfaceDef_ptr p ) { @@ -7589,7 +7589,7 @@ TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::release ( +TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::tao_release ( CORBA::AbstractInterfaceDef_ptr p ) { @@ -7598,14 +7598,14 @@ TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::AbstractInterfaceDef_ptr -TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::nil (void) +TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::tao_nil (void) { return CORBA::AbstractInterfaceDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::marshal ( +TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::tao_marshal ( CORBA::AbstractInterfaceDef_ptr p, TAO_OutputCDR & cdr ) @@ -7755,7 +7755,7 @@ CORBA::AbstractInterfaceDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ExtAbstractInterfaceDef_ptr -TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::duplicate ( +TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::tao_duplicate ( CORBA::ExtAbstractInterfaceDef_ptr p ) { @@ -7764,7 +7764,7 @@ TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::release ( +TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::tao_release ( CORBA::ExtAbstractInterfaceDef_ptr p ) { @@ -7773,14 +7773,14 @@ TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ExtAbstractInterfaceDef_ptr -TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::nil (void) +TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::tao_nil (void) { return CORBA::ExtAbstractInterfaceDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::marshal ( +TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::tao_marshal ( CORBA::ExtAbstractInterfaceDef_ptr p, TAO_OutputCDR & cdr ) @@ -7939,7 +7939,7 @@ CORBA::ExtAbstractInterfaceDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::LocalInterfaceDef_ptr -TAO::Objref_Traits<CORBA::LocalInterfaceDef>::duplicate ( +TAO::Objref_Traits<CORBA::LocalInterfaceDef>::tao_duplicate ( CORBA::LocalInterfaceDef_ptr p ) { @@ -7948,7 +7948,7 @@ TAO::Objref_Traits<CORBA::LocalInterfaceDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::LocalInterfaceDef>::release ( +TAO::Objref_Traits<CORBA::LocalInterfaceDef>::tao_release ( CORBA::LocalInterfaceDef_ptr p ) { @@ -7957,14 +7957,14 @@ TAO::Objref_Traits<CORBA::LocalInterfaceDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::LocalInterfaceDef_ptr -TAO::Objref_Traits<CORBA::LocalInterfaceDef>::nil (void) +TAO::Objref_Traits<CORBA::LocalInterfaceDef>::tao_nil (void) { return CORBA::LocalInterfaceDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::LocalInterfaceDef>::marshal ( +TAO::Objref_Traits<CORBA::LocalInterfaceDef>::tao_marshal ( CORBA::LocalInterfaceDef_ptr p, TAO_OutputCDR & cdr ) @@ -8114,7 +8114,7 @@ CORBA::LocalInterfaceDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ExtLocalInterfaceDef_ptr -TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::duplicate ( +TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::tao_duplicate ( CORBA::ExtLocalInterfaceDef_ptr p ) { @@ -8123,7 +8123,7 @@ TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::release ( +TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::tao_release ( CORBA::ExtLocalInterfaceDef_ptr p ) { @@ -8132,14 +8132,14 @@ TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ExtLocalInterfaceDef_ptr -TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::nil (void) +TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::tao_nil (void) { return CORBA::ExtLocalInterfaceDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::marshal ( +TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::tao_marshal ( CORBA::ExtLocalInterfaceDef_ptr p, TAO_OutputCDR & cdr ) diff --git a/TAO/tao/IFR_Client/IFR_BasicC.h b/TAO/tao/IFR_Client/IFR_BasicC.h index 31319ba79cc..b1bf2abe16e 100644 --- a/TAO/tao/IFR_Client/IFR_BasicC.h +++ b/TAO/tao/IFR_Client/IFR_BasicC.h @@ -4459,14 +4459,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::Repository> { - static CORBA::Repository_ptr duplicate ( + static CORBA::Repository_ptr tao_duplicate ( CORBA::Repository_ptr ); - static void release ( + static void tao_release ( CORBA::Repository_ptr ); - static CORBA::Repository_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::Repository_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::Repository_ptr p, TAO_OutputCDR & cdr ); @@ -4480,14 +4480,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ModuleDef> { - static CORBA::ModuleDef_ptr duplicate ( + static CORBA::ModuleDef_ptr tao_duplicate ( CORBA::ModuleDef_ptr ); - static void release ( + static void tao_release ( CORBA::ModuleDef_ptr ); - static CORBA::ModuleDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::ModuleDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::ModuleDef_ptr p, TAO_OutputCDR & cdr ); @@ -4501,14 +4501,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ConstantDef> { - static CORBA::ConstantDef_ptr duplicate ( + static CORBA::ConstantDef_ptr tao_duplicate ( CORBA::ConstantDef_ptr ); - static void release ( + static void tao_release ( CORBA::ConstantDef_ptr ); - static CORBA::ConstantDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::ConstantDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::ConstantDef_ptr p, TAO_OutputCDR & cdr ); @@ -4522,14 +4522,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::StructDef> { - static CORBA::StructDef_ptr duplicate ( + static CORBA::StructDef_ptr tao_duplicate ( CORBA::StructDef_ptr ); - static void release ( + static void tao_release ( CORBA::StructDef_ptr ); - static CORBA::StructDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::StructDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::StructDef_ptr p, TAO_OutputCDR & cdr ); @@ -4543,14 +4543,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::UnionDef> { - static CORBA::UnionDef_ptr duplicate ( + static CORBA::UnionDef_ptr tao_duplicate ( CORBA::UnionDef_ptr ); - static void release ( + static void tao_release ( CORBA::UnionDef_ptr ); - static CORBA::UnionDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::UnionDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::UnionDef_ptr p, TAO_OutputCDR & cdr ); @@ -4564,14 +4564,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::EnumDef> { - static CORBA::EnumDef_ptr duplicate ( + static CORBA::EnumDef_ptr tao_duplicate ( CORBA::EnumDef_ptr ); - static void release ( + static void tao_release ( CORBA::EnumDef_ptr ); - static CORBA::EnumDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::EnumDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::EnumDef_ptr p, TAO_OutputCDR & cdr ); @@ -4585,14 +4585,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::AliasDef> { - static CORBA::AliasDef_ptr duplicate ( + static CORBA::AliasDef_ptr tao_duplicate ( CORBA::AliasDef_ptr ); - static void release ( + static void tao_release ( CORBA::AliasDef_ptr ); - static CORBA::AliasDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::AliasDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::AliasDef_ptr p, TAO_OutputCDR & cdr ); @@ -4606,14 +4606,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::InterfaceDef> { - static CORBA::InterfaceDef_ptr duplicate ( + static CORBA::InterfaceDef_ptr tao_duplicate ( CORBA::InterfaceDef_ptr ); - static void release ( + static void tao_release ( CORBA::InterfaceDef_ptr ); - static CORBA::InterfaceDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::InterfaceDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::InterfaceDef_ptr p, TAO_OutputCDR & cdr ); @@ -4627,14 +4627,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExceptionDef> { - static CORBA::ExceptionDef_ptr duplicate ( + static CORBA::ExceptionDef_ptr tao_duplicate ( CORBA::ExceptionDef_ptr ); - static void release ( + static void tao_release ( CORBA::ExceptionDef_ptr ); - static CORBA::ExceptionDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::ExceptionDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::ExceptionDef_ptr p, TAO_OutputCDR & cdr ); @@ -4648,14 +4648,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::NativeDef> { - static CORBA::NativeDef_ptr duplicate ( + static CORBA::NativeDef_ptr tao_duplicate ( CORBA::NativeDef_ptr ); - static void release ( + static void tao_release ( CORBA::NativeDef_ptr ); - static CORBA::NativeDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::NativeDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::NativeDef_ptr p, TAO_OutputCDR & cdr ); @@ -4669,14 +4669,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::AbstractInterfaceDef> { - static CORBA::AbstractInterfaceDef_ptr duplicate ( + static CORBA::AbstractInterfaceDef_ptr tao_duplicate ( CORBA::AbstractInterfaceDef_ptr ); - static void release ( + static void tao_release ( CORBA::AbstractInterfaceDef_ptr ); - static CORBA::AbstractInterfaceDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::AbstractInterfaceDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::AbstractInterfaceDef_ptr p, TAO_OutputCDR & cdr ); @@ -4690,14 +4690,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::LocalInterfaceDef> { - static CORBA::LocalInterfaceDef_ptr duplicate ( + static CORBA::LocalInterfaceDef_ptr tao_duplicate ( CORBA::LocalInterfaceDef_ptr ); - static void release ( + static void tao_release ( CORBA::LocalInterfaceDef_ptr ); - static CORBA::LocalInterfaceDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::LocalInterfaceDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::LocalInterfaceDef_ptr p, TAO_OutputCDR & cdr ); @@ -4711,14 +4711,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExtInterfaceDef> { - static CORBA::ExtInterfaceDef_ptr duplicate ( + static CORBA::ExtInterfaceDef_ptr tao_duplicate ( CORBA::ExtInterfaceDef_ptr ); - static void release ( + static void tao_release ( CORBA::ExtInterfaceDef_ptr ); - static CORBA::ExtInterfaceDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::ExtInterfaceDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::ExtInterfaceDef_ptr p, TAO_OutputCDR & cdr ); @@ -4732,14 +4732,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExtAbstractInterfaceDef> { - static CORBA::ExtAbstractInterfaceDef_ptr duplicate ( + static CORBA::ExtAbstractInterfaceDef_ptr tao_duplicate ( CORBA::ExtAbstractInterfaceDef_ptr ); - static void release ( + static void tao_release ( CORBA::ExtAbstractInterfaceDef_ptr ); - static CORBA::ExtAbstractInterfaceDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::ExtAbstractInterfaceDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::ExtAbstractInterfaceDef_ptr p, TAO_OutputCDR & cdr ); @@ -4753,14 +4753,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExtLocalInterfaceDef> { - static CORBA::ExtLocalInterfaceDef_ptr duplicate ( + static CORBA::ExtLocalInterfaceDef_ptr tao_duplicate ( CORBA::ExtLocalInterfaceDef_ptr ); - static void release ( + static void tao_release ( CORBA::ExtLocalInterfaceDef_ptr ); - static CORBA::ExtLocalInterfaceDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::ExtLocalInterfaceDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::ExtLocalInterfaceDef_ptr p, TAO_OutputCDR & cdr ); @@ -4774,14 +4774,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::PrimitiveDef> { - static CORBA::PrimitiveDef_ptr duplicate ( + static CORBA::PrimitiveDef_ptr tao_duplicate ( CORBA::PrimitiveDef_ptr ); - static void release ( + static void tao_release ( CORBA::PrimitiveDef_ptr ); - static CORBA::PrimitiveDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::PrimitiveDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::PrimitiveDef_ptr p, TAO_OutputCDR & cdr ); @@ -4795,14 +4795,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::StringDef> { - static CORBA::StringDef_ptr duplicate ( + static CORBA::StringDef_ptr tao_duplicate ( CORBA::StringDef_ptr ); - static void release ( + static void tao_release ( CORBA::StringDef_ptr ); - static CORBA::StringDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::StringDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::StringDef_ptr p, TAO_OutputCDR & cdr ); @@ -4816,14 +4816,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::SequenceDef> { - static CORBA::SequenceDef_ptr duplicate ( + static CORBA::SequenceDef_ptr tao_duplicate ( CORBA::SequenceDef_ptr ); - static void release ( + static void tao_release ( CORBA::SequenceDef_ptr ); - static CORBA::SequenceDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::SequenceDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::SequenceDef_ptr p, TAO_OutputCDR & cdr ); @@ -4837,14 +4837,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ArrayDef> { - static CORBA::ArrayDef_ptr duplicate ( + static CORBA::ArrayDef_ptr tao_duplicate ( CORBA::ArrayDef_ptr ); - static void release ( + static void tao_release ( CORBA::ArrayDef_ptr ); - static CORBA::ArrayDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::ArrayDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::ArrayDef_ptr p, TAO_OutputCDR & cdr ); @@ -4858,14 +4858,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::WstringDef> { - static CORBA::WstringDef_ptr duplicate ( + static CORBA::WstringDef_ptr tao_duplicate ( CORBA::WstringDef_ptr ); - static void release ( + static void tao_release ( CORBA::WstringDef_ptr ); - static CORBA::WstringDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::WstringDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::WstringDef_ptr p, TAO_OutputCDR & cdr ); @@ -4879,14 +4879,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::FixedDef> { - static CORBA::FixedDef_ptr duplicate ( + static CORBA::FixedDef_ptr tao_duplicate ( CORBA::FixedDef_ptr ); - static void release ( + static void tao_release ( CORBA::FixedDef_ptr ); - static CORBA::FixedDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::FixedDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::FixedDef_ptr p, TAO_OutputCDR & cdr ); @@ -4900,14 +4900,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::AttributeDef> { - static CORBA::AttributeDef_ptr duplicate ( + static CORBA::AttributeDef_ptr tao_duplicate ( CORBA::AttributeDef_ptr ); - static void release ( + static void tao_release ( CORBA::AttributeDef_ptr ); - static CORBA::AttributeDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::AttributeDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::AttributeDef_ptr p, TAO_OutputCDR & cdr ); @@ -4921,14 +4921,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExtAttributeDef> { - static CORBA::ExtAttributeDef_ptr duplicate ( + static CORBA::ExtAttributeDef_ptr tao_duplicate ( CORBA::ExtAttributeDef_ptr ); - static void release ( + static void tao_release ( CORBA::ExtAttributeDef_ptr ); - static CORBA::ExtAttributeDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::ExtAttributeDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::ExtAttributeDef_ptr p, TAO_OutputCDR & cdr ); @@ -4942,14 +4942,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::OperationDef> { - static CORBA::OperationDef_ptr duplicate ( + static CORBA::OperationDef_ptr tao_duplicate ( CORBA::OperationDef_ptr ); - static void release ( + static void tao_release ( CORBA::OperationDef_ptr ); - static CORBA::OperationDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::OperationDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::OperationDef_ptr p, TAO_OutputCDR & cdr ); @@ -4963,14 +4963,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::InterfaceAttrExtension> { - static CORBA::InterfaceAttrExtension_ptr duplicate ( + static CORBA::InterfaceAttrExtension_ptr tao_duplicate ( CORBA::InterfaceAttrExtension_ptr ); - static void release ( + static void tao_release ( CORBA::InterfaceAttrExtension_ptr ); - static CORBA::InterfaceAttrExtension_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::InterfaceAttrExtension_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::InterfaceAttrExtension_ptr p, TAO_OutputCDR & cdr ); diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp index a41531e4f0e..fc1c6142e55 100644 --- a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp +++ b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp @@ -599,7 +599,7 @@ namespace TAO ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::EventDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::duplicate ( +TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::tao_duplicate ( CORBA::ComponentIR::EventDef_ptr p ) { @@ -608,7 +608,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::release ( +TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::tao_release ( CORBA::ComponentIR::EventDef_ptr p ) { @@ -617,14 +617,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::EventDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::nil (void) +TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::tao_nil (void) { return CORBA::ComponentIR::EventDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::marshal ( +TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::tao_marshal ( CORBA::ComponentIR::EventDef_ptr p, TAO_OutputCDR & cdr ) @@ -778,7 +778,7 @@ CORBA::ComponentIR::EventDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::Container_ptr -TAO::Objref_Traits<CORBA::ComponentIR::Container>::duplicate ( +TAO::Objref_Traits<CORBA::ComponentIR::Container>::tao_duplicate ( CORBA::ComponentIR::Container_ptr p ) { @@ -787,7 +787,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::Container>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ComponentIR::Container>::release ( +TAO::Objref_Traits<CORBA::ComponentIR::Container>::tao_release ( CORBA::ComponentIR::Container_ptr p ) { @@ -796,14 +796,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::Container>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::Container_ptr -TAO::Objref_Traits<CORBA::ComponentIR::Container>::nil (void) +TAO::Objref_Traits<CORBA::ComponentIR::Container>::tao_nil (void) { return CORBA::ComponentIR::Container::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ComponentIR::Container>::marshal ( +TAO::Objref_Traits<CORBA::ComponentIR::Container>::tao_marshal ( CORBA::ComponentIR::Container_ptr p, TAO_OutputCDR & cdr ) @@ -1133,7 +1133,7 @@ CORBA::ComponentIR::Container::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::ModuleDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::duplicate ( +TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::tao_duplicate ( CORBA::ComponentIR::ModuleDef_ptr p ) { @@ -1142,7 +1142,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::release ( +TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::tao_release ( CORBA::ComponentIR::ModuleDef_ptr p ) { @@ -1151,14 +1151,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::ModuleDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::nil (void) +TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::tao_nil (void) { return CORBA::ComponentIR::ModuleDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::marshal ( +TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::tao_marshal ( CORBA::ComponentIR::ModuleDef_ptr p, TAO_OutputCDR & cdr ) @@ -1309,7 +1309,7 @@ CORBA::ComponentIR::ModuleDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::Repository_ptr -TAO::Objref_Traits<CORBA::ComponentIR::Repository>::duplicate ( +TAO::Objref_Traits<CORBA::ComponentIR::Repository>::tao_duplicate ( CORBA::ComponentIR::Repository_ptr p ) { @@ -1318,7 +1318,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::Repository>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ComponentIR::Repository>::release ( +TAO::Objref_Traits<CORBA::ComponentIR::Repository>::tao_release ( CORBA::ComponentIR::Repository_ptr p ) { @@ -1327,14 +1327,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::Repository>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::Repository_ptr -TAO::Objref_Traits<CORBA::ComponentIR::Repository>::nil (void) +TAO::Objref_Traits<CORBA::ComponentIR::Repository>::tao_nil (void) { return CORBA::ComponentIR::Repository::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ComponentIR::Repository>::marshal ( +TAO::Objref_Traits<CORBA::ComponentIR::Repository>::tao_marshal ( CORBA::ComponentIR::Repository_ptr p, TAO_OutputCDR & cdr ) @@ -1481,7 +1481,7 @@ CORBA::ComponentIR::Repository::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::ProvidesDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::duplicate ( +TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::tao_duplicate ( CORBA::ComponentIR::ProvidesDef_ptr p ) { @@ -1490,7 +1490,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::release ( +TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::tao_release ( CORBA::ComponentIR::ProvidesDef_ptr p ) { @@ -1499,14 +1499,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::ProvidesDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::nil (void) +TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::tao_nil (void) { return CORBA::ComponentIR::ProvidesDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::marshal ( +TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::tao_marshal ( CORBA::ComponentIR::ProvidesDef_ptr p, TAO_OutputCDR & cdr ) @@ -1742,7 +1742,7 @@ CORBA::ComponentIR::ProvidesDescription::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::UsesDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::duplicate ( +TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::tao_duplicate ( CORBA::ComponentIR::UsesDef_ptr p ) { @@ -1751,7 +1751,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::release ( +TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::tao_release ( CORBA::ComponentIR::UsesDef_ptr p ) { @@ -1760,14 +1760,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::UsesDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::nil (void) +TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::tao_nil (void) { return CORBA::ComponentIR::UsesDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::marshal ( +TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::tao_marshal ( CORBA::ComponentIR::UsesDef_ptr p, TAO_OutputCDR & cdr ) @@ -2088,7 +2088,7 @@ CORBA::ComponentIR::UsesDescription::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::EventPortDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::duplicate ( +TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::tao_duplicate ( CORBA::ComponentIR::EventPortDef_ptr p ) { @@ -2097,7 +2097,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::release ( +TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::tao_release ( CORBA::ComponentIR::EventPortDef_ptr p ) { @@ -2106,14 +2106,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::EventPortDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::nil (void) +TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::tao_nil (void) { return CORBA::ComponentIR::EventPortDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::marshal ( +TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::tao_marshal ( CORBA::ComponentIR::EventPortDef_ptr p, TAO_OutputCDR & cdr ) @@ -2394,7 +2394,7 @@ CORBA::ComponentIR::EventPortDescription::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::EmitsDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::duplicate ( +TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::tao_duplicate ( CORBA::ComponentIR::EmitsDef_ptr p ) { @@ -2403,7 +2403,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::release ( +TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::tao_release ( CORBA::ComponentIR::EmitsDef_ptr p ) { @@ -2412,14 +2412,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::EmitsDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::nil (void) +TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::tao_nil (void) { return CORBA::ComponentIR::EmitsDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::marshal ( +TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::tao_marshal ( CORBA::ComponentIR::EmitsDef_ptr p, TAO_OutputCDR & cdr ) @@ -2561,7 +2561,7 @@ CORBA::ComponentIR::EmitsDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::PublishesDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::duplicate ( +TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::tao_duplicate ( CORBA::ComponentIR::PublishesDef_ptr p ) { @@ -2570,7 +2570,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::release ( +TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::tao_release ( CORBA::ComponentIR::PublishesDef_ptr p ) { @@ -2579,14 +2579,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::PublishesDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::nil (void) +TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::tao_nil (void) { return CORBA::ComponentIR::PublishesDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::marshal ( +TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::tao_marshal ( CORBA::ComponentIR::PublishesDef_ptr p, TAO_OutputCDR & cdr ) @@ -2728,7 +2728,7 @@ CORBA::ComponentIR::PublishesDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::ConsumesDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::duplicate ( +TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::tao_duplicate ( CORBA::ComponentIR::ConsumesDef_ptr p ) { @@ -2737,7 +2737,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::release ( +TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::tao_release ( CORBA::ComponentIR::ConsumesDef_ptr p ) { @@ -2746,14 +2746,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::ConsumesDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::nil (void) +TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::tao_nil (void) { return CORBA::ComponentIR::ConsumesDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::marshal ( +TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::tao_marshal ( CORBA::ComponentIR::ConsumesDef_ptr p, TAO_OutputCDR & cdr ) @@ -2895,7 +2895,7 @@ CORBA::ComponentIR::ConsumesDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::ComponentDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::duplicate ( +TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::tao_duplicate ( CORBA::ComponentIR::ComponentDef_ptr p ) { @@ -2904,7 +2904,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::release ( +TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::tao_release ( CORBA::ComponentIR::ComponentDef_ptr p ) { @@ -2913,14 +2913,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::ComponentDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::nil (void) +TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::tao_nil (void) { return CORBA::ComponentIR::ComponentDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::marshal ( +TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::tao_marshal ( CORBA::ComponentIR::ComponentDef_ptr p, TAO_OutputCDR & cdr ) @@ -3693,7 +3693,7 @@ CORBA::ComponentIR::ComponentDescription::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::FactoryDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::duplicate ( +TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::tao_duplicate ( CORBA::ComponentIR::FactoryDef_ptr p ) { @@ -3702,7 +3702,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::release ( +TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::tao_release ( CORBA::ComponentIR::FactoryDef_ptr p ) { @@ -3711,14 +3711,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::FactoryDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::nil (void) +TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::tao_nil (void) { return CORBA::ComponentIR::FactoryDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::marshal ( +TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::tao_marshal ( CORBA::ComponentIR::FactoryDef_ptr p, TAO_OutputCDR & cdr ) @@ -3860,7 +3860,7 @@ CORBA::ComponentIR::FactoryDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::FinderDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::duplicate ( +TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::tao_duplicate ( CORBA::ComponentIR::FinderDef_ptr p ) { @@ -3869,7 +3869,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::release ( +TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::tao_release ( CORBA::ComponentIR::FinderDef_ptr p ) { @@ -3878,14 +3878,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::FinderDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::nil (void) +TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::tao_nil (void) { return CORBA::ComponentIR::FinderDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::marshal ( +TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::tao_marshal ( CORBA::ComponentIR::FinderDef_ptr p, TAO_OutputCDR & cdr ) @@ -4027,7 +4027,7 @@ CORBA::ComponentIR::FinderDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::HomeDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::duplicate ( +TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::tao_duplicate ( CORBA::ComponentIR::HomeDef_ptr p ) { @@ -4036,7 +4036,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::release ( +TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::tao_release ( CORBA::ComponentIR::HomeDef_ptr p ) { @@ -4045,14 +4045,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::HomeDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::nil (void) +TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::tao_nil (void) { return CORBA::ComponentIR::HomeDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::marshal ( +TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::tao_marshal ( CORBA::ComponentIR::HomeDef_ptr p, TAO_OutputCDR & cdr ) diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.h b/TAO/tao/IFR_Client/IFR_ComponentsC.h index a4f9abf3170..1acd22d6ed5 100644 --- a/TAO/tao/IFR_Client/IFR_ComponentsC.h +++ b/TAO/tao/IFR_Client/IFR_ComponentsC.h @@ -2462,14 +2462,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::ComponentDef> { - static CORBA::ComponentIR::ComponentDef_ptr duplicate ( + static CORBA::ComponentIR::ComponentDef_ptr tao_duplicate ( CORBA::ComponentIR::ComponentDef_ptr ); - static void release ( + static void tao_release ( CORBA::ComponentIR::ComponentDef_ptr ); - static CORBA::ComponentIR::ComponentDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::ComponentIR::ComponentDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::ComponentIR::ComponentDef_ptr p, TAO_OutputCDR & cdr ); @@ -2483,14 +2483,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::HomeDef> { - static CORBA::ComponentIR::HomeDef_ptr duplicate ( + static CORBA::ComponentIR::HomeDef_ptr tao_duplicate ( CORBA::ComponentIR::HomeDef_ptr ); - static void release ( + static void tao_release ( CORBA::ComponentIR::HomeDef_ptr ); - static CORBA::ComponentIR::HomeDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::ComponentIR::HomeDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::ComponentIR::HomeDef_ptr p, TAO_OutputCDR & cdr ); @@ -2504,14 +2504,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::EventDef> { - static CORBA::ComponentIR::EventDef_ptr duplicate ( + static CORBA::ComponentIR::EventDef_ptr tao_duplicate ( CORBA::ComponentIR::EventDef_ptr ); - static void release ( + static void tao_release ( CORBA::ComponentIR::EventDef_ptr ); - static CORBA::ComponentIR::EventDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::ComponentIR::EventDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::ComponentIR::EventDef_ptr p, TAO_OutputCDR & cdr ); @@ -2525,14 +2525,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::Container> { - static CORBA::ComponentIR::Container_ptr duplicate ( + static CORBA::ComponentIR::Container_ptr tao_duplicate ( CORBA::ComponentIR::Container_ptr ); - static void release ( + static void tao_release ( CORBA::ComponentIR::Container_ptr ); - static CORBA::ComponentIR::Container_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::ComponentIR::Container_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::ComponentIR::Container_ptr p, TAO_OutputCDR & cdr ); @@ -2546,14 +2546,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::ModuleDef> { - static CORBA::ComponentIR::ModuleDef_ptr duplicate ( + static CORBA::ComponentIR::ModuleDef_ptr tao_duplicate ( CORBA::ComponentIR::ModuleDef_ptr ); - static void release ( + static void tao_release ( CORBA::ComponentIR::ModuleDef_ptr ); - static CORBA::ComponentIR::ModuleDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::ComponentIR::ModuleDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::ComponentIR::ModuleDef_ptr p, TAO_OutputCDR & cdr ); @@ -2567,14 +2567,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::Repository> { - static CORBA::ComponentIR::Repository_ptr duplicate ( + static CORBA::ComponentIR::Repository_ptr tao_duplicate ( CORBA::ComponentIR::Repository_ptr ); - static void release ( + static void tao_release ( CORBA::ComponentIR::Repository_ptr ); - static CORBA::ComponentIR::Repository_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::ComponentIR::Repository_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::ComponentIR::Repository_ptr p, TAO_OutputCDR & cdr ); @@ -2588,14 +2588,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::ProvidesDef> { - static CORBA::ComponentIR::ProvidesDef_ptr duplicate ( + static CORBA::ComponentIR::ProvidesDef_ptr tao_duplicate ( CORBA::ComponentIR::ProvidesDef_ptr ); - static void release ( + static void tao_release ( CORBA::ComponentIR::ProvidesDef_ptr ); - static CORBA::ComponentIR::ProvidesDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::ComponentIR::ProvidesDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::ComponentIR::ProvidesDef_ptr p, TAO_OutputCDR & cdr ); @@ -2609,14 +2609,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::UsesDef> { - static CORBA::ComponentIR::UsesDef_ptr duplicate ( + static CORBA::ComponentIR::UsesDef_ptr tao_duplicate ( CORBA::ComponentIR::UsesDef_ptr ); - static void release ( + static void tao_release ( CORBA::ComponentIR::UsesDef_ptr ); - static CORBA::ComponentIR::UsesDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::ComponentIR::UsesDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::ComponentIR::UsesDef_ptr p, TAO_OutputCDR & cdr ); @@ -2630,14 +2630,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::EventPortDef> { - static CORBA::ComponentIR::EventPortDef_ptr duplicate ( + static CORBA::ComponentIR::EventPortDef_ptr tao_duplicate ( CORBA::ComponentIR::EventPortDef_ptr ); - static void release ( + static void tao_release ( CORBA::ComponentIR::EventPortDef_ptr ); - static CORBA::ComponentIR::EventPortDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::ComponentIR::EventPortDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::ComponentIR::EventPortDef_ptr p, TAO_OutputCDR & cdr ); @@ -2651,14 +2651,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::EmitsDef> { - static CORBA::ComponentIR::EmitsDef_ptr duplicate ( + static CORBA::ComponentIR::EmitsDef_ptr tao_duplicate ( CORBA::ComponentIR::EmitsDef_ptr ); - static void release ( + static void tao_release ( CORBA::ComponentIR::EmitsDef_ptr ); - static CORBA::ComponentIR::EmitsDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::ComponentIR::EmitsDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::ComponentIR::EmitsDef_ptr p, TAO_OutputCDR & cdr ); @@ -2672,14 +2672,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::PublishesDef> { - static CORBA::ComponentIR::PublishesDef_ptr duplicate ( + static CORBA::ComponentIR::PublishesDef_ptr tao_duplicate ( CORBA::ComponentIR::PublishesDef_ptr ); - static void release ( + static void tao_release ( CORBA::ComponentIR::PublishesDef_ptr ); - static CORBA::ComponentIR::PublishesDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::ComponentIR::PublishesDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::ComponentIR::PublishesDef_ptr p, TAO_OutputCDR & cdr ); @@ -2693,14 +2693,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::ConsumesDef> { - static CORBA::ComponentIR::ConsumesDef_ptr duplicate ( + static CORBA::ComponentIR::ConsumesDef_ptr tao_duplicate ( CORBA::ComponentIR::ConsumesDef_ptr ); - static void release ( + static void tao_release ( CORBA::ComponentIR::ConsumesDef_ptr ); - static CORBA::ComponentIR::ConsumesDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::ComponentIR::ConsumesDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::ComponentIR::ConsumesDef_ptr p, TAO_OutputCDR & cdr ); @@ -2714,14 +2714,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::FactoryDef> { - static CORBA::ComponentIR::FactoryDef_ptr duplicate ( + static CORBA::ComponentIR::FactoryDef_ptr tao_duplicate ( CORBA::ComponentIR::FactoryDef_ptr ); - static void release ( + static void tao_release ( CORBA::ComponentIR::FactoryDef_ptr ); - static CORBA::ComponentIR::FactoryDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::ComponentIR::FactoryDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::ComponentIR::FactoryDef_ptr p, TAO_OutputCDR & cdr ); @@ -2735,14 +2735,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::FinderDef> { - static CORBA::ComponentIR::FinderDef_ptr duplicate ( + static CORBA::ComponentIR::FinderDef_ptr tao_duplicate ( CORBA::ComponentIR::FinderDef_ptr ); - static void release ( + static void tao_release ( CORBA::ComponentIR::FinderDef_ptr ); - static CORBA::ComponentIR::FinderDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::ComponentIR::FinderDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::ComponentIR::FinderDef_ptr p, TAO_OutputCDR & cdr ); diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp index 444a2cfab77..838d54cf154 100644 --- a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp +++ b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp @@ -518,7 +518,7 @@ namespace TAO ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::FixedDef_ptr -TAO::Objref_Traits<CORBA::FixedDef>::duplicate ( +TAO::Objref_Traits<CORBA::FixedDef>::tao_duplicate ( CORBA::FixedDef_ptr p ) { @@ -527,7 +527,7 @@ TAO::Objref_Traits<CORBA::FixedDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::FixedDef>::release ( +TAO::Objref_Traits<CORBA::FixedDef>::tao_release ( CORBA::FixedDef_ptr p ) { @@ -536,14 +536,14 @@ TAO::Objref_Traits<CORBA::FixedDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::FixedDef_ptr -TAO::Objref_Traits<CORBA::FixedDef>::nil (void) +TAO::Objref_Traits<CORBA::FixedDef>::tao_nil (void) { return CORBA::FixedDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::FixedDef>::marshal ( +TAO::Objref_Traits<CORBA::FixedDef>::tao_marshal ( CORBA::FixedDef_ptr p, TAO_OutputCDR & cdr ) @@ -917,7 +917,7 @@ void CORBA::ValueMemberSeq::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ValueMemberDef_ptr -TAO::Objref_Traits<CORBA::ValueMemberDef>::duplicate ( +TAO::Objref_Traits<CORBA::ValueMemberDef>::tao_duplicate ( CORBA::ValueMemberDef_ptr p ) { @@ -926,7 +926,7 @@ TAO::Objref_Traits<CORBA::ValueMemberDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ValueMemberDef>::release ( +TAO::Objref_Traits<CORBA::ValueMemberDef>::tao_release ( CORBA::ValueMemberDef_ptr p ) { @@ -935,14 +935,14 @@ TAO::Objref_Traits<CORBA::ValueMemberDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ValueMemberDef_ptr -TAO::Objref_Traits<CORBA::ValueMemberDef>::nil (void) +TAO::Objref_Traits<CORBA::ValueMemberDef>::tao_nil (void) { return CORBA::ValueMemberDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ValueMemberDef>::marshal ( +TAO::Objref_Traits<CORBA::ValueMemberDef>::tao_marshal ( CORBA::ValueMemberDef_ptr p, TAO_OutputCDR & cdr ) @@ -1292,7 +1292,7 @@ CORBA::ValueMemberDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ValueDef_ptr -TAO::Objref_Traits<CORBA::ValueDef>::duplicate ( +TAO::Objref_Traits<CORBA::ValueDef>::tao_duplicate ( CORBA::ValueDef_ptr p ) { @@ -1301,7 +1301,7 @@ TAO::Objref_Traits<CORBA::ValueDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ValueDef>::release ( +TAO::Objref_Traits<CORBA::ValueDef>::tao_release ( CORBA::ValueDef_ptr p ) { @@ -1310,14 +1310,14 @@ TAO::Objref_Traits<CORBA::ValueDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ValueDef_ptr -TAO::Objref_Traits<CORBA::ValueDef>::nil (void) +TAO::Objref_Traits<CORBA::ValueDef>::tao_nil (void) { return CORBA::ValueDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ValueDef>::marshal ( +TAO::Objref_Traits<CORBA::ValueDef>::tao_marshal ( CORBA::ValueDef_ptr p, TAO_OutputCDR & cdr ) @@ -2353,7 +2353,7 @@ CORBA::ValueDescription::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ExtValueDef_ptr -TAO::Objref_Traits<CORBA::ExtValueDef>::duplicate ( +TAO::Objref_Traits<CORBA::ExtValueDef>::tao_duplicate ( CORBA::ExtValueDef_ptr p ) { @@ -2362,7 +2362,7 @@ TAO::Objref_Traits<CORBA::ExtValueDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ExtValueDef>::release ( +TAO::Objref_Traits<CORBA::ExtValueDef>::tao_release ( CORBA::ExtValueDef_ptr p ) { @@ -2371,14 +2371,14 @@ TAO::Objref_Traits<CORBA::ExtValueDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ExtValueDef_ptr -TAO::Objref_Traits<CORBA::ExtValueDef>::nil (void) +TAO::Objref_Traits<CORBA::ExtValueDef>::tao_nil (void) { return CORBA::ExtValueDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ExtValueDef>::marshal ( +TAO::Objref_Traits<CORBA::ExtValueDef>::tao_marshal ( CORBA::ExtValueDef_ptr p, TAO_OutputCDR & cdr ) @@ -2731,7 +2731,7 @@ CORBA::ExtValueDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ValueBoxDef_ptr -TAO::Objref_Traits<CORBA::ValueBoxDef>::duplicate ( +TAO::Objref_Traits<CORBA::ValueBoxDef>::tao_duplicate ( CORBA::ValueBoxDef_ptr p ) { @@ -2740,7 +2740,7 @@ TAO::Objref_Traits<CORBA::ValueBoxDef>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ValueBoxDef>::release ( +TAO::Objref_Traits<CORBA::ValueBoxDef>::tao_release ( CORBA::ValueBoxDef_ptr p ) { @@ -2749,14 +2749,14 @@ TAO::Objref_Traits<CORBA::ValueBoxDef>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ValueBoxDef_ptr -TAO::Objref_Traits<CORBA::ValueBoxDef>::nil (void) +TAO::Objref_Traits<CORBA::ValueBoxDef>::tao_nil (void) { return CORBA::ValueBoxDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ValueBoxDef>::marshal ( +TAO::Objref_Traits<CORBA::ValueBoxDef>::tao_marshal ( CORBA::ValueBoxDef_ptr p, TAO_OutputCDR & cdr ) diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.h b/TAO/tao/IFR_Client/IFR_ExtendedC.h index 61c72d2bbc8..2b62a2bede4 100644 --- a/TAO/tao/IFR_Client/IFR_ExtendedC.h +++ b/TAO/tao/IFR_Client/IFR_ExtendedC.h @@ -1297,14 +1297,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ValueDef> { - static CORBA::ValueDef_ptr duplicate ( + static CORBA::ValueDef_ptr tao_duplicate ( CORBA::ValueDef_ptr ); - static void release ( + static void tao_release ( CORBA::ValueDef_ptr ); - static CORBA::ValueDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::ValueDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::ValueDef_ptr p, TAO_OutputCDR & cdr ); @@ -1318,14 +1318,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ValueBoxDef> { - static CORBA::ValueBoxDef_ptr duplicate ( + static CORBA::ValueBoxDef_ptr tao_duplicate ( CORBA::ValueBoxDef_ptr ); - static void release ( + static void tao_release ( CORBA::ValueBoxDef_ptr ); - static CORBA::ValueBoxDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::ValueBoxDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::ValueBoxDef_ptr p, TAO_OutputCDR & cdr ); @@ -1339,14 +1339,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExtValueDef> { - static CORBA::ExtValueDef_ptr duplicate ( + static CORBA::ExtValueDef_ptr tao_duplicate ( CORBA::ExtValueDef_ptr ); - static void release ( + static void tao_release ( CORBA::ExtValueDef_ptr ); - static CORBA::ExtValueDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::ExtValueDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::ExtValueDef_ptr p, TAO_OutputCDR & cdr ); @@ -1360,14 +1360,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::FixedDef> { - static CORBA::FixedDef_ptr duplicate ( + static CORBA::FixedDef_ptr tao_duplicate ( CORBA::FixedDef_ptr ); - static void release ( + static void tao_release ( CORBA::FixedDef_ptr ); - static CORBA::FixedDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::FixedDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::FixedDef_ptr p, TAO_OutputCDR & cdr ); @@ -1381,14 +1381,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ValueMemberDef> { - static CORBA::ValueMemberDef_ptr duplicate ( + static CORBA::ValueMemberDef_ptr tao_duplicate ( CORBA::ValueMemberDef_ptr ); - static void release ( + static void tao_release ( CORBA::ValueMemberDef_ptr ); - static CORBA::ValueMemberDef_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::ValueMemberDef_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::ValueMemberDef_ptr p, TAO_OutputCDR & cdr ); diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp index c48e62962c8..cd8aa272822 100644 --- a/TAO/tao/IIOP_Connection_Handler.cpp +++ b/TAO/tao/IIOP_Connection_Handler.cpp @@ -15,6 +15,7 @@ #include "ace/os_include/netinet/os_tcp.h" #include "ace/os_include/os_netdb.h" +#include "ace/os_include/netinet/os_tcp.h" ACE_RCSID (tao, IIOP_Connection_Handler, @@ -140,11 +141,9 @@ TAO_IIOP_Connection_Handler::open (void*) client, this->peer ().get_handle ())); } - // Set that the transport is now connected, if fails we return -1 - // Use C-style cast b/c otherwise we get warnings on lots of - // compilers - if (!this->transport ()->post_open ((size_t) this->get_handle ())) - return -1; + // Set the id in the transport now that we're active. + // Use C-style cast b/c otherwise we get warnings on lots of compilers + this->transport ()->id ((size_t) this->get_handle ()); this->state_changed (TAO_LF_Event::LFS_SUCCESS); @@ -166,7 +165,16 @@ TAO_IIOP_Connection_Handler::close_connection (void) int TAO_IIOP_Connection_Handler::handle_input (ACE_HANDLE h) { - return this->handle_input_eh (h, this); + const int result = + this->handle_input_eh (h, this); + + if (result == -1) + { + this->close_connection (); + return 0; + } + + return result; } int @@ -205,7 +213,9 @@ TAO_IIOP_Connection_Handler::handle_close (ACE_HANDLE, int TAO_IIOP_Connection_Handler::close (u_long) { - return this->close_handler (); + this->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED); + this->transport ()->remove_reference (); + return 0; } int @@ -246,14 +256,6 @@ TAO_IIOP_Connection_Handler::process_listen_point_list ( // Get the size of the list const CORBA::ULong len = listen_list.length (); - if (TAO_debug_level > 0 && len == 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT("TAO (%P|%t) - IIOP_Connection_Handler::") - ACE_TEXT("process_listen_point_list, ") - ACE_TEXT("Received list of size 0, check client config.\n"))); - } - for (CORBA::ULong i = 0; i < len; ++i) { IIOP::ListenPoint listen_point = listen_list[i]; @@ -282,9 +284,7 @@ TAO_IIOP_Connection_Handler::process_listen_point_list ( // The property for this handler has changed. Recache the // handler with this property - int retval = - this->transport ()->recache_transport (&prop); - + int retval = this->transport ()->recache_transport (&prop); if (retval == -1) return retval; diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index 8deb1c31355..618ff481ad7 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -6,10 +6,8 @@ #include "Protocols_Hooks.h" #include "Connect_Strategy.h" #include "Thread_Lane_Resources.h" -#include "Profile_Transport_Resolver.h" #include "Transport.h" #include "Wait_Strategy.h" -#include "SystemException.h" #include "ace/OS_NS_strings.h" #include "ace/OS_NS_string.h" @@ -56,7 +54,7 @@ int TAO_IIOP_Connector::open (TAO_ORB_Core *orb_core) { // @@todo: The functionality of the following two statements could - // be done in the constructor, but that involves changing the + // be done in the constructor, but that involves changing the // interface of the pluggable transport factory. // Set the ORB Core @@ -134,42 +132,32 @@ TAO_IIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint) } TAO_Transport * -TAO_IIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r, +TAO_IIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, TAO_Transport_Descriptor_Interface &desc, - ACE_Time_Value *timeout) + ACE_Time_Value *max_wait_time) { - TAO_IIOP_Endpoint *iiop_endpoint = - this->remote_endpoint (desc.endpoint ()); + TAO_IIOP_Endpoint *iiop_endpoint = this->remote_endpoint (desc.endpoint ()); if (iiop_endpoint == 0) return 0; - const ACE_INET_Addr &remote_address = - iiop_endpoint->object_addr (); + const ACE_INET_Addr &remote_address = iiop_endpoint->object_addr (); if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - IIOP_Connector::make_connection, " - "to <%s:%d> which should %s\n", - ACE_TEXT_CHAR_TO_TCHAR(iiop_endpoint->host()), - iiop_endpoint->port(), - r->blocked () ? ACE_TEXT("block") : ACE_TEXT("nonblock"))); + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - IIOP_Connector::make_connection, " + "to <%s:%d>\n", + ACE_TEXT_CHAR_TO_TCHAR(iiop_endpoint->host()), + iiop_endpoint->port())); + } // Get the right synch options ACE_Synch_Options synch_options; - this->active_connect_strategy_->synch_options (timeout, + this->active_connect_strategy_->synch_options (max_wait_time, synch_options); - // If we don't need to block for a transport just set the timeout to - // be zero. - ACE_Time_Value tmp_zero (ACE_Time_Value::zero); - if (!r->blocked ()) - { - synch_options.timeout (ACE_Time_Value::zero); - timeout = &tmp_zero; - } - TAO_IIOP_Connection_Handler *svc_handler = 0; // Connect. @@ -179,14 +167,13 @@ TAO_IIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r, synch_options); // The connect() method creates the service handler and bumps the - // #REFCOUNT# up one extra. There are four possibilities from + // #REFCOUNT# up one extra. There are three possibilities from // calling connect(): (a) connection succeeds immediately - in this // case, the #REFCOUNT# on the handler is two; (b) connection // completion is pending - in this case, the #REFCOUNT# on the // handler is also two; (c) connection fails immediately - in this // case, the #REFCOUNT# on the handler is one since close() gets - // called on the handler; (d) the connect immediately returns when we - // have specified that it shouldn't block. + // called on the handler. // // The extra reference count in // TAO_Connect_Creation_Strategy::make_svc_handler() is needed in @@ -197,67 +184,118 @@ TAO_IIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r, // another thread pick up the completion and potentially deletes the // handler before we get a chance to increment the reference count. - // Make sure that we always do a remove_reference - ACE_Event_Handler_var svc_handler_auto_ptr (svc_handler); + // No immediate result. Wait for completion. + if (result == -1 && errno == EWOULDBLOCK) + { + if (TAO_debug_level > 2) + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - IIOP_Connector::make_connection, " + "going to wait for connection completion on local" + "handle [%d]\n", + svc_handler->get_handle ())); + } - TAO_Transport *transport = - svc_handler->transport (); + // Wait for connection completion. + result = + this->active_connect_strategy_->wait (svc_handler, + max_wait_time); - if (result == -1) - { - // No immediate result, wait for completion - if (errno == EWOULDBLOCK) + if (TAO_debug_level > 2) { - // Try to wait until connection completion. Incase we block, then we - // get a connected transport or not. In case of non block we get - // a connected or not connected transport - if (!this->wait_for_connection_completion (r, - transport, - timeout)) - { - if (TAO_debug_level > 2) - ACE_ERROR ((LM_ERROR, "TAO (%P|%t) - IIOP_Connector::" - "make_connection, " - "wait for completion failed\n")); - } + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - IIOP_Connector::make_connection" + "wait done for handle[%d], result = %d\n", + svc_handler->get_handle (), result)); } - else + + // There are three possibilities when wait() returns: (a) + // connection succeeded; (b) connection failed; (c) wait() + // failed because of some other error. It is easy to deal with + // (a) and (b). (c) is tricky since the connection is still + // pending and may get completed by some other thread. The + // following code deals with (c). + + // Check if the handler has been closed. + int closed = + svc_handler->is_closed (); + + // In case of failures and close() has not be called. + if (result == -1 && !closed) { - // Transport is not usable - transport = 0; + // First, cancel from connector. + this->base_connector_.cancel (svc_handler); + + // Double check to make sure the handler has not been closed + // yet. This double check is required to ensure that the + // connection handler was not closed yet by some other + // thread since it was still registered with the connector. + // Once connector.cancel() has been processed, we are + // assured that the connector will no longer open/close this + // handler. + closed = svc_handler->is_closed (); + + // If closed, there is nothing to do here. If not closed, + // it was either opened or is still pending. + if (!closed) + { + // Check if the handler has been opened. + const int open = svc_handler->is_open (); + + // Some other thread was able to open the handler even + // though wait failed for this thread. + if (open) + // Overwrite <result>. + result = 0; + else + { + // Assert that it is still connecting. + ACE_ASSERT (svc_handler->is_connecting ()); + + // Force close the handler now. + svc_handler->close (); + } + } } } - // In case of errors transport is zero - if (transport == 0) + // Irrespective of success or failure, remove the extra #REFCOUNT#. + svc_handler->remove_reference (); + + // In case of errors. + if (result == -1) { // Give users a clue to the problem. - if (TAO_debug_level > 3) + if (TAO_debug_level) + { ACE_DEBUG ((LM_ERROR, "TAO (%P|%t) - IIOP_Connector::make_connection, " "connection to <%s:%d> failed (%p)\n", - iiop_endpoint->host (), iiop_endpoint->port (), + ACE_TEXT_CHAR_TO_TCHAR(iiop_endpoint->host ()), iiop_endpoint->port (), ACE_TEXT("errno"))); + } return 0; } - // At this point, the connection has be successfully created - // connected or not connected, but we have a connection. + // At this point, the connection has be successfully connected. + // #REFCOUNT# is one. if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - IIOP_Connector::make_connection, " - "new %s connection to <%s:%d> on Transport[%d]\n", - transport->is_connected() ? "connected" : "not connected", - iiop_endpoint->host (), - iiop_endpoint->port (), - svc_handler->peer ().get_handle ())); + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - IIOP_Connector::make_connection, " + "new connection to <%s:%d> on Transport[%d]\n", + ACE_TEXT_CHAR_TO_TCHAR(iiop_endpoint->host ()), + iiop_endpoint->port (), + svc_handler->peer ().get_handle ())); + } + + TAO_Transport *transport = svc_handler->transport (); // Add the handler to Cache int retval = - this->orb_core ()->lane_resources ().transport_cache ().cache_transport ( - &desc, - transport); + this->orb_core ()->lane_resources ().transport_cache ().cache_transport (&desc, + transport); // Failure in adding to cache. if (retval != 0) @@ -275,24 +313,26 @@ TAO_IIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r, return 0; } - if (transport->is_connected () && - transport->wait_strategy ()->register_handler () != 0) - { - // Registration failures. + // If the wait strategy wants us to be registered with the reactor + // then we do so. If registeration is required and it succeeds, + // #REFCOUNT# becomes two. + retval = transport->wait_strategy ()->register_handler (); - // Purge from the connection cache, if we are not in the cache, this - // just does nothing. - (void) transport->purge_entry (); + // Registration failures. + if (retval != 0) + { + // Purge from the connection cache. + transport->purge_entry (); // Close the handler. - (void) transport->close_connection (); + svc_handler->close (); if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, - "TAO (%P|%t) - IIOP_Connector [%d]::make_connection, " - "could not register the transport " - "in the reactor.\n", - transport->id ())); + { + ACE_ERROR ((LM_ERROR, + "TAO (%P|%t) - IIOP_Connector::make_connection, " + "could not register the new connection in the reactor\n")); + } return 0; } @@ -303,7 +343,7 @@ TAO_IIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r, TAO_Profile * TAO_IIOP_Connector::create_profile (TAO_InputCDR& cdr) { - TAO_Profile *pfile = 0; + TAO_Profile *pfile; ACE_NEW_RETURN (pfile, TAO_IIOP_Profile (this->orb_core ()), 0); @@ -331,7 +371,7 @@ TAO_IIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL) TAO_IIOP_Profile (this->orb_core ()), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); @@ -395,8 +435,7 @@ TAO_IIOP_Connector::init_tcp_properties (void) int no_delay = this->orb_core ()->orb_params ()->nodelay (); int enable_network_priority = 0; - TAO_Protocols_Hooks *tph = - this->orb_core ()->get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER); + TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (tph != 0) @@ -443,23 +482,3 @@ TAO_IIOP_Connector::remote_endpoint (TAO_Endpoint *endpoint) return iiop_endpoint; } - -int -TAO_IIOP_Connector::cancel_svc_handler ( - TAO_Connection_Handler * svc_handler) -{ - TAO_IIOP_Connection_Handler* handler= - dynamic_cast<TAO_IIOP_Connection_Handler*>(svc_handler); - - if (handler) - { - // Cancel from the connector - this->base_connector_.cancel (handler); - - return 0; - } - else - { - return -1; - } -} diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h index 8b2bcefb164..d8dac4ba098 100644 --- a/TAO/tao/IIOP_Connector.h +++ b/TAO/tao/IIOP_Connector.h @@ -99,9 +99,6 @@ protected: /// initialize <tcp_properties_>. int init_tcp_properties (void); - /// Cancel the passed cvs handler from the connector - virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler); - protected: /// TCP configuration properties to be used for all diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp index 724fcd451fc..a19999c8d7f 100644 --- a/TAO/tao/IIOP_Profile.cpp +++ b/TAO/tao/IIOP_Profile.cpp @@ -4,7 +4,6 @@ #include "tao/debug.h" #include "tao/IIOP_EndpointsC.h" #include "tao/CDR.h" -#include "tao/SystemException.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_stdio.h" @@ -124,7 +123,7 @@ TAO_IIOP_Profile::parse_string_i (const char *ior // No object key delimiter or no hostname specified. ACE_THROW (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, EINVAL), CORBA::COMPLETED_NO)); } @@ -139,7 +138,7 @@ TAO_IIOP_Profile::parse_string_i (const char *ior // No hostname specified! It is required by the spec. ACE_THROW (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, EINVAL), CORBA::COMPLETED_NO)); } @@ -165,7 +164,7 @@ TAO_IIOP_Profile::parse_string_i (const char *ior { ACE_THROW (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, EINVAL), CORBA::COMPLETED_NO)); } @@ -211,7 +210,7 @@ TAO_IIOP_Profile::parse_string_i (const char *ior // @@ What's the right exception to throw here? ACE_THROW (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, EINVAL), CORBA::COMPLETED_NO)); } diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp index cc77eb99222..3151824b184 100644 --- a/TAO/tao/IIOP_Transport.cpp +++ b/TAO/tao/IIOP_Transport.cpp @@ -320,25 +320,14 @@ TAO_IIOP_Transport::set_bidir_context_info (TAO_Operation_Details &opdetails) { if (TAO_debug_level > 0) ACE_ERROR ((LM_ERROR, - "TAO (%P|%t) - IIOP_Transport::set_bidir_context_info, " - "error getting listen_point\n")); + "TAO (%P|%t) - IIOP_Transport::set_bidir_info, " + "error getting listen_point \n")); return; } } } - if (listen_point_list.length () == 0) - { - if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, - "TAO (%P|%t) - IIOP_Transport::set_bidir_context_info, " - "listen_point list is empty, client should send a list " - "with at least one point\n")); - - return; - } - // We have the ListenPointList at this point. Create a output CDR // stream at this point TAO_OutputCDR cdr; @@ -381,8 +370,9 @@ TAO_IIOP_Transport::get_listen_point ( == -1) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - IIOP_Transport::get_listen_point, ") - ACE_TEXT ("could not resolve local host address\n")), + ACE_TEXT ("(%P|%t) Could not resolve local ") + ACE_TEXT ("host address in ") + ACE_TEXT ("get_listen_point()\n")), -1); } @@ -397,8 +387,8 @@ TAO_IIOP_Transport::get_listen_point ( local_interface.out ()) == -1) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - IIOP_Transport::get_listen_point, ") - ACE_TEXT ("could not resolve local host name\n")), + ACE_TEXT ("(%P|%t) Could not resolve local host ") + ACE_TEXT ("name \n")), -1); } @@ -406,7 +396,7 @@ TAO_IIOP_Transport::get_listen_point ( index < count; ++index) { - if (local_addr.get_ip_address () + if (local_addr.get_ip_address() == endpoint_addr[index].get_ip_address ()) { // Get the count of the number of elements diff --git a/TAO/tao/IOP_CodecC.cpp b/TAO/tao/IOP_CodecC.cpp index 3a6a8dbddaa..5a99e777ab4 100644 --- a/TAO/tao/IOP_CodecC.cpp +++ b/TAO/tao/IOP_CodecC.cpp @@ -30,7 +30,6 @@ #include "IOP_CodecC.h" -#include "tao/SystemException.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" @@ -58,7 +57,7 @@ namespace TAO ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION IOP::Codec_ptr -TAO::Objref_Traits<IOP::Codec>::duplicate ( +TAO::Objref_Traits<IOP::Codec>::tao_duplicate ( IOP::Codec_ptr p ) { @@ -67,7 +66,7 @@ TAO::Objref_Traits<IOP::Codec>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<IOP::Codec>::release ( +TAO::Objref_Traits<IOP::Codec>::tao_release ( IOP::Codec_ptr p ) { @@ -76,14 +75,14 @@ TAO::Objref_Traits<IOP::Codec>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION IOP::Codec_ptr -TAO::Objref_Traits<IOP::Codec>::nil (void) +TAO::Objref_Traits<IOP::Codec>::tao_nil (void) { return IOP::Codec::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<IOP::Codec>::marshal ( +TAO::Objref_Traits<IOP::Codec>::tao_marshal ( IOP::Codec_ptr p, TAO_OutputCDR & cdr ) @@ -662,7 +661,7 @@ IOP::Encoding::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION IOP::CodecFactory_ptr -TAO::Objref_Traits<IOP::CodecFactory>::duplicate ( +TAO::Objref_Traits<IOP::CodecFactory>::tao_duplicate ( IOP::CodecFactory_ptr p ) { @@ -671,7 +670,7 @@ TAO::Objref_Traits<IOP::CodecFactory>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<IOP::CodecFactory>::release ( +TAO::Objref_Traits<IOP::CodecFactory>::tao_release ( IOP::CodecFactory_ptr p ) { @@ -680,14 +679,14 @@ TAO::Objref_Traits<IOP::CodecFactory>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION IOP::CodecFactory_ptr -TAO::Objref_Traits<IOP::CodecFactory>::nil (void) +TAO::Objref_Traits<IOP::CodecFactory>::tao_nil (void) { return IOP::CodecFactory::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<IOP::CodecFactory>::marshal ( +TAO::Objref_Traits<IOP::CodecFactory>::tao_marshal ( IOP::CodecFactory_ptr p, TAO_OutputCDR & cdr ) diff --git a/TAO/tao/IOP_CodecC.h b/TAO/tao/IOP_CodecC.h index 6b08d0a6a4b..3c05765c8d8 100644 --- a/TAO/tao/IOP_CodecC.h +++ b/TAO/tao/IOP_CodecC.h @@ -46,7 +46,6 @@ #include "tao/Any.h" #include "tao/Objref_VarOut_T.h" #include "tao/VarOut_T.h" -#include "tao/SystemException.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -71,13 +70,13 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// 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; } @@ -87,22 +86,22 @@ namespace TAO namespace IOP { - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_IOP_CODEC__VAR_OUT_CH_) #define _IOP_CODEC__VAR_OUT_CH_ - + class Codec; typedef Codec *Codec_ptr; - + typedef TAO_Objref_Var_T< Codec > Codec_var; - + typedef TAO_Objref_Out_T< Codec @@ -110,58 +109,58 @@ namespace IOP Codec_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_IOP_CODEC_CH_) #define _IOP_CODEC_CH_ - + class TAO_Export Codec : public virtual CORBA::Object { public: typedef Codec_ptr _ptr_type; typedef Codec_var _var_type; - + // The static operations. static Codec_ptr _duplicate (Codec_ptr obj); - + static Codec_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Codec_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Codec_ptr _nil (void) { return (Codec_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_IOP_CODEC_INVALIDTYPEFORENCODING_CH_) #define _IOP_CODEC_INVALIDTYPEFORENCODING_CH_ - + class TAO_Export InvalidTypeForEncoding : public CORBA::UserException { public: - + InvalidTypeForEncoding (void); InvalidTypeForEncoding (const InvalidTypeForEncoding &); ~InvalidTypeForEncoding (void); InvalidTypeForEncoding &operator= (const InvalidTypeForEncoding &); - + static void _tao_any_destructor (void *); - + static InvalidTypeForEncoding *_downcast (CORBA::Exception *); static CORBA::Exception *_alloc (void); @@ -173,43 +172,43 @@ namespace IOP 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_InvalidTypeForEncoding; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_IOP_CODEC_FORMATMISMATCH_CH_) #define _IOP_CODEC_FORMATMISMATCH_CH_ - + class TAO_Export FormatMismatch : public CORBA::UserException { public: - + FormatMismatch (void); FormatMismatch (const FormatMismatch &); ~FormatMismatch (void); FormatMismatch &operator= (const FormatMismatch &); - + static void _tao_any_destructor (void *); - + static FormatMismatch *_downcast (CORBA::Exception *); static CORBA::Exception *_alloc (void); @@ -221,43 +220,43 @@ namespace IOP 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_FormatMismatch; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_IOP_CODEC_TYPEMISMATCH_CH_) #define _IOP_CODEC_TYPEMISMATCH_CH_ - + class TAO_Export TypeMismatch : public CORBA::UserException { public: - + TypeMismatch (void); TypeMismatch (const TypeMismatch &); ~TypeMismatch (void); TypeMismatch &operator= (const TypeMismatch &); - + static void _tao_any_destructor (void *); - + static TypeMismatch *_downcast (CORBA::Exception *); static CORBA::Exception *_alloc (void); @@ -269,28 +268,28 @@ namespace IOP 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_TypeMismatch; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::OctetSeq * encode ( const CORBA::Any & data ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -299,10 +298,10 @@ namespace IOP CORBA::SystemException , IOP::Codec::InvalidTypeForEncoding )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Any * decode ( const CORBA::OctetSeq & data ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -311,10 +310,10 @@ namespace IOP CORBA::SystemException , IOP::Codec::FormatMismatch )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::OctetSeq * encode_value ( const CORBA::Any & data ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -323,10 +322,10 @@ namespace IOP CORBA::SystemException , IOP::Codec::InvalidTypeForEncoding )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Any * decode_value ( const CORBA::OctetSeq & data, CORBA::TypeCode_ptr tc @@ -337,102 +336,102 @@ namespace IOP , IOP::Codec::FormatMismatch , IOP::Codec::TypeMismatch )) = 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. Codec (void); - + virtual ~Codec (void); - + private: // Private and unimplemented for concrete interfaces. Codec (const Codec &); - + void operator= (const Codec &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Codec; - + // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:342 - + typedef CORBA::Short EncodingFormat; typedef CORBA::Short_out EncodingFormat_out; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EncodingFormat; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const IOP::EncodingFormat ENCODING_CDR_ENCAPS = 0; - + // TAO_IDL - Generated from // be\be_type.cpp:258 - + struct Encoding; - + typedef TAO_Fixed_Var_T< Encoding > Encoding_var; - + typedef Encoding & Encoding_out; - + // TAO_IDL - Generated from // be\be_visitor_structure/structure_ch.cpp:52 - + struct TAO_Export Encoding { typedef Encoding_var _var_type; - + static void _tao_any_destructor (void *); IOP::EncodingFormat format; CORBA::Octet major_version; CORBA::Octet minor_version; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Encoding; - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_IOP_CODECFACTORY__VAR_OUT_CH_) #define _IOP_CODECFACTORY__VAR_OUT_CH_ - + class CodecFactory; typedef CodecFactory *CodecFactory_ptr; - + typedef TAO_Objref_Var_T< CodecFactory > CodecFactory_var; - + typedef TAO_Objref_Out_T< CodecFactory @@ -440,58 +439,58 @@ namespace IOP CodecFactory_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_IOP_CODECFACTORY_CH_) #define _IOP_CODECFACTORY_CH_ - + class TAO_Export CodecFactory : public virtual CORBA::Object { public: typedef CodecFactory_ptr _ptr_type; typedef CodecFactory_var _var_type; - + // The static operations. static CodecFactory_ptr _duplicate (CodecFactory_ptr obj); - + static CodecFactory_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static CodecFactory_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static CodecFactory_ptr _nil (void) { return (CodecFactory_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_IOP_CODECFACTORY_UNKNOWNENCODING_CH_) #define _IOP_CODECFACTORY_UNKNOWNENCODING_CH_ - + class TAO_Export UnknownEncoding : public CORBA::UserException { public: - + UnknownEncoding (void); UnknownEncoding (const UnknownEncoding &); ~UnknownEncoding (void); UnknownEncoding &operator= (const UnknownEncoding &); - + static void _tao_any_destructor (void *); - + static UnknownEncoding *_downcast (CORBA::Exception *); static CORBA::Exception *_alloc (void); @@ -503,28 +502,28 @@ namespace IOP 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_UnknownEncoding; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::IOP::Codec_ptr create_codec ( const IOP::Encoding & enc ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -533,36 +532,36 @@ namespace IOP CORBA::SystemException , IOP::CodecFactory::UnknownEncoding )) = 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. CodecFactory (void); - + virtual ~CodecFactory (void); - + private: // Private and unimplemented for concrete interfaces. CodecFactory (const CodecFactory &); - + void operator= (const CodecFactory &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodecFactory; // TAO_IDL - Generated from @@ -579,18 +578,18 @@ namespace TAO #if !defined (_IOP_CODEC__TRAITS_CH_) #define _IOP_CODEC__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<IOP::Codec> { - static IOP::Codec_ptr duplicate ( + static IOP::Codec_ptr tao_duplicate ( IOP::Codec_ptr ); - static void release ( + static void tao_release ( IOP::Codec_ptr ); - static IOP::Codec_ptr nil (void); - static CORBA::Boolean marshal ( + static IOP::Codec_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( IOP::Codec_ptr p, TAO_OutputCDR & cdr ); @@ -600,18 +599,18 @@ namespace TAO #if !defined (_IOP_CODECFACTORY__TRAITS_CH_) #define _IOP_CODECFACTORY__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<IOP::CodecFactory> { - static IOP::CodecFactory_ptr duplicate ( + static IOP::CodecFactory_ptr tao_duplicate ( IOP::CodecFactory_ptr ); - static void release ( + static void tao_release ( IOP::CodecFactory_ptr ); - static IOP::CodecFactory_ptr nil (void); - static CORBA::Boolean marshal ( + static IOP::CodecFactory_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( IOP::CodecFactory_ptr p, TAO_OutputCDR & cdr ); @@ -698,3 +697,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::Encoding &); #include /**/ "ace/post.h" #endif /* ifndef */ + diff --git a/TAO/tao/IORInterceptor.mpc b/TAO/tao/IORInterceptor.mpc index 5141059d624..ae14f21d80e 100644 --- a/TAO/tao/IORInterceptor.mpc +++ b/TAO/tao/IORInterceptor.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, portableserver, objreftemplate, core { +project : taolib, objreftemplate, core { sharedname = TAO_IORInterceptor dynamicflags = TAO_IORINTERCEPTOR_BUILD_DLL @@ -22,8 +22,4 @@ project : taolib, portableserver, objreftemplate, core { Resource_Files { IORInterceptor } - - PIDL_Files { - IORInterceptor - } } diff --git a/TAO/tao/IORInterceptor/IORInterceptor.pidl b/TAO/tao/IORInterceptor/IORInterceptor.pidl index 1013e104599..2c466dd0e49 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor.pidl +++ b/TAO/tao/IORInterceptor/IORInterceptor.pidl @@ -10,7 +10,7 @@ * * The following is from orbos/99-12-02 Portable Interceptors spec, * the full IDL is downloadable from orbos/99-12-02. This file contains - * interfaces from PortableInterceptor.idl that depend on + * interfaces from PortableInterceptor.idl that depend on * ObjectReferenceFactory and ObjectReferenceTemplate, which inherit * directly or indirectly from CORBA::ValueBase. This separate file * has been created to remove the dependency from the rest of module @@ -27,6 +27,9 @@ * -Wb,pre_include="ace/pre.h" * -Wb,post_include="ace/post.h" * IORInterceptor.pidl + * + * Patches for changes to the generated code are available in the + * `diffs' directory. */ // File: IORInterceptor.idl @@ -34,21 +37,40 @@ #define _IOR_INTERCEPTOR_IDL_ #include "tao/PortableInterceptor.pidl" -#include "tao/IORInterceptor/IORInfo.pidl" #include "tao/ObjRefTemplate/ObjectReferenceTemplate.pidl" -module PortableInterceptor +module PortableInterceptor { typeprefix PortableInterceptor "omg.org"; - local interface IORInterceptor : Interceptor + local interface IORInfo + { + CORBA::Policy get_effective_policy (in CORBA::PolicyType type); + + void add_ior_component (in IOP::TaggedComponent a_component); + + void add_ior_component_to_profile ( + in IOP::TaggedComponent a_component, + in IOP::ProfileId profile_id + ); + + readonly attribute AdapterManagerId manager_id; + + readonly attribute AdapterState state; + + readonly attribute ObjectReferenceTemplate adapter_template; + + attribute ObjectReferenceFactory current_factory; + }; + + local interface IORInterceptor : Interceptor { void establish_components (in IORInfo info); void components_established (in IORInfo info); void adapter_manager_state_changed ( - in AdapterManagerId id, + in AdapterManagerId id, in AdapterState state ); void adapter_state_changed ( diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.cpp b/TAO/tao/IORInterceptor/IORInterceptorC.cpp index be51db89f4b..c839e820eac 100644 --- a/TAO/tao/IORInterceptor/IORInterceptorC.cpp +++ b/TAO/tao/IORInterceptor/IORInterceptorC.cpp @@ -26,11 +26,12 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:303 +// be\be_codegen.cpp:323 #include "IORInterceptorC.h" #include "tao/CDR.h" +#include "tao/Object_Argument_T.h" #include "ace/OS_NS_string.h" #if defined (__BORLANDC__) @@ -38,26 +39,180 @@ #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) -#include "IORInterceptorC.inl" +#include "IORInterceptorC.i" #endif /* !defined INLINE */ // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:64 +// be\be_visitor_arg_traits.cpp:64 // Arg traits specializations. namespace TAO { + +#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_CS_) +#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_IORInterceptor_Export Arg_Traits<PortableInterceptor::ObjectReferenceFactory> + : public + Object_Arg_Traits_T< + PortableInterceptor::ObjectReferenceFactory *, + PortableInterceptor::ObjectReferenceFactory_var, + PortableInterceptor::ObjectReferenceFactory_out, + TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory> + > + { + }; + +#endif /* end #if !defined */ } // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60 +// be\be_visitor_interface/interface_cs.cpp:60 + +// Traits specializations for PortableInterceptor::IORInfo. + +ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION +PortableInterceptor::IORInfo_ptr +TAO::Objref_Traits<PortableInterceptor::IORInfo>::tao_duplicate ( + PortableInterceptor::IORInfo_ptr p + ) +{ + return PortableInterceptor::IORInfo::_duplicate (p); +} + +ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION +void +TAO::Objref_Traits<PortableInterceptor::IORInfo>::tao_release ( + PortableInterceptor::IORInfo_ptr p + ) +{ + CORBA::release (p); +} + +ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION +PortableInterceptor::IORInfo_ptr +TAO::Objref_Traits<PortableInterceptor::IORInfo>::tao_nil (void) +{ + return PortableInterceptor::IORInfo::_nil (); +} + +ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION +CORBA::Boolean +TAO::Objref_Traits<PortableInterceptor::IORInfo>::tao_marshal ( + PortableInterceptor::IORInfo_ptr p, + TAO_OutputCDR & cdr + ) +{ + return CORBA::Object::marshal (p, cdr); +} + +// Function pointer for collocation factory initialization. +TAO::Collocation_Proxy_Broker * +(*PortableInterceptor__TAO_IORInfo_Proxy_Broker_Factory_function_pointer) ( + CORBA::Object_ptr obj + ) = 0; + +PortableInterceptor::IORInfo::IORInfo (void) +{} + +PortableInterceptor::IORInfo::~IORInfo (void) +{} + +PortableInterceptor::IORInfo_ptr +PortableInterceptor::IORInfo::_narrow ( + CORBA::Object_ptr _tao_objref + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + if (CORBA::is_nil (_tao_objref)) + { + return IORInfo::_nil (); + } + + IORInfo_ptr proxy = + dynamic_cast<IORInfo_ptr> (_tao_objref); + + return IORInfo::_duplicate (proxy); +} + +PortableInterceptor::IORInfo_ptr +PortableInterceptor::IORInfo::_unchecked_narrow ( + CORBA::Object_ptr _tao_objref + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + if (CORBA::is_nil (_tao_objref)) + { + return IORInfo::_nil (); + } + + IORInfo_ptr proxy = + dynamic_cast<IORInfo_ptr> (_tao_objref); + + return IORInfo::_duplicate (proxy); +} + +PortableInterceptor::IORInfo_ptr +PortableInterceptor::IORInfo::_duplicate (IORInfo_ptr obj) +{ + if (! CORBA::is_nil (obj)) + { + obj->_add_ref (); + } + + return obj; +} + +CORBA::Boolean +PortableInterceptor::IORInfo::_is_a ( + const char *value + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + if ( + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/PortableInterceptor/IORInfo:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/LocalObject:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/Object:1.0" + ) + ) + { + return 1; // success using local knowledge + } + else + { + return 0; + } +} + +const char* PortableInterceptor::IORInfo::_interface_repository_id (void) const +{ + return "IDL:omg.org/PortableInterceptor/IORInfo:1.0"; +} + +CORBA::Boolean +PortableInterceptor::IORInfo::marshal (TAO_OutputCDR &) +{ + return 0; +} + +// TAO_IDL - Generated from +// be\be_visitor_interface/interface_cs.cpp:60 // Traits specializations for PortableInterceptor::IORInterceptor. ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::IORInterceptor_ptr -TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::duplicate ( +TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::tao_duplicate ( PortableInterceptor::IORInterceptor_ptr p ) { @@ -66,7 +221,7 @@ TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::release ( +TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::tao_release ( PortableInterceptor::IORInterceptor_ptr p ) { @@ -75,14 +230,14 @@ TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::IORInterceptor_ptr -TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::nil (void) +TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::tao_nil (void) { return PortableInterceptor::IORInterceptor::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::marshal ( +TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::tao_marshal ( PortableInterceptor::IORInterceptor_ptr p, TAO_OutputCDR & cdr ) @@ -91,7 +246,7 @@ TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*PortableInterceptor__TAO_IORInterceptor_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -112,10 +267,10 @@ PortableInterceptor::IORInterceptor::_narrow ( { return IORInterceptor::_nil (); } - + IORInterceptor_ptr proxy = dynamic_cast<IORInterceptor_ptr> (_tao_objref); - + return IORInterceptor::_duplicate (proxy); } @@ -129,10 +284,10 @@ PortableInterceptor::IORInterceptor::_unchecked_narrow ( { return IORInterceptor::_nil (); } - + IORInterceptor_ptr proxy = dynamic_cast<IORInterceptor_ptr> (_tao_objref); - + return IORInterceptor::_duplicate (proxy); } @@ -143,7 +298,7 @@ PortableInterceptor::IORInterceptor::_duplicate (IORInterceptor_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -192,7 +347,7 @@ PortableInterceptor::IORInterceptor::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1628 +// be\be_visitor_root/root.cpp:1628 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) @@ -205,12 +360,45 @@ PortableInterceptor::IORInterceptor::marshal (TAO_OutputCDR &) TAO_Objref_Var_T< PortableInterceptor::IORInterceptor >; - + template class TAO_Objref_Out_T< PortableInterceptor::IORInterceptor >; +#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_TMPLINST_CS_) +#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_TMPLINST_CS_ + + template class + TAO::Arg_Traits< + PortableInterceptor::ObjectReferenceFactory + >; + + template class + TAO::Object_Arg_Traits_T< + PortableInterceptor::ObjectReferenceFactory *, + PortableInterceptor::ObjectReferenceFactory_var, + PortableInterceptor::ObjectReferenceFactory_out, + TAO::Objref_Traits<PortableInterceptor::ObjectReferenceFactory> + >; + +#endif /* end #if !defined */ + + template class + TAO::Objref_Traits< + PortableInterceptor::IORInfo + >; + + template class + TAO_Objref_Var_T< + PortableInterceptor::IORInfo + >; + + template class + TAO_Objref_Out_T< + PortableInterceptor::IORInfo + >; + #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ @@ -222,10 +410,44 @@ PortableInterceptor::IORInterceptor::marshal (TAO_OutputCDR &) TAO_Objref_Var_T< \ PortableInterceptor::IORInterceptor > - + # pragma instantiate \ TAO_Objref_Out_T< \ PortableInterceptor::IORInterceptor > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_TMPLINST_CS_) +#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_TMPLINST_CS_ + +# pragma instantiate \ + TAO::Arg_Traits< \ + PortableInterceptor::ObjectReferenceFactory \ + > + +# pragma instantiate \ + TAO::Object_Arg_Traits_T< \ + PortableInterceptor::ObjectReferenceFactory *, \ + PortableInterceptor::ObjectReferenceFactory_var, \ + PortableInterceptor::ObjectReferenceFactory_out, \ + TAO::Objref_Traits<PortableInterceptor::ObjectReferenceFactory> \ + > + +#endif /* end #if !defined */ + +# pragma instantiate \ + TAO::Objref_Traits< \ + PortableInterceptor::IORInfo \ + > + +# pragma instantiate \ + TAO_Objref_Var_T< \ + PortableInterceptor::IORInfo + > + +# pragma instantiate \ + TAO_Objref_Out_T< \ + PortableInterceptor::IORInfo + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.h b/TAO/tao/IORInterceptor/IORInterceptorC.h index e7e07e8f806..8dce343deac 100644 --- a/TAO/tao/IORInterceptor/IORInterceptorC.h +++ b/TAO/tao/IORInterceptor/IORInterceptorC.h @@ -26,28 +26,25 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:153 +// be\be_codegen.cpp:171 #ifndef _TAO_IDL_ORIG_IORINTERCEPTORC_H_ #define _TAO_IDL_ORIG_IORINTERCEPTORC_H_ #include /**/ "ace/pre.h" - -#include "ace/config-all.h" +#include "tao/ORB.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "iorinterceptor_export.h" -#include "tao/ORB.h" #include "tao/Environment.h" #include "tao/Object.h" #include "tao/Objref_VarOut_T.h" #include "tao/PortableInterceptorC.h" -#include "tao/IORInterceptor/IORInfoC.h" #include "tao/ObjRefTemplate/ObjectReferenceTemplateC.h" #if defined (TAO_EXPORT_MACRO) @@ -73,38 +70,205 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_ch.cpp:63 +// 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; } // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48 +// be\be_visitor_module/module_ch.cpp:48 namespace PortableInterceptor { + + // TAO_IDL - Generated from + // be\be_interface.cpp:611 + +#if !defined (_PORTABLEINTERCEPTOR_IORINFO__VAR_OUT_CH_) +#define _PORTABLEINTERCEPTOR_IORINFO__VAR_OUT_CH_ + + class IORInfo; + typedef IORInfo *IORInfo_ptr; + + typedef + TAO_Objref_Var_T< + IORInfo + > + IORInfo_var; + + typedef + TAO_Objref_Out_T< + IORInfo + > + IORInfo_out; + +#endif /* end #if !defined */ + + // TAO_IDL - Generated from + // be\be_visitor_interface/interface_ch.cpp:54 + +#if !defined (_PORTABLEINTERCEPTOR_IORINFO_CH_) +#define _PORTABLEINTERCEPTOR_IORINFO_CH_ + + class TAO_IORInterceptor_Export IORInfo + : public virtual CORBA::Object + { + public: + typedef IORInfo_ptr _ptr_type; + typedef IORInfo_var _var_type; + + // The static operations. + static IORInfo_ptr _duplicate (IORInfo_ptr obj); + + static IORInfo_ptr _narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + + static IORInfo_ptr _unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + + static IORInfo_ptr _nil (void) + { + return (IORInfo_ptr)0; + } + + + + // TAO_IDL - Generated from + // be\be_visitor_operation/operation_ch.cpp:46 + + virtual ::CORBA::Policy_ptr get_effective_policy ( + CORBA::PolicyType type + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + // TAO_IDL - Generated from + // be\be_visitor_operation/operation_ch.cpp:46 + + virtual void add_ior_component ( + const IOP::TaggedComponent & a_component + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + // TAO_IDL - Generated from + // be\be_visitor_operation/operation_ch.cpp:46 + + virtual void add_ior_component_to_profile ( + const IOP::TaggedComponent & a_component, + IOP::ProfileId profile_id + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + // TAO_IDL - Generated from + // be\be_visitor_operation/operation_ch.cpp:46 + + virtual PortableInterceptor::AdapterManagerId manager_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::AdapterState state ( + 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::ObjectReferenceTemplate * adapter_template ( + 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::ObjectReferenceFactory * current_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 current_factory ( + PortableInterceptor::ObjectReferenceFactory * current_factory + ACE_ENV_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. + IORInfo (void); + + virtual ~IORInfo (void); + + private: + // Private and unimplemented for concrete interfaces. + IORInfo (const IORInfo &); + + void operator= (const IORInfo &); + }; +#endif /* end #if !defined */ + // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:613 + // 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 @@ -112,119 +276,119 @@ namespace PortableInterceptor IORInterceptor_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 + // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR_CH_) #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR_CH_ - + class TAO_IORInterceptor_Export IORInterceptor - : public virtual ::PortableInterceptor::Interceptor + : public virtual PortableInterceptor::Interceptor { public: typedef IORInterceptor_ptr _ptr_type; typedef IORInterceptor_var _var_type; - + // The static operations. static IORInterceptor_ptr _duplicate (IORInterceptor_ptr obj); - + static IORInterceptor_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static IORInterceptor_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static IORInterceptor_ptr _nil (void) { return (IORInterceptor_ptr)0; } - - - + + + // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be\be_visitor_operation/operation_ch.cpp:46 + virtual void establish_components ( - ::PortableInterceptor::IORInfo_ptr info + PortableInterceptor::IORInfo_ptr info ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be\be_visitor_operation/operation_ch.cpp:46 + virtual void components_established ( - ::PortableInterceptor::IORInfo_ptr info + PortableInterceptor::IORInfo_ptr info ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be\be_visitor_operation/operation_ch.cpp:46 + virtual void adapter_manager_state_changed ( - ::PortableInterceptor::AdapterManagerId id, - ::PortableInterceptor::AdapterState state + PortableInterceptor::AdapterManagerId id, + PortableInterceptor::AdapterState state ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be\be_visitor_operation/operation_ch.cpp:46 + virtual void adapter_state_changed ( - const ::PortableInterceptor::ObjectReferenceTemplateSeq & templates, - ::PortableInterceptor::AdapterState state + const PortableInterceptor::ObjectReferenceTemplateSeq & templates, + PortableInterceptor::AdapterState state ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:208 - + // 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. IORInterceptor (void); - + virtual ~IORInterceptor (void); - + private: // Private and unimplemented for concrete interfaces. IORInterceptor (const IORInterceptor &); - + void operator= (const IORInterceptor &); }; #endif /* end #if !defined */ // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:66 +// be\be_visitor_module/module_ch.cpp:66 } // module PortableInterceptor // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:59 +// be\be_visitor_traits.cpp:59 // Traits specializations. namespace TAO @@ -232,19 +396,40 @@ namespace TAO #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_) #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_ + + ACE_TEMPLATE_SPECIALIZATION + struct TAO_IORInterceptor_Export Objref_Traits<PortableInterceptor::IORInterceptor> + { + static PortableInterceptor::IORInterceptor_ptr tao_duplicate ( + PortableInterceptor::IORInterceptor_ptr + ); + static void tao_release ( + PortableInterceptor::IORInterceptor_ptr + ); + static PortableInterceptor::IORInterceptor_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( + PortableInterceptor::IORInterceptor_ptr p, + TAO_OutputCDR & cdr + ); + }; +#endif /* end #if !defined */ + +#if !defined (_PORTABLEINTERCEPTOR_IORINFO__TRAITS_CH_) +#define _PORTABLEINTERCEPTOR_IORINFO__TRAITS_CH_ + ACE_TEMPLATE_SPECIALIZATION - struct TAO_IORInterceptor_Export Objref_Traits< ::PortableInterceptor::IORInterceptor> + struct TAO_IORInterceptor_Export Objref_Traits<PortableInterceptor::IORInfo> { - static ::PortableInterceptor::IORInterceptor_ptr duplicate ( - ::PortableInterceptor::IORInterceptor_ptr + static PortableInterceptor::IORInfo_ptr tao_duplicate ( + PortableInterceptor::IORInfo_ptr ); - static void release ( - ::PortableInterceptor::IORInterceptor_ptr + static void tao_release ( + PortableInterceptor::IORInfo_ptr ); - static ::PortableInterceptor::IORInterceptor_ptr nil (void); - static CORBA::Boolean marshal ( - ::PortableInterceptor::IORInterceptor_ptr p, + static PortableInterceptor::IORInfo_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( + PortableInterceptor::IORInfo_ptr p, TAO_OutputCDR & cdr ); }; @@ -253,10 +438,10 @@ namespace TAO } // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:958 +// be\be_codegen.cpp:978 #if defined (__ACE_INLINE__) -#include "IORInterceptorC.inl" +#include "IORInterceptorC.i" #endif /* defined INLINE */ #if defined(_MSC_VER) && (_MSC_VER >= 1200) @@ -270,3 +455,4 @@ namespace TAO #include /**/ "ace/post.h" #endif /* ifndef */ + diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.i b/TAO/tao/IORInterceptor/IORInterceptorC.i new file mode 100644 index 00000000000..38aa32569ba --- /dev/null +++ b/TAO/tao/IORInterceptor/IORInterceptorC.i @@ -0,0 +1,28 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + + diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp index 39bf2af372e..2fa56bf2766 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp +++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp @@ -16,7 +16,7 @@ TAO_IORInterceptor_Adapter * TAO_IORInterceptor_Adapter_Factory_Impl::create ( ) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IORInterceptor_Adapter_Impl * new_iorinterceptor_adapter = 0; + TAO_IORInterceptor_Adapter_Impl * new_iorinterceptor_adapter; ACE_NEW_RETURN (new_iorinterceptor_adapter, TAO_IORInterceptor_Adapter_Impl, 0); diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp index ecd898772e8..727319bb0e7 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp +++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp @@ -1,10 +1,7 @@ // $Id$ #include "IORInterceptor_Adapter_Impl.h" -#include "IORInfo.h" #include "tao/debug.h" -#include "tao/ORB_Constants.h" -#include "tao/PortableServer/POA.h" ACE_RCSID (IORInterceptor, IORInterceptor_Adapter_Impl, @@ -80,162 +77,3 @@ TAO_IORInterceptor_Adapter_Impl::interceptor_list (void) { return &this->ior_interceptor_list_; } - -void -TAO_IORInterceptor_Adapter_Impl::establish_components ( - TAO_POA* poa - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - TAO_IORInterceptor_List::TYPE & interceptors = - this->ior_interceptor_list_.interceptors (); - - const size_t interceptor_count = interceptors.size (); - - if (interceptor_count == 0) - return; - - TAO_IORInfo *tao_info = 0; - ACE_NEW_THROW_EX (tao_info, - TAO_IORInfo (poa), - CORBA::NO_MEMORY ( - CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, - ENOMEM), - CORBA::COMPLETED_NO)); - ACE_CHECK; - - PortableInterceptor::IORInfo_var info = tao_info; - - // Release the POA during IORInterceptor calls to avoid potential - // deadlocks. - TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*poa); - ACE_UNUSED_ARG (non_servant_upcall); - - for (size_t i = 0; i < interceptor_count; ++i) - { - ACE_TRY - { - interceptors[i]->establish_components (info.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - // According to the Portable Interceptors specification, - // IORInterceptor::establish_components() must not throw an - // exception. If it does, then the ORB is supposed to - // ignore it and continue processing the remaining - // IORInterceptors. - if (TAO_debug_level > 1) - { - CORBA::String_var name = interceptors[i]->name ( - ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - // @@ What do we do if we get an exception here? - - if (name.in () != 0) - { - ACE_DEBUG ((LM_WARNING, - "(%P|%t) Exception thrown while processing " - "IORInterceptor \"%s\">\n", - ACE_TEXT_CHAR_TO_TCHAR (name.in ()))); - } - - ACE_PRINT_TAO_EXCEPTION (ACE_ANY_EXCEPTION, - "Ignoring exception in " - "IORInterceptor::establish_components"); - } - } - ACE_ENDTRY; - ACE_CHECK; - } - - tao_info->components_established (); - - this->components_established (info.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - // The IORInfo instance is no longer valid. Invalidate it to - // prevent the user from peforming "illegal" operations. - tao_info->invalidate (); -} - -void -TAO_IORInterceptor_Adapter_Impl::components_established ( - PortableInterceptor::IORInfo_ptr info - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - // Iterate over the registered IOR interceptors so that they may be - // given the opportunity to add tagged components to the profiles - // for this servant. - TAO_IORInterceptor_List::TYPE & interceptors = - this->ior_interceptor_list_.interceptors (); - - const size_t interceptor_count = interceptors.size (); - - // All the establish_components() interception points have been - // invoked. Now call the components_established() interception point - // on all the IORInterceptors. - for (size_t j = 0; j < interceptor_count; ++j) - { - ACE_TRY - { - interceptors[j]->components_established ( - info - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_THROW (CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 6, - CORBA::COMPLETED_NO)); - } - ACE_ENDTRY; - ACE_CHECK; - } -} - -void -TAO_IORInterceptor_Adapter_Impl::adapter_state_changed ( - const TAO_ObjectReferenceTemplate_Array &array_obj_ref_template, - PortableInterceptor::AdapterState state - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - this->ior_interceptor_list_.adapter_state_changed ( - array_obj_ref_template, - state - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; -} - -void -TAO_IORInterceptor_Adapter_Impl::adapter_manager_state_changed ( - PortableInterceptor::AdapterManagerId id, - PortableInterceptor::AdapterState state - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - /// Whenever the POAManager state is changed, the - /// adapter_manager_state_changed method is to be invoked on all the IOR - /// Interceptors. - TAO_IORInterceptor_List::TYPE & interceptors = - this->ior_interceptor_list_.interceptors (); - - const size_t interceptor_count = interceptors.size (); - - if (interceptor_count == 0) - return; - - for (size_t i = 0; i < interceptor_count; ++i) - { - interceptors[i]->adapter_manager_state_changed ( - id, - state - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } -} diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h index 8a4a7f82b6f..160476a9949 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h +++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h @@ -27,8 +27,6 @@ #include "ace/Service_Config.h" #include "IORInterceptor_List.h" -class TAO_POA; - /** * @class TAO_IORInterceptor_Adapter_Impl * @@ -44,6 +42,7 @@ class TAO_IORInterceptor_Export TAO_IORInterceptor_Adapter_Impl public: virtual ~TAO_IORInterceptor_Adapter_Impl (void); + virtual void add_interceptor (PortableInterceptor::IORInterceptor_ptr interceptor ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -54,28 +53,8 @@ public: virtual TAO_IORInterceptor_List *interceptor_list (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void establish_components (TAO_POA *poa ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - /// Call the IORInterceptor::components_established() method on all - /// registered IORInterceptors. - virtual void components_established (PortableInterceptor::IORInfo_ptr info - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual void adapter_state_changed ( - const TAO_ObjectReferenceTemplate_Array &array_obj_ref_template, - PortableInterceptor::AdapterState state - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual void adapter_manager_state_changed ( - PortableInterceptor::AdapterManagerId id, - PortableInterceptor::AdapterState state - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - private: + /// List of IOR interceptors maintained TAO_IORInterceptor_List ior_interceptor_list_; }; diff --git a/TAO/tao/IORInterceptor/IORInterceptor_List.cpp b/TAO/tao/IORInterceptor/IORInterceptor_List.cpp index debefc5ac8b..d31f6348adc 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor_List.cpp +++ b/TAO/tao/IORInterceptor/IORInterceptor_List.cpp @@ -52,41 +52,6 @@ TAO_IORInterceptor_List::add_interceptor ( PortableInterceptor::IORInterceptor::_duplicate (interceptor); } -void -TAO_IORInterceptor_List::adapter_state_changed ( - const TAO::ORT_Array &array_obj_ref_template, - PortableInterceptor::AdapterState state - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - const size_t interceptor_count = this->interceptors_.size (); - - if (interceptor_count == 0) - return; - - PortableInterceptor::ObjectReferenceTemplateSeq seq_obj_ref_template; - - seq_obj_ref_template.length (array_obj_ref_template.size()); - - for (size_t counter = 0; counter < array_obj_ref_template.size(); ++counter) - { - PortableInterceptor::ObjectReferenceTemplate *member = - array_obj_ref_template[counter]; - - CORBA::add_ref (member); - - seq_obj_ref_template[counter] = member; - } - - for (size_t i = 0; i < interceptor_count; ++i) - { - this->interceptors_[i]->adapter_state_changed (seq_obj_ref_template, - state - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } - -} #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/IORInterceptor/IORInterceptor_List.h b/TAO/tao/IORInterceptor/IORInterceptor_List.h index 05bd4f9d3c5..3d77e7aec7a 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor_List.h +++ b/TAO/tao/IORInterceptor/IORInterceptor_List.h @@ -24,7 +24,6 @@ #include "IORInterceptorC.h" #include "tao/Interceptor_List.h" -#include "tao/PortableServer/ORT_Adapter.h" /** * @class TAO_IORInterceptor_List @@ -54,12 +53,6 @@ public: /// Return reference to the underlying Portable Interceptor array. TYPE & interceptors (void); - void adapter_state_changed ( - const TAO::ORT_Array &array_obj_ref_template, - PortableInterceptor::AdapterState state - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - protected: /// Return the length of the underlying interceptor array. @@ -68,13 +61,14 @@ protected: /// Set the length of the underlying interceptor array. virtual void length (size_t); - /// Return the interceptor in array element @a index. - virtual PortableInterceptor::Interceptor_ptr interceptor (size_t index); + /// Return the interceptor in array element <index>. + virtual PortableInterceptor::Interceptor_ptr interceptor (size_t); private: /// Dynamic array of registered IOR interceptors. TYPE interceptors_; + }; diff --git a/TAO/tao/IORInterceptor_Adapter.h b/TAO/tao/IORInterceptor_Adapter.h index 8ab77cbb616..786e0e14141 100644 --- a/TAO/tao/IORInterceptor_Adapter.h +++ b/TAO/tao/IORInterceptor_Adapter.h @@ -16,14 +16,12 @@ #include /**/ "ace/pre.h" #include "ace/Service_Object.h" -#include "ace/Array_Base.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/SystemException.h" -#include "tao/PI_ForwardC.h" +#include "tao/Exception.h" namespace PortableInterceptor { @@ -31,17 +29,9 @@ namespace PortableInterceptor typedef Interceptor *Interceptor_ptr; class IORInterceptor; typedef IORInterceptor *IORInterceptor_ptr; - class IORInfo; - typedef IORInfo *IORInfo_ptr; - class ObjectReferenceTemplate; } -typedef -ACE_Array_Base<PortableInterceptor::ObjectReferenceTemplate*> - TAO_ObjectReferenceTemplate_Array; - class TAO_IORInterceptor_List; -class TAO_POA; /** * @class TAO_IORInterceptor_Adapter @@ -71,34 +61,6 @@ public: virtual TAO_IORInterceptor_List *interceptor_list (void) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; - /// Call the IORInterceptor::establish_components() method on all - /// registered IORInterceptors. - /** - * This method calls IORInterceptor::establish_components() method - * on all registered IORInterceptors, and - * IORInterceptor::components_established() once the former is - * completed. - */ - virtual void establish_components (TAO_POA *poa ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; - - /// Call the IORInterceptor::components_established() method on all - /// registered IORInterceptors. - virtual void components_established (PortableInterceptor::IORInfo_ptr info - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; - - virtual void adapter_state_changed ( - const TAO_ObjectReferenceTemplate_Array &array_obj_ref_template, - PortableInterceptor::AdapterState state - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; - - virtual void adapter_manager_state_changed ( - PortableInterceptor::AdapterManagerId id, - PortableInterceptor::AdapterState state - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; }; #include /**/ "ace/post.h" diff --git a/TAO/tao/IORInterceptor_Adapter_Factory.h b/TAO/tao/IORInterceptor_Adapter_Factory.h index e56e7994296..5b030bd87af 100644 --- a/TAO/tao/IORInterceptor_Adapter_Factory.h +++ b/TAO/tao/IORInterceptor_Adapter_Factory.h @@ -21,7 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/SystemException.h" +#include "tao/Exception.h" class TAO_IORInterceptor_Adapter; @@ -34,7 +34,7 @@ class TAO_IORInterceptor_Adapter; * ORB on the ORB's first usage of its ior_interceptor_adapter_. This is a base * class for the actual implementation in the TAO_IORInterceptor library. */ -class TAO_Export TAO_IORInterceptor_Adapter_Factory +class TAO_Export TAO_IORInterceptor_Adapter_Factory : public ACE_Service_Object { public: diff --git a/TAO/tao/IORManipulation.mpc b/TAO/tao/IORManipulation.mpc index 37f3b5cead9..91ff9430e0a 100644 --- a/TAO/tao/IORManipulation.mpc +++ b/TAO/tao/IORManipulation.mpc @@ -22,8 +22,4 @@ project : taolib, core { Resource_Files { IORManipulation } - - PIDL_Files { - IORManipulation - } } diff --git a/TAO/tao/IORManipulation/IORC.cpp b/TAO/tao/IORManipulation/IORC.cpp index d579c25af93..420a5348e22 100644 --- a/TAO/tao/IORManipulation/IORC.cpp +++ b/TAO/tao/IORManipulation/IORC.cpp @@ -613,7 +613,7 @@ CORBA::TypeCode_ptr TAO_IOP::MultiProfileList::_type (void) const ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION TAO_IOP::TAO_IOR_Property_ptr -TAO::Objref_Traits<TAO_IOP::TAO_IOR_Property>::duplicate ( +TAO::Objref_Traits<TAO_IOP::TAO_IOR_Property>::tao_duplicate ( TAO_IOP::TAO_IOR_Property_ptr p ) { @@ -622,7 +622,7 @@ TAO::Objref_Traits<TAO_IOP::TAO_IOR_Property>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<TAO_IOP::TAO_IOR_Property>::release ( +TAO::Objref_Traits<TAO_IOP::TAO_IOR_Property>::tao_release ( TAO_IOP::TAO_IOR_Property_ptr p ) { @@ -631,14 +631,14 @@ TAO::Objref_Traits<TAO_IOP::TAO_IOR_Property>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION TAO_IOP::TAO_IOR_Property_ptr -TAO::Objref_Traits<TAO_IOP::TAO_IOR_Property>::nil (void) +TAO::Objref_Traits<TAO_IOP::TAO_IOR_Property>::tao_nil (void) { return TAO_IOP::TAO_IOR_Property::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<TAO_IOP::TAO_IOR_Property>::marshal ( +TAO::Objref_Traits<TAO_IOP::TAO_IOR_Property>::tao_marshal ( TAO_IOP::TAO_IOR_Property_ptr p, TAO_OutputCDR & cdr ) @@ -758,7 +758,7 @@ TAO_IOP::TAO_IOR_Property::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION TAO_IOP::TAO_IOR_Manipulation_ptr -TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>::duplicate ( +TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>::tao_duplicate ( TAO_IOP::TAO_IOR_Manipulation_ptr p ) { @@ -767,7 +767,7 @@ TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>::release ( +TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>::tao_release ( TAO_IOP::TAO_IOR_Manipulation_ptr p ) { @@ -776,14 +776,14 @@ TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION TAO_IOP::TAO_IOR_Manipulation_ptr -TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>::nil (void) +TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>::tao_nil (void) { return TAO_IOP::TAO_IOR_Manipulation::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>::marshal ( +TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>::tao_marshal ( TAO_IOP::TAO_IOR_Manipulation_ptr p, TAO_OutputCDR & cdr ) @@ -1207,3 +1207,4 @@ CORBA::Boolean operator>> ( > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/IORManipulation/IORC.h b/TAO/tao/IORManipulation/IORC.h index 6ff36e7447c..eab5475bb6d 100644 --- a/TAO/tao/IORManipulation/IORC.h +++ b/TAO/tao/IORManipulation/IORC.h @@ -74,13 +74,13 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// 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; } @@ -90,25 +90,25 @@ namespace TAO namespace TAO_IOP { - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_TAO_IOP_EMPTYPROFILELIST_CH_) #define _TAO_IOP_EMPTYPROFILELIST_CH_ - + class TAO_IORManip_Export EmptyProfileList : public CORBA::UserException { public: - + EmptyProfileList (void); EmptyProfileList (const EmptyProfileList &); ~EmptyProfileList (void); EmptyProfileList &operator= (const EmptyProfileList &); - + static void _tao_any_destructor (void *); - + static EmptyProfileList *_downcast (CORBA::Exception *); static CORBA::Exception *_alloc (void); @@ -120,43 +120,43 @@ namespace TAO_IOP 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_EmptyProfileList; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_TAO_IOP_NOTFOUND_CH_) #define _TAO_IOP_NOTFOUND_CH_ - + class TAO_IORManip_Export NotFound : public CORBA::UserException { public: - + NotFound (void); NotFound (const NotFound &); ~NotFound (void); NotFound &operator= (const NotFound &); - + static void _tao_any_destructor (void *); - + static NotFound *_downcast (CORBA::Exception *); static CORBA::Exception *_alloc (void); @@ -168,43 +168,43 @@ namespace TAO_IOP 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_NotFound; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_TAO_IOP_DUPLICATE_CH_) #define _TAO_IOP_DUPLICATE_CH_ - + class TAO_IORManip_Export Duplicate : public CORBA::UserException { public: - + Duplicate (void); Duplicate (const Duplicate &); ~Duplicate (void); Duplicate &operator= (const Duplicate &); - + static void _tao_any_destructor (void *); - + static Duplicate *_downcast (CORBA::Exception *); static CORBA::Exception *_alloc (void); @@ -216,43 +216,43 @@ namespace TAO_IOP 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_Duplicate; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_TAO_IOP_INVALID_IOR_CH_) #define _TAO_IOP_INVALID_IOR_CH_ - + class TAO_IORManip_Export Invalid_IOR : public CORBA::UserException { public: - + Invalid_IOR (void); Invalid_IOR (const Invalid_IOR &); ~Invalid_IOR (void); Invalid_IOR &operator= (const Invalid_IOR &); - + static void _tao_any_destructor (void *); - + static Invalid_IOR *_downcast (CORBA::Exception *); static CORBA::Exception *_alloc (void); @@ -264,43 +264,43 @@ namespace TAO_IOP 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_Invalid_IOR; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_TAO_IOP_MULTIPROFILELIST_CH_) #define _TAO_IOP_MULTIPROFILELIST_CH_ - + class TAO_IORManip_Export MultiProfileList : public CORBA::UserException { public: - + MultiProfileList (void); MultiProfileList (const MultiProfileList &); ~MultiProfileList (void); MultiProfileList &operator= (const MultiProfileList &); - + static void _tao_any_destructor (void *); - + static MultiProfileList *_downcast (CORBA::Exception *); static CORBA::Exception *_alloc (void); @@ -312,40 +312,40 @@ namespace TAO_IOP 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_MultiProfileList; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_TAO_IOP_TAO_IOR_PROPERTY__VAR_OUT_CH_) #define _TAO_IOP_TAO_IOR_PROPERTY__VAR_OUT_CH_ - + class TAO_IOR_Property; typedef TAO_IOR_Property *TAO_IOR_Property_ptr; - + typedef TAO_Objref_Var_T< TAO_IOR_Property > TAO_IOR_Property_var; - + typedef TAO_Objref_Out_T< TAO_IOR_Property @@ -353,43 +353,43 @@ namespace TAO_IOP TAO_IOR_Property_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_TAO_IOP_TAO_IOR_PROPERTY_CH_) #define _TAO_IOP_TAO_IOR_PROPERTY_CH_ - + class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA::Object { public: typedef TAO_IOR_Property_ptr _ptr_type; typedef TAO_IOR_Property_var _var_type; - + // The static operations. static TAO_IOR_Property_ptr _duplicate (TAO_IOR_Property_ptr obj); - + static TAO_IOR_Property_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static TAO_IOR_Property_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static TAO_IOR_Property_ptr _nil (void) { return (TAO_IOR_Property_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Boolean set_property ( CORBA::Object_ptr & ior ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -398,10 +398,10 @@ namespace TAO_IOP CORBA::SystemException , TAO_IOP::Invalid_IOR )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Boolean set_primary ( CORBA::Object_ptr & ior1, CORBA::Object_ptr ior2 @@ -412,10 +412,10 @@ namespace TAO_IOP , TAO_IOP::Duplicate , TAO_IOP::NotFound )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Object_ptr get_primary ( CORBA::Object_ptr ior ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -424,10 +424,10 @@ namespace TAO_IOP CORBA::SystemException , TAO_IOP::NotFound )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Boolean is_primary_set ( CORBA::Object_ptr ior ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -435,10 +435,10 @@ namespace TAO_IOP ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Boolean remove_primary_tag ( CORBA::Object_ptr & iogr ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -447,53 +447,53 @@ namespace TAO_IOP CORBA::SystemException , TAO_IOP::NotFound )) = 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. TAO_IOR_Property (void); - + virtual ~TAO_IOR_Property (void); - + private: // Private and unimplemented for concrete interfaces. TAO_IOR_Property (const TAO_IOR_Property &); - + void operator= (const TAO_IOR_Property &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TAO_IOR_Property; - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION__VAR_OUT_CH_) #define _TAO_IOP_TAO_IOR_MANIPULATION__VAR_OUT_CH_ - + class TAO_IOR_Manipulation; typedef TAO_IOR_Manipulation *TAO_IOR_Manipulation_ptr; - + typedef TAO_Objref_Var_T< TAO_IOR_Manipulation > TAO_IOR_Manipulation_var; - + typedef TAO_Objref_Out_T< TAO_IOR_Manipulation @@ -501,48 +501,48 @@ namespace TAO_IOP TAO_IOR_Manipulation_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_CH_) #define _TAO_IOP_TAO_IOR_MANIPULATION_CH_ - + class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA::Object { public: typedef TAO_IOR_Manipulation_ptr _ptr_type; typedef TAO_IOR_Manipulation_var _var_type; - + // The static operations. static TAO_IOR_Manipulation_ptr _duplicate (TAO_IOR_Manipulation_ptr obj); - + static TAO_IOR_Manipulation_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static TAO_IOR_Manipulation_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static TAO_IOR_Manipulation_ptr _nil (void) { return (TAO_IOR_Manipulation_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_) #define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_ - + class IORList; - + typedef TAO_MngSeq_Var_T< IORList, @@ -551,7 +551,7 @@ namespace TAO_IOP > > IORList_var; - + typedef TAO_MngSeq_Out_T< IORList, @@ -561,7 +561,7 @@ namespace TAO_IOP > > IORList_out; - + class TAO_IORManip_Export IORList : public TAO_Unbounded_Pseudo_Sequence< @@ -574,27 +574,27 @@ namespace TAO_IOP IORList ( CORBA::ULong max, CORBA::ULong length, - CORBA::Object_ptr* buffer, + CORBA::Object_ptr* buffer, CORBA::Boolean release = 0 ); IORList (const IORList &); ~IORList (void); - + static void _tao_any_destructor (void *); - + typedef IORList_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + static ::CORBA::TypeCode_ptr _tc_IORList; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Object_ptr merge_iors ( const TAO_IOP::TAO_IOR_Manipulation::IORList & iors ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -605,10 +605,10 @@ namespace TAO_IOP , TAO_IOP::Duplicate , TAO_IOP::Invalid_IOR )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Object_ptr add_profiles ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 @@ -620,10 +620,10 @@ namespace TAO_IOP , TAO_IOP::Duplicate , TAO_IOP::Invalid_IOR )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Object_ptr remove_profiles ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 @@ -635,10 +635,10 @@ namespace TAO_IOP , TAO_IOP::EmptyProfileList , TAO_IOP::NotFound )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Boolean set_property ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr ior @@ -649,10 +649,10 @@ namespace TAO_IOP , TAO_IOP::Invalid_IOR , TAO_IOP::Duplicate )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Boolean set_primary ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr ior1, @@ -666,10 +666,10 @@ namespace TAO_IOP , TAO_IOP::MultiProfileList , TAO_IOP::NotFound )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Boolean remove_primary_tag ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr ior @@ -678,10 +678,10 @@ namespace TAO_IOP ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Object_ptr get_primary ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr ior @@ -691,10 +691,10 @@ namespace TAO_IOP CORBA::SystemException , TAO_IOP::NotFound )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Boolean is_primary_set ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr ior @@ -703,10 +703,10 @@ namespace TAO_IOP ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::ULong is_in_ior ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 @@ -716,10 +716,10 @@ namespace TAO_IOP CORBA::SystemException , TAO_IOP::NotFound )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::ULong get_profile_count ( CORBA::Object_ptr ior ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -728,36 +728,36 @@ namespace TAO_IOP CORBA::SystemException , TAO_IOP::EmptyProfileList )) = 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. TAO_IOR_Manipulation (void); - + virtual ~TAO_IOR_Manipulation (void); - + private: // Private and unimplemented for concrete interfaces. TAO_IOR_Manipulation (const TAO_IOR_Manipulation &); - + void operator= (const TAO_IOR_Manipulation &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TAO_IOR_Manipulation; // TAO_IDL - Generated from @@ -774,18 +774,18 @@ namespace TAO #if !defined (_TAO_IOP_TAO_IOR_PROPERTY__TRAITS_CH_) #define _TAO_IOP_TAO_IOR_PROPERTY__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_IORManip_Export Objref_Traits<TAO_IOP::TAO_IOR_Property> { - static TAO_IOP::TAO_IOR_Property_ptr duplicate ( + static TAO_IOP::TAO_IOR_Property_ptr tao_duplicate ( TAO_IOP::TAO_IOR_Property_ptr ); - static void release ( + static void tao_release ( TAO_IOP::TAO_IOR_Property_ptr ); - static TAO_IOP::TAO_IOR_Property_ptr nil (void); - static CORBA::Boolean marshal ( + static TAO_IOP::TAO_IOR_Property_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( TAO_IOP::TAO_IOR_Property_ptr p, TAO_OutputCDR & cdr ); @@ -795,18 +795,18 @@ namespace TAO #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION__TRAITS_CH_) #define _TAO_IOP_TAO_IOR_MANIPULATION__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_IORManip_Export Objref_Traits<TAO_IOP::TAO_IOR_Manipulation> { - static TAO_IOP::TAO_IOR_Manipulation_ptr duplicate ( + static TAO_IOP::TAO_IOR_Manipulation_ptr tao_duplicate ( TAO_IOP::TAO_IOR_Manipulation_ptr ); - static void release ( + static void tao_release ( TAO_IOP::TAO_IOR_Manipulation_ptr ); - static TAO_IOP::TAO_IOR_Manipulation_ptr nil (void); - static CORBA::Boolean marshal ( + static TAO_IOP::TAO_IOR_Manipulation_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( TAO_IOP::TAO_IOR_Manipulation_ptr p, TAO_OutputCDR & cdr ); @@ -925,3 +925,4 @@ TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::MultiPro #include /**/ "ace/post.h" #endif /* ifndef */ + diff --git a/TAO/tao/IORTable.mpc b/TAO/tao/IORTable.mpc index 439e11e52a5..7ad2b70055b 100644 --- a/TAO/tao/IORTable.mpc +++ b/TAO/tao/IORTable.mpc @@ -22,8 +22,4 @@ project : taolib, core { Resource_Files { IORTable } - - PIDL_Files { - IORTable - } } diff --git a/TAO/tao/IORTable/IORTableC.cpp b/TAO/tao/IORTable/IORTableC.cpp index 2ee31f9dcb2..1984a986857 100644 --- a/TAO/tao/IORTable/IORTableC.cpp +++ b/TAO/tao/IORTable/IORTableC.cpp @@ -31,7 +31,6 @@ #include "IORTableC.h" #include "tao/CDR.h" -#include "tao/SystemException.h" #include "ace/OS_NS_string.h" #if defined (__BORLANDC__) @@ -51,7 +50,7 @@ namespace TAO } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 IORTable::AlreadyBound::AlreadyBound (void) @@ -127,7 +126,7 @@ void IORTable::AlreadyBound::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -140,13 +139,13 @@ void IORTable::AlreadyBound::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 IORTable::NotFound::NotFound (void) @@ -222,7 +221,7 @@ void IORTable::NotFound::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -235,7 +234,7 @@ void IORTable::NotFound::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -248,7 +247,7 @@ void IORTable::NotFound::_tao_decode ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION IORTable::Table_ptr -TAO::Objref_Traits<IORTable::Table>::duplicate ( +TAO::Objref_Traits<IORTable::Table>::tao_duplicate ( IORTable::Table_ptr p ) { @@ -257,7 +256,7 @@ TAO::Objref_Traits<IORTable::Table>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<IORTable::Table>::release ( +TAO::Objref_Traits<IORTable::Table>::tao_release ( IORTable::Table_ptr p ) { @@ -266,14 +265,14 @@ TAO::Objref_Traits<IORTable::Table>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION IORTable::Table_ptr -TAO::Objref_Traits<IORTable::Table>::nil (void) +TAO::Objref_Traits<IORTable::Table>::tao_nil (void) { return IORTable::Table::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<IORTable::Table>::marshal ( +TAO::Objref_Traits<IORTable::Table>::tao_marshal ( IORTable::Table_ptr p, TAO_OutputCDR & cdr ) @@ -282,7 +281,7 @@ TAO::Objref_Traits<IORTable::Table>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*IORTable__TAO_Table_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -303,10 +302,10 @@ IORTable::Table::_narrow ( { return Table::_nil (); } - + Table_ptr proxy = dynamic_cast<Table_ptr> (_tao_objref); - + return Table::_duplicate (proxy); } @@ -320,10 +319,10 @@ IORTable::Table::_unchecked_narrow ( { return Table::_nil (); } - + Table_ptr proxy = dynamic_cast<Table_ptr> (_tao_objref); - + return Table::_duplicate (proxy); } @@ -334,7 +333,7 @@ IORTable::Table::_duplicate (Table_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -385,7 +384,7 @@ IORTable::Table::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION IORTable::Locator_ptr -TAO::Objref_Traits<IORTable::Locator>::duplicate ( +TAO::Objref_Traits<IORTable::Locator>::tao_duplicate ( IORTable::Locator_ptr p ) { @@ -394,7 +393,7 @@ TAO::Objref_Traits<IORTable::Locator>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<IORTable::Locator>::release ( +TAO::Objref_Traits<IORTable::Locator>::tao_release ( IORTable::Locator_ptr p ) { @@ -403,14 +402,14 @@ TAO::Objref_Traits<IORTable::Locator>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION IORTable::Locator_ptr -TAO::Objref_Traits<IORTable::Locator>::nil (void) +TAO::Objref_Traits<IORTable::Locator>::tao_nil (void) { return IORTable::Locator::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<IORTable::Locator>::marshal ( +TAO::Objref_Traits<IORTable::Locator>::tao_marshal ( IORTable::Locator_ptr p, TAO_OutputCDR & cdr ) @@ -419,7 +418,7 @@ TAO::Objref_Traits<IORTable::Locator>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*IORTable__TAO_Locator_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -440,10 +439,10 @@ IORTable::Locator::_narrow ( { return Locator::_nil (); } - + Locator_ptr proxy = dynamic_cast<Locator_ptr> (_tao_objref); - + return Locator::_duplicate (proxy); } @@ -457,10 +456,10 @@ IORTable::Locator::_unchecked_narrow ( { return Locator::_nil (); } - + Locator_ptr proxy = dynamic_cast<Locator_ptr> (_tao_objref); - + return Locator::_duplicate (proxy); } @@ -471,7 +470,7 @@ IORTable::Locator::_duplicate (Locator_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -583,7 +582,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< IORTable::Locator >; - + template class TAO_Objref_Out_T< IORTable::Locator @@ -598,7 +597,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< IORTable::Table >; - + template class TAO_Objref_Out_T< IORTable::Table @@ -615,7 +614,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ IORTable::Locator > - + # pragma instantiate \ TAO_Objref_Out_T< \ IORTable::Locator @@ -630,10 +629,11 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ IORTable::Table > - + # pragma instantiate \ TAO_Objref_Out_T< \ IORTable::Table > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/IORTable/IORTableC.h b/TAO/tao/IORTable/IORTableC.h index 8b22ddb0d82..4db02def81f 100644 --- a/TAO/tao/IORTable/IORTableC.h +++ b/TAO/tao/IORTable/IORTableC.h @@ -41,8 +41,7 @@ #include "tao/Environment.h" #include "tao/Object.h" -#include "tao/SystemException.h" -#include "tao/UserException.h" +#include "tao/Exception.h" #include "tao/Objref_VarOut_T.h" #if defined (TAO_EXPORT_MACRO) @@ -68,13 +67,13 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// 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; } @@ -84,22 +83,22 @@ namespace TAO namespace IORTable { - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_IORTABLE_LOCATOR__VAR_OUT_CH_) #define _IORTABLE_LOCATOR__VAR_OUT_CH_ - + class Locator; typedef Locator *Locator_ptr; - + typedef TAO_Objref_Var_T< Locator > Locator_var; - + typedef TAO_Objref_Out_T< Locator @@ -107,23 +106,23 @@ namespace IORTable Locator_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_IORTABLE_ALREADYBOUND_CH_) #define _IORTABLE_ALREADYBOUND_CH_ - + class TAO_IORTable_Export AlreadyBound : public CORBA::UserException { public: - + AlreadyBound (void); AlreadyBound (const AlreadyBound &); ~AlreadyBound (void); AlreadyBound &operator= (const AlreadyBound &); - + static AlreadyBound *_downcast (CORBA::Exception *); static CORBA::Exception *_alloc (void); @@ -135,34 +134,34 @@ namespace IORTable 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 }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_IORTABLE_NOTFOUND_CH_) #define _IORTABLE_NOTFOUND_CH_ - + class TAO_IORTable_Export NotFound : public CORBA::UserException { public: - + NotFound (void); NotFound (const NotFound &); ~NotFound (void); NotFound &operator= (const NotFound &); - + static NotFound *_downcast (CORBA::Exception *); static CORBA::Exception *_alloc (void); @@ -174,33 +173,33 @@ namespace IORTable 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 }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_IORTABLE_TABLE__VAR_OUT_CH_) #define _IORTABLE_TABLE__VAR_OUT_CH_ - + class Table; typedef Table *Table_ptr; - + typedef TAO_Objref_Var_T< Table > Table_var; - + typedef TAO_Objref_Out_T< Table @@ -208,43 +207,43 @@ namespace IORTable Table_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_IORTABLE_TABLE_CH_) #define _IORTABLE_TABLE_CH_ - + class TAO_IORTable_Export Table : public virtual CORBA::Object { public: typedef Table_ptr _ptr_type; typedef Table_var _var_type; - + // The static operations. static Table_ptr _duplicate (Table_ptr obj); - + static Table_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Table_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Table_ptr _nil (void) { return (Table_ptr)0; } - - - + + + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void bind ( const char * object_key, const char * IOR @@ -254,10 +253,10 @@ namespace IORTable CORBA::SystemException , IORTable::AlreadyBound )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void rebind ( const char * object_key, const char * IOR @@ -266,10 +265,10 @@ namespace IORTable ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void unbind ( const char * object_key ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -278,10 +277,10 @@ namespace IORTable CORBA::SystemException , IORTable::NotFound )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void set_locator ( IORTable::Locator_ptr the_locator ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -289,69 +288,69 @@ namespace IORTable 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. Table (void); - + virtual ~Table (void); - + private: // Private and unimplemented for concrete interfaces. Table (const Table &); - + void operator= (const Table &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_IORTABLE_LOCATOR_CH_) #define _IORTABLE_LOCATOR_CH_ - + class TAO_IORTable_Export Locator : public virtual CORBA::Object { public: typedef Locator_ptr _ptr_type; typedef Locator_var _var_type; - + // The static operations. static Locator_ptr _duplicate (Locator_ptr obj); - + static Locator_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Locator_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Locator_ptr _nil (void) { return (Locator_ptr)0; } - - - + + + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual char * locate ( const char * object_key ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -360,28 +359,28 @@ namespace IORTable CORBA::SystemException , IORTable::NotFound )) = 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. Locator (void); - + virtual ~Locator (void); - + private: // Private and unimplemented for concrete interfaces. Locator (const Locator &); - + void operator= (const Locator &); }; @@ -401,18 +400,18 @@ namespace TAO #if !defined (_IORTABLE_LOCATOR__TRAITS_CH_) #define _IORTABLE_LOCATOR__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_IORTable_Export Objref_Traits<IORTable::Locator> { - static IORTable::Locator_ptr duplicate ( + static IORTable::Locator_ptr tao_duplicate ( IORTable::Locator_ptr ); - static void release ( + static void tao_release ( IORTable::Locator_ptr ); - static IORTable::Locator_ptr nil (void); - static CORBA::Boolean marshal ( + static IORTable::Locator_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( IORTable::Locator_ptr p, TAO_OutputCDR & cdr ); @@ -422,18 +421,18 @@ namespace TAO #if !defined (_IORTABLE_TABLE__TRAITS_CH_) #define _IORTABLE_TABLE__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_IORTable_Export Objref_Traits<IORTable::Table> { - static IORTable::Table_ptr duplicate ( + static IORTable::Table_ptr tao_duplicate ( IORTable::Table_ptr ); - static void release ( + static void tao_release ( IORTable::Table_ptr ); - static IORTable::Table_ptr nil (void); - static CORBA::Boolean marshal ( + static IORTable::Table_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( IORTable::Table_ptr p, TAO_OutputCDR & cdr ); @@ -472,3 +471,4 @@ TAO_IORTable_Export CORBA::Boolean operator>> (TAO_InputCDR &, IORTable::NotFoun #include /**/ "ace/post.h" #endif /* ifndef */ + diff --git a/TAO/tao/IOR_Parser.h b/TAO/tao/IOR_Parser.h index 9fa4bbb727a..7ddcb6b28a3 100644 --- a/TAO/tao/IOR_Parser.h +++ b/TAO/tao/IOR_Parser.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/SystemException.h" +#include "tao/Exception.h" namespace CORBA { @@ -47,12 +47,12 @@ public: /// The destructor virtual ~TAO_IOR_Parser (void); - /// Return 1 if @a ior_string starts with a prefix known to this IOR + /// Return 1 if <ior_string> starts with a prefix known to this IOR /// parser virtual int match_prefix (const char *ior_string) const = 0; /** - * Parse the @a ior argument and return an object reference. + * Parse the <ior> argument and return an object reference. * The call may raise the standard system exceptions (NO_MEMORY, * INV_OBJREF, etc.) */ diff --git a/TAO/tao/Interceptor_List.cpp b/TAO/tao/Interceptor_List.cpp index 39bf41fe752..d8d2f4ca80b 100644 --- a/TAO/tao/Interceptor_List.cpp +++ b/TAO/tao/Interceptor_List.cpp @@ -1,7 +1,6 @@ // $Id$ #include "tao/Interceptor_List.h" -#include "tao/SystemException.h" #include "tao/ORB_Constants.h" #include "ace/os_include/os_stddef.h" #include "ace/OS_NS_string.h" @@ -89,7 +88,7 @@ TAO_Interceptor_List::add_interceptor_i ( ACE_THROW_RETURN ( CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, EINVAL ), CORBA::COMPLETED_NO diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp index 6331f852eca..173782f5ee5 100644 --- a/TAO/tao/Invocation_Adapter.cpp +++ b/TAO/tao/Invocation_Adapter.cpp @@ -1,5 +1,4 @@ //$Id$ - #include "Invocation_Adapter.h" #include "Profile_Transport_Resolver.h" #include "operation_details.h" @@ -21,6 +20,7 @@ ACE_RCSID (tao, Invocation_Adapter, "$Id$") + namespace TAO { void @@ -163,10 +163,9 @@ namespace TAO details, this->type_ == TAO_TWOWAY_INVOCATION); - status = - coll_inv.invoke (this->cpb_, - strat - ACE_ENV_ARG_PARAMETER); + status = coll_inv.invoke (this->cpb_, + strat + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); if (status == TAO_INVOKE_RESTART && @@ -184,41 +183,6 @@ namespace TAO return status; } - void - Invocation_Adapter::set_response_flags ( - TAO_Stub *stub, - TAO_Operation_Details &details) - { - switch (this->type_) - { - case TAO_ONEWAY_INVOCATION: - { - // Grab the syncscope policy from the ORB. - Messaging::SyncScope sync_scope; - - bool has_synchronization = false; - - stub->orb_core ()->call_sync_scope_hook (stub, - has_synchronization, - sync_scope); - if (has_synchronization) - details.response_flags (CORBA::Octet (sync_scope)); - else - details.response_flags ( - CORBA::Octet (Messaging::SYNC_WITH_TRANSPORT)); - break; - } - case TAO_TWOWAY_INVOCATION: - { - // @@note: Need to change this to something better. Too many - // hash defines meaning the same things. - details.response_flags (TAO_TWOWAY_RESPONSE_FLAG); - break; - } - } - - return; - } Invocation_Status Invocation_Adapter::invoke_remote_i (TAO_Stub *stub, @@ -235,15 +199,10 @@ namespace TAO if (is_timeout) max_wait_time = &tmp_wait_time; - (void) this->set_response_flags (stub, - details); - // Create the resolver which will pick (or create) for us a // transport and a profile from the effective_target. - Profile_Transport_Resolver resolver ( - effective_target.in (), - stub, - (details.response_flags () != Messaging::SYNC_NONE)); + Profile_Transport_Resolver resolver (effective_target.in (), + stub); resolver.resolve (max_wait_time ACE_ENV_ARG_PARAMETER); @@ -264,6 +223,9 @@ namespace TAO } else if (this->type_ == TAO_TWOWAY_INVOCATION) { + // @@ NOTE:Need to change this to something better. Too many + // hash defines meaning the same thing.. + details.response_flags (TAO_TWOWAY_RESPONSE_FLAG); return this->invoke_twoway (details, effective_target, resolver, @@ -275,7 +237,7 @@ namespace TAO } Invocation_Status - Invocation_Adapter::invoke_twoway (TAO_Operation_Details &details, + Invocation_Adapter::invoke_twoway (TAO_Operation_Details &op, CORBA::Object_var &effective_target, Profile_Transport_Resolver &r, ACE_Time_Value *&max_wait_time @@ -295,7 +257,7 @@ namespace TAO TAO::Synch_Twoway_Invocation synch (this->target_, r, - details); + op); Invocation_Status status = synch.remote_twoway (max_wait_time @@ -305,8 +267,7 @@ namespace TAO if (status == TAO_INVOKE_RESTART && synch.is_forwarded ()) { - effective_target = - synch.steal_forwarded_reference (); + effective_target = synch.steal_forwarded_reference (); this->object_forwarded (effective_target, r.stub () @@ -318,15 +279,28 @@ namespace TAO } Invocation_Status - Invocation_Adapter::invoke_oneway (TAO_Operation_Details &details, + Invocation_Adapter::invoke_oneway (TAO_Operation_Details &op, CORBA::Object_var &effective_target, Profile_Transport_Resolver &r, ACE_Time_Value *&max_wait_time ACE_ENV_ARG_DECL) { + // Grab the syncscope policy from the ORB. + bool has_synchronization = false; + Messaging::SyncScope sync_scope; + + r.stub ()->orb_core ()->call_sync_scope_hook (r.stub (), + has_synchronization, + sync_scope); + + if (has_synchronization) + op.response_flags (CORBA::Octet (sync_scope)); + else + op.response_flags (CORBA::Octet (Messaging::SYNC_WITH_TRANSPORT)); + TAO::Synch_Oneway_Invocation synch (this->target_, r, - details); + op); Invocation_Status s = synch.remote_oneway (max_wait_time @@ -336,8 +310,7 @@ namespace TAO if (s == TAO_INVOKE_RESTART && synch.is_forwarded ()) { - effective_target = - synch.steal_forwarded_reference (); + effective_target = synch.steal_forwarded_reference (); this->object_forwarded (effective_target, r.stub () diff --git a/TAO/tao/Invocation_Adapter.h b/TAO/tao/Invocation_Adapter.h index 23e75c89b8a..c134d991b5d 100644 --- a/TAO/tao/Invocation_Adapter.h +++ b/TAO/tao/Invocation_Adapter.h @@ -201,7 +201,7 @@ namespace TAO * is forwarded to a new location. */ virtual Invocation_Status invoke_twoway ( - TAO_Operation_Details &details, + TAO_Operation_Details &op, CORBA::Object_var &effective_target, Profile_Transport_Resolver &r, ACE_Time_Value *&max_wait_time @@ -215,7 +215,7 @@ namespace TAO * is forwarded to a new location to take appropriate action. */ virtual Invocation_Status invoke_oneway ( - TAO_Operation_Details &details, + TAO_Operation_Details &op, CORBA::Object_var &effective_target, Profile_Transport_Resolver &r, ACE_Time_Value *&max_wait_time @@ -235,11 +235,6 @@ namespace TAO void object_forwarded (CORBA::Object_var &effective_target, TAO_Stub *stub ACE_ENV_ARG_DECL); - - /// Helper method to set the response flags within @a details - void set_response_flags (TAO_Stub *stub, - TAO_Operation_Details &details); - protected: /// The target object on which this invocation is carried out. diff --git a/TAO/tao/Invocation_Base.cpp b/TAO/tao/Invocation_Base.cpp index 08b0253c9fe..66beadddff8 100644 --- a/TAO/tao/Invocation_Base.cpp +++ b/TAO/tao/Invocation_Base.cpp @@ -4,7 +4,6 @@ #include "ORB_Core.h" #include "Typecode.h" #include "DynamicC.h" -#include "SystemException.h" #if TAO_HAS_INTERCEPTORS == 1 #include "RequestInfo_Util.h" diff --git a/TAO/tao/Invocation_Endpoint_Selectors.cpp b/TAO/tao/Invocation_Endpoint_Selectors.cpp index 42a2075a302..14ce667c411 100644 --- a/TAO/tao/Invocation_Endpoint_Selectors.cpp +++ b/TAO/tao/Invocation_Endpoint_Selectors.cpp @@ -6,7 +6,6 @@ #include "Base_Transport_Property.h" #include "Profile_Transport_Resolver.h" #include "ORB_Constants.h" -#include "SystemException.h" #if !defined (__ACE_INLINE__) #include "tao/Invocation_Endpoint_Selectors.i" @@ -44,34 +43,28 @@ TAO_Default_Endpoint_Selector::select_endpoint ( { r->profile (r->stub ()->profile_in_use ()); - // Check whether we need to do a blocked wait or we have a - // non-blocked wait and we support that. If this is not the - // case we can't use this profile so try the next. - if (r->blocked () || - (!r->blocked () && r->profile ()->supports_non_blocking_oneways ())) - { - const size_t endpoint_count = - r->profile ()->endpoint_count (); + const size_t endpoint_count = + r->profile ()->endpoint_count (); + + TAO_Endpoint *ep = + r->profile ()->endpoint (); - TAO_Endpoint *ep = - r->profile ()->endpoint (); + for (size_t i = 0; i < endpoint_count; ++i) + { + TAO_Base_Transport_Property desc (ep); - for (size_t i = 0; i < endpoint_count; ++i) - { - TAO_Base_Transport_Property desc (ep); - const bool retval = - r->try_connect (&desc, - max_wait_time - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + bool retval = + r->try_connect (&desc, + max_wait_time + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; - // Check if the connect has completed. - if (retval) - return; + // Check if the connect has completed. + if (retval) + return; - // Go to the next endpoint in this profile. - ep = ep->next (); - } + // Go to the next endpoint in this profile. + ep = ep->next (); } } while (r->stub ()->next_profile_retry () != 0); diff --git a/TAO/tao/LF_Connect_Strategy.cpp b/TAO/tao/LF_Connect_Strategy.cpp index 3acdc624452..d1aa0d78b8c 100644 --- a/TAO/tao/LF_Connect_Strategy.cpp +++ b/TAO/tao/LF_Connect_Strategy.cpp @@ -2,7 +2,7 @@ #include "Connection_Handler.h" #include "LF_Follower.h" #include "Leader_Follower.h" -#include "Transport.h" + #include "ace/Synch_Options.h" ACE_RCSID(tao, @@ -40,24 +40,19 @@ int TAO_LF_Connect_Strategy::wait (TAO_Connection_Handler *ch, ACE_Time_Value *max_wait_time) { - ACE_ASSERT (ch != 0); + ACE_ASSERT(ch != 0); - return this->wait (ch->transport (), - max_wait_time); -} + // @@todo We need to use a auto_ptr<>-like object here! + // TAO_Transport * transport = ch->get_transport_locked(); + TAO_Transport *transport = ch->transport (); -int -TAO_LF_Connect_Strategy::wait (TAO_Transport *transport, - ACE_Time_Value *max_wait_time) -{ // Basically the connection was EINPROGRESS, but before we could // wait for it some other thread detected a failure and cleaned up // the connection handler. - if (transport == 0) - return -1; - - TAO_Connection_Handler *ch = - transport->connection_handler (); + if(transport == 0) + { + return -1; + } TAO_Leader_Follower &leader_follower = this->orb_core_->leader_follower (); diff --git a/TAO/tao/LF_Connect_Strategy.h b/TAO/tao/LF_Connect_Strategy.h index 5ca99679939..f2e02fc5f8b 100644 --- a/TAO/tao/LF_Connect_Strategy.h +++ b/TAO/tao/LF_Connect_Strategy.h @@ -51,10 +51,6 @@ public: virtual int wait (TAO_Connection_Handler *ch, ACE_Time_Value *val); - virtual int wait (TAO_Transport *ch, - ACE_Time_Value *val); - - }; #include /**/ "ace/post.h" diff --git a/TAO/tao/LocalObject.cpp b/TAO/tao/LocalObject.cpp index f561d37ae0d..3d752b69478 100644 --- a/TAO/tao/LocalObject.cpp +++ b/TAO/tao/LocalObject.cpp @@ -8,7 +8,7 @@ # include "LocalObject.i" #endif /* ! __ACE_INLINE__ */ -#include "SystemException.h" +#include "Exception.h" #include "debug.h" #include "ORB_Constants.h" diff --git a/TAO/tao/LocateRequest_Invocation.cpp b/TAO/tao/LocateRequest_Invocation.cpp index 45e7c44dae7..58e27158601 100644 --- a/TAO/tao/LocateRequest_Invocation.cpp +++ b/TAO/tao/LocateRequest_Invocation.cpp @@ -3,6 +3,7 @@ #include "operation_details.h" #include "Stub.h" #include "Bind_Dispatcher_Guard.h" +#include "Pluggable_Messaging.h" #include "Transport.h" #include "Synch_Reply_Dispatcher.h" #include "GIOP_Utils.h" @@ -61,7 +62,7 @@ namespace TAO this->resolver_.transport (); TAO_OutputCDR &cdr = - transport->out_stream (); + transport->messaging_object ()->out_stream (); int retval = transport->generate_locate_request (tspec, diff --git a/TAO/tao/LocateRequest_Invocation.h b/TAO/tao/LocateRequest_Invocation.h index 9006ada4f05..8585342818a 100644 --- a/TAO/tao/LocateRequest_Invocation.h +++ b/TAO/tao/LocateRequest_Invocation.h @@ -37,7 +37,7 @@ namespace TAO /** * @class LocateRequest_Invocation * - * @brief Object created by TAO::LocateRequest_Invocation_Adapter to + * @brief Object created bu TAO::LocateRequest_Invocation_Adapter to * create and send LocateRequest invocation. * */ @@ -46,7 +46,7 @@ namespace TAO { public: /** - * @param otarget The target on which this invocation was + * @param target The target on which this invocation was * started. * * @param resolver Container of the profile and transport on diff --git a/TAO/tao/LocateRequest_Invocation_Adapter.cpp b/TAO/tao/LocateRequest_Invocation_Adapter.cpp index 527999bff53..20dd2f48720 100644 --- a/TAO/tao/LocateRequest_Invocation_Adapter.cpp +++ b/TAO/tao/LocateRequest_Invocation_Adapter.cpp @@ -30,7 +30,7 @@ namespace TAO if (stub == 0) ACE_THROW (CORBA::INTERNAL ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, EINVAL), CORBA::COMPLETED_NO)); @@ -49,8 +49,7 @@ namespace TAO s == TAO_INVOKE_RESTART) { Profile_Transport_Resolver resolver (effective_target, - stub, - true); + stub); ACE_TRY { diff --git a/TAO/tao/MProfile.cpp b/TAO/tao/MProfile.cpp index 6e761046cc3..3dd6957803d 100644 --- a/TAO/tao/MProfile.cpp +++ b/TAO/tao/MProfile.cpp @@ -6,7 +6,6 @@ #include "tao/Profile.h" #include "tao/PolicyC.h" #include "tao/ORB_Constants.h" -#include "tao/SystemException.h" #include "ace/Log_Msg.h" #include "ace/Guard_T.h" @@ -313,7 +312,7 @@ TAO_MProfile::create_policy_list (ACE_ENV_SINGLE_ARG_DECL) { ACE_NEW_THROW_EX (this->policy_list_, CORBA::PolicyList, - CORBA::NO_MEMORY (0, + CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); } @@ -353,7 +352,7 @@ TAO_MProfile::policy_list (ACE_ENV_SINGLE_ARG_DECL) CORBA::PolicyList *ret_val = 0; ACE_NEW_THROW_EX (ret_val, CORBA::PolicyList (*this->policy_list_), - CORBA::NO_MEMORY (0, + CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am index a7fdce409fd..694a123dc22 100644 --- a/TAO/tao/Makefile.am +++ b/TAO/tao/Makefile.am @@ -1,9 +1,5 @@ -## $Id$ -## ## Process this file with automake to create Makefile.in -includedir = @includedir@/tao - ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. TAO_ROOT = $(top_srcdir) @@ -12,286 +8,284 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.TAO.am ORB_Core = \ - Abstract_Servant_Base.cpp \ - Adapter.cpp \ + ServicesC.cpp \ + NVList.cpp \ + Dynamic_Adapter.cpp \ + Policy_Manager.cpp \ + Buffering_Constraint_Policy.cpp \ + Messaging_PolicyValueC.cpp \ Any.cpp \ - AnySeqA.cpp \ - AnySeqC.cpp \ Any_Basic_Impl.cpp \ Any_Impl.cpp \ - Any_SystemException.cpp \ Any_Unknown_IDL_Type.cpp \ - Argument.cpp \ - Asynch_Queued_Message.cpp \ - Asynch_Reply_Dispatcher_Base.cpp \ - Base_Transport_Property.cpp \ - Basic_Arguments.cpp \ - BiDir_Adapter.cpp \ - Bind_Dispatcher_Guard.cpp \ - Block_Flushing_Strategy.cpp \ - Blocked_Connect_Strategy.cpp \ - BooleanSeqA.cpp \ - BooleanSeqC.cpp \ - BoundsA.cpp \ - BoundsC.cpp \ - Buffering_Constraint_Policy.cpp \ - CDR.cpp \ - CDR_Encaps_Codec.cpp \ - CONV_FRAMEA.cpp \ - CONV_FRAMEC.cpp \ - CORBALOC_Parser.cpp \ - CORBANAME_Parser.cpp \ + Any_SystemException.cpp \ CORBA_String.cpp \ - Cache_Entries.cpp \ - CharSeqA.cpp \ - CharSeqC.cpp \ - Cleanup_Func_Registry.cpp \ + CurrentC.cpp \ + CurrentA.cpp \ + Exception.cpp \ + WrongTransactionC.cpp \ + WrongTransactionA.cpp \ + Environment.cpp \ + Object.cpp \ + LocalObject.cpp \ + ObjectIdListC.cpp \ + ORB.cpp \ + Policy_ForwardC.cpp \ + Policy_ForwardA.cpp \ + PolicyC.cpp \ + PolicyA.cpp \ + Policy_Validator.cpp \ + Encodable.cpp \ + Abstract_Servant_Base.cpp \ + Object_Proxy_Broker.cpp \ + Remote_Object_Proxy_Broker.cpp \ + Object_Proxy_Impl.cpp \ + DomainC.cpp \ + DomainA.cpp \ + TimeBaseC.cpp \ + TimeBaseA.cpp \ + Principal.cpp \ + Sequence.cpp \ + MProfile.cpp \ + Stub.cpp \ + Typecode.cpp \ + CDR.cpp \ + Client_Strategy_Factory.cpp \ + debug.cpp \ + Object_KeyC.cpp \ + Protocols_Hooks.cpp \ + Default_Protocols_Hooks.cpp \ + Messaging_SyncScopeC.cpp \ + Invocation_Base.cpp \ + Invocation_Adapter.cpp \ + LocateRequest_Invocation_Adapter.cpp \ + Profile_Transport_Resolver.cpp \ + Remote_Invocation.cpp \ + Collocated_Invocation.cpp \ + Synch_Invocation.cpp \ + LocateRequest_Invocation.cpp \ + Invocation_Endpoint_Selectors.cpp \ + operation_details.cpp \ ClientRequestInfo.cpp \ ClientRequestInfo_i.cpp \ + RequestInfo_Util.cpp \ ClientRequestInterceptor_Adapter.cpp \ - Client_Strategy_Factory.cpp \ - CodecFactory.cpp \ - CodecFactory_ORBInitializer.cpp \ - Codeset_Manager.cpp \ - Codeset_Translator_Factory.cpp \ - Collocated_Invocation.cpp \ - Collocation_Resolver.cpp \ - Connect_Strategy.cpp \ - Connection_Purging_Strategy.cpp \ - CurrentA.cpp \ - CurrentC.cpp \ - DLL_Parser.cpp \ - Default_Collocation_Resolver.cpp \ - Default_Endpoint_Selector_Factory.cpp \ - Default_Protocols_Hooks.cpp \ - Default_Stub_Factory.cpp \ - Default_Thread_Lane_Resources_Manager.cpp \ - DomainA.cpp \ - DomainC.cpp \ - DoubleSeqA.cpp \ - DoubleSeqC.cpp \ - DynamicA.cpp \ + PI_ForwardC.cpp \ + PortableInterceptorC.cpp \ + PortableInterceptorA.cpp \ + PICurrent.cpp \ + PICurrent_Copy_Callback.cpp \ + PICurrent_ORBInitializer.cpp \ DynamicC.cpp \ - Dynamic_Adapter.cpp \ - Dynamic_ParameterA.cpp \ + DynamicA.cpp \ Dynamic_ParameterC.cpp \ - Encodable.cpp \ - Endpoint_Selector_Factory.cpp \ - Environment.cpp \ - Exception.cpp \ - Exclusive_TMS.cpp \ - FILE_Parser.cpp \ - Fault_Tolerance_Service.cpp \ + Dynamic_ParameterA.cpp \ + ParameterMode.cpp \ + AnySeqA.cpp \ + AnySeqC.cpp \ + BooleanSeqA.cpp \ + BooleanSeqC.cpp \ + CharSeqA.cpp \ + CharSeqC.cpp \ + DoubleSeqA.cpp \ + DoubleSeqC.cpp \ FloatSeqA.cpp \ FloatSeqC.cpp \ - Flushing_Strategy.cpp \ - GIOPA.cpp \ - GIOPC.cpp \ - IFR_Client_Adapter.cpp \ - IOPC.cpp \ - IOP_CodecA.cpp \ - IOP_CodecC.cpp \ - IOP_IORA.cpp \ - IOP_IORC.cpp \ - IORInterceptor_Adapter.cpp \ - IORInterceptor_Adapter_Factory.cpp \ - IOR_Parser.cpp \ - Interceptor_List.cpp \ - Invocation_Adapter.cpp \ - Invocation_Base.cpp \ - Invocation_Endpoint_Selectors.cpp \ - LF_CH_Event.cpp \ - LF_Connect_Strategy.cpp \ - LF_Event.cpp \ - LF_Event_Binder.cpp \ - LF_Event_Loop_Thread_Helper.cpp \ - LF_Follower.cpp \ - LF_Follower_Auto_Adder.cpp \ - LF_Follower_Auto_Ptr.cpp \ - LF_Invocation_Event.cpp \ - LF_Strategy.cpp \ - LF_Strategy_Complete.cpp \ - LRU_Connection_Purging_Strategy.cpp \ - Leader_Follower.cpp \ - Leader_Follower_Flushing_Strategy.cpp \ - LocalObject.cpp \ - LocateRequest_Invocation.cpp \ - LocateRequest_Invocation_Adapter.cpp \ LongDoubleSeqA.cpp \ LongDoubleSeqC.cpp \ LongLongSeqA.cpp \ LongLongSeqC.cpp \ LongSeqA.cpp \ LongSeqC.cpp \ - MCAST_Parser.cpp \ - MProfile.cpp \ - Messaging_PolicyValueC.cpp \ - Messaging_SyncScopeC.cpp \ - Muxed_TMS.cpp \ - NVList.cpp \ - ORB.cpp \ - ORBInitInfo.cpp \ - ORBInitializer_Registry.cpp \ - ORB_Core.cpp \ - ORB_Core_Auto_Ptr.cpp \ - ORB_Table.cpp \ - Object.cpp \ - ObjectIdListC.cpp \ - ObjectKey_Table.cpp \ - Object_KeyC.cpp \ - Object_Loader.cpp \ - Object_Proxy_Broker.cpp \ - Object_Proxy_Impl.cpp \ - Object_Ref_Table.cpp \ OctetSeqA.cpp \ OctetSeqC.cpp \ - PICurrent.cpp \ - PICurrent_Copy_Callback.cpp \ - PICurrent_ORBInitializer.cpp \ - PI_ForwardC.cpp \ - ParameterMode.cpp \ - Parser_Registry.cpp \ - PolicyA.cpp \ - PolicyC.cpp \ - PolicyFactory_Registry.cpp \ - Policy_ForwardA.cpp \ - Policy_ForwardC.cpp \ - Policy_Manager.cpp \ - Policy_Set.cpp \ - Policy_Validator.cpp \ - PollableC.cpp \ - PortableInterceptorA.cpp \ - PortableInterceptorC.cpp \ - PredefinedType_Seq_Tmplinst.cpp \ - Principal.cpp \ - Profile_Transport_Resolver.cpp \ - Protocols_Hooks.cpp \ - Queued_Message.cpp \ - Reactive_Connect_Strategy.cpp \ - Reactive_Flushing_Strategy.cpp \ - Refcounted_ObjectKey.cpp \ - Remote_Invocation.cpp \ - Remote_Object_Proxy_Broker.cpp \ - Reply_Dispatcher.cpp \ - RequestInfo_Util.cpp \ - Request_Dispatcher.cpp \ - Resource_Factory.cpp \ - Sequence.cpp \ - Server_Strategy_Factory.cpp \ - Service_Callbacks.cpp \ - Service_Context.cpp \ - ServicesC.cpp \ - Services_Activate.cpp \ ShortSeqA.cpp \ ShortSeqC.cpp \ - Special_Basic_Arguments.cpp \ StringSeqA.cpp \ StringSeqC.cpp \ - Stub.cpp \ - Stub_Factory.cpp \ - Sync_Strategies.cpp \ - Synch_Invocation.cpp \ - Synch_Queued_Message.cpp \ - Synch_Refcountable.cpp \ - Synch_Reply_Dispatcher.cpp \ - SystemException.cpp \ - TAOA.cpp \ - TAOC.cpp \ - TAO_Internal.cpp \ - TAO_Server_Request.cpp \ - TAO_Singleton_Manager.cpp \ - TSS_Resources.cpp \ - Tagged_Components.cpp \ - Thread_Lane_Resources.cpp \ - Thread_Lane_Resources_Manager.cpp \ - TimeBaseA.cpp \ - TimeBaseC.cpp \ - Transport_Cache_Manager.cpp \ - Transport_Descriptor_Interface.cpp \ - Transport_Mux_Strategy.cpp \ - Transport_Timer.cpp \ - TypeCodeFactory_Adapter.cpp \ - Typecode.cpp \ - Typecode_Constants.cpp \ ULongLongSeqA.cpp \ ULongLongSeqC.cpp \ ULongSeqA.cpp \ ULongSeqC.cpp \ UShortSeqA.cpp \ UShortSeqC.cpp \ - UTF16_BOM_Factory.cpp \ - UTF16_BOM_Translator.cpp \ - UserException.cpp \ - Valuetype_Adapter.cpp \ WCharSeqA.cpp \ WCharSeqC.cpp \ WStringSeqA.cpp \ WStringSeqC.cpp \ - Wait_On_LF_No_Upcall.cpp \ - Wait_On_Leader_Follower.cpp \ - Wait_On_Reactor.cpp \ - Wait_On_Read.cpp \ + Codeset_Manager.cpp \ + Codeset_Translator_Factory.cpp \ + UTF16_BOM_Translator.cpp \ + UTF16_BOM_Factory.cpp \ + ORB_Core.cpp \ + ORB_Core_Auto_Ptr.cpp \ + Collocation_Resolver.cpp \ + Default_Collocation_Resolver.cpp \ + Stub_Factory.cpp \ + ORB_Table.cpp \ + LF_Follower.cpp \ + LF_Follower_Auto_Ptr.cpp \ + LF_Follower_Auto_Adder.cpp \ + Leader_Follower.cpp \ + Leader_Follower_Flushing_Strategy.cpp \ + LF_Event.cpp \ + LF_Invocation_Event.cpp \ + LF_CH_Event.cpp \ + LF_Event_Binder.cpp \ + LF_Event_Loop_Thread_Helper.cpp \ + LF_Strategy.cpp \ + LF_Strategy_Complete.cpp \ + params.cpp \ + Resource_Factory.cpp \ + Server_Strategy_Factory.cpp \ + Sync_Strategies.cpp \ + TAO_Internal.cpp \ + TAO_Server_Request.cpp \ + Typecode_Constants.cpp \ + PredefinedType_Seq_Tmplinst.cpp \ + TypeCodeFactory_Adapter.cpp \ Wait_Strategy.cpp \ - WrongTransactionA.cpp \ - WrongTransactionC.cpp \ - debug.cpp \ - operation_details.cpp \ - params.cpp + Wait_On_Read.cpp \ + Wait_On_Reactor.cpp \ + Wait_On_Leader_Follower.cpp \ + Transport_Mux_Strategy.cpp \ + Exclusive_TMS.cpp \ + Muxed_TMS.cpp \ + Reply_Dispatcher.cpp \ + Synch_Reply_Dispatcher.cpp \ + Synch_Refcountable.cpp \ + Asynch_Reply_Dispatcher_Base.cpp \ + IOP_IORC.cpp \ + IOP_IORA.cpp \ + IOP_CodecC.cpp \ + IOP_CodecA.cpp \ + IOPC.cpp \ + PollableC.cpp \ + CONV_FRAMEC.cpp \ + CONV_FRAMEA.cpp \ + Tagged_Components.cpp \ + Service_Context.cpp \ + GIOPC.cpp \ + GIOPA.cpp \ + BoundsC.cpp \ + BoundsA.cpp \ + TAOC.cpp \ + TAOA.cpp \ + Object_Loader.cpp \ + TAO_Singleton_Manager.cpp \ + DLL_ORB.cpp \ + Adapter.cpp \ + Services_Activate.cpp \ + Service_Callbacks.cpp \ + Parser_Registry.cpp \ + IOR_Parser.cpp \ + DLL_Parser.cpp \ + FILE_Parser.cpp \ + CORBALOC_Parser.cpp \ + CORBANAME_Parser.cpp \ + MCAST_Parser.cpp \ + Bind_Dispatcher_Guard.cpp \ + Fault_Tolerance_Service.cpp \ + Interceptor_List.cpp \ + IORInterceptor_Adapter.cpp \ + IORInterceptor_Adapter_Factory.cpp \ + IFR_Client_Adapter.cpp \ + ORBInitInfo.cpp \ + ORBInitializer_Registry.cpp \ + PolicyFactory_Registry.cpp \ + Cache_Entries.cpp \ + Base_Transport_Property.cpp \ + Transport_Cache_Manager.cpp \ + Cleanup_Func_Registry.cpp \ + Transport_Descriptor_Interface.cpp \ + Object_Ref_Table.cpp \ + BiDir_Adapter.cpp \ + CodecFactory.cpp \ + CodecFactory_ORBInitializer.cpp \ + CDR_Encaps_Codec.cpp \ + Endpoint_Selector_Factory.cpp \ + Flushing_Strategy.cpp \ + Block_Flushing_Strategy.cpp \ + Reactive_Flushing_Strategy.cpp \ + Connect_Strategy.cpp \ + Blocked_Connect_Strategy.cpp \ + Reactive_Connect_Strategy.cpp \ + LF_Connect_Strategy.cpp \ + Queued_Message.cpp \ + Synch_Queued_Message.cpp \ + Asynch_Queued_Message.cpp \ + Transport_Timer.cpp \ + Connection_Purging_Strategy.cpp \ + LRU_Connection_Purging_Strategy.cpp \ + Policy_Set.cpp \ + Default_Endpoint_Selector_Factory.cpp \ + Thread_Lane_Resources.cpp \ + Thread_Lane_Resources_Manager.cpp \ + Default_Thread_Lane_Resources_Manager.cpp \ + Default_Stub_Factory.cpp \ + Request_Dispatcher.cpp \ + Valuetype_Adapter.cpp \ + ObjectKey_Table.cpp \ + Refcounted_ObjectKey.cpp \ + TSS_Resources.cpp \ + Argument.cpp \ + Basic_Arguments.cpp \ + Special_Basic_Arguments.cpp Pluggable_Protocols = \ - Acceptor_Filter.cpp \ - Acceptor_Registry.cpp \ - Connection_Handler.cpp \ - Connector_Registry.cpp \ + Transport_Acceptor.cpp \ + Transport_Connector.cpp \ + Transport.cpp \ + Incoming_Message_Queue.cpp \ + Resume_Handle.cpp \ + Profile.cpp \ Endpoint.cpp \ - IIOPA.cpp \ - IIOPC.cpp \ - IIOP_Acceptor.cpp \ - IIOP_Connection_Handler.cpp \ - IIOP_Connector.cpp \ - IIOP_Endpoint.cpp \ - IIOP_EndpointsA.cpp \ - IIOP_EndpointsC.cpp \ + Connector_Registry.cpp \ + Connection_Handler.cpp \ + Thread_Per_Connection_Handler.cpp \ + Acceptor_Registry.cpp \ + Protocol_Factory.cpp \ + Acceptor_Filter.cpp \ IIOP_Factory.cpp \ IIOP_Lite_Factory.cpp \ IIOP_Profile.cpp \ IIOP_Transport.cpp \ - Incoming_Message_Queue.cpp \ - Profile.cpp \ - Protocol_Factory.cpp \ - Resume_Handle.cpp \ - Thread_Per_Connection_Handler.cpp \ - Transport.cpp \ - Transport_Acceptor.cpp \ - Transport_Connector.cpp + IIOP_Connector.cpp \ + IIOP_Acceptor.cpp \ + IIOP_Connection_Handler.cpp \ + IIOP_Endpoint.cpp \ + IIOP_EndpointsC.cpp \ + IIOP_EndpointsA.cpp \ + IIOPC.cpp \ + IIOPA.cpp Pluggable_Messaging = \ + Pluggable_Messaging.cpp \ + Pluggable_Messaging_Utils.cpp \ GIOP_Message_Base.cpp \ + GIOP_Message_Lite.cpp \ GIOP_Message_Generator_Parser.cpp \ GIOP_Message_Generator_Parser_10.cpp \ GIOP_Message_Generator_Parser_11.cpp \ GIOP_Message_Generator_Parser_12.cpp \ GIOP_Message_Generator_Parser_Impl.cpp \ - GIOP_Message_Lite.cpp \ + GIOP_Utils.cpp \ GIOP_Message_Locate_Header.cpp \ + target_specification.cpp \ GIOP_Message_State.cpp \ GIOP_Message_Version.cpp \ - GIOP_Utils.cpp \ - Pluggable_Messaging.cpp \ - Pluggable_Messaging_Utils.cpp \ - Tagged_Profile.cpp \ - target_specification.cpp + Tagged_Profile.cpp Default_Resources = \ default_client.cpp \ - default_resource.cpp \ default_server.cpp \ - qt_resource.cpp \ - xt_resource.cpp + default_resource.cpp \ + xt_resource.cpp \ + qt_resource.cpp Interpretive_Marshaling = \ - Marshal.cpp \ append.cpp \ + Marshal.cpp \ skip.cpp IDL_Compiler = \ @@ -318,9 +312,9 @@ libTAO_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_la_LIBADD = \ - $(ACE_BUILDDIR)/ace/libACE.la + $(ACE_BUILDDIR)/ace/libACE.la -nobase_include_HEADERS = \ +nobase_pkginclude_HEADERS = \ Abstract_Servant_Base.h \ Acceptor_Filter.h \ Acceptor_Impl.h \ @@ -328,8 +322,6 @@ nobase_include_HEADERS = \ Adapter.h \ Allocator.h \ Any.h \ - AnySeqC.h \ - AnySeqS.h \ Any_Array_Impl_T.h \ Any_Basic_Impl.h \ Any_Basic_Impl_T.h \ @@ -339,20 +331,22 @@ nobase_include_HEADERS = \ Any_Special_Impl_T.h \ Any_SystemException.h \ Any_Unknown_IDL_Type.h \ + AnySeqC.h \ + AnySeqS.h \ Arg_Traits_T.h \ Argument.h \ Array_VarOut_T.h \ Asynch_Queued_Message.h \ Asynch_Reply_Dispatcher_Base.h \ Auto_Functor.h \ - BD_String_Argument_T.h \ - BD_String_SArgument_T.h \ Base_Transport_Property.h \ Basic_Argument_T.h \ Basic_Arguments.h \ Basic_SArgument_T.h \ Basic_SArguments.h \ Basic_Types.h \ + BD_String_Argument_T.h \ + BD_String_SArgument_T.h \ BiDir_Adapter.h \ Bind_Dispatcher_Guard.h \ Block_Flushing_Strategy.h \ @@ -362,23 +356,16 @@ nobase_include_HEADERS = \ BoundsC.h \ Buffer_Allocator_T.h \ Buffering_Constraint_Policy.h \ + Cache_Entries.h \ CDR.h \ CDR_Encaps_Codec.h \ - CONV_FRAMEC.h \ - CONV_FRAMES.h \ - CONV_FRAMES_T.h \ - CORBALOC_Parser.h \ - CORBANAME_Parser.h \ - CORBA_String.h \ - CORBA_methods.h \ - Cache_Entries.h \ CharSeqC.h \ CharSeqS.h \ Cleanup_Func_Registry.h \ + Client_Strategy_Factory.h \ ClientRequestInfo.h \ ClientRequestInfo_i.h \ ClientRequestInterceptor_Adapter.h \ - Client_Strategy_Factory.h \ CodecFactory.h \ CodecFactory_ORBInitializer.h \ Codeset_Manager.h \ @@ -394,19 +381,35 @@ nobase_include_HEADERS = \ Connection_Purging_Strategy.h \ Connector_Impl.h \ Connector_Registry.h \ + CONV_FRAMEC.h \ + CONV_FRAMES.h \ + CONV_FRAMES_T.h \ + corba.h \ + CORBA_methods.h \ + CORBA_String.h \ + corbafwd.h \ + CORBALOC_Parser.h \ + CORBANAME_Parser.h \ CurrentC.h \ - DLL_Parser.h \ + debug.h \ + default_client.h \ Default_Collocation_Resolver.h \ Default_Endpoint_Selector_Factory.h \ + default_environment.h \ + default_ports.h \ Default_Protocols_Hooks.h \ + default_resource.h \ + default_server.h \ Default_Stub_Factory.h \ Default_Thread_Lane_Resources_Manager.h \ + DLL_ORB.h \ + DLL_Parser.h \ DomainC.h \ DoubleSeqC.h \ DoubleSeqS.h \ - DynamicC.h \ Dynamic_Adapter.h \ Dynamic_ParameterC.h \ + DynamicC.h \ Encodable.h \ Endpoint.h \ Endpoint_Selector_Factory.h \ @@ -414,8 +417,8 @@ nobase_include_HEADERS = \ Exception.h \ Exception_Data.h \ Exclusive_TMS.h \ - FILE_Parser.h \ Fault_Tolerance_Service.h \ + FILE_Parser.h \ Fixed_Array_Argument_T.h \ Fixed_Array_SArgument_T.h \ Fixed_Size_Argument_T.h \ @@ -423,9 +426,6 @@ nobase_include_HEADERS = \ FloatSeqC.h \ FloatSeqS.h \ Flushing_Strategy.h \ - GIOPC.h \ - GIOPS.h \ - GIOPS_T.h \ GIOP_Message_Base.h \ GIOP_Message_Generator_Parser.h \ GIOP_Message_Generator_Parser_10.h \ @@ -437,8 +437,10 @@ nobase_include_HEADERS = \ GIOP_Message_State.h \ GIOP_Message_Version.h \ GIOP_Utils.h \ + GIOPC.h \ + GIOPS.h \ + GIOPS_T.h \ IFR_Client_Adapter.h \ - IIOPC.h \ IIOP_Acceptor.h \ IIOP_Connection_Handler.h \ IIOP_Connector.h \ @@ -448,20 +450,23 @@ nobase_include_HEADERS = \ IIOP_Lite_Factory.h \ IIOP_Profile.h \ IIOP_Transport.h \ - IOPC.h \ - IOPS.h \ - IOPS_T.h \ - IOP_CodecC.h \ - IOP_IORC.h \ - IORInterceptor_Adapter.h \ - IORInterceptor_Adapter_Factory.h \ - IOR_Parser.h \ + IIOPC.h \ Incoming_Message_Queue.h \ Interceptor_List.h \ Invocation_Adapter.h \ Invocation_Base.h \ Invocation_Endpoint_Selectors.h \ Invocation_Utils.h \ + IOP_CodecC.h \ + IOP_IORC.h \ + IOPC.h \ + IOPS.h \ + IOPS_T.h \ + IOR_Parser.h \ + IORInterceptor_Adapter.h \ + IORInterceptor_Adapter_Factory.h \ + Leader_Follower.h \ + Leader_Follower_Flushing_Strategy.h \ LF_CH_Event.h \ LF_Connect_Strategy.h \ LF_Event.h \ @@ -473,9 +478,6 @@ nobase_include_HEADERS = \ LF_Invocation_Event.h \ LF_Strategy.h \ LF_Strategy_Complete.h \ - LRU_Connection_Purging_Strategy.h \ - Leader_Follower.h \ - Leader_Follower_Flushing_Strategy.h \ LocalObject.h \ LocateRequest_Invocation.h \ LocateRequest_Invocation_Adapter.h \ @@ -485,26 +487,17 @@ nobase_include_HEADERS = \ LongLongSeqS.h \ LongSeqC.h \ LongSeqS.h \ - MCAST_Parser.h \ - MProfile.h \ + LRU_Connection_Purging_Strategy.h \ Managed_Types.h \ Marshal.h \ + MCAST_Parser.h \ Messaging_PolicyValueC.h \ Messaging_SyncScopeC.h \ + MProfile.h \ Muxed_TMS.h \ - NVList.h \ New_Leader_Generator.h \ - OBV_Constants.h \ - ORB.h \ - ORBInitInfo.h \ - ORBInitializer_Registry.h \ - ORB_Constants.h \ - ORB_Core.h \ - ORB_Core_Auto_Ptr.h \ - ORB_Table.h \ + NVList.h \ Object.h \ - ObjectIdListC.h \ - ObjectKey_Table.h \ Object_Argument_T.h \ Object_KeyC.h \ Object_Loader.h \ @@ -513,24 +506,38 @@ nobase_include_HEADERS = \ Object_Ref_Table.h \ Object_SArgument_T.h \ Object_T.h \ + objectid.h \ + ObjectIdListC.h \ + ObjectKey_Table.h \ Objref_VarOut_T.h \ + OBV_Constants.h \ OctetSeqC.h \ OctetSeqS.h \ + operation_details.h \ + ORB.h \ + ORB_Constants.h \ + ORB_Core.h \ + ORB_Core_Auto_Ptr.h \ + ORB_Table.h \ + orbconf.h \ + ORBInitializer_Registry.h \ + ORBInitInfo.h \ + ParameterMode.h \ + params.h \ + Parser_Registry.h \ + PI_ForwardC.h \ PICurrent.h \ PICurrent_Copy_Callback.h \ PICurrent_ORBInitializer.h \ - PI_ForwardC.h \ - ParameterMode.h \ - Parser_Registry.h \ Pluggable_Messaging.h \ Pluggable_Messaging_Utils.h \ - PolicyC.h \ - PolicyFactory_Registry.h \ - PolicyS.h \ Policy_ForwardC.h \ Policy_Manager.h \ Policy_Set.h \ Policy_Validator.h \ + PolicyC.h \ + PolicyFactory_Registry.h \ + PolicyS.h \ PollableC.h \ PollableS.h \ PollableS_T.h \ @@ -543,6 +550,7 @@ nobase_include_HEADERS = \ Protocol_Factory.h \ Protocols_Hooks.h \ Pseudo_VarOut_T.h \ + qt_resource.h \ Queued_Message.h \ Reactive_Connect_Strategy.h \ Reactive_Flushing_Strategy.h \ @@ -550,8 +558,8 @@ nobase_include_HEADERS = \ Remote_Invocation.h \ Remote_Object_Proxy_Broker.h \ Reply_Dispatcher.h \ - RequestInfo_Util.h \ Request_Dispatcher.h \ + RequestInfo_Util.h \ Resource_Factory.h \ Resume_Handle.h \ Seq_Out_T.h \ @@ -561,10 +569,10 @@ nobase_include_HEADERS = \ Server_Strategy_Factory.h \ Service_Callbacks.h \ Service_Context.h \ + Services_Activate.h \ ServicesC.h \ ServicesS.h \ ServicesS_T.h \ - Services_Activate.h \ ShortSeqC.h \ ShortSeqS.h \ Special_Basic_Argument_T.h \ @@ -580,19 +588,18 @@ nobase_include_HEADERS = \ Synch_Queued_Message.h \ Synch_Refcountable.h \ Synch_Reply_Dispatcher.h \ - SystemException.h \ - TAOC.h \ - TAOS.h \ - TAOS_T.h \ + Tagged_Components.h \ + Tagged_Profile.h \ TAO_Export.h \ TAO_Internal.h \ TAO_Server_Request.h \ TAO_Singleton.h \ TAO_Singleton_Manager.h \ + TAOC.h \ + TAOS.h \ + TAOS_T.h \ + target_specification.h \ TC_Constants_Forward.h \ - TSS_Resources.h \ - Tagged_Components.h \ - Tagged_Profile.h \ Thread_Lane_Resources.h \ Thread_Lane_Resources_Manager.h \ Thread_Per_Connection_Handler.h \ @@ -607,9 +614,10 @@ nobase_include_HEADERS = \ Transport_Descriptor_Interface.h \ Transport_Mux_Strategy.h \ Transport_Timer.h \ - TypeCodeFactory_Adapter.h \ + TSS_Resources.h \ Typecode.h \ Typecode_Constants.h \ + TypeCodeFactory_Adapter.h \ UB_String_Argument_T.h \ UB_String_Arguments.h \ UB_String_SArgument_T.h \ @@ -622,263 +630,243 @@ nobase_include_HEADERS = \ UShortSeqS.h \ UTF16_BOM_Factory.h \ UTF16_BOM_Translator.h \ - UserException.h \ Valuetype_Adapter.h \ - VarOut_T.h \ Var_Array_Argument_T.h \ Var_Array_SArgument_T.h \ Var_Size_Argument_T.h \ Var_Size_SArgument_T.h \ + varbase.h \ + VarOut_T.h \ Version.h \ - WCharSeqC.h \ - WCharSeqS.h \ - WStringSeqC.h \ - WStringSeqS.h \ - Wait_On_LF_No_Upcall.h \ Wait_On_Leader_Follower.h \ Wait_On_Reactor.h \ Wait_On_Read.h \ Wait_Strategy.h \ + WCharSeqC.h \ + WCharSeqS.h \ WrongTransactionC.h \ - corba.h \ - corbafwd.h \ - debug.h \ - default_client.h \ - default_environment.h \ - default_ports.h \ - default_resource.h \ - default_server.h \ - objectid.h \ - operation_details.h \ - orbconf.h \ - params.h \ - qt_resource.h \ - target_specification.h \ - varbase.h \ + WStringSeqC.h \ + WStringSeqS.h \ xt_resource.h \ Acceptor_Filter.i \ Acceptor_Impl.i \ Acceptor_Registry.i \ Adapter.i \ Any.i \ - AnySeqC.inl \ - Any_Array_Impl_T.inl \ - Any_Basic_Impl_T.inl \ - Any_Dual_Impl_T.inl \ - Any_Impl_T.inl \ - Any_Special_Impl_T.inl \ - Array_VarOut_T.inl \ Asynch_Reply_Dispatcher_Base.i \ - BD_String_Argument_T.inl \ - BD_String_SArgument_T.inl \ - Base_Transport_Property.inl \ - Basic_Argument_T.inl \ - Basic_SArgument_T.inl \ Bind_Dispatcher_Guard.i \ BooleanSeqC.i \ BoundsC.i \ Buffering_Constraint_Policy.i \ CDR.i \ + Collocation_Resolver.i \ + Connector_Registry.i \ CONV_FRAMEC.i \ CONV_FRAMES.i \ CONV_FRAMES_T.i \ + corbafwd.i \ CORBALOC_Parser.i \ CORBANAME_Parser.i \ - CORBA_String.inl \ - Cache_Entries.inl \ - CharSeqC.inl \ - Cleanup_Func_Registry.inl \ - ClientRequestInfo.inl \ - ClientRequestInfo_i.inl \ - ClientRequestInterceptor_Adapter.inl \ - Collocation_Resolver.i \ - Condition.inl \ - Connection_Handler.inl \ - Connection_Purging_Strategy.inl \ - Connector_Impl.inl \ - Connector_Registry.i \ CurrentC.i \ - DLL_Parser.i \ + default_client.i \ Default_Collocation_Resolver.i \ Default_Protocols_Hooks.i \ + default_resource.i \ + default_server.i \ Default_Thread_Lane_Resources_Manager.i \ + DLL_Parser.i \ DomainC.i \ - DoubleSeqC.inl \ - DynamicC.i \ Dynamic_ParameterC.i \ + DynamicC.i \ Endpoint.i \ Environment.i \ Exception.i \ - FILE_Parser.i \ Fault_Tolerance_Service.i \ - Fixed_Array_Argument_T.inl \ - Fixed_Array_SArgument_T.inl \ - Fixed_Size_Argument_T.inl \ - Fixed_Size_SArgument_T.inl \ + FILE_Parser.i \ FloatSeqC.i \ - GIOPC.i \ - GIOPS.i \ - GIOPS_T.i \ GIOP_Message_Base.i \ - GIOP_Message_Generator_Parser.inl \ - GIOP_Message_Generator_Parser_10.inl \ - GIOP_Message_Generator_Parser_11.inl \ - GIOP_Message_Generator_Parser_12.inl \ - GIOP_Message_Generator_Parser_Impl.inl \ GIOP_Message_Lite.i \ GIOP_Message_Locate_Header.i \ - GIOP_Message_State.inl \ - GIOP_Message_Version.inl \ GIOP_Utils.i \ - IIOPC.i \ + GIOPC.i \ + GIOPS.i \ + GIOPS_T.i \ IIOP_Acceptor.i \ IIOP_Connection_Handler.i \ IIOP_Endpoint.i \ IIOP_EndpointsC.i \ IIOP_Profile.i \ IIOP_Transport.i \ + IIOPC.i \ + Invocation_Endpoint_Selectors.i \ + IOP_CodecC.i \ + IOP_IORC.i \ IOPC.i \ IOPS.i \ IOPS_T.i \ - IOP_CodecC.i \ - IOP_IORC.i \ IOR_Parser.i \ - Incoming_Message_Queue.inl \ - Interceptor_List.inl \ - Invocation_Adapter.inl \ - Invocation_Base.inl \ - Invocation_Endpoint_Selectors.i \ - LF_Event.inl \ - LF_Event_Binder.inl \ - LF_Event_Loop_Thread_Helper.inl \ - LF_Follower.inl \ - LF_Follower_Auto_Adder.inl \ - LF_Follower_Auto_Ptr.inl \ - LF_Invocation_Event.inl \ - LF_Strategy.inl \ - LF_Strategy_Complete.inl \ Leader_Follower.i \ LocalObject.i \ - LongDoubleSeqC.inl \ - LongLongSeqC.inl \ - LongSeqC.inl \ - MCAST_Parser.i \ - MProfile.i \ Managed_Types.i \ Marshal.i \ + MCAST_Parser.i \ Messaging_PolicyValueC.i \ Messaging_SyncScopeC.i \ + MProfile.i \ NVList.i \ - ORB.i \ - ORBInitInfo.inl \ - ORB_Core.i \ - ORB_Core_Auto_Ptr.inl \ - ORB_Table.inl \ Object.i \ - ObjectIdListC.i \ - Object_Argument_T.inl \ Object_KeyC.i \ Object_Loader.i \ - Object_SArgument_T.inl \ - Objref_VarOut_T.inl \ - OctetSeqC.inl \ - PICurrent.inl \ - PI_ForwardC.inl \ + ObjectIdListC.i \ + operation_details.i \ + ORB.i \ + ORB_Core.i \ + params.i \ Parser_Registry.i \ + PI_ForwardC.i \ Pluggable_Messaging.i \ Pluggable_Messaging_Utils.i \ - PolicyC.i \ Policy_ForwardC.i \ Policy_Manager.i \ Policy_Set.i \ + PolicyC.i \ PollableC.i \ PollableS.i \ PollableS_T.i \ PortableInterceptorC.i \ Principal.i \ Profile.i \ - Profile_Transport_Resolver.inl \ - Pseudo_VarOut_T.inl \ - Queued_Message.inl \ - Refcounted_ObjectKey.inl \ + qt_resource.i \ Reply_Dispatcher.i \ - Resume_Handle.inl \ - Seq_Out_T.inl \ - Seq_Var_T.inl \ Sequence.i \ Sequence_T.i \ Service_Callbacks.i \ - Service_Context.inl \ ServicesC.i \ ServicesS.i \ ServicesS_T.i \ ShortSeqC.i \ - Special_Basic_Argument_T.inl \ - Special_Basic_SArgument_T.inl \ - StringSeqC.inl \ Stub.i \ Sync_Strategies.i \ - Synch_Invocation.inl \ - Synch_Refcountable.inl \ - SystemException.inl \ + Tagged_Components.i \ + Tagged_Profile.i \ + TAO_Server_Request.i \ TAOC.i \ TAOS.i \ TAOS_T.i \ - TAO_Server_Request.i \ - TAO_Singleton.inl \ - TAO_Singleton_Manager.inl \ - Tagged_Components.i \ - Tagged_Profile.i \ + target_specification.i \ Thread_Lane_Resources_Manager.i \ TimeBaseC.i \ TimeBaseS.i \ TimeBaseS_T.i \ + Typecode.i \ + ULongSeqC.i \ + UShortSeqC.i \ + WrongTransactionC.i \ + xt_resource.i \ + Any_Array_Impl_T.inl \ + Any_Basic_Impl_T.inl \ + Any_Dual_Impl_T.inl \ + Any_Impl_T.inl \ + Any_Special_Impl_T.inl \ + AnySeqC.inl \ + Array_VarOut_T.inl \ + Base_Transport_Property.inl \ + Basic_Argument_T.inl \ + Basic_SArgument_T.inl \ + BD_String_Argument_T.inl \ + BD_String_SArgument_T.inl \ + Cache_Entries.inl \ + CharSeqC.inl \ + Cleanup_Func_Registry.inl \ + ClientRequestInfo.inl \ + ClientRequestInfo_i.inl \ + ClientRequestInterceptor_Adapter.inl \ + Condition.inl \ + Connection_Handler.inl \ + Connection_Purging_Strategy.inl \ + Connector_Impl.inl \ + CORBA_String.inl \ + DLL_ORB.inl \ + DoubleSeqC.inl \ + Fixed_Array_Argument_T.inl \ + Fixed_Array_SArgument_T.inl \ + Fixed_Size_Argument_T.inl \ + Fixed_Size_SArgument_T.inl \ + GIOP_Message_Generator_Parser.inl \ + GIOP_Message_Generator_Parser_10.inl \ + GIOP_Message_Generator_Parser_11.inl \ + GIOP_Message_Generator_Parser_12.inl \ + GIOP_Message_Generator_Parser_Impl.inl \ + GIOP_Message_State.inl \ + GIOP_Message_Version.inl \ + Incoming_Message_Queue.inl \ + Interceptor_List.inl \ + Invocation_Adapter.inl \ + Invocation_Base.inl \ + LF_Event.inl \ + LF_Event_Binder.inl \ + LF_Event_Loop_Thread_Helper.inl \ + LF_Follower.inl \ + LF_Follower_Auto_Adder.inl \ + LF_Follower_Auto_Ptr.inl \ + LF_Invocation_Event.inl \ + LF_Strategy.inl \ + LF_Strategy_Complete.inl \ + LongDoubleSeqC.inl \ + LongLongSeqC.inl \ + LongSeqC.inl \ + Object_Argument_T.inl \ + Object_SArgument_T.inl \ + Objref_VarOut_T.inl \ + OctetSeqC.inl \ + ORB_Core_Auto_Ptr.inl \ + ORB_Table.inl \ + ORBInitInfo.inl \ + PICurrent.inl \ + Profile_Transport_Resolver.inl \ + Pseudo_VarOut_T.inl \ + Queued_Message.inl \ + Refcounted_ObjectKey.inl \ + Resume_Handle.inl \ + Seq_Out_T.inl \ + Seq_Var_T.inl \ + Service_Context.inl \ + Special_Basic_Argument_T.inl \ + Special_Basic_SArgument_T.inl \ + StringSeqC.inl \ + Synch_Invocation.inl \ + Synch_Refcountable.inl \ + TAO_Singleton.inl \ + TAO_Singleton_Manager.inl \ Transport.inl \ Transport_Acceptor.inl \ Transport_Cache_Manager.inl \ Transport_Connector.inl \ Transport_Descriptor_Interface.inl \ - Typecode.i \ UB_String_Argument_T.inl \ UB_String_SArgument_T.inl \ ULongLongSeqC.inl \ - ULongSeqC.i \ - UShortSeqC.i \ - UserException.inl \ - VarOut_T.inl \ Var_Array_Argument_T.inl \ Var_Array_SArgument_T.inl \ Var_Size_Argument_T.inl \ Var_Size_SArgument_T.inl \ + VarOut_T.inl \ + Wait_Strategy.inl \ WCharSeqC.inl \ WStringSeqC.inl \ - Wait_Strategy.inl \ - WrongTransactionC.i \ - corbafwd.i \ - default_client.i \ - default_resource.i \ - default_server.i \ - operation_details.i \ - params.i \ - qt_resource.i \ - target_specification.i \ - xt_resource.i \ - Acceptor_Impl.cpp \ Any_Array_Impl_T.cpp \ Any_Basic_Impl_T.cpp \ Any_Dual_Impl_T.cpp \ Any_Impl_T.cpp \ Any_Special_Impl_T.cpp \ Array_VarOut_T.cpp \ - BD_String_Argument_T.cpp \ - BD_String_SArgument_T.cpp \ Basic_Argument_T.cpp \ Basic_SArgument_T.cpp \ + BD_String_Argument_T.cpp \ + BD_String_SArgument_T.cpp \ Buffer_Allocator_T.cpp \ - CONV_FRAMES_T.cpp \ Codeset_Translator_Factory_T.cpp \ - Condition.cpp \ - Connector_Impl.cpp \ + CONV_FRAMES_T.cpp \ Fixed_Array_Argument_T.cpp \ Fixed_Array_SArgument_T.cpp \ Fixed_Size_Argument_T.cpp \ @@ -898,62 +886,20 @@ nobase_include_HEADERS = \ Special_Basic_Argument_T.cpp \ Special_Basic_SArgument_T.cpp \ TAOS_T.cpp \ - TAO_Singleton.cpp \ TimeBaseS_T.cpp \ UB_String_Argument_T.cpp \ UB_String_SArgument_T.cpp \ - VarOut_T.cpp \ Var_Array_Argument_T.cpp \ Var_Array_SArgument_T.cpp \ Var_Size_Argument_T.cpp \ Var_Size_SArgument_T.cpp \ - orb.idl \ - AnySeq.pidl \ - BooleanSeq.pidl \ - Bounds.pidl \ - CONV_FRAME.pidl \ - CharSeq.pidl \ - Current.pidl \ - Domain.pidl \ - DoubleSeq.pidl \ - Dynamic.pidl \ - Dynamic_Parameter.pidl \ - FloatSeq.pidl \ - GIOP.pidl \ - IIOP.pidl \ - IIOP_Endpoints.pidl \ - IOP.pidl \ - IOP_Codec.pidl \ - IOP_IOR.pidl \ - InterfaceDef.pidl \ - InvalidName.pidl \ - LongDoubleSeq.pidl \ - LongLongSeq.pidl \ - LongSeq.pidl \ - Messaging_PolicyValue.pidl \ - Messaging_SyncScope.pidl \ - ObjectIdList.pidl \ - Object_Key.pidl \ - OctetSeq.pidl \ - PI_Forward.pidl \ - Policy.pidl \ - Policy_Forward.pidl \ - Pollable.pidl \ - PortableInterceptor.pidl \ - Services.pidl \ - ShortSeq.pidl \ - StringSeq.pidl \ - TAO.pidl \ - TimeBase.pidl \ - ULongLongSeq.pidl \ - ULongSeq.pidl \ - UShortSeq.pidl \ - WCharSeq.pidl \ - WStringSeq.pidl \ - WrongTransaction.pidl - -EXTRA_DIST = \ - tao.rc + VarOut_T.cpp \ + Acceptor_Impl.cpp \ + Condition.cpp \ + Connector_Impl.cpp \ + TAO_Singleton.cpp \ + orb.idl + ## Makefile.BiDir_GIOP.am @@ -967,34 +913,145 @@ libTAO_BiDirGIOP_la_CPPFLAGS = \ -DTAO_BIDIRGIOP_BUILD_DLL libTAO_BiDirGIOP_la_SOURCES = \ - BiDir_GIOP/BiDirGIOP.cpp \ BiDir_GIOP/BiDirPolicyC.cpp \ BiDir_GIOP/BiDirPolicy_Validator.cpp \ BiDir_GIOP/BiDir_ORBInitializer.cpp \ BiDir_GIOP/BiDir_PolicyFactory.cpp \ - BiDir_GIOP/BiDir_Policy_i.cpp + BiDir_GIOP/BiDir_Policy_i.cpp \ + BiDir_GIOP/BiDirGIOP.cpp libTAO_BiDirGIOP_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_BiDirGIOP_la_LIBADD = \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la -nobase_include_HEADERS += \ +nobase_pkginclude_HEADERS += \ BiDir_GIOP/BiDirGIOP.h \ BiDir_GIOP/BiDirPolicyC.h \ - BiDir_GIOP/BiDirPolicy_Validator.h \ BiDir_GIOP/BiDir_ORBInitializer.h \ BiDir_GIOP/BiDir_PolicyFactory.h \ BiDir_GIOP/BiDir_Policy_i.h \ BiDir_GIOP/bidirgiop_export.h \ + BiDir_GIOP/BiDirPolicy_Validator.h \ BiDir_GIOP/BiDirPolicyC.i \ - BiDir_GIOP/BiDir_Policy_i.inl \ - BiDir_GIOP/BiDirPolicy.pidl + BiDir_GIOP/BiDir_Policy_i.inl + + +## Makefile.Valuetype.am + +lib_LTLIBRARIES += libTAO_Valuetype.la + +libTAO_Valuetype_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -DTAO_VALUETYPE_BUILD_DLL + +libTAO_Valuetype_la_SOURCES = \ + Valuetype/AbstractBase.cpp \ + Valuetype/AbstractBase_Invocation_Adapter.cpp \ + Valuetype/Seq_Tmplinst.cpp \ + Valuetype/ValueFactory_Map.cpp \ + Valuetype/ValueBase.cpp \ + Valuetype/ValueFactory.cpp \ + Valuetype/Valuetype_Adapter_Impl.cpp + +libTAO_Valuetype_la_LDFLAGS = \ + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + +libTAO_Valuetype_la_LIBADD = \ + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +nobase_pkginclude_HEADERS += \ + Valuetype/AbstractBase.h \ + Valuetype/Sequence_T.h \ + Valuetype/AbstractBase_Invocation_Adapter.h \ + Valuetype/AbstractBase_T.h \ + Valuetype/ValueBase.h \ + Valuetype/ValueFactory.h \ + Valuetype/Value_CORBA_methods.h \ + Valuetype/ValueFactory_Map.h \ + Valuetype/Value_VarOut_T.h \ + Valuetype/Valuetype_Adapter_Impl.h \ + Valuetype/valuetype_export.h \ + Valuetype/AbstractBase.inl \ + Valuetype/Sequence_T.inl \ + Valuetype/ValueBase.inl \ + Valuetype/ValueFactory.inl \ + Valuetype/ValueFactory_Map.inl \ + Valuetype/Value_VarOut_T.inl \ + Valuetype/AbstractBase_T.cpp \ + Valuetype/Sequence_T.cpp \ + Valuetype/Value_VarOut_T.cpp + + +## Makefile.ObjRefTemplate.am + +lib_LTLIBRARIES += libTAO_ObjRefTemplate.la + +libTAO_ObjRefTemplate_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -DTAO_ORT_BUILD_DLL + +libTAO_ObjRefTemplate_la_SOURCES = \ + ObjRefTemplate/ObjectReferenceTemplateC.cpp + +libTAO_ObjRefTemplate_la_LDFLAGS = \ + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + +libTAO_ObjRefTemplate_la_LIBADD = \ + libTAO_Valuetype.la \ + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +nobase_pkginclude_HEADERS += \ + ObjRefTemplate/ObjectReferenceTemplateC.h \ + ObjRefTemplate/ort_export.h \ + ObjRefTemplate/ObjectReferenceTemplateC.i + + +## Makefile.IORInterceptor.am + +lib_LTLIBRARIES += libTAO_IORInterceptor.la + +libTAO_IORInterceptor_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -DTAO_IORINTERCEPTOR_BUILD_DLL + +libTAO_IORInterceptor_la_SOURCES = \ + IORInterceptor/IORInterceptor_List.cpp \ + IORInterceptor/IORInterceptorC.cpp \ + IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp \ + IORInterceptor/IORInterceptor_Adapter_Impl.cpp + +libTAO_IORInterceptor_la_LDFLAGS = \ + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + +libTAO_IORInterceptor_la_LIBADD = \ + libTAO_ObjRefTemplate.la \ + libTAO_Valuetype.la \ + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +nobase_pkginclude_HEADERS += \ + IORInterceptor/IORInterceptorC.h \ + IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h \ + IORInterceptor/IORInterceptor_Adapter_Impl.h \ + IORInterceptor/IORInterceptor_List.h \ + IORInterceptor/iorinterceptor_export.h \ + IORInterceptor/IORInterceptorC.i \ + IORInterceptor/IORInterceptor_List.inl -EXTRA_DIST += \ - BiDir_GIOP/TAO_BiDir_GIOP.rc ## Makefile.PortableServer.am @@ -1008,11 +1065,15 @@ libTAO_PortableServer_la_CPPFLAGS = \ -DTAO_PORTABLESERVER_BUILD_DLL libTAO_PortableServer_la_SOURCES = \ + PortableServer/Default_Acceptor_Filter.cpp \ + PortableServer/AMH_Response_Handler.cpp \ PortableServer/Active_Object_Map.cpp \ + PortableServer/Object_Adapter.cpp \ PortableServer/Collocated_Object_Proxy_Broker.cpp \ - PortableServer/Default_Acceptor_Filter.cpp \ - PortableServer/Default_Policy_Validator.cpp \ + PortableServer/Default_ORTC.cpp \ + PortableServer/IORInfo.cpp \ PortableServer/Default_Servant_Dispatcher.cpp \ + PortableServer/Default_Policy_Validator.cpp \ PortableServer/ImR_LocatorC.cpp \ PortableServer/ImR_LocatorS.cpp \ PortableServer/ImplRepoC.cpp \ @@ -1020,19 +1081,16 @@ libTAO_PortableServer_la_SOURCES = \ PortableServer/ImplRepo_i.cpp \ PortableServer/Key_Adapters.cpp \ PortableServer/ORB_Manager.cpp \ - PortableServer/ORT_Adapter.cpp \ - PortableServer/ORT_Adapter_Factory.cpp \ - PortableServer/Object_Adapter.cpp \ + PortableServer/POA.cpp \ + PortableServer/ObjectReferenceTemplate.cpp \ PortableServer/Operation_Table.cpp \ PortableServer/PICurrent_Guard.cpp \ - PortableServer/POA.cpp \ - PortableServer/POAManager.cpp \ PortableServer/POA_Cached_Policies.cpp \ + PortableServer/POAManager.cpp \ + PortableServer/PortableServer.cpp \ PortableServer/POA_Policies.cpp \ PortableServer/POA_Policy_Set.cpp \ - PortableServer/PolicyS.cpp \ PortableServer/PortableGroup_Hooks.cpp \ - PortableServer/PortableServer.cpp \ PortableServer/PortableServerA.cpp \ PortableServer/PortableServerC.cpp \ PortableServer/PortableServer_ORBInitializer.cpp \ @@ -1040,20 +1098,27 @@ libTAO_PortableServer_la_SOURCES = \ PortableServer/Servant_Base.cpp \ PortableServer/Servant_Dispatcher.cpp \ PortableServer/ServerInterceptorAdapter.cpp \ - PortableServer/ServerRequestInfo.cpp + PortableServer/ServerRequestInfo.cpp \ + PortableServer/PolicyS.cpp libTAO_PortableServer_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_PortableServer_la_LIBADD = \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - PortableServer/Active_Object_Map.h \ + libTAO_IORInterceptor.la \ + libTAO_ObjRefTemplate.la \ + libTAO_Valuetype.la \ + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +nobase_pkginclude_HEADERS += \ + PortableServer/AMH_Response_Handler.h \ PortableServer/Collocated_Object_Proxy_Broker.h \ PortableServer/Default_Acceptor_Filter.h \ + PortableServer/Default_ORTC.h \ + PortableServer/POA.h \ PortableServer/Default_Policy_Validator.h \ + PortableServer/IORInfo.h \ PortableServer/Default_Servant_Dispatcher.h \ PortableServer/ImR_LocatorC.h \ PortableServer/ImR_LocatorS.h \ @@ -1062,56 +1127,53 @@ nobase_include_HEADERS += \ PortableServer/ImplRepo_i.h \ PortableServer/Key_Adapters.h \ PortableServer/ORB_Manager.h \ - PortableServer/ORT_Adapter.h \ - PortableServer/ORT_Adapter_Factory.h \ + PortableServer/ObjectReferenceTemplate.h \ PortableServer/Object_Adapter.h \ PortableServer/Operation_Table.h \ + PortableServer/PolicyS_T.h \ + PortableServer/PolicyS.h \ PortableServer/PICurrent_Guard.h \ - PortableServer/POA.h \ PortableServer/POAManager.h \ PortableServer/POA_Cached_Policies.h \ PortableServer/POA_Policies.h \ PortableServer/POA_Policy_Set.h \ - PortableServer/PolicyS.h \ - PortableServer/PolicyS_T.h \ + PortableServer/PortableServer_ORBInitializer.h \ PortableServer/PortableGroup_Hooks.h \ PortableServer/PortableServer.h \ PortableServer/PortableServerC.h \ PortableServer/PortableServerS.h \ - PortableServer/PortableServer_ORBInitializer.h \ + PortableServer/poa_macros.h \ PortableServer/PortableServer_PolicyFactory.h \ PortableServer/Servant_Base.h \ PortableServer/Servant_Dispatcher.h \ PortableServer/ServerInterceptorAdapter.h \ PortableServer/ServerRequestInfo.h \ PortableServer/Upcall_Wrapper.h \ - PortableServer/poa_macros.h \ PortableServer/portableserver_export.h \ + PortableServer/Active_Object_Map.h \ PortableServer/Active_Object_Map.i \ - PortableServer/ImR_LocatorC.inl \ - PortableServer/ImR_LocatorS.inl \ - PortableServer/ImplRepoC.inl \ - PortableServer/ImplRepoS.inl \ + PortableServer/Default_ORTC.i \ + PortableServer/IORInfo.inl \ + PortableServer/ImR_LocatorC.i \ + PortableServer/ImR_LocatorS.i \ + PortableServer/ImplRepoC.i \ + PortableServer/ImplRepoS.i \ PortableServer/Key_Adapters.i \ + PortableServer/ObjectReferenceTemplate.inl \ PortableServer/Object_Adapter.i \ PortableServer/POA.i \ PortableServer/POAManager.i \ PortableServer/POA_Cached_Policies.i \ PortableServer/POA_Policies.i \ PortableServer/POA_Policy_Set.i \ - PortableServer/PolicyS.inl \ - PortableServer/PolicyS_T.inl \ - PortableServer/PortableServerC.inl \ + PortableServer/PolicyS.i \ + PortableServer/PolicyS_T.i \ + PortableServer/PortableServerC.i \ PortableServer/Servant_Base.i \ PortableServer/ServerInterceptorAdapter.inl \ PortableServer/ServerRequestInfo.inl \ - PortableServer/PolicyS_T.cpp \ - PortableServer/ImR_Locator.pidl \ - PortableServer/ImplRepo.pidl \ - PortableServer/PortableServer.pidl + PortableServer/PolicyS_T.cpp -EXTRA_DIST += \ - PortableServer/TAO_PortableServer.rc ## Makefile.IFR_Client.am @@ -1139,10 +1201,10 @@ libTAO_IFR_Client_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_IFR_Client_la_LIBADD = \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la -nobase_include_HEADERS += \ +nobase_pkginclude_HEADERS += \ IFR_Client/IFR_BaseC.h \ IFR_Client/IFR_BaseS.h \ IFR_Client/IFR_BasicC.h \ @@ -1153,14 +1215,8 @@ nobase_include_HEADERS += \ IFR_Client/IFR_BaseC.i \ IFR_Client/IFR_BasicC.i \ IFR_Client/IFR_ComponentsC.i \ - IFR_Client/IFR_ExtendedC.i \ - IFR_Client/IFR_Base.pidl \ - IFR_Client/IFR_Basic.pidl \ - IFR_Client/IFR_Components.pidl \ - IFR_Client/IFR_Extended.pidl + IFR_Client/IFR_ExtendedC.i -EXTRA_DIST += \ - IFR_Client/TAO_IFR_Client.rc ## Makefile.Domain.am @@ -1180,12 +1236,15 @@ libTAO_Domain_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_Domain_la_LIBADD = \ - libTAO_PortableServer.la \ - libTAO_IFR_Client.la \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ + libTAO_PortableServer.la \ + libTAO_IORInterceptor.la \ + libTAO_ObjRefTemplate.la \ + libTAO_Valuetype.la \ + libTAO_IFR_Client.la \ + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +nobase_pkginclude_HEADERS += \ Domain/DomainS.h \ Domain/DomainS_T.h \ Domain/domain_export.h \ @@ -1193,8 +1252,6 @@ nobase_include_HEADERS += \ Domain/DomainS_T.i \ Domain/DomainS_T.cpp -EXTRA_DIST += \ - Domain/TAO_Domain.rc ## Makefile.DynamicAny.am @@ -1208,7 +1265,6 @@ libTAO_DynamicAny_la_CPPFLAGS = \ -DTAO_DYNAMICANY_BUILD_DLL libTAO_DynamicAny_la_SOURCES = \ - DynamicAny/DynAnyFactory.cpp \ DynamicAny/DynAny_i.cpp \ DynamicAny/DynArray_i.cpp \ DynamicAny/DynCommon.cpp \ @@ -1217,17 +1273,18 @@ libTAO_DynamicAny_la_SOURCES = \ DynamicAny/DynStruct_i.cpp \ DynamicAny/DynUnion_i.cpp \ DynamicAny/DynamicAny.cpp \ - DynamicAny/DynamicAnyC.cpp + DynamicAny/DynamicAnyC.cpp \ + DynamicAny/DynAnyFactory.cpp libTAO_DynamicAny_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_DynamicAny_la_LIBADD = \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + libTAO_Valuetype.la \ + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la -nobase_include_HEADERS += \ - DynamicAny/DynAnyFactory.h \ +nobase_pkginclude_HEADERS += \ DynamicAny/DynAny_i.h \ DynamicAny/DynArray_i.h \ DynamicAny/DynCommon.h \ @@ -1238,63 +1295,9 @@ nobase_include_HEADERS += \ DynamicAny/DynamicAny.h \ DynamicAny/DynamicAnyC.h \ DynamicAny/dynamicany_export.h \ - DynamicAny/DynamicAnyC.i \ - DynamicAny/DynamicAny.pidl - -EXTRA_DIST += \ - DynamicAny/TAO_DynamicAny.rc - -## Makefile.Valuetype.am - -lib_LTLIBRARIES += libTAO_Valuetype.la - -libTAO_Valuetype_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DTAO_VALUETYPE_BUILD_DLL - -libTAO_Valuetype_la_SOURCES = \ - Valuetype/AbstractBase.cpp \ - Valuetype/AbstractBase_Invocation_Adapter.cpp \ - Valuetype/Seq_Tmplinst.cpp \ - Valuetype/ValueBase.cpp \ - Valuetype/ValueFactory.cpp \ - Valuetype/ValueFactory_Map.cpp \ - Valuetype/Valuetype_Adapter_Impl.cpp - -libTAO_Valuetype_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - -libTAO_Valuetype_la_LIBADD = \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - Valuetype/AbstractBase.h \ - Valuetype/AbstractBase_Invocation_Adapter.h \ - Valuetype/AbstractBase_T.h \ - Valuetype/Sequence_T.h \ - Valuetype/ValueBase.h \ - Valuetype/ValueFactory.h \ - Valuetype/ValueFactory_Map.h \ - Valuetype/Value_CORBA_methods.h \ - Valuetype/Value_VarOut_T.h \ - Valuetype/Valuetype_Adapter_Impl.h \ - Valuetype/valuetype_export.h \ - Valuetype/AbstractBase.inl \ - Valuetype/Sequence_T.inl \ - Valuetype/ValueBase.inl \ - Valuetype/ValueFactory.inl \ - Valuetype/ValueFactory_Map.inl \ - Valuetype/Value_VarOut_T.inl \ - Valuetype/AbstractBase_T.cpp \ - Valuetype/Sequence_T.cpp \ - Valuetype/Value_VarOut_T.cpp + DynamicAny/DynAnyFactory.h \ + DynamicAny/DynamicAnyC.i -EXTRA_DIST += \ - Valuetype/TAO_Valuetype.rc ## Makefile.Messaging.am @@ -1308,40 +1311,41 @@ libTAO_Messaging_la_CPPFLAGS = \ -DTAO_MESSAGING_BUILD_DLL libTAO_Messaging_la_SOURCES = \ - Messaging/AMH_Response_Handler.cpp \ - Messaging/Asynch_Invocation.cpp \ - Messaging/Asynch_Invocation_Adapter.cpp \ + Messaging/Connection_Timeout_Policy_i.cpp \ Messaging/Asynch_Reply_Dispatcher.cpp \ Messaging/Asynch_Timeout_Handler.cpp \ - Messaging/Connection_Timeout_Policy_i.cpp \ Messaging/Messaging.cpp \ Messaging/MessagingC.cpp \ Messaging/MessagingS.cpp \ - Messaging/Messaging_No_ImplC.cpp \ Messaging/Messaging_ORBInitializer.cpp \ - Messaging/Messaging_PolicyFactory.cpp \ + Messaging/Messaging_No_ImplC.cpp \ Messaging/Messaging_Policy_i.cpp \ + Messaging/Messaging_PolicyFactory.cpp \ Messaging/Messaging_RT_PolicyC.cpp \ Messaging/Messaging_SyncScope_PolicyC.cpp \ - Messaging/TAO_ExtC.cpp + Messaging/TAO_ExtC.cpp \ + Messaging/Asynch_Invocation_Adapter.cpp \ + Messaging/Asynch_Invocation.cpp libTAO_Messaging_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_Messaging_la_LIBADD = \ - libTAO_Valuetype.la \ - libTAO_PortableServer.la \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - Messaging/AMH_Response_Handler.h \ + libTAO_PortableServer.la \ + libTAO_IORInterceptor.la \ + libTAO_ObjRefTemplate.la \ + libTAO_Valuetype.la \ + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +nobase_pkginclude_HEADERS += \ Messaging/Asynch_Invocation.h \ Messaging/Asynch_Invocation_Adapter.h \ Messaging/Asynch_Reply_Dispatcher.h \ Messaging/Asynch_Timeout_Handler.h \ Messaging/Connection_Timeout_Policy_i.h \ Messaging/Messaging.h \ + Messaging/TAO_ExtC.h \ Messaging/MessagingC.h \ Messaging/MessagingS.h \ Messaging/MessagingS_T.h \ @@ -1351,7 +1355,6 @@ nobase_include_HEADERS += \ Messaging/Messaging_Policy_i.h \ Messaging/Messaging_RT_PolicyC.h \ Messaging/Messaging_SyncScope_PolicyC.h \ - Messaging/TAO_ExtC.h \ Messaging/messaging_export.h \ Messaging/Asynch_Invocation_Adapter.inl \ Messaging/Asynch_Reply_Dispatcher.i \ @@ -1363,20 +1366,11 @@ nobase_include_HEADERS += \ Messaging/Messaging_RT_PolicyC.i \ Messaging/Messaging_SyncScope_PolicyC.i \ Messaging/TAO_ExtC.i \ - Messaging/MessagingS_T.cpp \ - Messaging/Messaging.pidl \ - Messaging/Messaging_No_Impl.pidl \ - Messaging/Messaging_RT_Policy.pidl \ - Messaging/Messaging_SyncScope_Policy.pidl \ - Messaging/TAO_Ext.pidl + Messaging/MessagingS_T.cpp -EXTRA_DIST += \ - Messaging/TAO_Messaging.rc ## Makefile.DynamicInterface.am -if !BUILD_MINIMUM_CORBA - lib_LTLIBRARIES += libTAO_DynamicInterface.la libTAO_DynamicInterface_la_CPPFLAGS = \ @@ -1387,29 +1381,31 @@ libTAO_DynamicInterface_la_CPPFLAGS = \ -DTAO_DYNAMICINTERFACE_BUILD_DLL libTAO_DynamicInterface_la_SOURCES = \ - DynamicInterface/Context.cpp \ DynamicInterface/DII_Arguments.cpp \ - DynamicInterface/DII_Invocation.cpp \ + DynamicInterface/Context.cpp \ DynamicInterface/DII_Invocation_Adapter.cpp \ - DynamicInterface/DII_Reply_Dispatcher.cpp \ - DynamicInterface/Dynamic_Adapter_Impl.cpp \ + DynamicInterface/DII_Invocation.cpp \ DynamicInterface/Dynamic_Implementation.cpp \ - DynamicInterface/ExceptionList.cpp \ + DynamicInterface/DII_Reply_Dispatcher.cpp \ DynamicInterface/Request.cpp \ - DynamicInterface/Server_Request.cpp \ - DynamicInterface/Unknown_User_Exception.cpp + DynamicInterface/ExceptionList.cpp \ + DynamicInterface/Dynamic_Adapter_Impl.cpp \ + DynamicInterface/Unknown_User_Exception.cpp \ + DynamicInterface/Server_Request.cpp libTAO_DynamicInterface_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_DynamicInterface_la_LIBADD = \ - libTAO_Messaging.la \ - libTAO_PortableServer.la \ - libTAO_Valuetype.la \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ + libTAO_Messaging.la \ + libTAO_PortableServer.la \ + libTAO_IORInterceptor.la \ + libTAO_ObjRefTemplate.la \ + libTAO_Valuetype.la \ + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +nobase_pkginclude_HEADERS += \ DynamicInterface/Context.h \ DynamicInterface/DII_Arguments.h \ DynamicInterface/DII_CORBA_methods.h \ @@ -1430,100 +1426,6 @@ nobase_include_HEADERS += \ DynamicInterface/Request.inl \ DynamicInterface/Server_Request.inl -endif !BUILD_MINIMUM_CORBA - -EXTRA_DIST += \ - DynamicInterface/TAO_DynamicInterface.rc - -## Makefile.ObjRefTemplate.am - -lib_LTLIBRARIES += libTAO_ObjRefTemplate.la - -libTAO_ObjRefTemplate_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DTAO_ORT_BUILD_DLL - -libTAO_ObjRefTemplate_la_SOURCES = \ - ObjRefTemplate/Default_ORTC.cpp \ - ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp \ - ObjRefTemplate/ORT_Adapter_Impl.cpp \ - ObjRefTemplate/ObjectReferenceTemplateC.cpp \ - ObjRefTemplate/ObjectReferenceTemplate_i.cpp - -libTAO_ObjRefTemplate_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - -libTAO_ObjRefTemplate_la_LIBADD = \ - libTAO_PortableServer.la \ - libTAO_Valuetype.la \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - ObjRefTemplate/Default_ORTC.h \ - ObjRefTemplate/ORT_Adapter_Factory_Impl.h \ - ObjRefTemplate/ORT_Adapter_Impl.h \ - ObjRefTemplate/ObjectReferenceTemplateC.h \ - ObjRefTemplate/ObjectReferenceTemplate_i.h \ - ObjRefTemplate/ort_export.h \ - ObjRefTemplate/Default_ORTC.i \ - ObjRefTemplate/ObjectReferenceTemplateC.inl \ - ObjRefTemplate/ObjectReferenceTemplate_i.inl \ - ObjRefTemplate/Default_ORT.pidl \ - ObjRefTemplate/ObjectReferenceTemplate.pidl - -EXTRA_DIST += \ - ObjRefTemplate/TAO_ObjRefTemplate.rc - -## Makefile.IORInterceptor.am - -lib_LTLIBRARIES += libTAO_IORInterceptor.la - -libTAO_IORInterceptor_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DTAO_IORINTERCEPTOR_BUILD_DLL - -libTAO_IORInterceptor_la_SOURCES = \ - IORInterceptor/IORInfo.cpp \ - IORInterceptor/IORInfoC.cpp \ - IORInterceptor/IORInterceptorC.cpp \ - IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp \ - IORInterceptor/IORInterceptor_Adapter_Impl.cpp \ - IORInterceptor/IORInterceptor_List.cpp - -libTAO_IORInterceptor_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - -libTAO_IORInterceptor_la_LIBADD = \ - libTAO_ObjRefTemplate.la \ - libTAO_Valuetype.la \ - libTAO_PortableServer.la \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - IORInterceptor/IORInfo.h \ - IORInterceptor/IORInfoC.h \ - IORInterceptor/IORInterceptorC.h \ - IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h \ - IORInterceptor/IORInterceptor_Adapter_Impl.h \ - IORInterceptor/IORInterceptor_List.h \ - IORInterceptor/iorinterceptor_export.h \ - IORInterceptor/IORInfo.inl \ - IORInterceptor/IORInfoC.inl \ - IORInterceptor/IORInterceptorC.inl \ - IORInterceptor/IORInterceptor_List.inl \ - IORInterceptor/IORInfo.pidl \ - IORInterceptor/IORInterceptor.pidl - -EXTRA_DIST += \ - IORInterceptor/TAO_IORInterceptor.rc ## Makefile.IORManipulation.am @@ -1546,19 +1448,16 @@ libTAO_IORManip_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_IORManip_la_LIBADD = \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la -nobase_include_HEADERS += \ +nobase_pkginclude_HEADERS += \ IORManipulation/IORC.h \ IORManipulation/IORManip_Loader.h \ IORManipulation/IORManipulation.h \ IORManipulation/ior_manip_export.h \ - IORManipulation/IORC.i \ - IORManipulation/IOR.pidl + IORManipulation/IORC.i -EXTRA_DIST += \ - IORManipulation/TAO_IORManip.rc ## Makefile.IORTable.am @@ -1572,34 +1471,29 @@ libTAO_IORTable_la_CPPFLAGS = \ -DTAO_IORTABLE_BUILD_DLL libTAO_IORTable_la_SOURCES = \ - IORTable/IORTable.cpp \ - IORTable/IORTableC.cpp \ IORTable/IOR_Table_Impl.cpp \ - IORTable/Table_Adapter.cpp + IORTable/IORTableC.cpp \ + IORTable/Table_Adapter.cpp \ + IORTable/IORTable.cpp libTAO_IORTable_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_IORTable_la_LIBADD = \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la -nobase_include_HEADERS += \ +nobase_pkginclude_HEADERS += \ IORTable/IORTable.h \ IORTable/IORTableC.h \ IORTable/IOR_Table_Impl.h \ - IORTable/Table_Adapter.h \ IORTable/iortable_export.h \ - IORTable/IORTableC.i \ - IORTable/IORTable.pidl + IORTable/Table_Adapter.h \ + IORTable/IORTableC.i -EXTRA_DIST += \ - IORTable/TAO_IORTable.rc ## Makefile.RTCORBA.am -if BUILD_RT_CORBA - lib_LTLIBRARIES += libTAO_RTCORBA.la libTAO_RTCORBA_la_CPPFLAGS = \ @@ -1610,23 +1504,22 @@ libTAO_RTCORBA_la_CPPFLAGS = \ -DTAO_RTCORBA_BUILD_DLL libTAO_RTCORBA_la_SOURCES = \ - RTCORBA/Continuous_Priority_Mapping.cpp \ RTCORBA/Direct_Priority_Mapping.cpp \ - RTCORBA/Linear_Network_Priority_Mapping.cpp \ + RTCORBA/RTCORBA.cpp \ RTCORBA/Linear_Priority_Mapping.cpp \ RTCORBA/Multi_Priority_Mapping.cpp \ RTCORBA/Network_Priority_Mapping.cpp \ RTCORBA/Network_Priority_Mapping_Manager.cpp \ RTCORBA/Priority_Mapping.cpp \ - RTCORBA/Priority_Mapping_Manager.cpp \ - RTCORBA/RTCORBA.cpp \ RTCORBA/RTCORBAC.cpp \ + RTCORBA/Priority_Mapping_Manager.cpp \ RTCORBA/RT_Current.cpp \ + RTCORBA/RT_Invocation_Endpoint_Selectors.cpp \ RTCORBA/RT_Endpoint_Selector_Factory.cpp \ RTCORBA/RT_Endpoint_Utils.cpp \ - RTCORBA/RT_Invocation_Endpoint_Selectors.cpp \ RTCORBA/RT_Mutex.cpp \ RTCORBA/RT_ORB.cpp \ + RTCORBA/RT_Transport_Descriptor.cpp \ RTCORBA/RT_ORBInitializer.cpp \ RTCORBA/RT_ORB_Loader.cpp \ RTCORBA/RT_PolicyFactory.cpp \ @@ -1635,38 +1528,39 @@ libTAO_RTCORBA_la_SOURCES = \ RTCORBA/RT_Stub.cpp \ RTCORBA/RT_Stub_Factory.cpp \ RTCORBA/RT_Thread_Lane_Resources_Manager.cpp \ - RTCORBA/RT_Transport_Descriptor.cpp \ RTCORBA/RT_Transport_Descriptor_Property.cpp \ - RTCORBA/Thread_Pool.cpp + RTCORBA/Thread_Pool.cpp \ + RTCORBA/Linear_Network_Priority_Mapping.cpp \ + RTCORBA/Continuous_Priority_Mapping.cpp libTAO_RTCORBA_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTCORBA_la_LIBADD = \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la -nobase_include_HEADERS += \ +nobase_pkginclude_HEADERS += \ RTCORBA/Continuous_Priority_Mapping.h \ RTCORBA/Direct_Priority_Mapping.h \ + RTCORBA/Priority_Mapping.h \ RTCORBA/Linear_Network_Priority_Mapping.h \ RTCORBA/Linear_Priority_Mapping.h \ + RTCORBA/RTCORBA.h \ + RTCORBA/Network_Priority_Mapping_Manager.h \ RTCORBA/Multi_Priority_Mapping.h \ RTCORBA/Network_Priority_Mapping.h \ - RTCORBA/Network_Priority_Mapping_Manager.h \ - RTCORBA/Priority_Mapping.h \ + RTCORBA/RTCORBA_includeC.h \ RTCORBA/Priority_Mapping_Manager.h \ - RTCORBA/RTCORBA.h \ RTCORBA/RTCORBAC.h \ - RTCORBA/RTCORBA_includeC.h \ RTCORBA/RTCORBA_includeS.h \ RTCORBA/RT_Current.h \ RTCORBA/RT_Endpoint_Selector_Factory.h \ RTCORBA/RT_Endpoint_Utils.h \ + RTCORBA/RT_ORBInitializer.h \ RTCORBA/RT_Invocation_Endpoint_Selectors.h \ RTCORBA/RT_Mutex.h \ RTCORBA/RT_ORB.h \ - RTCORBA/RT_ORBInitializer.h \ RTCORBA/RT_ORB_Loader.h \ RTCORBA/RT_PolicyFactory.h \ RTCORBA/RT_Policy_i.h \ @@ -1698,19 +1592,11 @@ nobase_include_HEADERS += \ RTCORBA/RT_Thread_Lane_Resources_Manager.i \ RTCORBA/RT_Transport_Descriptor.inl \ RTCORBA/RT_Transport_Descriptor_Property.inl \ - RTCORBA/Thread_Pool.i \ - RTCORBA/RTCORBA.pidl \ - RTCORBA/RTCORBA_include.pidl - -endif BUILD_RT_CORBA + RTCORBA/Thread_Pool.i -EXTRA_DIST += \ - RTCORBA/TAO_RTCORBA.rc ## Makefile.RTPortableServer.am -if BUILD_RT_CORBA - lib_LTLIBRARIES += libTAO_RTPortableServer.la libTAO_RTPortableServer_la_CPPFLAGS = \ @@ -1721,51 +1607,46 @@ libTAO_RTPortableServer_la_CPPFLAGS = \ -DTAO_RTPORTABLESERVER_BUILD_DLL libTAO_RTPortableServer_la_SOURCES = \ - RTPortableServer/RTPortableServer.cpp \ + RTPortableServer/RT_Collocation_Resolver.cpp \ RTPortableServer/RTPortableServerA.cpp \ RTPortableServer/RTPortableServerC.cpp \ RTPortableServer/RT_Acceptor_Filters.cpp \ - RTPortableServer/RT_Collocation_Resolver.cpp \ RTPortableServer/RT_Object_Adapter_Factory.cpp \ RTPortableServer/RT_POA.cpp \ + RTPortableServer/RT_Servant_Dispatcher.cpp \ RTPortableServer/RT_Policy_Validator.cpp \ - RTPortableServer/RT_Servant_Dispatcher.cpp + RTPortableServer/RTPortableServer.cpp libTAO_RTPortableServer_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTPortableServer_la_LIBADD = \ - libTAO_PortableServer.la \ - libTAO_RTCORBA.la \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ + libTAO_PortableServer.la \ + libTAO_IORInterceptor.la \ + libTAO_ObjRefTemplate.la \ + libTAO_Valuetype.la \ + libTAO_RTCORBA.la \ + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +nobase_pkginclude_HEADERS += \ RTPortableServer/RTPortableServer.h \ RTPortableServer/RTPortableServerC.h \ RTPortableServer/RT_Acceptor_Filters.h \ RTPortableServer/RT_Collocation_Resolver.h \ - RTPortableServer/RT_Object_Adapter_Factory.h \ RTPortableServer/RT_POA.h \ + RTPortableServer/RT_Object_Adapter_Factory.h \ RTPortableServer/RT_Policy_Validator.h \ - RTPortableServer/RT_Servant_Dispatcher.h \ RTPortableServer/rtportableserver_export.h \ + RTPortableServer/RT_Servant_Dispatcher.h \ RTPortableServer/RTPortableServerC.i \ RTPortableServer/RT_Acceptor_Filters.i \ RTPortableServer/RT_Collocation_Resolver.i \ - RTPortableServer/RT_POA.i \ - RTPortableServer/RTPortableServer.pidl - -endif BUILD_RT_CORBA + RTPortableServer/RT_POA.i -EXTRA_DIST += \ - RTPortableServer/TAO_RTPortableServer.rc ## Makefile.RTScheduler.am -if BUILD_RT_CORBA -if BUILD_CORBA_MESSAGING - lib_LTLIBRARIES += libTAO_RTScheduler.la libTAO_RTScheduler_la_CPPFLAGS = \ @@ -1776,25 +1657,28 @@ libTAO_RTScheduler_la_CPPFLAGS = \ -DTAO_RTSCHEDULER_BUILD_DLL libTAO_RTScheduler_la_SOURCES = \ - RTScheduling/Current.cpp \ + RTScheduling/RTScheduler_Initializer.cpp \ RTScheduling/Distributable_Thread.cpp \ - RTScheduling/RTScheduler.cpp \ RTScheduling/RTSchedulerC.cpp \ - RTScheduling/RTScheduler_Initializer.cpp \ RTScheduling/RTScheduler_Loader.cpp \ RTScheduling/RTScheduler_Manager.cpp \ - RTScheduling/Request_Interceptor.cpp + RTScheduling/Request_Interceptor.cpp \ + RTScheduling/RTScheduler.cpp \ + RTScheduling/Current.cpp libTAO_RTScheduler_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTScheduler_la_LIBADD = \ - libTAO_PortableServer.la \ - libTAO_RTCORBA.la \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ + libTAO_PortableServer.la \ + libTAO_IORInterceptor.la \ + libTAO_ObjRefTemplate.la \ + libTAO_Valuetype.la \ + libTAO_RTCORBA.la \ + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +nobase_pkginclude_HEADERS += \ RTScheduling/Current.h \ RTScheduling/Distributable_Thread.h \ RTScheduling/RTScheduler.h \ @@ -1807,15 +1691,8 @@ nobase_include_HEADERS += \ RTScheduling/ThreadAction.h \ RTScheduling/rtscheduler_export.h \ RTScheduling/RTSchedulerC.i \ - RTScheduling/RTScheduler_Manager.i \ - RTScheduling/RTScheduler.pidl \ - RTScheduling/RTScheduler_include.pidl + RTScheduling/RTScheduler_Manager.i -endif BUILD_CORBA_MESSAGING -endif BUILD_RT_CORBA - -EXTRA_DIST += \ - RTScheduling/TAO_RTScheduler.rc ## Makefile.SmartProxies.am @@ -1835,16 +1712,14 @@ libTAO_SmartProxies_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_SmartProxies_la_LIBADD = \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la -nobase_include_HEADERS += \ +nobase_pkginclude_HEADERS += \ SmartProxies/Smart_Proxies.h \ SmartProxies/smartproxies_export.h \ SmartProxies/Smart_Proxies.inl -EXTRA_DIST += \ - SmartProxies/SmartProxies.rc ## Makefile.Strategies.am @@ -1859,17 +1734,18 @@ libTAO_Strategies_la_CPPFLAGS = \ libTAO_Strategies_la_SOURCES = \ Strategies/DIOP_Acceptor.cpp \ - Strategies/DIOP_Connection_Handler.cpp \ Strategies/DIOP_Connector.cpp \ + Strategies/DIOP_Transport.cpp \ + Strategies/DIOP_Connection_Handler.cpp \ Strategies/DIOP_Endpoint.cpp \ Strategies/DIOP_Factory.cpp \ Strategies/DIOP_Profile.cpp \ - Strategies/DIOP_Transport.cpp \ + Strategies/LF_Strategy_Null.cpp \ Strategies/FIFO_Connection_Purging_Strategy.cpp \ Strategies/LFU_Connection_Purging_Strategy.cpp \ - Strategies/LF_Strategy_Null.cpp \ Strategies/NULL_Connection_Purging_Strategy.cpp \ Strategies/SCIOP_Acceptor.cpp \ + Strategies/SHMIOP_Connection_Handler.cpp \ Strategies/SCIOP_Connection_Handler.cpp \ Strategies/SCIOP_Connector.cpp \ Strategies/SCIOP_Endpoint.cpp \ @@ -1878,21 +1754,20 @@ libTAO_Strategies_la_SOURCES = \ Strategies/SCIOP_Profile.cpp \ Strategies/SCIOP_Transport.cpp \ Strategies/SHMIOP_Acceptor.cpp \ - Strategies/SHMIOP_Connection_Handler.cpp \ + Strategies/UIOP_Connection_Handler.cpp \ Strategies/SHMIOP_Connector.cpp \ Strategies/SHMIOP_Endpoint.cpp \ Strategies/SHMIOP_Factory.cpp \ Strategies/SHMIOP_Profile.cpp \ Strategies/SHMIOP_Transport.cpp \ Strategies/UIOP_Acceptor.cpp \ - Strategies/UIOP_Connection_Handler.cpp \ + Strategies/UIOP_Lite_Factory.cpp \ Strategies/UIOP_Connector.cpp \ Strategies/UIOP_Endpoint.cpp \ Strategies/UIOP_Factory.cpp \ - Strategies/UIOP_Lite_Factory.cpp \ + Strategies/advanced_resource.cpp \ Strategies/UIOP_Profile.cpp \ Strategies/UIOP_Transport.cpp \ - Strategies/advanced_resource.cpp \ Strategies/sciop_endpoints.cpp \ Strategies/uiop_endpoints.cpp @@ -1900,10 +1775,10 @@ libTAO_Strategies_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_Strategies_la_LIBADD = \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la -nobase_include_HEADERS += \ +nobase_pkginclude_HEADERS += \ Strategies/DIOP_Acceptor.h \ Strategies/DIOP_Connection_Handler.h \ Strategies/DIOP_Connector.h \ @@ -1911,12 +1786,12 @@ nobase_include_HEADERS += \ Strategies/DIOP_Factory.h \ Strategies/DIOP_Profile.h \ Strategies/DIOP_Transport.h \ + Strategies/SCIOP_Connection_Handler.h \ Strategies/FIFO_Connection_Purging_Strategy.h \ Strategies/LFU_Connection_Purging_Strategy.h \ Strategies/LF_Strategy_Null.h \ Strategies/NULL_Connection_Purging_Strategy.h \ Strategies/SCIOP_Acceptor.h \ - Strategies/SCIOP_Connection_Handler.h \ Strategies/SCIOP_Connector.h \ Strategies/SCIOP_Endpoint.h \ Strategies/SCIOP_Factory.h \ @@ -1964,12 +1839,8 @@ nobase_include_HEADERS += \ Strategies/UIOP_Transport.i \ Strategies/advanced_resource.i \ Strategies/sciop_endpoints.i \ - Strategies/uiop_endpoints.i \ - Strategies/sciop_endpoints.pidl \ - Strategies/uiop_endpoints.pidl + Strategies/uiop_endpoints.i -EXTRA_DIST += \ - Strategies/TAO_Strategies.rc ## Makefile.TypeCodeFactory.am @@ -1985,28 +1856,25 @@ libTAO_TypeCodeFactory_la_CPPFLAGS = \ libTAO_TypeCodeFactory_la_SOURCES = \ TypeCodeFactory/TypeCodeFactoryC.cpp \ TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp \ - TypeCodeFactory/TypeCodeFactory_Loader.cpp \ - TypeCodeFactory/TypeCodeFactory_i.cpp + TypeCodeFactory/TypeCodeFactory_i.cpp \ + TypeCodeFactory/TypeCodeFactory_Loader.cpp libTAO_TypeCodeFactory_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_TypeCodeFactory_la_LIBADD = \ - libTAO_IFR_Client.la \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + libTAO_IFR_Client.la \ + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la -nobase_include_HEADERS += \ +nobase_pkginclude_HEADERS += \ TypeCodeFactory/TypeCodeFactoryC.h \ TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h \ TypeCodeFactory/TypeCodeFactory_Loader.h \ TypeCodeFactory/TypeCodeFactory_i.h \ TypeCodeFactory/typecodefactory_export.h \ - TypeCodeFactory/TypeCodeFactoryC.inl \ - TypeCodeFactory/TypeCodeFactory.pidl + TypeCodeFactory/TypeCodeFactoryC.inl -EXTRA_DIST += \ - TypeCodeFactory/TypeCodeFactory.rc ## Makefile.Utils.am @@ -2031,11 +1899,14 @@ libTAO_Utils_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_Utils_la_LIBADD = \ - libTAO_PortableServer.la \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ + libTAO_PortableServer.la \ + libTAO_IORInterceptor.la \ + libTAO_ObjRefTemplate.la \ + libTAO_Valuetype.la \ + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +nobase_pkginclude_HEADERS += \ Utils/Auto_Functor.h \ Utils/Implicit_Deactivator.h \ Utils/ORB_Destroyer.h \ @@ -2047,6 +1918,7 @@ nobase_include_HEADERS += \ Utils/PolicyList_Destroyer.inl \ Utils/Servant_Var.inl + ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/tao/Messaging.mpc b/TAO/tao/Messaging.mpc index 705b76b43b9..267df3700da 100644 --- a/TAO/tao/Messaging.mpc +++ b/TAO/tao/Messaging.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, core, portableserver, valuetype { +project : taolib, core, portableserver { sharedname = TAO_Messaging dynamicflags = TAO_MESSAGING_BUILD_DLL @@ -22,8 +22,4 @@ project : taolib, core, portableserver, valuetype { Resource_Files { Messaging } - - PIDL_Files { - Messaging - } } diff --git a/TAO/tao/Messaging/Asynch_Invocation.cpp b/TAO/tao/Messaging/Asynch_Invocation.cpp index 0f986e5b769..4444cb1b7e7 100644 --- a/TAO/tao/Messaging/Asynch_Invocation.cpp +++ b/TAO/tao/Messaging/Asynch_Invocation.cpp @@ -41,21 +41,16 @@ namespace TAO this->init_target_spec (tspec ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); - TAO_OutputCDR &cdr = - this->resolver_.transport ()->messaging_object ()->out_stream (); - Invocation_Status s = TAO_INVOKE_FAILURE; +#if TAO_HAS_INTERCEPTORS == 1 + s = + this->send_request_interception (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); - this->write_header (tspec, - cdr - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (s); - - this->marshal_data (cdr - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (s); - + if (s != TAO_INVOKE_SUCCESS) + return s; +#endif /*TAO_HAS_INTERCEPTORS */ // Register a reply dispatcher for this invocation. Use the // preallocated reply dispatcher. TAO_Bind_Dispatcher_Guard dispatch_guard ( @@ -82,20 +77,23 @@ namespace TAO // reply dispatcher. dispatch_guard.status (TAO_Bind_Dispatcher_Guard::NO_UNBIND); -#if TAO_HAS_INTERCEPTORS == 1 - s = - this->send_request_interception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); - - if (s != TAO_INVOKE_SUCCESS) - return s; -#endif /*TAO_HAS_INTERCEPTORS */ + TAO_OutputCDR &cdr = + this->resolver_.transport ()->messaging_object ()->out_stream (); // We have started the interception flow. We need to call the // ending interception flow if things go wrong. The purpose of the // try block is to take care of the cases when things go wrong. ACE_TRY { + this->write_header (tspec, + cdr + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + this->marshal_data (cdr + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + // Send it as a oneway request. It will make all the required // paraphernalia within the ORB to fire, like buffering if // send blocks etc. diff --git a/TAO/tao/Messaging/MessagingC.cpp b/TAO/tao/Messaging/MessagingC.cpp index 31b5a52dcc6..89793da3ad9 100644 --- a/TAO/tao/Messaging/MessagingC.cpp +++ b/TAO/tao/Messaging/MessagingC.cpp @@ -60,65 +60,65 @@ static const CORBA::Long _oc_Messaging_ExceptionHolder[] = { TAO_ENCAP_BYTE_ORDER, // byte order 42, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d657373), - ACE_NTOHL (0x6167696e), - ACE_NTOHL (0x672f4578), - ACE_NTOHL (0x63657074), - ACE_NTOHL (0x696f6e48), - ACE_NTOHL (0x6f6c6465), - ACE_NTOHL (0x723a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d657373), + ACE_NTOHL (0x6167696e), + ACE_NTOHL (0x672f4578), + ACE_NTOHL (0x63657074), + ACE_NTOHL (0x696f6e48), + ACE_NTOHL (0x6f6c6465), + ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/Messaging/ExceptionHolder:1.0 16, - ACE_NTOHL (0x45786365), - ACE_NTOHL (0x7074696f), - ACE_NTOHL (0x6e486f6c), + ACE_NTOHL (0x45786365), + ACE_NTOHL (0x7074696f), + ACE_NTOHL (0x6e486f6c), ACE_NTOHL (0x64657200), // name = ExceptionHolder 0, // value modifier CORBA::tk_null, // no stateful base valuetype 3, // member count 20, - ACE_NTOHL (0x69735f73), - ACE_NTOHL (0x79737465), - ACE_NTOHL (0x6d5f6578), - ACE_NTOHL (0x63657074), + ACE_NTOHL (0x69735f73), + ACE_NTOHL (0x79737465), + ACE_NTOHL (0x6d5f6578), + ACE_NTOHL (0x63657074), ACE_NTOHL (0x696f6e00), // name = is_system_exception CORBA::tk_boolean, 1, // data member visibility marker 11, - ACE_NTOHL (0x62797465), - ACE_NTOHL (0x5f6f7264), + ACE_NTOHL (0x62797465), + ACE_NTOHL (0x5f6f7264), ACE_NTOHL (0x65720000), // name = byte_order CORBA::tk_boolean, 1, // data member visibility marker 20, - ACE_NTOHL (0x6d617273), - ACE_NTOHL (0x68616c65), - ACE_NTOHL (0x645f6578), - ACE_NTOHL (0x63657074), + ACE_NTOHL (0x6d617273), + ACE_NTOHL (0x68616c65), + ACE_NTOHL (0x645f6578), + ACE_NTOHL (0x63657074), ACE_NTOHL (0x696f6e00), // name = marshaled_exception CORBA::tk_alias, // typecode kind for typedefs 76, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 31, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f4f63), - ACE_NTOHL (0x74657453), - ACE_NTOHL (0x65713a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f4f63), + ACE_NTOHL (0x74657453), + ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0 9, - ACE_NTOHL (0x4f637465), - ACE_NTOHL (0x74536571), + ACE_NTOHL (0x4f637465), + ACE_NTOHL (0x74536571), ACE_NTOHL (0x0), // name = OctetSeq CORBA::tk_sequence, // typecode kind 12, // encapsulation length @@ -149,7 +149,7 @@ namespace Messaging // TAO_IDL - Generated from // be\be_visitor_valuetype/valuetype_cs.cpp:66 -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION +ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Value_Traits<Messaging::ExceptionHolder>::tao_add_ref ( Messaging::ExceptionHolder * p @@ -158,7 +158,7 @@ TAO::Value_Traits<Messaging::ExceptionHolder>::tao_add_ref ( CORBA::add_ref (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION +ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Value_Traits<Messaging::ExceptionHolder>::tao_remove_ref ( Messaging::ExceptionHolder * p @@ -167,9 +167,9 @@ TAO::Value_Traits<Messaging::ExceptionHolder>::tao_remove_ref ( CORBA::remove_ref (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION +ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Value_Traits<Messaging::ExceptionHolder>::release ( +TAO::Value_Traits<Messaging::ExceptionHolder>::tao_release ( Messaging::ExceptionHolder * p ) { @@ -183,7 +183,7 @@ Messaging::ExceptionHolder::_downcast (CORBA::ValueBase *v) { return 0; } - + return dynamic_cast< ::Messaging::ExceptionHolder * > (v); } @@ -228,29 +228,29 @@ CORBA::Boolean Messaging::ExceptionHolder::_tao_unmarshal ( base, ExceptionHolder::_tao_obv_static_repository_id () ); - + if (retval == 0) { return 0; } - + if (factory.in () != 0) { base = factory->create_for_unmarshal (); - + if (base == 0) { return 0; // %! except.? } - + retval = base->_tao_unmarshal_v (strm); - + if (retval == 0) { return 0; } } - + // Now base must be null or point to the unmarshaled object. // Align the pointer to the right subobject. new_object = ExceptionHolder::_downcast (base); @@ -268,7 +268,7 @@ Messaging::ExceptionHolder_init::~ExceptionHolder_init (void) { } -const char* +const char* Messaging::ExceptionHolder_init::tao_repository_id (void) { return ::Messaging::ExceptionHolder::_tao_obv_static_repository_id (); @@ -293,7 +293,7 @@ Messaging::ExceptionHolder_init::create_for_unmarshal (void) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::ReplyHandler_ptr -TAO::Objref_Traits<Messaging::ReplyHandler>::duplicate ( +TAO::Objref_Traits<Messaging::ReplyHandler>::tao_duplicate ( Messaging::ReplyHandler_ptr p ) { @@ -302,7 +302,7 @@ TAO::Objref_Traits<Messaging::ReplyHandler>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<Messaging::ReplyHandler>::release ( +TAO::Objref_Traits<Messaging::ReplyHandler>::tao_release ( Messaging::ReplyHandler_ptr p ) { @@ -311,14 +311,14 @@ TAO::Objref_Traits<Messaging::ReplyHandler>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::ReplyHandler_ptr -TAO::Objref_Traits<Messaging::ReplyHandler>::nil (void) +TAO::Objref_Traits<Messaging::ReplyHandler>::tao_nil (void) { return Messaging::ReplyHandler::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<Messaging::ReplyHandler>::marshal ( +TAO::Objref_Traits<Messaging::ReplyHandler>::tao_marshal ( Messaging::ReplyHandler_ptr p, TAO_OutputCDR & cdr ) @@ -327,7 +327,7 @@ TAO::Objref_Traits<Messaging::ReplyHandler>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -351,7 +351,7 @@ Messaging::ReplyHandler::Messaging_ReplyHandler_setup_collocation () Messaging::ReplyHandler::~ReplyHandler (void) {} -void +void Messaging::ReplyHandler::_tao_any_destructor (void *_tao_void_pointer) { ReplyHandler *_tao_tmp_pointer = @@ -396,7 +396,7 @@ Messaging::ReplyHandler::_duplicate (ReplyHandler_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -446,20 +446,20 @@ static const CORBA::Long _oc_Messaging_ReplyHandler[] = { TAO_ENCAP_BYTE_ORDER, // byte order 39, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d657373), - ACE_NTOHL (0x6167696e), - ACE_NTOHL (0x672f5265), - ACE_NTOHL (0x706c7948), - ACE_NTOHL (0x616e646c), - ACE_NTOHL (0x65723a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d657373), + ACE_NTOHL (0x6167696e), + ACE_NTOHL (0x672f5265), + ACE_NTOHL (0x706c7948), + ACE_NTOHL (0x616e646c), + ACE_NTOHL (0x65723a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/Messaging/ReplyHandler:1.0 13, - ACE_NTOHL (0x5265706c), - ACE_NTOHL (0x7948616e), - ACE_NTOHL (0x646c6572), + ACE_NTOHL (0x5265706c), + ACE_NTOHL (0x7948616e), + ACE_NTOHL (0x646c6572), ACE_NTOHL (0x0), // name = ReplyHandler }; @@ -762,21 +762,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if ((strm >> obj.inout ()) == 0) { return 0; } - + typedef ::Messaging::ReplyHandler RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -793,13 +793,13 @@ CORBA::Boolean operator>> ( template class TAO_Value_Var_T< Messaging::ExceptionHolder - + >; - + template class TAO_Value_Out_T< Messaging::ExceptionHolder - + >; template class @@ -816,7 +816,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< Messaging::ReplyHandler >; - + template class TAO_Objref_Out_T< Messaging::ReplyHandler @@ -842,13 +842,13 @@ CORBA::Boolean operator>> ( # pragma instantiate \ TAO_Value_Var_T< \ Messaging::ExceptionHolder \ - + > - + # pragma instantiate \ TAO_Value_Out_T< \ Messaging::ExceptionHolder \ - + > # pragma instantiate \ @@ -865,7 +865,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ Messaging::ReplyHandler > - + # pragma instantiate \ TAO_Objref_Out_T< \ Messaging::ReplyHandler @@ -881,4 +881,5 @@ CORBA::Boolean operator>> ( Messaging::ReplyHandler \ > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/Messaging/MessagingC.h b/TAO/tao/Messaging/MessagingC.h index da218e55e7d..34595011524 100644 --- a/TAO/tao/Messaging/MessagingC.h +++ b/TAO/tao/Messaging/MessagingC.h @@ -419,7 +419,7 @@ namespace TAO { static void tao_add_ref (Messaging::ExceptionHolder *); static void tao_remove_ref (Messaging::ExceptionHolder *); - static void release (Messaging::ExceptionHolder *); + static void tao_release (Messaging::ExceptionHolder *); }; #endif /* end #if !defined */ @@ -430,14 +430,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Messaging_Export Objref_Traits<Messaging::ReplyHandler> { - static Messaging::ReplyHandler_ptr duplicate ( + static Messaging::ReplyHandler_ptr tao_duplicate ( Messaging::ReplyHandler_ptr ); - static void release ( + static void tao_release ( Messaging::ReplyHandler_ptr ); - static Messaging::ReplyHandler_ptr nil (void); - static CORBA::Boolean marshal ( + static Messaging::ReplyHandler_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( Messaging::ReplyHandler_ptr p, TAO_OutputCDR & cdr ); diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.cpp b/TAO/tao/Messaging/Messaging_No_ImplC.cpp index c6ba7f3fc9b..4c3c75a122e 100644 --- a/TAO/tao/Messaging/Messaging_No_ImplC.cpp +++ b/TAO/tao/Messaging/Messaging_No_ImplC.cpp @@ -214,7 +214,7 @@ namespace Messaging ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::RebindPolicy_ptr -TAO::Objref_Traits<Messaging::RebindPolicy>::duplicate ( +TAO::Objref_Traits<Messaging::RebindPolicy>::tao_duplicate ( Messaging::RebindPolicy_ptr p ) { @@ -223,7 +223,7 @@ TAO::Objref_Traits<Messaging::RebindPolicy>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<Messaging::RebindPolicy>::release ( +TAO::Objref_Traits<Messaging::RebindPolicy>::tao_release ( Messaging::RebindPolicy_ptr p ) { @@ -232,14 +232,14 @@ TAO::Objref_Traits<Messaging::RebindPolicy>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::RebindPolicy_ptr -TAO::Objref_Traits<Messaging::RebindPolicy>::nil (void) +TAO::Objref_Traits<Messaging::RebindPolicy>::tao_nil (void) { return Messaging::RebindPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<Messaging::RebindPolicy>::marshal ( +TAO::Objref_Traits<Messaging::RebindPolicy>::tao_marshal ( Messaging::RebindPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -497,7 +497,7 @@ Messaging::PriorityRange::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::RequestPriorityPolicy_ptr -TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::duplicate ( +TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::tao_duplicate ( Messaging::RequestPriorityPolicy_ptr p ) { @@ -506,7 +506,7 @@ TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::release ( +TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::tao_release ( Messaging::RequestPriorityPolicy_ptr p ) { @@ -515,14 +515,14 @@ TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::RequestPriorityPolicy_ptr -TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::nil (void) +TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::tao_nil (void) { return Messaging::RequestPriorityPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::marshal ( +TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::tao_marshal ( Messaging::RequestPriorityPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -688,7 +688,7 @@ namespace Messaging ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::ReplyPriorityPolicy_ptr -TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::duplicate ( +TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::tao_duplicate ( Messaging::ReplyPriorityPolicy_ptr p ) { @@ -697,7 +697,7 @@ TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::release ( +TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::tao_release ( Messaging::ReplyPriorityPolicy_ptr p ) { @@ -706,14 +706,14 @@ TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::ReplyPriorityPolicy_ptr -TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::nil (void) +TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::tao_nil (void) { return Messaging::ReplyPriorityPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::marshal ( +TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::tao_marshal ( Messaging::ReplyPriorityPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -878,7 +878,7 @@ namespace Messaging ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::RequestStartTimePolicy_ptr -TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::duplicate ( +TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::tao_duplicate ( Messaging::RequestStartTimePolicy_ptr p ) { @@ -887,7 +887,7 @@ TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::release ( +TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::tao_release ( Messaging::RequestStartTimePolicy_ptr p ) { @@ -896,14 +896,14 @@ TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::RequestStartTimePolicy_ptr -TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::nil (void) +TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::tao_nil (void) { return Messaging::RequestStartTimePolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::marshal ( +TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::tao_marshal ( Messaging::RequestStartTimePolicy_ptr p, TAO_OutputCDR & cdr ) @@ -1070,7 +1070,7 @@ namespace Messaging ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::RequestEndTimePolicy_ptr -TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::duplicate ( +TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::tao_duplicate ( Messaging::RequestEndTimePolicy_ptr p ) { @@ -1079,7 +1079,7 @@ TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::release ( +TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::tao_release ( Messaging::RequestEndTimePolicy_ptr p ) { @@ -1088,14 +1088,14 @@ TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::RequestEndTimePolicy_ptr -TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::nil (void) +TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::tao_nil (void) { return Messaging::RequestEndTimePolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::marshal ( +TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::tao_marshal ( Messaging::RequestEndTimePolicy_ptr p, TAO_OutputCDR & cdr ) @@ -1261,7 +1261,7 @@ namespace Messaging ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::ReplyStartTimePolicy_ptr -TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::duplicate ( +TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::tao_duplicate ( Messaging::ReplyStartTimePolicy_ptr p ) { @@ -1270,7 +1270,7 @@ TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::release ( +TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::tao_release ( Messaging::ReplyStartTimePolicy_ptr p ) { @@ -1279,14 +1279,14 @@ TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::ReplyStartTimePolicy_ptr -TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::nil (void) +TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::tao_nil (void) { return Messaging::ReplyStartTimePolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::marshal ( +TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::tao_marshal ( Messaging::ReplyStartTimePolicy_ptr p, TAO_OutputCDR & cdr ) @@ -1452,7 +1452,7 @@ namespace Messaging ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::ReplyEndTimePolicy_ptr -TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::duplicate ( +TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::tao_duplicate ( Messaging::ReplyEndTimePolicy_ptr p ) { @@ -1461,7 +1461,7 @@ TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::release ( +TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::tao_release ( Messaging::ReplyEndTimePolicy_ptr p ) { @@ -1470,14 +1470,14 @@ TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::ReplyEndTimePolicy_ptr -TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::nil (void) +TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::tao_nil (void) { return Messaging::ReplyEndTimePolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::marshal ( +TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::tao_marshal ( Messaging::ReplyEndTimePolicy_ptr p, TAO_OutputCDR & cdr ) @@ -1642,7 +1642,7 @@ namespace Messaging ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::RelativeRequestTimeoutPolicy_ptr -TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::duplicate ( +TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::tao_duplicate ( Messaging::RelativeRequestTimeoutPolicy_ptr p ) { @@ -1651,7 +1651,7 @@ TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::release ( +TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::tao_release ( Messaging::RelativeRequestTimeoutPolicy_ptr p ) { @@ -1660,14 +1660,14 @@ TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::RelativeRequestTimeoutPolicy_ptr -TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::nil (void) +TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::tao_nil (void) { return Messaging::RelativeRequestTimeoutPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::marshal ( +TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::tao_marshal ( Messaging::RelativeRequestTimeoutPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -1937,7 +1937,7 @@ Messaging::RoutingTypeRange::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::RoutingPolicy_ptr -TAO::Objref_Traits<Messaging::RoutingPolicy>::duplicate ( +TAO::Objref_Traits<Messaging::RoutingPolicy>::tao_duplicate ( Messaging::RoutingPolicy_ptr p ) { @@ -1946,7 +1946,7 @@ TAO::Objref_Traits<Messaging::RoutingPolicy>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<Messaging::RoutingPolicy>::release ( +TAO::Objref_Traits<Messaging::RoutingPolicy>::tao_release ( Messaging::RoutingPolicy_ptr p ) { @@ -1955,14 +1955,14 @@ TAO::Objref_Traits<Messaging::RoutingPolicy>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::RoutingPolicy_ptr -TAO::Objref_Traits<Messaging::RoutingPolicy>::nil (void) +TAO::Objref_Traits<Messaging::RoutingPolicy>::tao_nil (void) { return Messaging::RoutingPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<Messaging::RoutingPolicy>::marshal ( +TAO::Objref_Traits<Messaging::RoutingPolicy>::tao_marshal ( Messaging::RoutingPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -2124,7 +2124,7 @@ namespace Messaging ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::MaxHopsPolicy_ptr -TAO::Objref_Traits<Messaging::MaxHopsPolicy>::duplicate ( +TAO::Objref_Traits<Messaging::MaxHopsPolicy>::tao_duplicate ( Messaging::MaxHopsPolicy_ptr p ) { @@ -2133,7 +2133,7 @@ TAO::Objref_Traits<Messaging::MaxHopsPolicy>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<Messaging::MaxHopsPolicy>::release ( +TAO::Objref_Traits<Messaging::MaxHopsPolicy>::tao_release ( Messaging::MaxHopsPolicy_ptr p ) { @@ -2142,14 +2142,14 @@ TAO::Objref_Traits<Messaging::MaxHopsPolicy>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::MaxHopsPolicy_ptr -TAO::Objref_Traits<Messaging::MaxHopsPolicy>::nil (void) +TAO::Objref_Traits<Messaging::MaxHopsPolicy>::tao_nil (void) { return Messaging::MaxHopsPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<Messaging::MaxHopsPolicy>::marshal ( +TAO::Objref_Traits<Messaging::MaxHopsPolicy>::tao_marshal ( Messaging::MaxHopsPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -2311,7 +2311,7 @@ namespace Messaging ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::QueueOrderPolicy_ptr -TAO::Objref_Traits<Messaging::QueueOrderPolicy>::duplicate ( +TAO::Objref_Traits<Messaging::QueueOrderPolicy>::tao_duplicate ( Messaging::QueueOrderPolicy_ptr p ) { @@ -2320,7 +2320,7 @@ TAO::Objref_Traits<Messaging::QueueOrderPolicy>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<Messaging::QueueOrderPolicy>::release ( +TAO::Objref_Traits<Messaging::QueueOrderPolicy>::tao_release ( Messaging::QueueOrderPolicy_ptr p ) { @@ -2329,14 +2329,14 @@ TAO::Objref_Traits<Messaging::QueueOrderPolicy>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::QueueOrderPolicy_ptr -TAO::Objref_Traits<Messaging::QueueOrderPolicy>::nil (void) +TAO::Objref_Traits<Messaging::QueueOrderPolicy>::tao_nil (void) { return Messaging::QueueOrderPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<Messaging::QueueOrderPolicy>::marshal ( +TAO::Objref_Traits<Messaging::QueueOrderPolicy>::tao_marshal ( Messaging::QueueOrderPolicy_ptr p, TAO_OutputCDR & cdr ) diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.h b/TAO/tao/Messaging/Messaging_No_ImplC.h index ae675e406e1..f85f397cfe4 100644 --- a/TAO/tao/Messaging/Messaging_No_ImplC.h +++ b/TAO/tao/Messaging/Messaging_No_ImplC.h @@ -1612,14 +1612,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Messaging_Export Objref_Traits<Messaging::RebindPolicy> { - static Messaging::RebindPolicy_ptr duplicate ( + static Messaging::RebindPolicy_ptr tao_duplicate ( Messaging::RebindPolicy_ptr ); - static void release ( + static void tao_release ( Messaging::RebindPolicy_ptr ); - static Messaging::RebindPolicy_ptr nil (void); - static CORBA::Boolean marshal ( + static Messaging::RebindPolicy_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( Messaging::RebindPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -1633,14 +1633,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Messaging_Export Objref_Traits<Messaging::RequestPriorityPolicy> { - static Messaging::RequestPriorityPolicy_ptr duplicate ( + static Messaging::RequestPriorityPolicy_ptr tao_duplicate ( Messaging::RequestPriorityPolicy_ptr ); - static void release ( + static void tao_release ( Messaging::RequestPriorityPolicy_ptr ); - static Messaging::RequestPriorityPolicy_ptr nil (void); - static CORBA::Boolean marshal ( + static Messaging::RequestPriorityPolicy_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( Messaging::RequestPriorityPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -1654,14 +1654,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Messaging_Export Objref_Traits<Messaging::ReplyPriorityPolicy> { - static Messaging::ReplyPriorityPolicy_ptr duplicate ( + static Messaging::ReplyPriorityPolicy_ptr tao_duplicate ( Messaging::ReplyPriorityPolicy_ptr ); - static void release ( + static void tao_release ( Messaging::ReplyPriorityPolicy_ptr ); - static Messaging::ReplyPriorityPolicy_ptr nil (void); - static CORBA::Boolean marshal ( + static Messaging::ReplyPriorityPolicy_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( Messaging::ReplyPriorityPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -1675,14 +1675,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Messaging_Export Objref_Traits<Messaging::RequestStartTimePolicy> { - static Messaging::RequestStartTimePolicy_ptr duplicate ( + static Messaging::RequestStartTimePolicy_ptr tao_duplicate ( Messaging::RequestStartTimePolicy_ptr ); - static void release ( + static void tao_release ( Messaging::RequestStartTimePolicy_ptr ); - static Messaging::RequestStartTimePolicy_ptr nil (void); - static CORBA::Boolean marshal ( + static Messaging::RequestStartTimePolicy_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( Messaging::RequestStartTimePolicy_ptr p, TAO_OutputCDR & cdr ); @@ -1696,14 +1696,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Messaging_Export Objref_Traits<Messaging::RequestEndTimePolicy> { - static Messaging::RequestEndTimePolicy_ptr duplicate ( + static Messaging::RequestEndTimePolicy_ptr tao_duplicate ( Messaging::RequestEndTimePolicy_ptr ); - static void release ( + static void tao_release ( Messaging::RequestEndTimePolicy_ptr ); - static Messaging::RequestEndTimePolicy_ptr nil (void); - static CORBA::Boolean marshal ( + static Messaging::RequestEndTimePolicy_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( Messaging::RequestEndTimePolicy_ptr p, TAO_OutputCDR & cdr ); @@ -1717,14 +1717,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Messaging_Export Objref_Traits<Messaging::ReplyStartTimePolicy> { - static Messaging::ReplyStartTimePolicy_ptr duplicate ( + static Messaging::ReplyStartTimePolicy_ptr tao_duplicate ( Messaging::ReplyStartTimePolicy_ptr ); - static void release ( + static void tao_release ( Messaging::ReplyStartTimePolicy_ptr ); - static Messaging::ReplyStartTimePolicy_ptr nil (void); - static CORBA::Boolean marshal ( + static Messaging::ReplyStartTimePolicy_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( Messaging::ReplyStartTimePolicy_ptr p, TAO_OutputCDR & cdr ); @@ -1738,14 +1738,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Messaging_Export Objref_Traits<Messaging::ReplyEndTimePolicy> { - static Messaging::ReplyEndTimePolicy_ptr duplicate ( + static Messaging::ReplyEndTimePolicy_ptr tao_duplicate ( Messaging::ReplyEndTimePolicy_ptr ); - static void release ( + static void tao_release ( Messaging::ReplyEndTimePolicy_ptr ); - static Messaging::ReplyEndTimePolicy_ptr nil (void); - static CORBA::Boolean marshal ( + static Messaging::ReplyEndTimePolicy_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( Messaging::ReplyEndTimePolicy_ptr p, TAO_OutputCDR & cdr ); @@ -1759,14 +1759,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Messaging_Export Objref_Traits<Messaging::RelativeRequestTimeoutPolicy> { - static Messaging::RelativeRequestTimeoutPolicy_ptr duplicate ( + static Messaging::RelativeRequestTimeoutPolicy_ptr tao_duplicate ( Messaging::RelativeRequestTimeoutPolicy_ptr ); - static void release ( + static void tao_release ( Messaging::RelativeRequestTimeoutPolicy_ptr ); - static Messaging::RelativeRequestTimeoutPolicy_ptr nil (void); - static CORBA::Boolean marshal ( + static Messaging::RelativeRequestTimeoutPolicy_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( Messaging::RelativeRequestTimeoutPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -1780,14 +1780,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Messaging_Export Objref_Traits<Messaging::RoutingPolicy> { - static Messaging::RoutingPolicy_ptr duplicate ( + static Messaging::RoutingPolicy_ptr tao_duplicate ( Messaging::RoutingPolicy_ptr ); - static void release ( + static void tao_release ( Messaging::RoutingPolicy_ptr ); - static Messaging::RoutingPolicy_ptr nil (void); - static CORBA::Boolean marshal ( + static Messaging::RoutingPolicy_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( Messaging::RoutingPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -1801,14 +1801,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Messaging_Export Objref_Traits<Messaging::MaxHopsPolicy> { - static Messaging::MaxHopsPolicy_ptr duplicate ( + static Messaging::MaxHopsPolicy_ptr tao_duplicate ( Messaging::MaxHopsPolicy_ptr ); - static void release ( + static void tao_release ( Messaging::MaxHopsPolicy_ptr ); - static Messaging::MaxHopsPolicy_ptr nil (void); - static CORBA::Boolean marshal ( + static Messaging::MaxHopsPolicy_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( Messaging::MaxHopsPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -1822,14 +1822,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Messaging_Export Objref_Traits<Messaging::QueueOrderPolicy> { - static Messaging::QueueOrderPolicy_ptr duplicate ( + static Messaging::QueueOrderPolicy_ptr tao_duplicate ( Messaging::QueueOrderPolicy_ptr ); - static void release ( + static void tao_release ( Messaging::QueueOrderPolicy_ptr ); - static Messaging::QueueOrderPolicy_ptr nil (void); - static CORBA::Boolean marshal ( + static Messaging::QueueOrderPolicy_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( Messaging::QueueOrderPolicy_ptr p, TAO_OutputCDR & cdr ); diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp index 0dc6d2c6603..7fdcf3225e8 100644 --- a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp +++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp @@ -112,7 +112,7 @@ namespace Messaging ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::RelativeRoundtripTimeoutPolicy_ptr -TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::duplicate ( +TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::tao_duplicate ( Messaging::RelativeRoundtripTimeoutPolicy_ptr p ) { @@ -121,7 +121,7 @@ TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::release ( +TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::tao_release ( Messaging::RelativeRoundtripTimeoutPolicy_ptr p ) { @@ -130,14 +130,14 @@ TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::RelativeRoundtripTimeoutPolicy_ptr -TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::nil (void) +TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::tao_nil (void) { return Messaging::RelativeRoundtripTimeoutPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::marshal ( +TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::tao_marshal ( Messaging::RelativeRoundtripTimeoutPolicy_ptr p, TAO_OutputCDR & cdr ) diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.h b/TAO/tao/Messaging/Messaging_RT_PolicyC.h index 77d5c0fbe8a..bc35afd3dec 100644 --- a/TAO/tao/Messaging/Messaging_RT_PolicyC.h +++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.h @@ -238,14 +238,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Messaging_Export Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy> { - static Messaging::RelativeRoundtripTimeoutPolicy_ptr duplicate ( + static Messaging::RelativeRoundtripTimeoutPolicy_ptr tao_duplicate ( Messaging::RelativeRoundtripTimeoutPolicy_ptr ); - static void release ( + static void tao_release ( Messaging::RelativeRoundtripTimeoutPolicy_ptr ); - static Messaging::RelativeRoundtripTimeoutPolicy_ptr nil (void); - static CORBA::Boolean marshal ( + static Messaging::RelativeRoundtripTimeoutPolicy_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( Messaging::RelativeRoundtripTimeoutPolicy_ptr p, TAO_OutputCDR & cdr ); diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp index 2258328fd35..bf5c226f661 100644 --- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp +++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp @@ -59,7 +59,7 @@ namespace TAO ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::SyncScopePolicy_ptr -TAO::Objref_Traits<Messaging::SyncScopePolicy>::duplicate ( +TAO::Objref_Traits<Messaging::SyncScopePolicy>::tao_duplicate ( Messaging::SyncScopePolicy_ptr p ) { @@ -68,7 +68,7 @@ TAO::Objref_Traits<Messaging::SyncScopePolicy>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<Messaging::SyncScopePolicy>::release ( +TAO::Objref_Traits<Messaging::SyncScopePolicy>::tao_release ( Messaging::SyncScopePolicy_ptr p ) { @@ -77,14 +77,14 @@ TAO::Objref_Traits<Messaging::SyncScopePolicy>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::SyncScopePolicy_ptr -TAO::Objref_Traits<Messaging::SyncScopePolicy>::nil (void) +TAO::Objref_Traits<Messaging::SyncScopePolicy>::tao_nil (void) { return Messaging::SyncScopePolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<Messaging::SyncScopePolicy>::marshal ( +TAO::Objref_Traits<Messaging::SyncScopePolicy>::tao_marshal ( Messaging::SyncScopePolicy_ptr p, TAO_OutputCDR & cdr ) diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h index bfd072dec95..b901877a1ec 100644 --- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h +++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h @@ -227,14 +227,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Messaging_Export Objref_Traits<Messaging::SyncScopePolicy> { - static Messaging::SyncScopePolicy_ptr duplicate ( + static Messaging::SyncScopePolicy_ptr tao_duplicate ( Messaging::SyncScopePolicy_ptr ); - static void release ( + static void tao_release ( Messaging::SyncScopePolicy_ptr ); - static Messaging::SyncScopePolicy_ptr nil (void); - static CORBA::Boolean marshal ( + static Messaging::SyncScopePolicy_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( Messaging::SyncScopePolicy_ptr p, TAO_OutputCDR & cdr ); diff --git a/TAO/tao/Messaging/TAO_ExtC.cpp b/TAO/tao/Messaging/TAO_ExtC.cpp index 0f031d2aa95..14de8ef1ea2 100644 --- a/TAO/tao/Messaging/TAO_ExtC.cpp +++ b/TAO/tao/Messaging/TAO_ExtC.cpp @@ -59,7 +59,7 @@ namespace TAO ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION TAO::ConnectionTimeoutPolicy_ptr -TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::duplicate ( +TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::tao_duplicate ( TAO::ConnectionTimeoutPolicy_ptr p ) { @@ -68,7 +68,7 @@ TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::release ( +TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::tao_release ( TAO::ConnectionTimeoutPolicy_ptr p ) { @@ -77,14 +77,14 @@ TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION TAO::ConnectionTimeoutPolicy_ptr -TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::nil (void) +TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::tao_nil (void) { return TAO::ConnectionTimeoutPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::marshal ( +TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::tao_marshal ( TAO::ConnectionTimeoutPolicy_ptr p, TAO_OutputCDR & cdr ) diff --git a/TAO/tao/Messaging/TAO_ExtC.h b/TAO/tao/Messaging/TAO_ExtC.h index 738074f3f37..8840f468313 100644 --- a/TAO/tao/Messaging/TAO_ExtC.h +++ b/TAO/tao/Messaging/TAO_ExtC.h @@ -227,14 +227,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Messaging_Export Objref_Traits<TAO::ConnectionTimeoutPolicy> { - static TAO::ConnectionTimeoutPolicy_ptr duplicate ( + static TAO::ConnectionTimeoutPolicy_ptr tao_duplicate ( TAO::ConnectionTimeoutPolicy_ptr ); - static void release ( + static void tao_release ( TAO::ConnectionTimeoutPolicy_ptr ); - static TAO::ConnectionTimeoutPolicy_ptr nil (void); - static CORBA::Boolean marshal ( + static TAO::ConnectionTimeoutPolicy_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( TAO::ConnectionTimeoutPolicy_ptr p, TAO_OutputCDR & cdr ); diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp index fdfb2213e16..09378a0ba4d 100644 --- a/TAO/tao/NVList.cpp +++ b/TAO/tao/NVList.cpp @@ -5,14 +5,13 @@ #include "NVList.h" -#include "tao/SystemException.h" #include "tao/BoundsC.h" +#include "tao/debug.h" #include "tao/Typecode.h" #include "tao/Marshal.h" #include "tao/CORBA_String.h" #include "tao/Any_Impl.h" #include "tao/CDR.h" -#include "tao/debug.h" #include "ace/Auto_Ptr.h" @@ -244,7 +243,7 @@ CORBA::NVList::add_element (CORBA::Flags flags if (ACE_BIT_DISABLED (flags, CORBA::ARG_IN | CORBA::ARG_OUT | CORBA::ARG_INOUT)) { - ACE_THROW_RETURN (CORBA::BAD_PARAM (), + ACE_THROW_RETURN (CORBA::BAD_PARAM (), CORBA::NamedValue::_nil ()); } diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index a49d6a35bd1..06e158f02e5 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -27,7 +27,6 @@ ACE_RCSID (tao, #include "TypeCodeFactory_Adapter.h" #include "debug.h" #include "CDR.h" -#include "SystemException.h" #if TAO_HAS_INTERCEPTORS == 1 # include "PICurrent_ORBInitializer.h" /* @@ This should go away! */ @@ -47,14 +46,6 @@ ACE_RCSID (tao, #include "ace/OS_NS_string.h" #include "ace/os_include/os_ctype.h" -#if defined (ACE_HAS_EXCEPTIONS) -void TAO_unexpected_exception_handler (void) -{ - throw CORBA::UNKNOWN (); -} -#endif /* ACE_HAS_EXCEPTIONS */ - - static const char ior_prefix[] = "IOR:"; // = Static initialization. @@ -187,7 +178,7 @@ CORBA::ORB::destroy (ACE_ENV_SINGLE_ARG_DECL) // CORBA::OBJECT_NOT_EXIST exception if the ORB has been // destroyed by the time an ORB function is called. - ACE_THROW (CORBA::OBJECT_NOT_EXIST (0, + ACE_THROW (CORBA::OBJECT_NOT_EXIST (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } @@ -299,7 +290,7 @@ CORBA::ORB::create_list (CORBA::Long count, CORBA::NVList, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; @@ -316,7 +307,7 @@ CORBA::ORB::create_list (CORBA::Long count, CORBA::NamedValue, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; @@ -369,7 +360,7 @@ CORBA::ORB::create_environment (CORBA::Environment_ptr &environment CORBA::Environment (), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOMEM), CORBA::COMPLETED_NO)); } @@ -382,7 +373,7 @@ CORBA::ORB::create_named_value (CORBA::NamedValue_ptr &nv CORBA::NamedValue, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOMEM), CORBA::COMPLETED_NO)); } @@ -398,7 +389,7 @@ CORBA::ORB::get_service_information ( { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOTSUP), CORBA::COMPLETED_NO), 0); @@ -410,7 +401,7 @@ CORBA::ORB::create_context_list (CORBA::ContextList_ptr & { ACE_THROW (CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOTSUP), CORBA::COMPLETED_NO)); } @@ -421,7 +412,7 @@ CORBA::ORB::get_default_context (CORBA::Context_ptr & { ACE_THROW (CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOTSUP), CORBA::COMPLETED_NO)); } @@ -432,7 +423,7 @@ CORBA::ORB::send_multiple_requests_oneway (const CORBA::ORB::RequestSeq & { ACE_THROW (CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOTSUP), CORBA::COMPLETED_NO)); } @@ -443,7 +434,7 @@ CORBA::ORB::send_multiple_requests_deferred (const CORBA::ORB::RequestSeq & { ACE_THROW (CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOTSUP), CORBA::COMPLETED_NO)); } @@ -454,7 +445,7 @@ CORBA::ORB::get_next_response (CORBA::Request_ptr & { ACE_THROW (CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOTSUP), CORBA::COMPLETED_NO)); } @@ -464,7 +455,7 @@ CORBA::ORB::poll_next_response (ACE_ENV_SINGLE_ARG_DECL) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOTSUP), CORBA::COMPLETED_NO), 0); @@ -479,6 +470,7 @@ CORBA::ORB::create_struct_tc ( const CORBA::StructMemberSeq & members ACE_ENV_ARG_DECL ) + ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -505,6 +497,7 @@ CORBA::ORB::create_union_tc ( const CORBA::UnionMemberSeq & members ACE_ENV_ARG_DECL ) + ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -531,6 +524,7 @@ CORBA::ORB::create_enum_tc ( const CORBA::EnumMemberSeq & members ACE_ENV_ARG_DECL ) + ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -556,6 +550,7 @@ CORBA::ORB::create_alias_tc ( CORBA::TypeCode_ptr original_type ACE_ENV_ARG_DECL ) + ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -581,6 +576,7 @@ CORBA::ORB::create_exception_tc ( const CORBA::StructMemberSeq & members ACE_ENV_ARG_DECL ) + ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -605,6 +601,7 @@ CORBA::ORB::create_interface_tc ( const char *name ACE_ENV_ARG_DECL ) + ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -627,6 +624,7 @@ CORBA::ORB::create_string_tc ( CORBA::ULong bound ACE_ENV_ARG_DECL ) + ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -648,6 +646,7 @@ CORBA::ORB::create_wstring_tc ( CORBA::ULong bound ACE_ENV_ARG_DECL ) + ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -670,6 +669,7 @@ CORBA::ORB::create_fixed_tc ( CORBA::UShort scale ACE_ENV_ARG_DECL ) + ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -693,6 +693,7 @@ CORBA::ORB::create_sequence_tc ( CORBA::TypeCode_ptr element_type ACE_ENV_ARG_DECL ) + ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -716,6 +717,7 @@ CORBA::ORB::create_array_tc ( CORBA::TypeCode_ptr element_type ACE_ENV_ARG_DECL ) + ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -742,6 +744,7 @@ CORBA::ORB::create_value_tc ( const CORBA::ValueMemberSeq & members ACE_ENV_ARG_DECL ) + ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -769,6 +772,7 @@ CORBA::ORB::create_value_box_tc ( CORBA::TypeCode_ptr boxed_type ACE_ENV_ARG_DECL ) + ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -793,6 +797,7 @@ CORBA::ORB::create_native_tc ( const char *name ACE_ENV_ARG_DECL ) + ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -815,6 +820,7 @@ CORBA::ORB::create_recursive_tc ( const char *id ACE_ENV_ARG_DECL ) + ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -837,6 +843,7 @@ CORBA::ORB::create_abstract_interface_tc ( const char *name ACE_ENV_ARG_DECL ) + ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -860,6 +867,7 @@ CORBA::ORB::create_local_interface_tc ( const char *name ACE_ENV_ARG_DECL ) + ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -883,6 +891,7 @@ CORBA::ORB::create_component_tc ( const char *name ACE_ENV_ARG_DECL ) + ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -906,6 +915,7 @@ CORBA::ORB::create_home_tc ( const char *name ACE_ENV_ARG_DECL ) + ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -932,6 +942,7 @@ CORBA::ORB::create_event_tc ( const CORBA::ValueMemberSeq &members ACE_ENV_ARG_DECL ) + ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_Adapter *adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -1276,7 +1287,7 @@ CORBA::ORB::check_shutdown (ACE_ENV_SINGLE_ARG_DECL) // CORBA::OBJECT_NOT_EXIST exception if the ORB has been // destroyed by the time an ORB function is called. - ACE_THROW (CORBA::OBJECT_NOT_EXIST (0, + ACE_THROW (CORBA::OBJECT_NOT_EXIST (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } } @@ -1314,7 +1325,7 @@ CORBA::ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_DECL) // course requires the TypeCode constants and system exceptions to // have been initialized. TAO_Singleton_Manager::instance ()->_set_unexpected ( - ::TAO_unexpected_exception_handler); + CORBA::ORB::_tao_unexpected_exception); #endif /* ACE_HAS_EXCEPTIONS */ // Verify some of the basic implementation requirements. This test @@ -1322,15 +1333,15 @@ CORBA::ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_DECL) // routine does). // // NOTE: we still "just" assume that native floating point is IEEE. - if ( sizeof (CORBA::Boolean) != 1 - || sizeof (CORBA::Short) != 2 - || sizeof (CORBA::Long) != 4 - || sizeof (CORBA::LongLong) != 8 - || sizeof (CORBA::Float) != 4 - || sizeof (CORBA::Double) != 8 + if (sizeof (CORBA::Boolean) != 1 + || sizeof (CORBA::Short) != 2 + || sizeof (CORBA::Long) != 4 + || sizeof (CORBA::LongLong) != 8 + || sizeof (CORBA::Float) != 4 + || sizeof (CORBA::Double) != 8 || sizeof (CORBA::LongDouble) != 16 - || sizeof (CORBA::WChar) < 2 - || sizeof (void *) != ACE_SIZEOF_VOID_P) + || sizeof (CORBA::WChar) < 2 + || sizeof (void *) != ACE_SIZEOF_VOID_P) { ACE_ERROR ((LM_ERROR, "%N; ERROR: unexpected basic type size; " @@ -1355,7 +1366,7 @@ CORBA::ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_DECL) TAO_CodecFactory_ORBInitializer, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; @@ -1382,7 +1393,7 @@ CORBA::ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_DECL) TAO_PICurrent_ORBInitializer, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; @@ -1395,6 +1406,16 @@ CORBA::ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_DECL) #endif /* TAO_HAS_INTERCEPTORS == 1 */ } +void CORBA::ORB::_tao_unexpected_exception (void) +{ +#if defined(ACE_HAS_EXCEPTIONS) + throw CORBA::UNKNOWN (); +#else + // Nothing to do, this will be handled by the ORB core when sending + // the exception back to the client... +#endif /* ACE_HAS_EXCEPTIONS */ +} + const ACE_CString & CORBA::ORB::_tao_ft_client_id (void) { @@ -1493,7 +1514,7 @@ CORBA::ORB_init (int &argc, { ACE_THROW_RETURN (CORBA::BAD_PARAM ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, EINVAL), CORBA::COMPLETED_NO), CORBA::ORB::_nil ()); @@ -1568,7 +1589,7 @@ CORBA::ORB_init (int &argc, TAO_ORB_Core (orbid_string.c_str ()), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (CORBA::ORB::_nil ()); @@ -1607,7 +1628,7 @@ CORBA::ORB_init (int &argc, command_line.get_ASCII_argv()), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (CORBA::ORB::_nil ()); @@ -1633,7 +1654,7 @@ CORBA::ORB_init (int &argc, if (result == -1) ACE_THROW_RETURN (CORBA::BAD_PARAM ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, EINVAL), CORBA::COMPLETED_NO), CORBA::ORB::_nil ()); @@ -1663,7 +1684,7 @@ CORBA::ORB_init (int &argc, // Before returning remember to store the ORB into the table... if (TAO_ORB_Table::instance ()->bind (orbid_string.c_str (), safe_oc.get ()) != 0) - ACE_THROW_RETURN (CORBA::INTERNAL (0, + ACE_THROW_RETURN (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), CORBA::ORB::_nil ()); @@ -1784,7 +1805,7 @@ CORBA::ORB::object_to_string (CORBA::Object_ptr obj ACE_THROW_RETURN (CORBA::MARSHAL ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, EINVAL), CORBA::COMPLETED_NO), 0); @@ -1802,7 +1823,7 @@ CORBA::ORB::object_to_string (CORBA::Object_ptr obj ACE_THROW_RETURN (CORBA::MARSHAL ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, EINVAL), CORBA::COMPLETED_NO), 0); @@ -1830,7 +1851,7 @@ CORBA::ORB::string_to_object (const char *str if (str == 0) ACE_THROW_RETURN (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, EINVAL), CORBA::COMPLETED_NO), CORBA::Object::_nil ()); @@ -1870,6 +1891,8 @@ CORBA::Policy_ptr CORBA::ORB::create_policy (CORBA::PolicyType type, const CORBA::Any& val ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + CORBA::PolicyError)) { this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); @@ -1885,6 +1908,8 @@ CORBA::ORB::create_policy (CORBA::PolicyType type, CORBA::Policy_ptr CORBA::ORB::_create_policy (CORBA::PolicyType type ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + CORBA::PolicyError)) { this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); @@ -1985,7 +2010,7 @@ CORBA::ORB::url_ior_string_to_object (const char* str { ACE_THROW_RETURN (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, EINVAL), CORBA::COMPLETED_NO), CORBA::Object::_nil ()); diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index 325afa29502..1cf5b1c290b 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -9,7 +9,7 @@ * Header file for CORBA's ORB type. * * @author Copyright 1994-1995 by Sun Microsystems Inc. - * @author Douglas C. Schmidt <schmidt@dre.vanderbilt.edu.edu> + * @author Douglas C. Schmidt <schmidt@uci.edu> */ //============================================================================= @@ -18,17 +18,16 @@ #include /**/ "ace/pre.h" -#include "UserException.h" +#include "Exception.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "objectid.h" -#include "Policy_ForwardC.h" +#include "PolicyC.h" #include "OBV_Constants.h" #include "CORBA_methods.h" -#include "VarOut_T.h" #include "ace/Thread_Mutex.h" #include "ace/Guard_T.h" @@ -63,15 +62,6 @@ namespace CORBA class ValueMemberSeq; class ORB_ObjectIdList; - class ExceptionList; - typedef ExceptionList * ExceptionList_ptr; - - class ContextList; - typedef ContextList * ContextList_ptr; - - class Context; - typedef Context * Context_ptr; - // Used at present only in Typecode_Constants.cpp, to make _tc_ORBid. // TODO - implement OMG's 'ORBid CORBA::ORB::id (void)'. typedef char * ORBid; @@ -123,12 +113,11 @@ namespace CORBA typedef UShort ServiceType; class Request; - typedef Request * Request_ptr; typedef TAO_Pseudo_Var_T<Request> Request_var; typedef TAO_Pseudo_Out_T<Request, Request_var> Request_out; class ORB; - typedef ORB * ORB_ptr; + typedef ORB *ORB_ptr; typedef TAO_Pseudo_Var_T<ORB> ORB_var; typedef TAO_Pseudo_Out_T<ORB, ORB_var> ORB_out; @@ -208,7 +197,7 @@ namespace CORBA * Turn an object reference into a string. Each type of ORB, * e.g. an IIOP ORB, must implement this. This can be used by * servers to publish their whereabouts to clients. The output of - * this is typically eventually given to @c string_to_object() as + * this is typically eventually given to <string_to_object()> as * an argument. */ char * object_to_string (CORBA::Object_ptr obj @@ -303,60 +292,71 @@ namespace CORBA const char *id, const char *name, const CORBA::StructMemberSeq &members - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr create_union_tc ( const char *id, const char *name, CORBA::TypeCode_ptr discriminator_type, const CORBA::UnionMemberSeq &members - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr create_enum_tc ( const char *id, const char *name, const CORBA::EnumMemberSeq &members - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr create_alias_tc ( const char *id, const char *name, CORBA::TypeCode_ptr original_type - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr create_exception_tc ( const char *id, const char *name, const CORBA::StructMemberSeq &members - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr create_interface_tc ( const char *id, const char *name - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr create_string_tc ( CORBA::ULong bound - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr create_wstring_tc ( CORBA::ULong bound - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr create_fixed_tc ( CORBA::UShort digits, CORBA::UShort scale - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr create_sequence_tc ( CORBA::ULong bound, CORBA::TypeCode_ptr element_type - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr create_array_tc ( CORBA::ULong length, CORBA::TypeCode_ptr element_type - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr create_value_tc ( const char *id, @@ -364,43 +364,52 @@ namespace CORBA CORBA::ValueModifier type_modifier, CORBA::TypeCode_ptr concrete_base, const CORBA::ValueMemberSeq &members - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr create_value_box_tc ( const char *id, const char *name, CORBA::TypeCode_ptr boxed_type - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr create_native_tc ( const char *id, const char *name - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr create_recursive_tc ( const char *id - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr create_abstract_interface_tc ( const char *id, const char *name - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr create_local_interface_tc ( const char *id, const char *ame - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr create_component_tc ( const char *id, const char *name - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr create_home_tc ( const char *id, const char *name ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); + ) + ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr create_event_tc ( const char *id, @@ -408,7 +417,9 @@ namespace CORBA CORBA::ValueModifier type_modifier, CORBA::TypeCode_ptr concrete_base, const CORBA::ValueMemberSeq &members - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC ((CORBA::SystemException)); #endif /* TAO_HAS_MINIMUM_CORBA */ @@ -425,15 +436,10 @@ namespace CORBA /** * Instructs the ORB to initialize itself and run its event loop in * the current thread, not returning until the ORB has shut down or - * the time value specified through @a tv has expired. If an - * error occurs during initialization or at runtime, a CORBA - * system exception will be thrown. @a tv is reduced by the - * amount of time spent in this call. - * - * If this function is called with a @ tv value, client threads - * making invocations will continue their operations. When the - * operation timesout and returns, any invocations showing up on - * the server will be buffered by TCP. + * the time value specified through <tv> has expired. If an error + * occurs during initialization or at runtime, a CORBA system + * exception will be thrown. <tv> is reduced by the amount of time + * spent in this call. **/ void run (ACE_Time_Value &tv ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -441,17 +447,12 @@ namespace CORBA /** * Instructs the ORB to initialize itself and run its event loop in * the current thread, not returning until the ORB has shut down or - * the time value specified through @a tv has expired. If an error + * the time value specified through <tv> has expired. If an error * occurs during initialization or at runtime, a CORBA system - * exception will be thrown. @a tv is reduced by the amount of time - * spent in this call. If @a tv is 0, it means that the timeout - * is infinite. If @a tv is @c ACE_Time_Value::zero, it specifies - * to poll and does not block. - * - * If this function is called with @a tv value, client threads - * making invocations will continue their operations. When the - * operation timesout and returns, any invocations showing up on - * the server will be buffered by TCP. + * exception will be thrown. <tv> is reduced by the amount of time + * spent in this call. If <tv> is 0, it means that the timeout is + * infinite. If <tv> is ACE_Time_Value::zero, it specifies to poll + * and does not block. **/ void run (ACE_Time_Value *tv ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -545,7 +546,9 @@ namespace CORBA CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any& val - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException, + CORBA::PolicyError)); // ---------------------------------------------------------------- // = TAO-specific extensions to the CORBA specification. @@ -554,7 +557,9 @@ namespace CORBA /// Create an empty policy, usually to be filled in later by /// demarshaling. CORBA::Policy_ptr _create_policy (CORBA::PolicyType type - ACE_ENV_ARG_DECL); + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + CORBA::PolicyError)); /// Resolve the POA. CORBA::Object_ptr resolve_root_poa (ACE_ENV_SINGLE_ARG_DECL); @@ -563,6 +568,10 @@ namespace CORBA /// haven't been initialized yet. static void init_orb_globals (ACE_ENV_SINGLE_ARG_DECL); + // The function used by tao to handle the "unexpected" exceptions, + // It raises CORBA::UNKNOWN. + static void _tao_unexpected_exception (void); + // Reference counting... CORBA::ULong _incr_refcnt (void); CORBA::ULong _decr_refcnt (void); diff --git a/TAO/tao/ORBInitInfo.cpp b/TAO/tao/ORBInitInfo.cpp index 1ff36512203..f1e6ddf23ef 100644 --- a/TAO/tao/ORBInitInfo.cpp +++ b/TAO/tao/ORBInitInfo.cpp @@ -4,7 +4,6 @@ #include "ORB_Core.h" #include "ORB.h" #include "CodecFactory.h" -#include "SystemException.h" #if TAO_HAS_INTERCEPTORS == 1 #include "PICurrent.h" @@ -23,7 +22,7 @@ ACE_RCSID (TAO, // Traits specializations for TAO_ORBInitInfo. TAO_ORBInitInfo_ptr -TAO::Objref_Traits<TAO_ORBInitInfo>::duplicate ( +TAO::Objref_Traits<TAO_ORBInitInfo>::tao_duplicate ( TAO_ORBInitInfo_ptr p ) { @@ -31,7 +30,7 @@ TAO::Objref_Traits<TAO_ORBInitInfo>::duplicate ( } void -TAO::Objref_Traits<TAO_ORBInitInfo>::release ( +TAO::Objref_Traits<TAO_ORBInitInfo>::tao_release ( TAO_ORBInitInfo_ptr p ) { @@ -39,13 +38,13 @@ TAO::Objref_Traits<TAO_ORBInitInfo>::release ( } TAO_ORBInitInfo_ptr -TAO::Objref_Traits<TAO_ORBInitInfo>::nil (void) +TAO::Objref_Traits<TAO_ORBInitInfo>::tao_nil (void) { return TAO_ORBInitInfo::_nil (); } CORBA::Boolean -TAO::Objref_Traits<TAO_ORBInitInfo>::marshal ( +TAO::Objref_Traits<TAO_ORBInitInfo>::tao_marshal ( TAO_ORBInitInfo_ptr p, TAO_OutputCDR & cdr ) @@ -83,7 +82,7 @@ TAO_ORBInitInfo::arguments (ACE_ENV_SINGLE_ARG_DECL) CORBA::StringSeq, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); @@ -126,7 +125,7 @@ TAO_ORBInitInfo::codec_factory (ACE_ENV_SINGLE_ARG_DECL) TAO_CodecFactory (this->orb_core_), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (IOP::CodecFactory::_nil ()); @@ -202,7 +201,7 @@ TAO_ORBInitInfo::add_client_request_interceptor ( ACE_UNUSED_ARG (interceptor); ACE_THROW (CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOTSUP), CORBA::COMPLETED_NO)); #endif /* TAO_HAS_INTERCEPTORS == 1 */ @@ -226,7 +225,7 @@ TAO_ORBInitInfo::add_server_request_interceptor ( ACE_UNUSED_ARG (interceptor); ACE_THROW (CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOTSUP), CORBA::COMPLETED_NO)); #endif /* TAO_HAS_INTERCEPTORS == 1 */ @@ -260,7 +259,7 @@ TAO_ORBInitInfo::allocate_slot_id (ACE_ENV_SINGLE_ARG_DECL) #else ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOTSUP), CORBA::COMPLETED_NO), 0); @@ -301,7 +300,7 @@ TAO_ORBInitInfo::allocate_tss_slot_id (ACE_CLEANUP_FUNC cleanup if (result != 0) ACE_THROW_RETURN (CORBA::INTERNAL ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, errno), CORBA::COMPLETED_NO), 0); @@ -320,7 +319,7 @@ TAO_ORBInitInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL) // this instance to zero when it is done initializing the ORB, // which is why we base "existence" on the validity of the ORB // core pointer. - ACE_THROW (CORBA::OBJECT_NOT_EXIST (0, + ACE_THROW (CORBA::OBJECT_NOT_EXIST (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } } diff --git a/TAO/tao/ORBInitInfo.h b/TAO/tao/ORBInitInfo.h index cd4a6c0a3df..6b18c942d12 100644 --- a/TAO/tao/ORBInitInfo.h +++ b/TAO/tao/ORBInitInfo.h @@ -277,14 +277,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<TAO_ORBInitInfo> { - static TAO_ORBInitInfo_ptr duplicate ( + static TAO_ORBInitInfo_ptr tao_duplicate ( TAO_ORBInitInfo_ptr ); - static void release ( + static void tao_release ( TAO_ORBInitInfo_ptr ); - static TAO_ORBInitInfo_ptr nil (void); - static CORBA::Boolean marshal ( + static TAO_ORBInitInfo_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( TAO_ORBInitInfo_ptr p, TAO_OutputCDR & cdr ); diff --git a/TAO/tao/ORBInitializer_Registry.cpp b/TAO/tao/ORBInitializer_Registry.cpp index 4a7aa25a200..55ee065b5eb 100644 --- a/TAO/tao/ORBInitializer_Registry.cpp +++ b/TAO/tao/ORBInitializer_Registry.cpp @@ -4,7 +4,6 @@ #include "TAO_Singleton.h" #include "ORB_Constants.h" #include "TAO_Singleton_Manager.h" -#include "SystemException.h" #include "ace/Static_Object_Lock.h" @@ -74,7 +73,7 @@ TAO_ORBInitializer_Registry::register_orb_initializer ( else ACE_THROW (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, EINVAL), CORBA::COMPLETED_NO)); } diff --git a/TAO/tao/ORB_Constants.h b/TAO/tao/ORB_Constants.h index 585914e1604..2b992221904 100644 --- a/TAO/tao/ORB_Constants.h +++ b/TAO/tao/ORB_Constants.h @@ -2,14 +2,13 @@ //============================================================================= /** - * @file ORB_Constants.h + * @file ORB_Constants.h * * $Id$ * * Constants needed by various files. * * @author Jeff Parsons - * @author Ossama Othman */ //============================================================================= @@ -24,120 +23,29 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -// A hash define for the regular two way operation. +#include "tao/TAO_Export.h" + +// An hash define for the regular two way operation #define TAO_TWOWAY_RESPONSE_FLAG 255 namespace CORBA { - /// The OMG Vendor Minor Codeset ID (VMCID). + /// The OMG Vendor Minor Codeset ID. /** * This number is reserved by the OMG as a prefix to all the * standard system exception minor codes. Check the CORBA/IIOP * specification for details. - * - * OMG defined system exception minor codes should be logically - * OR-ed with this constant when passing such minor codes to a - * @c CORBA::SystemException constructor. For example, throwing a - * @c CORBA::BAD_PARAM exception with an OMG defined minor code of - * @c 2 is done as follows: - * - * @verbatim - * throw (CORBA::BAD_PARAM (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO); - * @endverbatim - * - * *NOT* as: - * - * @verbatim - * throw (CORBA::BAD_PARAM (2, CORBA::COMPLETED_NO); - * @endverbatim */ const ULong OMGVMCID = 0x4f4d0000U; } -namespace TAO -{ - /// TAO Vendor Minor Codeset ID (VMCID). - /** - * TAO Vendor Minor Codeset ID (VMCID) assigned by the OMG. Do - * *NOT* change at random. The TAO VMCID is an ASCII representation - * of @c TA0xxxx (close enough since a VMCID only consists of the - * higher order 20 bits of a 32 bit unsigned long integer). The - * first 16 bits are @c TA, and the remaining 4 are @c 0. - * - * @note Remember that we can only play with the lower order 12 - * bits. @c MAX_MINOR_CODE is there to remind us of that. - * - * @see @c MAX_MINOR_CODE - */ - const CORBA::ULong VMCID = 0x54410000U; - - /// Maximum allowed TAO system exception minor code. - /** - * Vendors are only allowed to use the lower order 12 bits of their - * when defining vendor-specific exception minor codes. - * @c MAX_MINOR_CODE is the maximum minor code value available to - * TAO. Do not exceed it when defining TAO system exception minor - * codes. - * - * @see @c VMCID - */ - const CORBA::ULong MAX_MINOR_CODE = VMCID | 0xfffU; - - /// TAO Vendor @c PolicyType Valueset ID (VPVID) - /** - * TAO Vendor @c PolicyType Valueset ID (VPVID) assigned by the - * OMG. This value was automatically assigned when TAO's VMCID was - * assigned. Its value is always the same as the VMCID. - * - * As with TAO-specific system exception minor codes, the - * TAO-specific @c PolicyType space occupies the lower order 12 bits - * of the TAO VPVID, i.e. - * - * @verbatim - * TAO::VPVID <= TAO PolicyType <= TAO::VPVID | 0xfffU. - * @endverbatim - * - * For example, TAO-specific @c PolicyTypes should be defined by - * logically "OR-ing" a 12 bit or less (i.e. 0x0U <= value <= - * 0xfffU) value with @c TAO::VPVID. - * - * @see VMCID - */ - const CORBA::ULong VPVID = VMCID; -} - -/** - * @name TAO-Specific System Exception Minor Code Values - * - * These system exception minor code values are specific to TAO. - */ -//@{ -/// TAO VMCID assigned by the OMG. -/** - * @note This constant has historically been used in the wrong way. - * It was often used as the @a location argument to the @c - * CORBA::SystemException::_tao_minor_code() static method. A - * more appropriate default @a location argument/value would - * have been zero since the location code resides in portion of - * the lower order 12 bits, not the higher order 20 bits which - * is where the VMCID resides, and what this value happens to - * be. - * - * @deprecated Please use @c TAO::VMCID instead, or zero if being used - * as default TAO exception location code argument. - * - * @see @c TAO::VMCID - */ -const CORBA::ULong TAO_DEFAULT_MINOR_CODE = TAO::VMCID; - -/// Maximum allowed system exception minor code. -/** - * @deprecated Please use @c TAO::MAX_MINOR_CODE instead. - * - * @see @c TAO::MAX_MINOR_CODE - */ -const CORBA::ULong TAO_MAX_MINOR_CODE = TAO::MAX_MINOR_CODE; -//@} +// This number was assigned by the OMG. Do *NOT* change at random. +// The ASCII representation is TA0xxxx, close enough since they only +// take 20 bits, the first 16 are TA, the next 4 are 0000. Remember +// that we can only play with the last 12 bits, TAO_MAX_MINOR_CODE is +// there to remind us of that. +const CORBA::ULong TAO_DEFAULT_MINOR_CODE = 0x54410000U; +const CORBA::ULong TAO_MAX_MINOR_CODE = 0x54410fffU; /// A dummy service context that is inserted in the service context /// list to preserve the alignment in DSI based gateways, so no @@ -150,8 +58,8 @@ const CORBA::ULong TAO_SVC_CONTEXT_ALIGN = 0x54414f00U; /** * @name TAO-Specific Profile IDs * - * The TAO @c IOP::ProfileId range @c 0x54414f00 - @c 0x54414f0f has - * been reserved with the OMG. + * The TAO @c IOP::ProfileId range 0x54414f00 - 0x54414f0f has been + * reserved with the OMG. * * @note It is *NOT* necessary to list your own protocols here. * diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index f32effcf875..7530bde6ff3 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -2036,20 +2036,6 @@ TAO_ORB_Core::destroy (ACE_ENV_SINGLE_ARG_DECL) } void -TAO_ORB_Core::check_shutdown (ACE_ENV_SINGLE_ARG_DECL) -{ - if (this->has_shutdown ()) - { - // As defined by the CORBA 2.3 specification, throw a - // CORBA::BAD_INV_ORDER exception with minor code 4 if the ORB - // has shutdown by the time an ORB function is called. - - ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 4, - CORBA::COMPLETED_NO)); - } -} - -void TAO_ORB_Core::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (()) { @@ -2784,6 +2770,17 @@ TAO_ORB_Core::add_interceptor ( } } +TAO_IORInterceptor_List * +TAO_ORB_Core::ior_interceptor_list (void) +{ + if (this->ior_interceptor_adapter ()) + { + return this->ior_interceptor_adapter_->interceptor_list (); + } + + return 0; +} + TAO_IORInterceptor_Adapter * TAO_ORB_Core::ior_interceptor_adapter (void) { @@ -2818,7 +2815,6 @@ TAO_ORB_Core::ior_interceptor_adapter (void) "ior_interceptor_adapter \n"); } ACE_ENDTRY; - ACE_CHECK_RETURN(0); } } @@ -2832,7 +2828,6 @@ TAO_ORB_Core_TSS_Resources::TAO_ORB_Core_TSS_Resources (void) , client_leader_thread_ (0) , lane_ (0) , ts_objects_ () - , upcalls_temporarily_suspended_on_this_thread_ (false) , orb_core_ (0) #if TAO_HAS_INTERCEPTORS == 1 , pi_current_ () diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index 2a879aa4216..a9836d08857 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -55,6 +55,7 @@ class TAO_Connector_Registry; class TAO_Resource_Factory; class TAO_Client_Strategy_Factory; class TAO_Server_Strategy_Factory; +class TAO_Transport_Cache_Manager; class TAO_TSS_Resources; class TAO_Leader_Follower; @@ -85,6 +86,7 @@ class TAO_Policy_Manager; class TAO_Policy_Current; class TAO_Codeset_Manager; +class TAO_IORInterceptor_List; class TAO_IORInterceptor_Adapter; class TAO_Valuetype_Adapter; @@ -172,10 +174,6 @@ public: /// Generic container for thread-specific objects. ACE_Array_Base<void *> ts_objects_; - // Set to true by the wait_on_lf_no_nested_upcall wait strategy - // @CJC@ maybe we should use allocate_tss_slot_id() instead? - bool upcalls_temporarily_suspended_on_this_thread_; - /// Pointer to the ORB core. Needed to get access to the TSS /// cleanup functions for the TSS objects stored in the TSS object /// array in this class. @@ -934,14 +932,15 @@ public: void add_interceptor ( PortableInterceptor::IORInterceptor_ptr interceptor ACE_ENV_ARG_DECL); + + TAO_IORInterceptor_List *ior_interceptor_list (void); //@} /// Return the valuetype adapter TAO_Valuetype_Adapter *& valuetype_adapter (void); - /// Get the IOR Interceptor adapter. If not created, this method will try - /// to create one. - TAO_IORInterceptor_Adapter *ior_interceptor_adapter (void); + /// Return the underlying transport cache + TAO_Transport_Cache_Manager *transport_cache (void); /// Set and Get methods to indicate whether a BiDir IIOP policy has /// been set in the POA. @@ -1078,6 +1077,8 @@ private: CORBA::Boolean is_collocation_enabled (TAO_ORB_Core *other_orb, const TAO_MProfile &mp); + TAO_IORInterceptor_Adapter *ior_interceptor_adapter (void); + protected: /// Synchronize internal state... @@ -1348,11 +1349,10 @@ public: // The hook to be set for the SyncScopePolicy TAO_ORB_Core::Sync_Scope_Hook sync_scope_hook_; - /** - * Name of the protocols_hooks that needs to be instantiated. - * The default value is "Protocols_Hooks". If RTCORBA option is - * set, its value will be set to be "RT_Protocols_Hooks". - */ + // Name of the protocols_hooks that needs to be instantiated. + // The default value is "Protocols_Hooks". If RTCORBA option is + // set, its value will be set to + // be "RT_Protocols_Hooks". ACE_CString protocols_hooks_name_; /// The hook to be set for the RelativeRoundtripTimeoutPolicy. @@ -1361,105 +1361,81 @@ public: /// The hook to be set for the ConnectionTimeoutPolicy TAO_ORB_Core::Timeout_Hook connection_timeout_hook_; - /** - * Name of the endpoint selector factory that needs to be instantiated. - * The default value is "Default_Endpoint_Selector_Factory". If - * TAO_RTCORBA is linked, the set_endpoint_selector_factory will be - * called to set the value to be "RT_Endpoint_Selector_Factory". - */ + // Name of the endpoint selector factory that needs to be instantiated. + // The default value is "Default_Endpoint_Selector_Factory". If + // TAO_RTCORBA is linked, the set_endpoint_selector_factory will be + // called to set the value to be "RT_Endpoint_Selector_Factory". ACE_CString endpoint_selector_factory_name_; - /** - * Name of the thread lane resources manager that needs to be - * instantiated. The default value is - * "Default_Thread_Lane_Resources_Manager_Factory". If TAO_RTCORBA - * is linked, the set_thread_lane_resources_manager will be called - * to set the value to be - * "RT_Thread_Lane_Resources_Manager_Factory". - */ + // Name of the thread lane resources manager that needs to be + // instantiated. The default value is + // "Default_Thread_Lane_Resources_Manager_Factory". If TAO_RTCORBA + // is linked, the set_thread_lane_resources_manager will be called + // to set the value to be + // "RT_Thread_Lane_Resources_Manager_Factory". ACE_CString thread_lane_resources_manager_factory_name_; - /** - * Name of the collocation resolver that needs to be instantiated. - * The default value is "Default_Collocation_Resolver". If - * TAO_RTCORBA is linked, the set_collocation_resolver will be - * called to set the value to be "RT_Collocation_Resolver". - */ + // Name of the collocation resolver that needs to be instantiated. + // The default value is "Default_Collocation_Resolver". If + // TAO_RTCORBA is linked, the set_collocation_resolver will be + // called to set the value to be "RT_Collocation_Resolver". ACE_CString collocation_resolver_name_; - /** - * Name of the stub factory that needs to be instantiated. - * The default value is "Default_Stub_Factory". If TAO_RTCORBA is - * linked, the set_stub_factory will be called to set the value - * to be "RT_Stub_Factory". - */ + // Name of the stub factory that needs to be instantiated. + // The default value is "Default_Stub_Factory". If TAO_RTCORBA is + // linked, the set_stub_factory will be called to set the value + // to be "RT_Stub_Factory". ACE_CString stub_factory_name_; - /** - * Name of the resource factory that needs to be instantiated. - * The default value is "Resource_Factory". If TAO_Strategies is - * linked, the set_resource_factory will be called to set the value - * to be "Advanced_Resource_Factory". - */ + // Name of the resource factory that needs to be instantiated. + // The default value is "Resource_Factory". If TAO_Strategies is + // linked, the set_resource_factory will be called to set the value + // to be "Advanced_Resource_Factory". ACE_CString resource_factory_name_; - /** - * Name of the service object for DII request creation that needs - * to be instantiated. The default value is "Dynamic_Adaper". If - * TAO_DynamicInterface is linked, dynamic_adapter_name() will be - * called to set the value to "Concrete_Dynamic_Adapter". - */ + // Name of the service object for DII request creation that needs + // to be instantiated. The default value is "Dynamic_Adaper". If + // TAO_DynamicInterface is linked, dynamic_adapter_name() will be + // called to set the value to "Concrete_Dynamic_Adapter". ACE_CString dynamic_adapter_name_; - /** - * Name of the service object for functions that make calls on - * the Interface Repository. The default value is "IFR_Client_Adaper". - * If TAO_IFR_CLient is linked, ifr_client_adapter_name() will be - * called to set the value to "Concrete_IFR_Client_Adapter". - */ + // Name of the service object for functions that make calls on + // the Interface Repository. The default value is "IFR_Client_Adaper". + // If TAO_IFR_CLient is linked, ifr_client_adapter_name() will be + // called to set the value to "Concrete_IFR_Client_Adapter". ACE_CString ifr_client_adapter_name_; - /** - * Name of the service object used by the ORB create_*_tc functions. - * The default value is "TypeCodeFactory_Adapter". If the - * TypeCodeFactory library is linked, the corresponding accessor - * function typecodefactory_adapter_name() will be called to set - * the value to "Concrete_TypeCodeFactory_Adapter". - */ + // Name of the service object used by the ORB create_*_tc functions. + // The default value is "TypeCodeFactory_Adapter". If the + // TypeCodeFactory library is linked, the corresponding accessor + // function typecodefactory_adapter_name() will be called to set + // the value to "Concrete_TypeCodeFactory_Adapter". ACE_CString typecodefactory_adapter_name_; - /** - * Name of the factory object used to adapt function calls on - * the PortableInterceptor interfaces IORInfo and IORInterceptor. - * The default value is "IORInterceptor_Adapter_Factory". If the - * IORInterceptor library is linked, the corresponding accessor - * function iorinterceptor_adapter_factory_name() will be called to set - * the value to "Concrete_IORInterceptor_Adapter_Factory". - */ + // Name of the factory object used to adapt function calls on + // the PortableInterceptor interfaces IORInfo and IORInterceptor. + // The default value is "IORInterceptor_Adapter_Factory". If the + // IORInterceptor library is linked, the corresponding accessor + // function iorinterceptor_adapter_factory_name() will be called to set + // the value to "Concrete_IORInterceptor_Adapter_Factory". ACE_CString iorinterceptor_adapter_factory_name_; - /** - * Name of the service object used to adapt function calls on - * the valuetype-related interfaces. - * The default value is "Valuetype_Adapter". If the - * Valuetype library is linked, the corresponding accessor - * function valuetype_adapter_name() will be called to set - * the value to "Concrete_Valuetype_Adapter". - */ + // Name of the service object used to adapt function calls on + // the valuetype-related interfaces. + // The default value is "Valuetype_Adapter". If the + // Valuetype library is linked, the corresponding accessor + // function valuetype_adapter_name() will be called to set + // the value to "Concrete_Valuetype_Adapter". ACE_CString valuetype_adapter_name_; - /** - * Name of the service object used to create the RootPOA. The - * default value is "TAO_POA". If TAO_RTCORBA is loaded, this - * will be changed to TAO_RT_POA so that a POA equipped with - * realtime extensions will be returned. - */ + // Name of the service object used to create the RootPOA. The + // default value is "TAO_POA". If TAO_RTCORBA is loaded, this + // will be changed to TAO_RT_POA so that a POA equipped with + // realtime extensions will be returned. ACE_CString poa_factory_name_; - /** - * The service configurator directive used to load - * poa_factory_name_ dynamically. - */ + // The service configurator directive used to load + // poa_factory_name_ dynamically. ACE_CString poa_factory_directive_; private: diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i index 76be478d42a..7f9170af8dd 100644 --- a/TAO/tao/ORB_Core.i +++ b/TAO/tao/ORB_Core.i @@ -339,6 +339,21 @@ TAO_ORB_Core::has_shutdown (void) return this->has_shutdown_; } +ACE_INLINE void +TAO_ORB_Core::check_shutdown (ACE_ENV_SINGLE_ARG_DECL) +{ + if (this->has_shutdown ()) + { + // As defined by the CORBA 2.3 specification, throw a + // CORBA::BAD_INV_ORDER exception with minor code 4 if the ORB + // has shutdown by the time an ORB function is called. + + ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 4, + CORBA::COMPLETED_NO)); + } +} + + ACE_INLINE int TAO_ORB_Core::thread_per_connection_timeout (ACE_Time_Value &timeout) const { diff --git a/TAO/tao/ORB_Table.h b/TAO/tao/ORB_Table.h index 97a37403fe2..1148b06fd3b 100644 --- a/TAO/tao/ORB_Table.h +++ b/TAO/tao/ORB_Table.h @@ -16,15 +16,17 @@ #define TAO_ORB_TABLE_H #include /**/ "ace/pre.h" - -#include "tao/TAO_Export.h" +#include "ace/Null_Mutex.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/corbafwd.h" + #include "ace/Hash_Map_Manager_T.h" -#include "ace/Null_Mutex.h" + +#include "tao/TAO_Export.h" // Forward declarations. class TAO_ORB_Core; @@ -85,14 +87,14 @@ public: /// Set the ORB related to the orb_id as the default ORB and not the /// ORB that is first binded. void set_default (const char *orb_id); - + /// Method the ORB invokes to specify that it doesnt want to be the /// default ORB if there are more than one ORB registered. void not_default (const char *orb_id); - /// Accessor to the underlying table_ + /// Accessor to the underlying table_ Table * table (void); - + private: /// Prevent copying @@ -105,7 +107,7 @@ private: void update_orbs(); /// Variable to check if the first ORB decides not to be the default - bool first_orb_not_default_; + CORBA::Boolean first_orb_not_default_; /// The implementation. Table table_; diff --git a/TAO/tao/ObjRefTemplate.mpc b/TAO/tao/ObjRefTemplate.mpc index 8f84ef9c4aa..a873ddbb474 100644 --- a/TAO/tao/ObjRefTemplate.mpc +++ b/TAO/tao/ObjRefTemplate.mpc @@ -1,5 +1,5 @@ //$Id$ -project : valuetype, portableserver, core { +project : valuetype, core { sharedname = TAO_ObjRefTemplate dynamicflags = TAO_ORT_BUILD_DLL @@ -22,8 +22,4 @@ project : valuetype, portableserver, core { Resource_Files { ObjRefTemplate } - - PIDL_Files { - ObjRefTemplate - } } diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl index 34e55bb51a4..cae4150604a 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl @@ -33,6 +33,7 @@ #ifndef _OBJECT_REFERENCE_TEMPLATE_IDL_ #define _OBJECT_REFERENCE_TEMPLATE_IDL_ +#include <orb.idl> #include "tao/PI_Forward.pidl" module PortableInterceptor @@ -54,6 +55,15 @@ module PortableInterceptor }; typedef sequence<ObjectReferenceTemplate> ObjectReferenceTemplateSeq; + + typedef long AdapterManagerId; + + typedef short AdapterState; + const AdapterState HOLDING = 0; + const AdapterState ACTIVE = 1; + const AdapterState DISCARDING = 2; + const AdapterState INACTIVE = 3; + const AdapterState NON_EXISTENT = 4; }; #endif /* _OBJECT_REFERENCE_TEMPLATE_IDL_ */ diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp index 7ae8e3c69bc..6dbae78e6e8 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:303 +// be\be_codegen.cpp:323 #include "ObjectReferenceTemplateC.h" @@ -34,7 +34,6 @@ #include "tao/Exception_Data.h" #include "tao/Invocation_Adapter.h" #include "tao/Valuetype/ValueFactory.h" -#include "tao/ORB_Core.h" #include "tao/Typecode.h" #include "tao/Any_Impl_T.h" #include "tao/Any_Dual_Impl_T.h" @@ -47,22 +46,22 @@ #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) -#include "ObjectReferenceTemplateC.inl" +#include "ObjectReferenceTemplateC.i" #endif /* !defined INLINE */ // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:64 +// be\be_visitor_arg_traits.cpp:64 // Arg traits specializations. namespace TAO { - + // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:379 + // be\be_visitor_arg_traits.cpp:379 #if !defined (_CORBA_STRINGSEQ__ARG_TRAITS_CS_) #define _CORBA_STRINGSEQ__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_ORT_Export Arg_Traits<CORBA::StringSeq> : public @@ -79,33 +78,33 @@ namespace TAO // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:290 +// be\be_visitor_typecode/typecode_defn.cpp:290 static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceFactory[] = { TAO_ENCAP_BYTE_ORDER, // byte order 59, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x72636570), - ACE_NTOHL (0x746f722f), - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63745265), - ACE_NTOHL (0x66657265), - ACE_NTOHL (0x6e636546), - ACE_NTOHL (0x6163746f), - ACE_NTOHL (0x72793a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x496e7465), + ACE_NTOHL (0x72636570), + ACE_NTOHL (0x746f722f), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636546), + ACE_NTOHL (0x6163746f), + ACE_NTOHL (0x72793a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceFactory:1.0 23, - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63745265), - ACE_NTOHL (0x66657265), - ACE_NTOHL (0x6e636546), - ACE_NTOHL (0x6163746f), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636546), + ACE_NTOHL (0x6163746f), ACE_NTOHL (0x72790000), // name = ObjectReferenceFactory 2, // value modifier CORBA::tk_null, // no stateful base valuetype @@ -128,29 +127,29 @@ namespace PortableInterceptor } // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:66 +// be\be_visitor_valuetype/valuetype_cs.cpp:66 -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION +ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::add_ref ( +TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::tao_add_ref ( PortableInterceptor::ObjectReferenceFactory * p ) { CORBA::add_ref (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION +ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::remove_ref ( +TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::tao_remove_ref ( PortableInterceptor::ObjectReferenceFactory * p ) { CORBA::remove_ref (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION +ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::release ( +TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::tao_release ( PortableInterceptor::ObjectReferenceFactory * p ) { @@ -164,7 +163,7 @@ PortableInterceptor::ObjectReferenceFactory::_downcast (CORBA::ValueBase *v) { return 0; } - + return dynamic_cast< ::PortableInterceptor::ObjectReferenceFactory * > (v); } @@ -178,8 +177,8 @@ void PortableInterceptor::ObjectReferenceFactory::_tao_any_destructor (void *_tao_void_pointer) { ObjectReferenceFactory *_tao_tmp_pointer = - static_cast< - ObjectReferenceFactory *> ( + ACE_static_cast ( + ObjectReferenceFactory *, _tao_void_pointer ); CORBA::remove_ref (_tao_tmp_pointer); @@ -199,29 +198,29 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceFactory::_tao_unmarshal ( base, ObjectReferenceFactory::_tao_obv_static_repository_id () ); - + if (retval == 0) { return 0; } - + if (factory.in () != 0) { base = factory->create_for_unmarshal (); - + if (base == 0) { return 0; // %! except.? } - + retval = base->_tao_unmarshal_v (strm); - + if (retval == 0) { return 0; } } - + // Now base must be null or point to the unmarshaled object. // Align the pointer to the right subobject. new_object = ObjectReferenceFactory::_downcast (base); @@ -229,33 +228,33 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceFactory::_tao_unmarshal ( } // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:290 +// be\be_visitor_typecode/typecode_defn.cpp:290 static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplate[] = { TAO_ENCAP_BYTE_ORDER, // byte order 60, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x72636570), - ACE_NTOHL (0x746f722f), - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63745265), - ACE_NTOHL (0x66657265), - ACE_NTOHL (0x6e636554), - ACE_NTOHL (0x656d706c), - ACE_NTOHL (0x6174653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x496e7465), + ACE_NTOHL (0x72636570), + ACE_NTOHL (0x746f722f), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636554), + ACE_NTOHL (0x656d706c), + ACE_NTOHL (0x6174653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0 24, - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63745265), - ACE_NTOHL (0x66657265), - ACE_NTOHL (0x6e636554), - ACE_NTOHL (0x656d706c), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636554), + ACE_NTOHL (0x656d706c), ACE_NTOHL (0x61746500), // name = ObjectReferenceTemplate 2, // value modifier CORBA::tk_null, // no stateful base valuetype @@ -278,29 +277,29 @@ namespace PortableInterceptor } // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:66 +// be\be_visitor_valuetype/valuetype_cs.cpp:66 -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION +ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::add_ref ( +TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::tao_add_ref ( PortableInterceptor::ObjectReferenceTemplate * p ) { CORBA::add_ref (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION +ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::remove_ref ( +TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::tao_remove_ref ( PortableInterceptor::ObjectReferenceTemplate * p ) { CORBA::remove_ref (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION +ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::release ( +TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::tao_release ( PortableInterceptor::ObjectReferenceTemplate * p ) { @@ -314,7 +313,7 @@ PortableInterceptor::ObjectReferenceTemplate::_downcast (CORBA::ValueBase *v) { return 0; } - + return dynamic_cast< ::PortableInterceptor::ObjectReferenceTemplate * > (v); } @@ -328,8 +327,8 @@ void PortableInterceptor::ObjectReferenceTemplate::_tao_any_destructor (void *_tao_void_pointer) { ObjectReferenceTemplate *_tao_tmp_pointer = - static_cast< - ObjectReferenceTemplate *> ( + ACE_static_cast ( + ObjectReferenceTemplate *, _tao_void_pointer ); CORBA::remove_ref (_tao_tmp_pointer); @@ -349,37 +348,37 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceTemplate::_tao_unmarshal ( base, ObjectReferenceTemplate::_tao_obv_static_repository_id () ); - + if (retval == 0) { return 0; } - + if (factory.in () != 0) { base = factory->create_for_unmarshal (); - + if (base == 0) { return 0; // %! except.? } - + retval = base->_tao_unmarshal_v (strm); - + if (retval == 0) { return 0; } } - + // Now base must be null or point to the unmarshaled object. // Align the pointer to the right subobject. new_object = ObjectReferenceTemplate::_downcast (base); return retval; } -// TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:65 +// TAO_IDL - Generated from +// be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_ @@ -428,42 +427,42 @@ void PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor ( ) { ObjectReferenceTemplateSeq * _tao_tmp_pointer = - static_cast<ObjectReferenceTemplateSeq *> (_tao_void_pointer); + ACE_static_cast (ObjectReferenceTemplateSeq *, _tao_void_pointer); delete _tao_tmp_pointer; } #endif /* end #if !defined */ // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:290 +// be\be_visitor_typecode/typecode_defn.cpp:290 static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplateSeq[] = { TAO_ENCAP_BYTE_ORDER, // byte order 63, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x72636570), - ACE_NTOHL (0x746f722f), - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63745265), - ACE_NTOHL (0x66657265), - ACE_NTOHL (0x6e636554), - ACE_NTOHL (0x656d706c), - ACE_NTOHL (0x61746553), - ACE_NTOHL (0x65713a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x496e7465), + ACE_NTOHL (0x72636570), + ACE_NTOHL (0x746f722f), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636554), + ACE_NTOHL (0x656d706c), + ACE_NTOHL (0x61746553), + ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplateSeq:1.0 27, - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63745265), - ACE_NTOHL (0x66657265), - ACE_NTOHL (0x6e636554), - ACE_NTOHL (0x656d706c), - ACE_NTOHL (0x61746553), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636554), + ACE_NTOHL (0x656d706c), + ACE_NTOHL (0x61746553), ACE_NTOHL (0x65710000), // name = ObjectReferenceTemplateSeq CORBA::tk_sequence, // typecode kind 124, // encapsulation length @@ -472,33 +471,33 @@ static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplateSeq[] = 480, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 60, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x72636570), - ACE_NTOHL (0x746f722f), - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63745265), - ACE_NTOHL (0x66657265), - ACE_NTOHL (0x6e636554), - ACE_NTOHL (0x656d706c), - ACE_NTOHL (0x6174653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x496e7465), + ACE_NTOHL (0x72636570), + ACE_NTOHL (0x746f722f), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636554), + ACE_NTOHL (0x656d706c), + ACE_NTOHL (0x6174653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0 24, - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63745265), - ACE_NTOHL (0x66657265), - ACE_NTOHL (0x6e636554), - ACE_NTOHL (0x656d706c), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636554), + ACE_NTOHL (0x656d706c), ACE_NTOHL (0x61746500), // name = ObjectReferenceTemplate 2, // value modifier CORBA::tk_null, // no stateful base valuetype 3, // member count - + 0U, }; @@ -518,7 +517,97 @@ namespace PortableInterceptor } // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/any_op_cs.cpp:57 +// be\be_visitor_typecode/typecode_defn.cpp:290 + +static const CORBA::Long _oc_PortableInterceptor_AdapterManagerId[] = +{ + TAO_ENCAP_BYTE_ORDER, // byte order + 53, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x496e7465), + ACE_NTOHL (0x72636570), + ACE_NTOHL (0x746f722f), + ACE_NTOHL (0x41646170), + ACE_NTOHL (0x7465724d), + ACE_NTOHL (0x616e6167), + ACE_NTOHL (0x65724964), + ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x0), // repository ID = IDL:omg.org/PortableInterceptor/AdapterManagerId:1.0 + 17, + ACE_NTOHL (0x41646170), + ACE_NTOHL (0x7465724d), + ACE_NTOHL (0x616e6167), + ACE_NTOHL (0x65724964), + ACE_NTOHL (0x0), // name = AdapterManagerId + CORBA::tk_long, + +}; + +static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_AdapterManagerId ( + CORBA::tk_alias, + sizeof (_oc_PortableInterceptor_AdapterManagerId), + (char *) &_oc_PortableInterceptor_AdapterManagerId, + 0, + sizeof (PortableInterceptor::AdapterManagerId) + ); + +namespace PortableInterceptor +{ + ::CORBA::TypeCode_ptr _tc_AdapterManagerId = + &_tc_TAO_tc_PortableInterceptor_AdapterManagerId; +} + +// TAO_IDL - Generated from +// be\be_visitor_typecode/typecode_defn.cpp:290 + +static const CORBA::Long _oc_PortableInterceptor_AdapterState[] = +{ + TAO_ENCAP_BYTE_ORDER, // byte order + 49, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x496e7465), + ACE_NTOHL (0x72636570), + ACE_NTOHL (0x746f722f), + ACE_NTOHL (0x41646170), + ACE_NTOHL (0x74657253), + ACE_NTOHL (0x74617465), + ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x0), // repository ID = IDL:omg.org/PortableInterceptor/AdapterState:1.0 + 13, + ACE_NTOHL (0x41646170), + ACE_NTOHL (0x74657253), + ACE_NTOHL (0x74617465), + ACE_NTOHL (0x0), // name = AdapterState + CORBA::tk_short, + +}; + +static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_AdapterState ( + CORBA::tk_alias, + sizeof (_oc_PortableInterceptor_AdapterState), + (char *) &_oc_PortableInterceptor_AdapterState, + 0, + sizeof (PortableInterceptor::AdapterState) + ); + +namespace PortableInterceptor +{ + ::CORBA::TypeCode_ptr _tc_AdapterState = + &_tc_TAO_tc_PortableInterceptor_AdapterState; +} + +// TAO_IDL - Generated from +// be\be_visitor_valuetype/any_op_cs.cpp:57 + + template<> CORBA::Boolean @@ -574,7 +663,9 @@ operator>>= ( // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/any_op_cs.cpp:57 +// be\be_visitor_valuetype/any_op_cs.cpp:57 + + template<> CORBA::Boolean @@ -629,8 +720,8 @@ operator>>= ( -// TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54 +// TAO_IDL - Generated from +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -666,8 +757,8 @@ CORBA::Boolean operator>>= ( PortableInterceptor::ObjectReferenceTemplateSeq *&_tao_elem ) { - return _tao_any >>= const_cast< - const PortableInterceptor::ObjectReferenceTemplateSeq *&> ( + return _tao_any >>= ACE_const_cast ( + const PortableInterceptor::ObjectReferenceTemplateSeq *&, _tao_elem ); } @@ -688,7 +779,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:490 +// be\be_valuetype.cpp:490 void CORBA::add_ref (PortableInterceptor::ObjectReferenceFactory * vt) @@ -709,7 +800,7 @@ CORBA::remove_ref (PortableInterceptor::ObjectReferenceFactory * vt) } // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_cs.cpp:73 +// be\be_visitor_valuetype/cdr_op_cs.cpp:73 CORBA::Boolean operator<< ( @@ -720,8 +811,8 @@ operator<< ( return CORBA::ValueBase::_tao_marshal ( strm, - const_cast< - PortableInterceptor::ObjectReferenceFactory *> ( + ACE_const_cast ( + PortableInterceptor::ObjectReferenceFactory *, _tao_valuetype ), (ptrdiff_t) &PortableInterceptor::ObjectReferenceFactory::_downcast @@ -740,7 +831,7 @@ operator>> ( // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:490 +// be\be_valuetype.cpp:490 void CORBA::add_ref (PortableInterceptor::ObjectReferenceTemplate * vt) @@ -761,7 +852,7 @@ CORBA::remove_ref (PortableInterceptor::ObjectReferenceTemplate * vt) } // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_cs.cpp:73 +// be\be_visitor_valuetype/cdr_op_cs.cpp:73 CORBA::Boolean operator<< ( @@ -772,8 +863,8 @@ operator<< ( return CORBA::ValueBase::_tao_marshal ( strm, - const_cast< - PortableInterceptor::ObjectReferenceTemplate *> ( + ACE_const_cast ( + PortableInterceptor::ObjectReferenceTemplate *, _tao_valuetype ), (ptrdiff_t) &PortableInterceptor::ObjectReferenceTemplate::_downcast @@ -792,7 +883,7 @@ operator>> ( // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:96 +// be\be_visitor_sequence/cdr_op_cs.cpp:96 #if !defined _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_CPP_ #define _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_CPP_ @@ -802,21 +893,21 @@ CORBA::Boolean operator<< ( const PortableInterceptor::ObjectReferenceTemplateSeq &_tao_sequence ) { - const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - + CORBA::ULong _tao_seq_len = _tao_sequence.length (); + if (strm << _tao_seq_len) { // Encode all elements. CORBA::Boolean _tao_marshal_flag = 1; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = (strm << _tao_sequence[i].in ()); } - + return _tao_marshal_flag; } - + return 0; } @@ -826,7 +917,7 @@ CORBA::Boolean operator>> ( ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -836,35 +927,35 @@ 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. CORBA::Boolean _tao_marshal_flag = 1; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = (strm >> _tao_sequence[i].out ()); } - + return _tao_marshal_flag; - + } - + return 0; } #endif /* _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_CPP_ */ // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1628 +// be\be_visitor_root/root.cpp:1628 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) @@ -890,13 +981,13 @@ CORBA::Boolean operator>> ( template class TAO_Value_Var_T< PortableInterceptor::ObjectReferenceFactory - + >; - + template class TAO_Value_Out_T< PortableInterceptor::ObjectReferenceFactory - + >; template class @@ -918,13 +1009,13 @@ CORBA::Boolean operator>> ( template class TAO_Value_Var_T< PortableInterceptor::ObjectReferenceTemplate - + >; - + template class TAO_Value_Out_T< PortableInterceptor::ObjectReferenceTemplate - + >; template class @@ -1006,13 +1097,13 @@ CORBA::Boolean operator>> ( # pragma instantiate \ TAO_Value_Var_T< \ PortableInterceptor::ObjectReferenceFactory \ - + > - + # pragma instantiate \ TAO_Value_Out_T< \ PortableInterceptor::ObjectReferenceFactory \ - + > # pragma instantiate \ @@ -1021,12 +1112,6 @@ CORBA::Boolean operator>> ( > # pragma instantiate \ - TAO::Ret_Var_Size_Argument_T< \ - PortableInterceptor::AdapterName, \ - PortableInterceptor::AdapterName_var \ - > - -# pragma instantiate \ TAO::Value_Traits< \ PortableInterceptor::ObjectReferenceTemplate \ > @@ -1034,13 +1119,13 @@ CORBA::Boolean operator>> ( # pragma instantiate \ TAO_Value_Var_T< \ PortableInterceptor::ObjectReferenceTemplate \ - + > - + # pragma instantiate \ TAO_Value_Out_T< \ PortableInterceptor::ObjectReferenceTemplate \ - + > # pragma instantiate \ @@ -1092,4 +1177,5 @@ CORBA::Boolean operator>> ( PortableInterceptor::ObjectReferenceTemplateSeq \ > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h index d2a256eac7d..3e4798bd919 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h @@ -26,26 +26,24 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:153 +// be\be_codegen.cpp:171 #ifndef _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATEC_H_ #define _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATEC_H_ #include /**/ "ace/pre.h" - -#include "ace/config-all.h" +#include "tao/ORB.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ort_export.h" -#include "tao/Valuetype/ValueBase.h" -#include "tao/Valuetype/Valuetype_Adapter_Impl.h" -#include "tao/ORB.h" #include "tao/Environment.h" #include "tao/Object.h" +#include "tao/Valuetype/ValueBase.h" +#include "tao/Valuetype/Valuetype_Adapter_Impl.h" #include "tao/Valuetype/Sequence_T.h" #include "tao/Sequence_T.h" #include "tao/Valuetype/Value_VarOut_T.h" @@ -78,26 +76,26 @@ #endif /* __BORLANDC__ */ // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48 +// be\be_visitor_module/module_ch.cpp:48 namespace PortableInterceptor { - + // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:527 - - + // be\be_valuetype.cpp:527 + + #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__VAR_OUT_CH_ - + class ObjectReferenceFactory; typedef TAO_Value_Var_T< ObjectReferenceFactory > ObjectReferenceFactory_var; - + typedef TAO_Value_Out_T< ObjectReferenceFactory @@ -105,78 +103,78 @@ namespace PortableInterceptor ObjectReferenceFactory_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:56 + // be\be_visitor_valuetype/valuetype_ch.cpp:56 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY_CH_ - + class TAO_ORT_Export ObjectReferenceFactory : public virtual CORBA::ValueBase { public: typedef ObjectReferenceFactory_var _var_type; - + static ObjectReferenceFactory* _downcast (CORBA::ValueBase *); - + // (TAO extensions or internals) static CORBA::Boolean _tao_unmarshal ( TAO_InputCDR &, ObjectReferenceFactory *& ); - + virtual const char* _tao_obv_repository_id (void) const; - + static const char* _tao_obv_static_repository_id (void); - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:402 - + // be\be_visitor_valuetype/valuetype_ch.cpp:401 + public: virtual CORBA::Object_ptr make_object ( - const char *, const ::PortableInterceptor::ObjectId & ACE_ENV_ARG_DECL_WITH_DEFAULTS + const char *, const PortableInterceptor::ObjectId & ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; - + // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:250 - + // be\be_visitor_valuetype/valuetype_ch.cpp:250 + protected: ObjectReferenceFactory (void); - + virtual ~ObjectReferenceFactory (void); - - + + private: ObjectReferenceFactory (const ObjectReferenceFactory &); void operator= (const ObjectReferenceFactory &); - + }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + // be\be_visitor_typecode/typecode_decl.cpp:44 + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceFactory; - + // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:527 - - + // be\be_valuetype.cpp:527 + + #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__VAR_OUT_CH_ - + class ObjectReferenceTemplate; typedef TAO_Value_Var_T< ObjectReferenceTemplate > ObjectReferenceTemplate_var; - + typedef TAO_Value_Out_T< ObjectReferenceTemplate @@ -184,87 +182,87 @@ namespace PortableInterceptor ObjectReferenceTemplate_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:56 + // be\be_visitor_valuetype/valuetype_ch.cpp:56 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE_CH_ - + class TAO_ORT_Export ObjectReferenceTemplate : public virtual ObjectReferenceFactory { public: typedef ObjectReferenceTemplate_var _var_type; - + static ObjectReferenceTemplate* _downcast (CORBA::ValueBase *); - + // (TAO extensions or internals) static CORBA::Boolean _tao_unmarshal ( TAO_InputCDR &, ObjectReferenceTemplate *& ); - + virtual const char* _tao_obv_repository_id (void) const; - + static const char* _tao_obv_static_repository_id (void); - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:402 - + // be\be_visitor_valuetype/valuetype_ch.cpp:401 + public: virtual char * server_id ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) = 0; - + // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:402 - + // be\be_visitor_valuetype/valuetype_ch.cpp:401 + public: virtual char * orb_id ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) = 0; - + // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:402 - + // be\be_visitor_valuetype/valuetype_ch.cpp:401 + public: virtual ::PortableInterceptor::AdapterName * adapter_name ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) = 0; - + // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:250 - + // be\be_visitor_valuetype/valuetype_ch.cpp:250 + protected: ObjectReferenceTemplate (void); - + virtual ~ObjectReferenceTemplate (void); - - + + private: ObjectReferenceTemplate (const ObjectReferenceTemplate &); void operator= (const ObjectReferenceTemplate &); - + }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + // be\be_visitor_typecode/typecode_decl.cpp:44 + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplate; - + // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101 + // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_ - + class ObjectReferenceTemplateSeq; - + typedef TAO_MngSeq_Var_T< ObjectReferenceTemplateSeq, @@ -274,7 +272,7 @@ namespace PortableInterceptor > > ObjectReferenceTemplateSeq_var; - + typedef TAO_MngSeq_Out_T< ObjectReferenceTemplateSeq, @@ -285,7 +283,7 @@ namespace PortableInterceptor > > ObjectReferenceTemplateSeq_out; - + class TAO_ORT_Export ObjectReferenceTemplateSeq : public TAO_Unbounded_Valuetype_Sequence< @@ -299,38 +297,85 @@ namespace PortableInterceptor ObjectReferenceTemplateSeq ( CORBA::ULong max, CORBA::ULong length, - ObjectReferenceTemplate ** buffer, + ObjectReferenceTemplate ** buffer, CORBA::Boolean release = 0 ); ObjectReferenceTemplateSeq (const ObjectReferenceTemplateSeq &); ~ObjectReferenceTemplateSeq (void); - + static void _tao_any_destructor (void *); - + typedef ObjectReferenceTemplateSeq_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + // be\be_visitor_typecode/typecode_decl.cpp:44 + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplateSeq; + + // TAO_IDL - Generated from + // be\be_visitor_typedef/typedef_ch.cpp:342 + + typedef CORBA::Long AdapterManagerId; + typedef CORBA::Long_out AdapterManagerId_out; + + // TAO_IDL - Generated from + // be\be_visitor_typecode/typecode_decl.cpp:44 + + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterManagerId; + + // TAO_IDL - Generated from + // be\be_visitor_typedef/typedef_ch.cpp:342 + + typedef CORBA::Short AdapterState; + typedef CORBA::Short_out AdapterState_out; + + // TAO_IDL - Generated from + // be\be_visitor_typecode/typecode_decl.cpp:44 + + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterState; + + // TAO_IDL - Generated from + // be\be_visitor_constant/constant_ch.cpp:52 + + const PortableInterceptor::AdapterState HOLDING = 0; + + // TAO_IDL - Generated from + // be\be_visitor_constant/constant_ch.cpp:52 + + const PortableInterceptor::AdapterState ACTIVE = 1; + + // TAO_IDL - Generated from + // be\be_visitor_constant/constant_ch.cpp:52 + + const PortableInterceptor::AdapterState DISCARDING = 2; + + // TAO_IDL - Generated from + // be\be_visitor_constant/constant_ch.cpp:52 + + const PortableInterceptor::AdapterState INACTIVE = 3; + + // TAO_IDL - Generated from + // be\be_visitor_constant/constant_ch.cpp:52 + + const PortableInterceptor::AdapterState NON_EXISTENT = 4; // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:66 +// be\be_visitor_module/module_ch.cpp:66 } // module PortableInterceptor // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/obv_module.cpp:55 +// be\be_visitor_valuetype/obv_module.cpp:55 namespace OBV_PortableInterceptor { } // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:59 +// be\be_visitor_traits.cpp:59 // Traits specializations. namespace TAO @@ -338,47 +383,47 @@ namespace TAO #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__TRAITS_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_ORT_Export Value_Traits<PortableInterceptor::ObjectReferenceFactory> { - static void add_ref (PortableInterceptor::ObjectReferenceFactory *); - static void remove_ref (PortableInterceptor::ObjectReferenceFactory *); - static void release (PortableInterceptor::ObjectReferenceFactory *); + static void tao_add_ref (PortableInterceptor::ObjectReferenceFactory *); + static void tao_remove_ref (PortableInterceptor::ObjectReferenceFactory *); + static void tao_release (PortableInterceptor::ObjectReferenceFactory *); }; #endif /* end #if !defined */ #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__TRAITS_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_ORT_Export Value_Traits<PortableInterceptor::ObjectReferenceTemplate> { - static void add_ref (PortableInterceptor::ObjectReferenceTemplate *); - static void remove_ref (PortableInterceptor::ObjectReferenceTemplate *); - static void release (PortableInterceptor::ObjectReferenceTemplate *); + static void tao_add_ref (PortableInterceptor::ObjectReferenceTemplate *); + static void tao_remove_ref (PortableInterceptor::ObjectReferenceTemplate *); + static void tao_release (PortableInterceptor::ObjectReferenceTemplate *); }; #endif /* end #if !defined */ } // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/any_op_ch.cpp:54 +// be\be_visitor_valuetype/any_op_ch.cpp:54 TAO_ORT_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceFactory *); // copying TAO_ORT_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceFactory **); // non-copying TAO_ORT_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ObjectReferenceFactory *&); // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/any_op_ch.cpp:54 +// be\be_visitor_valuetype/any_op_ch.cpp:54 TAO_ORT_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceTemplate *); // copying TAO_ORT_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceTemplate **); // non-copying TAO_ORT_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ObjectReferenceTemplate *&); // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52 +// be\be_visitor_sequence/any_op_ch.cpp:52 TAO_ORT_Export void operator<<= (CORBA::Any &, const PortableInterceptor::ObjectReferenceTemplateSeq &); // copying version TAO_ORT_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceTemplateSeq*); // noncopying version @@ -386,7 +431,7 @@ TAO_ORT_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableIntercept TAO_ORT_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::ObjectReferenceTemplateSeq *&); // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:434 +// be\be_valuetype.cpp:434 namespace CORBA { @@ -395,13 +440,13 @@ namespace CORBA } // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_ch.cpp:61 +// be\be_visitor_valuetype/cdr_op_ch.cpp:61 TAO_ORT_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ObjectReferenceFactory *); TAO_ORT_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ObjectReferenceFactory *&); // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:434 +// be\be_valuetype.cpp:434 namespace CORBA { @@ -410,13 +455,13 @@ namespace CORBA } // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_ch.cpp:61 +// be\be_visitor_valuetype/cdr_op_ch.cpp:61 TAO_ORT_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ObjectReferenceTemplate *); TAO_ORT_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ObjectReferenceTemplate *&); // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:71 +// be\be_visitor_sequence/cdr_op_ch.cpp:71 #if !defined _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_H_ #define _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_H_ @@ -433,10 +478,10 @@ TAO_ORT_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_H_ */ // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:958 +// be\be_codegen.cpp:978 #if defined (__ACE_INLINE__) -#include "ObjectReferenceTemplateC.inl" +#include "ObjectReferenceTemplateC.i" #endif /* defined INLINE */ #if defined(_MSC_VER) && (_MSC_VER >= 1200) @@ -450,3 +495,4 @@ TAO_ORT_Export CORBA::Boolean operator>> ( #include /**/ "ace/post.h" #endif /* ifndef */ + diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.i b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.i new file mode 100644 index 00000000000..1185feac15c --- /dev/null +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.i @@ -0,0 +1,62 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + + +// TAO_IDL - Generated from +// be\be_visitor_valuetype/valuetype_ci.cpp:56 + +ACE_INLINE +PortableInterceptor::ObjectReferenceFactory::ObjectReferenceFactory (void) +{} + +ACE_INLINE +PortableInterceptor::ObjectReferenceFactory::~ObjectReferenceFactory (void) +{} + +ACE_INLINE const char* +PortableInterceptor::ObjectReferenceFactory::_tao_obv_static_repository_id () +{ + return "IDL:omg.org/PortableInterceptor/ObjectReferenceFactory:1.0"; +} + +// TAO_IDL - Generated from +// be\be_visitor_valuetype/valuetype_ci.cpp:56 + +ACE_INLINE +PortableInterceptor::ObjectReferenceTemplate::ObjectReferenceTemplate (void) +{} + +ACE_INLINE +PortableInterceptor::ObjectReferenceTemplate::~ObjectReferenceTemplate (void) +{} + +ACE_INLINE const char* +PortableInterceptor::ObjectReferenceTemplate::_tao_obv_static_repository_id () +{ + return "IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0"; +} + diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index bb64bcd766e..df57f09aed8 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -17,8 +17,6 @@ #include "IFR_Client_Adapter.h" #include "Remote_Object_Proxy_Broker.h" #include "CDR.h" -#include "SystemException.h" -#include "PolicyC.h" #include "ace/Dynamic_Service.h" #include "ace/OS_NS_string.h" @@ -303,7 +301,7 @@ CORBA::Object::_key (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_RETURN (CORBA::INTERNAL ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, EINVAL), CORBA::COMPLETED_NO), 0); @@ -542,7 +540,7 @@ CORBA::Object::_set_policy_overrides ( this->is_collocated_), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOMEM), CORBA::COMPLETED_MAYBE)); ACE_CHECK_RETURN (CORBA::Object::_nil ()); @@ -928,26 +926,26 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x) namespace TAO { CORBA::Object_ptr - Objref_Traits<CORBA::Object>::duplicate (CORBA::Object_ptr p) + Objref_Traits<CORBA::Object>::tao_duplicate (CORBA::Object_ptr p) { return CORBA::Object::_duplicate (p); } void - Objref_Traits<CORBA::Object>::release (CORBA::Object_ptr p) + Objref_Traits<CORBA::Object>::tao_release (CORBA::Object_ptr p) { CORBA::release (p); } CORBA::Object_ptr - Objref_Traits<CORBA::Object>::nil (void) + Objref_Traits<CORBA::Object>::tao_nil (void) { return CORBA::Object::_nil (); } CORBA::Boolean - Objref_Traits<CORBA::Object>::marshal (CORBA::Object_ptr p, - TAO_OutputCDR & cdr) + Objref_Traits<CORBA::Object>::tao_marshal (CORBA::Object_ptr p, + TAO_OutputCDR & cdr) { return p->marshal (cdr); } diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index abe40a97ce6..fb0a3b1af07 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -422,11 +422,11 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<CORBA::Object> { - static CORBA::Object_ptr duplicate (CORBA::Object_ptr); - static void release (CORBA::Object_ptr); - static CORBA::Object_ptr nil (void); - static CORBA::Boolean marshal (CORBA::Object_ptr p, - TAO_OutputCDR & cdr); + static CORBA::Object_ptr tao_duplicate (CORBA::Object_ptr); + static void tao_release (CORBA::Object_ptr); + static CORBA::Object_ptr tao_nil (void); + static CORBA::Boolean tao_marshal (CORBA::Object_ptr p, + TAO_OutputCDR & cdr); }; /** diff --git a/TAO/tao/Object_Argument_T.cpp b/TAO/tao/Object_Argument_T.cpp index db3a85f5329..f3b9d225df0 100644 --- a/TAO/tao/Object_Argument_T.cpp +++ b/TAO/tao/Object_Argument_T.cpp @@ -21,8 +21,6 @@ TAO::In_Object_Argument_T<S_ptr>::marshal (TAO_OutputCDR & cdr) return cdr << this->x_; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S_ptr> void TAO::In_Object_Argument_T<S_ptr>::interceptor_param (Dynamic::Parameter & p) @@ -31,8 +29,6 @@ TAO::In_Object_Argument_T<S_ptr>::interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_IN; } -#endif /* TAO_HAS_INTERCEPTORS */ - // =========================================================== template<typename S_ptr, typename S_traits> @@ -46,12 +42,10 @@ template<typename S_ptr, typename S_traits> CORBA::Boolean TAO::Inout_Object_Argument_T<S_ptr,S_traits>::demarshal (TAO_InputCDR & cdr) { - S_traits::release (this->x_); + S_traits::tao_release (this->x_); return cdr >> this->x_; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S_ptr, typename S_traits> void TAO::Inout_Object_Argument_T<S_ptr,S_traits>::interceptor_param ( @@ -62,8 +56,6 @@ TAO::Inout_Object_Argument_T<S_ptr,S_traits>::interceptor_param ( p.mode = CORBA::PARAM_INOUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================== template<typename S_ptr, typename S_out> @@ -73,8 +65,6 @@ TAO::Out_Object_Argument_T<S_ptr,S_out>::demarshal (TAO_InputCDR & cdr) return cdr >> this->x_; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S_ptr, typename S_out> void TAO::Out_Object_Argument_T<S_ptr,S_out>::interceptor_param ( @@ -85,8 +75,6 @@ TAO::Out_Object_Argument_T<S_ptr,S_out>::interceptor_param ( p.mode = CORBA::PARAM_OUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================ template<typename S_ptr, typename S_var> @@ -96,8 +84,6 @@ TAO::Ret_Object_Argument_T<S_ptr,S_var>::demarshal (TAO_InputCDR & cdr) return cdr >> this->x_.out (); } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S_ptr, typename S_var> void TAO::Ret_Object_Argument_T<S_ptr,S_var>::interceptor_result (CORBA::Any * any) @@ -105,6 +91,4 @@ TAO::Ret_Object_Argument_T<S_ptr,S_var>::interceptor_result (CORBA::Any * any) (*any) <<= this->x_.in (); } -#endif /* TAO_HAS_INTERCEPTORS */ - #endif /* TAO_OBJECT_ARGUMENT_T_C */ diff --git a/TAO/tao/Object_Argument_T.h b/TAO/tao/Object_Argument_T.h index 206d20fc631..fa23e08ef83 100644 --- a/TAO/tao/Object_Argument_T.h +++ b/TAO/tao/Object_Argument_T.h @@ -41,9 +41,9 @@ namespace TAO In_Object_Argument_T (S_ptr x); virtual CORBA::Boolean marshal (TAO_OutputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S_ptr arg (void) const; private: @@ -64,9 +64,9 @@ namespace TAO virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S_ptr & arg (void); private: @@ -86,9 +86,9 @@ namespace TAO Out_Object_Argument_T (S_out & x); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S_out arg (void); private: @@ -108,9 +108,9 @@ namespace TAO Ret_Object_Argument_T (void); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_result (CORBA::Any *); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S_ptr & arg (void); S_ptr excp (void); diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp index 7c673f39ba0..577447e433e 100644 --- a/TAO/tao/Object_KeyC.cpp +++ b/TAO/tao/Object_KeyC.cpp @@ -233,7 +233,7 @@ TAO::ObjectKey::demarshal_key (TAO::ObjectKey &key, return strm.read_octet_array (key.get_buffer (), _tao_seq_len); #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ - return strm.read_octet_array (key.get_buffer (), key.length ()); + return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ } diff --git a/TAO/tao/Object_Loader.h b/TAO/tao/Object_Loader.h index f5293c48b40..23aedad01ef 100644 --- a/TAO/tao/Object_Loader.h +++ b/TAO/tao/Object_Loader.h @@ -18,7 +18,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/SystemException.h" +#include "tao/Exception.h" namespace CORBA { diff --git a/TAO/tao/Object_Ref_Table.cpp b/TAO/tao/Object_Ref_Table.cpp index af00050eba3..d39df133941 100644 --- a/TAO/tao/Object_Ref_Table.cpp +++ b/TAO/tao/Object_Ref_Table.cpp @@ -3,16 +3,12 @@ #include "Environment.h" #include "debug.h" #include "ORB_Constants.h" -#include "SystemException.h" -#include "Object.h" #include "ace/OS_NS_string.h" - ACE_RCSID (tao, Object_Ref_Table, "$Id$") - // **************************************************************** TAO_Object_Ref_Table::TAO_Object_Ref_Table (void) diff --git a/TAO/tao/Object_SArgument_T.cpp b/TAO/tao/Object_SArgument_T.cpp index cdd83d2e90f..21f3d4d98c6 100644 --- a/TAO/tao/Object_SArgument_T.cpp +++ b/TAO/tao/Object_SArgument_T.cpp @@ -21,8 +21,6 @@ TAO::In_Object_SArgument_T<S_ptr,S_var>::demarshal (TAO_InputCDR &cdr) return cdr >> this->x_.out (); } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S_ptr, typename S_var> void TAO::In_Object_SArgument_T<S_ptr,S_var>::interceptor_param ( @@ -33,8 +31,6 @@ TAO::In_Object_SArgument_T<S_ptr,S_var>::interceptor_param ( p.mode = CORBA::PARAM_IN; } -#endif /* TAO_HAS_INTERCEPTORS */ - // =========================================================== template<typename S_ptr, typename S_var> @@ -51,8 +47,6 @@ TAO::Inout_Object_SArgument_T<S_ptr,S_var>::demarshal (TAO_InputCDR & cdr) return cdr >> this->x_.out (); } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S_ptr, typename S_var> void TAO::Inout_Object_SArgument_T<S_ptr,S_var>::interceptor_param ( @@ -63,8 +57,6 @@ TAO::Inout_Object_SArgument_T<S_ptr,S_var>::interceptor_param ( p.mode = CORBA::PARAM_INOUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================== template<typename S_ptr, typename S_var, typename S_out> @@ -74,8 +66,6 @@ TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out>::marshal (TAO_OutputCDR &cdr) return cdr << this->x_.in (); } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S_ptr, typename S_var, typename S_out> void TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out>::interceptor_param ( @@ -86,8 +76,6 @@ TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out>::interceptor_param ( p.mode = CORBA::PARAM_OUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================ template<typename S_ptr, typename S_var> @@ -97,8 +85,6 @@ TAO::Ret_Object_SArgument_T<S_ptr,S_var>::marshal (TAO_OutputCDR & cdr) return cdr << this->x_.in (); } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S_ptr, typename S_var> void TAO::Ret_Object_SArgument_T<S_ptr,S_var>::interceptor_result ( @@ -108,6 +94,4 @@ TAO::Ret_Object_SArgument_T<S_ptr,S_var>::interceptor_result ( (*any) <<= this->x_.in (); } -#endif /* TAO_HAS_INTERCEPTORS */ - #endif /* TAO_OBJECT_SARGUMENT_T_C */ diff --git a/TAO/tao/Object_SArgument_T.h b/TAO/tao/Object_SArgument_T.h index c906251067b..9876bdad6bb 100644 --- a/TAO/tao/Object_SArgument_T.h +++ b/TAO/tao/Object_SArgument_T.h @@ -41,9 +41,9 @@ namespace TAO In_Object_SArgument_T (void); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S_ptr arg (void) const; private: @@ -64,9 +64,9 @@ namespace TAO virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S_ptr & arg (void); private: @@ -86,9 +86,9 @@ namespace TAO Out_Object_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S_out arg (void); private: @@ -108,9 +108,9 @@ namespace TAO Ret_Object_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_result (CORBA::Any *); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S_ptr & arg (void); private: diff --git a/TAO/tao/Object_T.cpp b/TAO/tao/Object_T.cpp index 53bf34d07fb..663b1a6a7c5 100644 --- a/TAO/tao/Object_T.cpp +++ b/TAO/tao/Object_T.cpp @@ -2,9 +2,8 @@ #ifndef TAO_OBJECT_T_C #define TAO_OBJECT_T_C -#include "tao/Object_T.h" -#include "tao/Stub.h" -#include "tao/SystemException.h" +#include "Object_T.h" +#include "Stub.h" ACE_RCSID (tao, Object_T, diff --git a/TAO/tao/Objref_VarOut_T.cpp b/TAO/tao/Objref_VarOut_T.cpp index 7da5ea26bc6..1449d935ff6 100644 --- a/TAO/tao/Objref_VarOut_T.cpp +++ b/TAO/tao/Objref_VarOut_T.cpp @@ -15,7 +15,7 @@ ACE_RCSID (tao, template <typename T> TAO_Objref_Var_T<T>::TAO_Objref_Var_T (void) - : ptr_ (TAO::Objref_Traits<T>::nil ()) + : ptr_ (TAO::Objref_Traits<T>::tao_nil ()) { } @@ -24,21 +24,21 @@ TAO_Objref_Var_T<T>::TAO_Objref_Var_T ( const TAO_Objref_Var_T<T> & p ) : TAO_Base_var (), - ptr_ (TAO::Objref_Traits<T>::duplicate (p.ptr ())) + ptr_ (TAO::Objref_Traits<T>::tao_duplicate (p.ptr ())) { } template <typename T> TAO_Objref_Var_T<T>::~TAO_Objref_Var_T (void) { - TAO::Objref_Traits<T>::release (this->ptr_); + TAO::Objref_Traits<T>::tao_release (this->ptr_); } template <typename T> TAO_Objref_Var_T<T> & TAO_Objref_Var_T<T>::operator= (T * p) { - TAO::Objref_Traits<T>::release (this->ptr_); + TAO::Objref_Traits<T>::tao_release (this->ptr_); this->ptr_ = p; return *this; } @@ -51,8 +51,8 @@ TAO_Objref_Var_T<T>::operator= ( { if (this != &p) { - TAO::Objref_Traits<T>::release (this->ptr_); - this->ptr_ = TAO::Objref_Traits<T>::duplicate (p.ptr ()); + TAO::Objref_Traits<T>::tao_release (this->ptr_); + this->ptr_ = TAO::Objref_Traits<T>::tao_duplicate (p.ptr ()); } return *this; @@ -95,8 +95,8 @@ template <typename T> T *& TAO_Objref_Var_T<T>::out (void) { - TAO::Objref_Traits<T>::release (this->ptr_); - this->ptr_ = TAO::Objref_Traits<T>::nil (); + TAO::Objref_Traits<T>::tao_release (this->ptr_); + this->ptr_ = TAO::Objref_Traits<T>::tao_nil (); return this->ptr_; } @@ -105,7 +105,7 @@ T * TAO_Objref_Var_T<T>::_retn (void) { T * val = this->ptr_; - this->ptr_ = TAO::Objref_Traits<T>::nil (); + this->ptr_ = TAO::Objref_Traits<T>::tao_nil (); return val; } @@ -120,14 +120,14 @@ template <typename T> void TAO_Objref_Var_T<T>::free (void) { - TAO::Objref_Traits<T>::release (this->ptr_); + TAO::Objref_Traits<T>::tao_release (this->ptr_); } template <typename T> void TAO_Objref_Var_T<T>::reset (T * p) { - TAO::Objref_Traits<T>::release (this->ptr_); + TAO::Objref_Traits<T>::tao_release (this->ptr_); this->ptr_ = p; } @@ -137,7 +137,7 @@ template <typename T> TAO_Objref_Out_T<T>::TAO_Objref_Out_T (T *& p) : ptr_ (p) { - this->ptr_ = TAO::Objref_Traits<T>::nil (); + this->ptr_ = TAO::Objref_Traits<T>::tao_nil (); } template <typename T> @@ -146,8 +146,8 @@ TAO_Objref_Out_T<T>::TAO_Objref_Out_T ( ) : ptr_ (p.out ()) { - TAO::Objref_Traits<T>::release (this->ptr_); - this->ptr_ = TAO::Objref_Traits<T>::nil (); + TAO::Objref_Traits<T>::tao_release (this->ptr_); + this->ptr_ = TAO::Objref_Traits<T>::tao_nil (); } template <typename T> @@ -174,7 +174,7 @@ TAO_Objref_Out_T<T>::operator= ( const TAO_Objref_Var_T<T> & p ) { - this->ptr_ = TAO::Objref_Traits<T>::duplicate (p.ptr ()); + this->ptr_ = TAO::Objref_Traits<T>::tao_duplicate (p.ptr ()); return *this; } diff --git a/TAO/tao/Objref_VarOut_T.h b/TAO/tao/Objref_VarOut_T.h index f0d0fcf2407..a158f2b2f35 100644 --- a/TAO/tao/Objref_VarOut_T.h +++ b/TAO/tao/Objref_VarOut_T.h @@ -37,11 +37,11 @@ namespace TAO template<typename T> struct Objref_Traits { - static T * duplicate (T *); - static void release (T *); - static T * nil (void); - static CORBA::Boolean marshal (T *, - TAO_OutputCDR &); + static T * tao_duplicate (T *); + static void tao_release (T *); + static T * tao_nil (void); + static CORBA::Boolean tao_marshal (T *, + TAO_OutputCDR &); }; } diff --git a/TAO/tao/PICurrent.cpp b/TAO/tao/PICurrent.cpp index 8126af7647e..6c1929201ed 100644 --- a/TAO/tao/PICurrent.cpp +++ b/TAO/tao/PICurrent.cpp @@ -14,7 +14,6 @@ ACE_RCSID (tao, #include "ORB_Core.h" #include "TAO_Server_Request.h" #include "PICurrent_Copy_Callback.h" -#include "SystemException.h" TAO::PICurrent::PICurrent (TAO_ORB_Core * orb_core) @@ -121,7 +120,7 @@ TAO::PICurrent_Impl::get_slot (PortableInterceptor::SlotId id CORBA::Any (table[id]), // Make a copy. CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (any); @@ -135,7 +134,7 @@ TAO::PICurrent_Impl::get_slot (PortableInterceptor::SlotId id CORBA::Any, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (any); diff --git a/TAO/tao/PICurrent_ORBInitializer.cpp b/TAO/tao/PICurrent_ORBInitializer.cpp index f86a18151eb..c4f5255cdd7 100644 --- a/TAO/tao/PICurrent_ORBInitializer.cpp +++ b/TAO/tao/PICurrent_ORBInitializer.cpp @@ -4,7 +4,6 @@ #include "ORB_Core.h" #include "ORBInitInfo.h" -#include "SystemException.h" ACE_RCSID (tao, PICurrent_ORBInitializer, @@ -27,7 +26,7 @@ TAO_PICurrent_ORBInitializer::pre_init ( TAO::PICurrent (orb_core), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; diff --git a/TAO/tao/PI_Forward.pidl b/TAO/tao/PI_Forward.pidl index 5256404e9dc..a1269596552 100644 --- a/TAO/tao/PI_Forward.pidl +++ b/TAO/tao/PI_Forward.pidl @@ -43,8 +43,6 @@ module PortableInterceptor typedef string ORBId; typedef CORBA::StringSeq AdapterName; typedef CORBA::OctetSeq ObjectId; - typedef long AdapterManagerId; - typedef short AdapterState; }; #endif /* _PI_FORWARD_IDL_ */ diff --git a/TAO/tao/PI_ForwardC.cpp b/TAO/tao/PI_ForwardC.cpp index ab3fc77daa3..d989d5183a4 100644 --- a/TAO/tao/PI_ForwardC.cpp +++ b/TAO/tao/PI_ForwardC.cpp @@ -26,12 +26,10 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:303 +// be\be_codegen.cpp:323 #include "PI_ForwardC.h" -#include "tao/CDR.h" -#include "tao/ORB_Core.h" #include "tao/Typecode.h" #if defined (__BORLANDC__) @@ -39,11 +37,11 @@ #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) -#include "PI_ForwardC.inl" +#include "PI_ForwardC.i" #endif /* !defined INLINE */ // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:64 +// be\be_visitor_arg_traits.cpp:64 // Arg traits specializations. namespace TAO @@ -52,7 +50,7 @@ namespace TAO // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:290 +// be\be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_PortableInterceptor_ServerId[] = { @@ -93,7 +91,7 @@ namespace PortableInterceptor } // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:290 +// be\be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_PortableInterceptor_ORBId[] = { @@ -132,7 +130,7 @@ namespace PortableInterceptor } // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:290 +// be\be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_PortableInterceptor_AdapterName[] = { @@ -195,7 +193,7 @@ namespace PortableInterceptor } // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:290 +// be\be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_PortableInterceptor_ObjectId[] = { @@ -258,95 +256,7 @@ namespace PortableInterceptor } // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:290 - -static const CORBA::Long _oc_PortableInterceptor_AdapterManagerId[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 53, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x72636570), - ACE_NTOHL (0x746f722f), - ACE_NTOHL (0x41646170), - ACE_NTOHL (0x7465724d), - ACE_NTOHL (0x616e6167), - ACE_NTOHL (0x65724964), - ACE_NTOHL (0x3a312e30), - ACE_NTOHL (0x0), // repository ID = IDL:omg.org/PortableInterceptor/AdapterManagerId:1.0 - 17, - ACE_NTOHL (0x41646170), - ACE_NTOHL (0x7465724d), - ACE_NTOHL (0x616e6167), - ACE_NTOHL (0x65724964), - ACE_NTOHL (0x0), // name = AdapterManagerId - CORBA::tk_long, - -}; - -static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_AdapterManagerId ( - CORBA::tk_alias, - sizeof (_oc_PortableInterceptor_AdapterManagerId), - (char *) &_oc_PortableInterceptor_AdapterManagerId, - 0, - sizeof (PortableInterceptor::AdapterManagerId) - ); - -namespace PortableInterceptor -{ - ::CORBA::TypeCode_ptr _tc_AdapterManagerId = - &_tc_TAO_tc_PortableInterceptor_AdapterManagerId; -} - -// TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:290 - -static const CORBA::Long _oc_PortableInterceptor_AdapterState[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 49, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x72636570), - ACE_NTOHL (0x746f722f), - ACE_NTOHL (0x41646170), - ACE_NTOHL (0x74657253), - ACE_NTOHL (0x74617465), - ACE_NTOHL (0x3a312e30), - ACE_NTOHL (0x0), // repository ID = IDL:omg.org/PortableInterceptor/AdapterState:1.0 - 13, - ACE_NTOHL (0x41646170), - ACE_NTOHL (0x74657253), - ACE_NTOHL (0x74617465), - ACE_NTOHL (0x0), // name = AdapterState - CORBA::tk_short, - -}; - -static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_AdapterState ( - CORBA::tk_alias, - sizeof (_oc_PortableInterceptor_AdapterState), - (char *) &_oc_PortableInterceptor_AdapterState, - 0, - sizeof (PortableInterceptor::AdapterState) - ); - -namespace PortableInterceptor -{ - ::CORBA::TypeCode_ptr _tc_AdapterState = - &_tc_TAO_tc_PortableInterceptor_AdapterState; -} - -// TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1628 +// be\be_visitor_root/root.cpp:1633 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PI_ForwardC.h b/TAO/tao/PI_ForwardC.h index 9f876afd852..b1da5a26d1d 100644 --- a/TAO/tao/PI_ForwardC.h +++ b/TAO/tao/PI_ForwardC.h @@ -26,25 +26,21 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:153 +// be\be_codegen.cpp:171 #ifndef _TAO_IDL_ORIG_PI_FORWARDC_H_ #define _TAO_IDL_ORIG_PI_FORWARDC_H_ #include /**/ "ace/pre.h" - -#include "ace/config-all.h" +#include "OctetSeqC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/TAO_Export.h" -#include "tao/ORB.h" -#include "tao/Environment.h" -#include "OctetSeqC.h" #include "StringSeqC.h" #if defined (TAO_EXPORT_MACRO) @@ -71,88 +67,66 @@ #endif /* __BORLANDC__ */ // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48 +// be\be_visitor_module/module_ch.cpp:48 namespace PortableInterceptor { - + // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:376 - + // be\be_visitor_typedef/typedef_ch.cpp:376 + typedef char * ServerId; typedef CORBA::String_var ServerId_var; typedef CORBA::String_out ServerId_out; - + // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + // be\be_visitor_typecode/typecode_decl.cpp:44 + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerId; - + // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:376 - + // be\be_visitor_typedef/typedef_ch.cpp:376 + typedef char * ORBId; typedef CORBA::String_var ORBId_var; typedef CORBA::String_out ORBId_out; - + // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + // be\be_visitor_typecode/typecode_decl.cpp:44 + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORBId; - + // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:435 - + // be\be_visitor_typedef/typedef_ch.cpp:435 + typedef CORBA::StringSeq AdapterName; typedef CORBA::StringSeq_var AdapterName_var; typedef CORBA::StringSeq_out AdapterName_out; - + // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + // be\be_visitor_typecode/typecode_decl.cpp:44 + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterName; - + // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:435 - + // be\be_visitor_typedef/typedef_ch.cpp:435 + typedef CORBA::OctetSeq ObjectId; typedef CORBA::OctetSeq_var ObjectId_var; typedef CORBA::OctetSeq_out ObjectId_out; - + // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + // be\be_visitor_typecode/typecode_decl.cpp:44 + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectId; - - // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:342 - - typedef CORBA::Long AdapterManagerId; - typedef CORBA::Long_out AdapterManagerId_out; - - // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterManagerId; - - // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:342 - - typedef CORBA::Short AdapterState; - typedef CORBA::Short_out AdapterState_out; - - // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterState; // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:66 +// be\be_visitor_module/module_ch.cpp:66 } // module PortableInterceptor // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:59 +// be\be_visitor_traits.cpp:59 // Traits specializations. namespace TAO @@ -160,10 +134,10 @@ namespace TAO } // TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:958 +// be\be_codegen.cpp:978 #if defined (__ACE_INLINE__) -#include "PI_ForwardC.inl" +#include "PI_ForwardC.i" #endif /* defined INLINE */ #if defined(_MSC_VER) && (_MSC_VER >= 1200) diff --git a/TAO/tao/PI_ForwardC.i b/TAO/tao/PI_ForwardC.i new file mode 100644 index 00000000000..38aa32569ba --- /dev/null +++ b/TAO/tao/PI_ForwardC.i @@ -0,0 +1,28 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + + diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp index addf34ef1fd..a50804aa762 100644 --- a/TAO/tao/PolicyC.cpp +++ b/TAO/tao/PolicyC.cpp @@ -32,7 +32,6 @@ #include "PolicyC.h" #include "tao/CDR.h" #include "tao/Exception_Data.h" -#include "tao/SystemException.h" #include "tao/Invocation_Adapter.h" #include "tao/Object_T.h" #include "tao/Typecode.h" @@ -457,7 +456,7 @@ CORBA::TypeCode_ptr CORBA::InvalidPolicies::_type (void) const ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Policy_ptr -TAO::Objref_Traits<CORBA::Policy>::duplicate ( +TAO::Objref_Traits<CORBA::Policy>::tao_duplicate ( CORBA::Policy_ptr p ) { @@ -466,7 +465,7 @@ TAO::Objref_Traits<CORBA::Policy>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::Policy>::release ( +TAO::Objref_Traits<CORBA::Policy>::tao_release ( CORBA::Policy_ptr p ) { @@ -475,14 +474,14 @@ TAO::Objref_Traits<CORBA::Policy>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Policy_ptr -TAO::Objref_Traits<CORBA::Policy>::nil (void) +TAO::Objref_Traits<CORBA::Policy>::tao_nil (void) { return CORBA::Policy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::Policy>::marshal ( +TAO::Objref_Traits<CORBA::Policy>::tao_marshal ( CORBA::Policy_ptr p, TAO_OutputCDR & cdr ) @@ -734,7 +733,7 @@ CORBA::Policy::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::PolicyManager_ptr -TAO::Objref_Traits<CORBA::PolicyManager>::duplicate ( +TAO::Objref_Traits<CORBA::PolicyManager>::tao_duplicate ( CORBA::PolicyManager_ptr p ) { @@ -743,7 +742,7 @@ TAO::Objref_Traits<CORBA::PolicyManager>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::PolicyManager>::release ( +TAO::Objref_Traits<CORBA::PolicyManager>::tao_release ( CORBA::PolicyManager_ptr p ) { @@ -752,14 +751,14 @@ TAO::Objref_Traits<CORBA::PolicyManager>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::PolicyManager_ptr -TAO::Objref_Traits<CORBA::PolicyManager>::nil (void) +TAO::Objref_Traits<CORBA::PolicyManager>::tao_nil (void) { return CORBA::PolicyManager::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::PolicyManager>::marshal ( +TAO::Objref_Traits<CORBA::PolicyManager>::tao_marshal ( CORBA::PolicyManager_ptr p, TAO_OutputCDR & cdr ) @@ -879,7 +878,7 @@ CORBA::PolicyManager::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::PolicyCurrent_ptr -TAO::Objref_Traits<CORBA::PolicyCurrent>::duplicate ( +TAO::Objref_Traits<CORBA::PolicyCurrent>::tao_duplicate ( CORBA::PolicyCurrent_ptr p ) { @@ -888,7 +887,7 @@ TAO::Objref_Traits<CORBA::PolicyCurrent>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::PolicyCurrent>::release ( +TAO::Objref_Traits<CORBA::PolicyCurrent>::tao_release ( CORBA::PolicyCurrent_ptr p ) { @@ -897,14 +896,14 @@ TAO::Objref_Traits<CORBA::PolicyCurrent>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::PolicyCurrent_ptr -TAO::Objref_Traits<CORBA::PolicyCurrent>::nil (void) +TAO::Objref_Traits<CORBA::PolicyCurrent>::tao_nil (void) { return CORBA::PolicyCurrent::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::PolicyCurrent>::marshal ( +TAO::Objref_Traits<CORBA::PolicyCurrent>::tao_marshal ( CORBA::PolicyCurrent_ptr p, TAO_OutputCDR & cdr ) diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h index 1d4c2b5815f..4ac4a42dd25 100644 --- a/TAO/tao/PolicyC.h +++ b/TAO/tao/PolicyC.h @@ -40,8 +40,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/Environment.h" -#include "tao/UserException.h" -#include "tao/SystemException.h" +#include "tao/Exception.h" #include "tao/Object.h" #include "tao/Objref_VarOut_T.h" @@ -71,13 +70,13 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// 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; } @@ -87,62 +86,62 @@ namespace TAO namespace CORBA { - + // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:342 - + typedef CORBA::Short PolicyErrorCode; typedef CORBA::Short_out PolicyErrorCode_out; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyErrorCode; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const CORBA::PolicyErrorCode BAD_POLICY = 0; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const CORBA::PolicyErrorCode UNSUPPORTED_POLICY = 1; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const CORBA::PolicyErrorCode BAD_POLICY_TYPE = 2; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const CORBA::PolicyErrorCode BAD_POLICY_VALUE = 3; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const CORBA::PolicyErrorCode UNSUPPORTED_POLICY_VALUE = 4; - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_CORBA_POLICYERROR_CH_) #define _CORBA_POLICYERROR_CH_ - + class TAO_Export PolicyError : public CORBA::UserException { public: - + CORBA::PolicyErrorCode reason; PolicyError (void); PolicyError (const PolicyError &); ~PolicyError (void); PolicyError &operator= (const PolicyError &); - + static void _tao_any_destructor (void *); - + static PolicyError *_downcast (CORBA::Exception *); static CORBA::Exception *_alloc (void); @@ -154,51 +153,51 @@ namespace CORBA 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 - + PolicyError ( ACE_NESTED_CLASS (CORBA, PolicyErrorCode) _tao_reason ); - + // 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_PolicyError; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_CORBA_INVALIDPOLICIES_CH_) #define _CORBA_INVALIDPOLICIES_CH_ - + class TAO_Export InvalidPolicies : public CORBA::UserException { public: - + CORBA::UShortSeq indices; InvalidPolicies (void); InvalidPolicies (const InvalidPolicies &); ~InvalidPolicies (void); InvalidPolicies &operator= (const InvalidPolicies &); - + static void _tao_any_destructor (void *); - + static InvalidPolicies *_downcast (CORBA::Exception *); static CORBA::Exception *_alloc (void); @@ -210,47 +209,47 @@ namespace CORBA 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 - + InvalidPolicies ( const ACE_NESTED_CLASS (CORBA, UShortSeq) & _tao_indices ); - + // 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_InvalidPolicies; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_POLICY__VAR_OUT_CH_) #define _CORBA_POLICY__VAR_OUT_CH_ - + class Policy; typedef Policy *Policy_ptr; - + typedef TAO_Objref_Var_T< Policy > Policy_var; - + typedef TAO_Objref_Out_T< Policy @@ -258,13 +257,13 @@ namespace CORBA Policy_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_POLICY_CH_) #define _CORBA_POLICY_CH_ - + class TAO_Export Policy : public virtual CORBA::Object { @@ -272,65 +271,65 @@ namespace CORBA friend class TAO::Narrow_Utils<Policy>; typedef Policy_ptr _ptr_type; typedef Policy_var _var_type; - + // The static operations. static Policy_ptr _duplicate (Policy_ptr obj); - + static Policy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Policy_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Policy_ptr _nil (void) { return (Policy_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::PolicyType policy_type ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::Policy_ptr copy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // 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 )); - + // 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); @@ -344,21 +343,21 @@ namespace CORBA private: TAO::Collocation_Proxy_Broker *the_TAO_Policy_Proxy_Broker_; - + protected: // Concrete interface only. Policy (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_Policy_setup_collocation (void); - + // Concrete non-local interface only. Policy ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. Policy ( TAO_Stub *objref, @@ -366,38 +365,38 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~Policy (void); - + private: // Private and unimplemented for concrete interfaces. Policy (const Policy &); - + void operator= (const Policy &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Policy; - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_POLICYMANAGER__VAR_OUT_CH_) #define _CORBA_POLICYMANAGER__VAR_OUT_CH_ - + class PolicyManager; typedef PolicyManager *PolicyManager_ptr; - + typedef TAO_Objref_Var_T< PolicyManager > PolicyManager_var; - + typedef TAO_Objref_Out_T< PolicyManager @@ -405,43 +404,43 @@ namespace CORBA PolicyManager_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_POLICYMANAGER_CH_) #define _CORBA_POLICYMANAGER_CH_ - + class TAO_Export PolicyManager : public virtual CORBA::Object { public: typedef PolicyManager_ptr _ptr_type; typedef PolicyManager_var _var_type; - + // The static operations. static PolicyManager_ptr _duplicate (PolicyManager_ptr obj); - + static PolicyManager_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static PolicyManager_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static PolicyManager_ptr _nil (void) { return (PolicyManager_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::PolicyList * get_policy_overrides ( const CORBA::PolicyTypeSeq & ts ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -449,10 +448,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void set_policy_overrides ( const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add @@ -462,53 +461,53 @@ namespace CORBA CORBA::SystemException , CORBA::InvalidPolicies )) = 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. PolicyManager (void); - + virtual ~PolicyManager (void); - + private: // Private and unimplemented for concrete interfaces. PolicyManager (const PolicyManager &); - + void operator= (const PolicyManager &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyManager; - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_POLICYCURRENT__VAR_OUT_CH_) #define _CORBA_POLICYCURRENT__VAR_OUT_CH_ - + class PolicyCurrent; typedef PolicyCurrent *PolicyCurrent_ptr; - + typedef TAO_Objref_Var_T< PolicyCurrent > PolicyCurrent_var; - + typedef TAO_Objref_Out_T< PolicyCurrent @@ -516,13 +515,13 @@ namespace CORBA PolicyCurrent_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_POLICYCURRENT_CH_) #define _CORBA_POLICYCURRENT_CH_ - + class TAO_Export PolicyCurrent : public virtual CORBA::PolicyManager, public virtual CORBA::Current @@ -530,56 +529,56 @@ namespace CORBA public: typedef PolicyCurrent_ptr _ptr_type; typedef PolicyCurrent_var _var_type; - + // The static operations. static PolicyCurrent_ptr _duplicate (PolicyCurrent_ptr obj); - + static PolicyCurrent_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static PolicyCurrent_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static PolicyCurrent_ptr _nil (void) { return (PolicyCurrent_ptr)0; } - + static void _tao_any_destructor (void *); - + // 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. PolicyCurrent (void); - + virtual ~PolicyCurrent (void); - + private: // Private and unimplemented for concrete interfaces. PolicyCurrent (const PolicyCurrent &); - + void operator= (const PolicyCurrent &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyCurrent; // TAO_IDL - Generated from @@ -607,18 +606,18 @@ namespace TAO #if !defined (_CORBA_POLICY__TRAITS_CH_) #define _CORBA_POLICY__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<CORBA::Policy> { - static CORBA::Policy_ptr duplicate ( + static CORBA::Policy_ptr tao_duplicate ( CORBA::Policy_ptr ); - static void release ( + static void tao_release ( CORBA::Policy_ptr ); - static CORBA::Policy_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::Policy_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::Policy_ptr p, TAO_OutputCDR & cdr ); @@ -628,18 +627,18 @@ namespace TAO #if !defined (_CORBA_POLICYMANAGER__TRAITS_CH_) #define _CORBA_POLICYMANAGER__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<CORBA::PolicyManager> { - static CORBA::PolicyManager_ptr duplicate ( + static CORBA::PolicyManager_ptr tao_duplicate ( CORBA::PolicyManager_ptr ); - static void release ( + static void tao_release ( CORBA::PolicyManager_ptr ); - static CORBA::PolicyManager_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::PolicyManager_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::PolicyManager_ptr p, TAO_OutputCDR & cdr ); @@ -649,18 +648,18 @@ namespace TAO #if !defined (_CORBA_POLICYCURRENT__TRAITS_CH_) #define _CORBA_POLICYCURRENT__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<CORBA::PolicyCurrent> { - static CORBA::PolicyCurrent_ptr duplicate ( + static CORBA::PolicyCurrent_ptr tao_duplicate ( CORBA::PolicyCurrent_ptr ); - static void release ( + static void tao_release ( CORBA::PolicyCurrent_ptr ); - static CORBA::PolicyCurrent_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::PolicyCurrent_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::PolicyCurrent_ptr p, TAO_OutputCDR & cdr ); @@ -742,3 +741,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Policy_ptr &); #include /**/ "ace/post.h" #endif /* ifndef */ + diff --git a/TAO/tao/PolicyFactory_Registry.cpp b/TAO/tao/PolicyFactory_Registry.cpp index 2fc7b7da091..a4c6e2259a0 100644 --- a/TAO/tao/PolicyFactory_Registry.cpp +++ b/TAO/tao/PolicyFactory_Registry.cpp @@ -1,9 +1,6 @@ #include "PolicyFactory_Registry.h" #include "PortableInterceptorC.h" #include "ORB_Constants.h" -#include "SystemException.h" -#include "PolicyC.h" - ACE_RCSID (tao, PolicyFactory_Registry, @@ -39,7 +36,7 @@ TAO_PolicyFactory_Registry::register_policy_factory ( { ACE_THROW (CORBA::BAD_PARAM ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, EINVAL), CORBA::COMPLETED_NO)); } diff --git a/TAO/tao/Policy_Forward.pidl b/TAO/tao/Policy_Forward.pidl index 3b8ca403c1c..96c9e2e1bec 100644 --- a/TAO/tao/Policy_Forward.pidl +++ b/TAO/tao/Policy_Forward.pidl @@ -1,5 +1,3 @@ -// -*- IDL -*- - /** * @file Policy_Forward.pidl * diff --git a/TAO/tao/Policy_ForwardA.cpp b/TAO/tao/Policy_ForwardA.cpp index 0a4aca61ee6..c6d45c86850 100644 --- a/TAO/tao/Policy_ForwardA.cpp +++ b/TAO/tao/Policy_ForwardA.cpp @@ -26,7 +26,6 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html #include "Policy_ForwardC.h" -#include "tao/SystemException.h" #include "tao/Typecode.h" #include "tao/Any_Dual_Impl_T.h" #include "tao/Any_Basic_Impl_T.h" @@ -418,3 +417,4 @@ CORBA::Boolean operator>>= ( > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/Policy_ForwardC.cpp b/TAO/tao/Policy_ForwardC.cpp index 11609fa1252..5b41eace926 100644 --- a/TAO/tao/Policy_ForwardC.cpp +++ b/TAO/tao/Policy_ForwardC.cpp @@ -50,7 +50,7 @@ namespace TAO } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_POLICYLIST_CS_) @@ -106,7 +106,7 @@ void CORBA::PolicyList::_tao_any_destructor ( #endif /* end #if !defined */ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_POLICYTYPESEQ_CS_) @@ -171,23 +171,23 @@ CORBA::Boolean operator<< ( ) { CORBA::ULong _tao_seq_len = _tao_sequence.length (); - + if (strm << _tao_seq_len) { // Encode all elements. CORBA::Boolean _tao_marshal_flag = 1; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = - TAO::Objref_Traits<CORBA::Policy>::marshal ( + TAO::Objref_Traits<CORBA::Policy>::tao_marshal ( _tao_sequence[i].in (), strm ); } - + return _tao_marshal_flag; } - + return 0; } @@ -197,7 +197,7 @@ CORBA::Boolean operator>> ( ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -207,28 +207,28 @@ 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. CORBA::Boolean _tao_marshal_flag = 1; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = (strm >> _tao_sequence[i].out ()); } - + return _tao_marshal_flag; - + } - + return 0; } @@ -246,13 +246,13 @@ CORBA::Boolean operator<< ( ) { CORBA::ULong _tao_seq_len = _tao_sequence.length (); - + if (strm << _tao_seq_len) { // Encode all elements. return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); } - + return 0; } @@ -262,7 +262,7 @@ CORBA::Boolean operator>> ( ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -272,21 +272,21 @@ 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. return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - + } - + return 0; } @@ -305,12 +305,12 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::SetOverrideType &_tao_enum { CORBA::ULong _tao_temp = 0; CORBA::Boolean _tao_result = strm >> _tao_temp; - + if (_tao_result == 1) { _tao_enumval = ACE_static_cast (CORBA::SetOverrideType, _tao_temp); } - + return _tao_result; } @@ -443,4 +443,5 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::SetOverrideType &_tao_enum CORBA::PolicyType \ > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/Policy_ForwardC.h b/TAO/tao/Policy_ForwardC.h index 516e4a032d9..ff979fc2b4d 100644 --- a/TAO/tao/Policy_ForwardC.h +++ b/TAO/tao/Policy_ForwardC.h @@ -73,33 +73,33 @@ namespace CORBA { - + // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:342 - + typedef CORBA::ULong PolicyType; typedef CORBA::ULong_out PolicyType_out; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyType; - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_POLICY__VAR_OUT_CH_) #define _CORBA_POLICY__VAR_OUT_CH_ - + class Policy; typedef Policy *Policy_ptr; - + typedef TAO_Objref_Var_T< Policy > Policy_var; - + typedef TAO_Objref_Out_T< Policy @@ -107,15 +107,15 @@ namespace CORBA Policy_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_POLICYLIST_CH_) #define _CORBA_POLICYLIST_CH_ - + class PolicyList; - + typedef TAO_MngSeq_Var_T< PolicyList, @@ -125,7 +125,7 @@ namespace CORBA > > PolicyList_var; - + typedef TAO_MngSeq_Out_T< PolicyList, @@ -136,7 +136,7 @@ namespace CORBA > > PolicyList_out; - + class TAO_Export PolicyList : public TAO_Unbounded_Object_Sequence< @@ -150,39 +150,39 @@ namespace CORBA PolicyList ( CORBA::ULong max, CORBA::ULong length, - Policy_ptr* buffer, + Policy_ptr* buffer, CORBA::Boolean release = 0 ); PolicyList (const PolicyList &); ~PolicyList (void); - + static void _tao_any_destructor (void *); - + typedef PolicyList_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyList; - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_POLICYTYPESEQ_CH_) #define _CORBA_POLICYTYPESEQ_CH_ - + class PolicyTypeSeq; - + typedef TAO_FixedSeq_Var_T< PolicyTypeSeq, PolicyType > PolicyTypeSeq_var; - + typedef TAO_Seq_Out_T< PolicyTypeSeq, @@ -190,7 +190,7 @@ namespace CORBA PolicyType > PolicyTypeSeq_out; - + class TAO_Export PolicyTypeSeq : public TAO_Unbounded_Sequence< @@ -203,38 +203,38 @@ namespace CORBA PolicyTypeSeq ( CORBA::ULong max, CORBA::ULong length, - CORBA::ULong* buffer, + CORBA::ULong* buffer, CORBA::Boolean release = 0 ); PolicyTypeSeq (const PolicyTypeSeq &); ~PolicyTypeSeq (void); - + static void _tao_any_destructor (void *); - + typedef PolicyTypeSeq_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyTypeSeq; - + // TAO_IDL - Generated from // be\be_visitor_enum/enum_ch.cpp:57 - + enum SetOverrideType { SET_OVERRIDE, ADD_OVERRIDE }; - + typedef SetOverrideType &SetOverrideType_out; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SetOverrideType; // TAO_IDL - Generated from @@ -251,18 +251,18 @@ namespace TAO #if !defined (_CORBA_POLICY__TRAITS_CH_) #define _CORBA_POLICY__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<CORBA::Policy> { - static CORBA::Policy_ptr duplicate ( + static CORBA::Policy_ptr tao_duplicate ( CORBA::Policy_ptr ); - static void release ( + static void tao_release ( CORBA::Policy_ptr ); - static CORBA::Policy_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::Policy_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::Policy_ptr p, TAO_OutputCDR & cdr ); @@ -365,3 +365,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::SetOverrideType &); #include /**/ "ace/post.h" #endif /* ifndef */ + diff --git a/TAO/tao/Policy_Set.cpp b/TAO/tao/Policy_Set.cpp index 518901ec37d..0881e7ea41b 100644 --- a/TAO/tao/Policy_Set.cpp +++ b/TAO/tao/Policy_Set.cpp @@ -2,7 +2,6 @@ #include "Policy_Set.h" #include "Environment.h" -#include "SystemException.h" #include "debug.h" #if !defined (__ACE_INLINE__) diff --git a/TAO/tao/Policy_Set.h b/TAO/tao/Policy_Set.h index d54cbf9e7f9..6bd0220847c 100644 --- a/TAO/tao/Policy_Set.h +++ b/TAO/tao/Policy_Set.h @@ -49,7 +49,7 @@ public: /// Destructor ~TAO_Policy_Set (void); - /// Copy the state from @a source, it uses the copy() operator to + /// Copy the state from <source>, it uses the copy() operator to /// obtain independent copies of all the policies. void copy_from (TAO_Policy_Set* source ACE_ENV_ARG_DECL); diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp index acd5203ec22..1269caa0d2a 100644 --- a/TAO/tao/PollableC.cpp +++ b/TAO/tao/PollableC.cpp @@ -30,7 +30,6 @@ #include "PollableC.h" -#include "tao/SystemException.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" @@ -58,7 +57,7 @@ namespace TAO ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Pollable_ptr -TAO::Objref_Traits<CORBA::Pollable>::duplicate ( +TAO::Objref_Traits<CORBA::Pollable>::tao_duplicate ( CORBA::Pollable_ptr p ) { @@ -67,7 +66,7 @@ TAO::Objref_Traits<CORBA::Pollable>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::Pollable>::release ( +TAO::Objref_Traits<CORBA::Pollable>::tao_release ( CORBA::Pollable_ptr p ) { @@ -76,14 +75,14 @@ TAO::Objref_Traits<CORBA::Pollable>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Pollable_ptr -TAO::Objref_Traits<CORBA::Pollable>::nil (void) +TAO::Objref_Traits<CORBA::Pollable>::tao_nil (void) { return CORBA::Pollable::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::Pollable>::marshal ( +TAO::Objref_Traits<CORBA::Pollable>::tao_marshal ( CORBA::Pollable_ptr p, TAO_OutputCDR & cdr ) @@ -92,7 +91,7 @@ TAO::Objref_Traits<CORBA::Pollable>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_Pollable_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -113,10 +112,10 @@ CORBA::Pollable::_narrow ( { return Pollable::_nil (); } - + Pollable_ptr proxy = dynamic_cast<Pollable_ptr> (_tao_objref); - + return Pollable::_duplicate (proxy); } @@ -130,10 +129,10 @@ CORBA::Pollable::_unchecked_narrow ( { return Pollable::_nil (); } - + Pollable_ptr proxy = dynamic_cast<Pollable_ptr> (_tao_objref); - + return Pollable::_duplicate (proxy); } @@ -144,7 +143,7 @@ CORBA::Pollable::_duplicate (Pollable_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -195,7 +194,7 @@ CORBA::Pollable::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::DIIPollable_ptr -TAO::Objref_Traits<CORBA::DIIPollable>::duplicate ( +TAO::Objref_Traits<CORBA::DIIPollable>::tao_duplicate ( CORBA::DIIPollable_ptr p ) { @@ -204,7 +203,7 @@ TAO::Objref_Traits<CORBA::DIIPollable>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::DIIPollable>::release ( +TAO::Objref_Traits<CORBA::DIIPollable>::tao_release ( CORBA::DIIPollable_ptr p ) { @@ -213,14 +212,14 @@ TAO::Objref_Traits<CORBA::DIIPollable>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::DIIPollable_ptr -TAO::Objref_Traits<CORBA::DIIPollable>::nil (void) +TAO::Objref_Traits<CORBA::DIIPollable>::tao_nil (void) { return CORBA::DIIPollable::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::DIIPollable>::marshal ( +TAO::Objref_Traits<CORBA::DIIPollable>::tao_marshal ( CORBA::DIIPollable_ptr p, TAO_OutputCDR & cdr ) @@ -229,7 +228,7 @@ TAO::Objref_Traits<CORBA::DIIPollable>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_DIIPollable_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -250,10 +249,10 @@ CORBA::DIIPollable::_narrow ( { return DIIPollable::_nil (); } - + DIIPollable_ptr proxy = dynamic_cast<DIIPollable_ptr> (_tao_objref); - + return DIIPollable::_duplicate (proxy); } @@ -267,10 +266,10 @@ CORBA::DIIPollable::_unchecked_narrow ( { return DIIPollable::_nil (); } - + DIIPollable_ptr proxy = dynamic_cast<DIIPollable_ptr> (_tao_objref); - + return DIIPollable::_duplicate (proxy); } @@ -281,7 +280,7 @@ CORBA::DIIPollable::_duplicate (DIIPollable_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -336,7 +335,7 @@ CORBA::DIIPollable::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::PollableSet_ptr -TAO::Objref_Traits<CORBA::PollableSet>::duplicate ( +TAO::Objref_Traits<CORBA::PollableSet>::tao_duplicate ( CORBA::PollableSet_ptr p ) { @@ -345,7 +344,7 @@ TAO::Objref_Traits<CORBA::PollableSet>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::PollableSet>::release ( +TAO::Objref_Traits<CORBA::PollableSet>::tao_release ( CORBA::PollableSet_ptr p ) { @@ -354,14 +353,14 @@ TAO::Objref_Traits<CORBA::PollableSet>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::PollableSet_ptr -TAO::Objref_Traits<CORBA::PollableSet>::nil (void) +TAO::Objref_Traits<CORBA::PollableSet>::tao_nil (void) { return CORBA::PollableSet::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::PollableSet>::marshal ( +TAO::Objref_Traits<CORBA::PollableSet>::tao_marshal ( CORBA::PollableSet_ptr p, TAO_OutputCDR & cdr ) @@ -370,12 +369,12 @@ TAO::Objref_Traits<CORBA::PollableSet>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_PollableSet_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 CORBA::PollableSet::NoPossiblePollable::NoPossiblePollable (void) @@ -460,7 +459,7 @@ void CORBA::PollableSet::NoPossiblePollable::_tao_decode ( -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 CORBA::PollableSet::UnknownPollable::UnknownPollable (void) @@ -561,10 +560,10 @@ CORBA::PollableSet::_narrow ( { return PollableSet::_nil (); } - + PollableSet_ptr proxy = dynamic_cast<PollableSet_ptr> (_tao_objref); - + return PollableSet::_duplicate (proxy); } @@ -578,10 +577,10 @@ CORBA::PollableSet::_unchecked_narrow ( { return PollableSet::_nil (); } - + PollableSet_ptr proxy = dynamic_cast<PollableSet_ptr> (_tao_objref); - + return PollableSet::_duplicate (proxy); } @@ -592,7 +591,7 @@ CORBA::PollableSet::_duplicate (PollableSet_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -650,7 +649,7 @@ CORBA::PollableSet::marshal (TAO_OutputCDR &) TAO_Objref_Var_T< CORBA::PollableSet >; - + template class TAO_Objref_Out_T< CORBA::PollableSet @@ -665,7 +664,7 @@ CORBA::PollableSet::marshal (TAO_OutputCDR &) TAO_Objref_Var_T< CORBA::Pollable >; - + template class TAO_Objref_Out_T< CORBA::Pollable @@ -680,7 +679,7 @@ CORBA::PollableSet::marshal (TAO_OutputCDR &) TAO_Objref_Var_T< CORBA::DIIPollable >; - + template class TAO_Objref_Out_T< CORBA::DIIPollable @@ -697,7 +696,7 @@ CORBA::PollableSet::marshal (TAO_OutputCDR &) TAO_Objref_Var_T< \ CORBA::PollableSet > - + # pragma instantiate \ TAO_Objref_Out_T< \ CORBA::PollableSet @@ -712,7 +711,7 @@ CORBA::PollableSet::marshal (TAO_OutputCDR &) TAO_Objref_Var_T< \ CORBA::Pollable > - + # pragma instantiate \ TAO_Objref_Out_T< \ CORBA::Pollable @@ -727,10 +726,11 @@ CORBA::PollableSet::marshal (TAO_OutputCDR &) TAO_Objref_Var_T< \ CORBA::DIIPollable > - + # pragma instantiate \ TAO_Objref_Out_T< \ CORBA::DIIPollable > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/PollableC.h b/TAO/tao/PollableC.h index cf49db5e05d..1b6f8da199a 100644 --- a/TAO/tao/PollableC.h +++ b/TAO/tao/PollableC.h @@ -33,15 +33,14 @@ #include /**/ "ace/pre.h" -#include "tao/TAO_Export.h" +#include "tao/ORB.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/TAO_Export.h" #include "tao/Environment.h" -#include "tao/SystemException.h" -#include "tao/UserException.h" #include "tao/Object.h" #include "tao/Objref_VarOut_T.h" @@ -68,13 +67,13 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// 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; } @@ -84,22 +83,22 @@ namespace TAO namespace CORBA { - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_POLLABLESET__VAR_OUT_CH_) #define _CORBA_POLLABLESET__VAR_OUT_CH_ - + class PollableSet; typedef PollableSet *PollableSet_ptr; - + typedef TAO_Objref_Var_T< PollableSet > PollableSet_var; - + typedef TAO_Objref_Out_T< PollableSet @@ -107,22 +106,22 @@ namespace CORBA PollableSet_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_POLLABLE__VAR_OUT_CH_) #define _CORBA_POLLABLE__VAR_OUT_CH_ - + class Pollable; typedef Pollable *Pollable_ptr; - + typedef TAO_Objref_Var_T< Pollable > Pollable_var; - + typedef TAO_Objref_Out_T< Pollable @@ -130,43 +129,43 @@ namespace CORBA Pollable_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_POLLABLE_CH_) #define _CORBA_POLLABLE_CH_ - + class TAO_Export Pollable : public virtual CORBA::Object { public: typedef Pollable_ptr _ptr_type; typedef Pollable_var _var_type; - + // The static operations. static Pollable_ptr _duplicate (Pollable_ptr obj); - + static Pollable_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Pollable_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Pollable_ptr _nil (void) { return (Pollable_ptr)0; } - - - + + + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Boolean is_ready ( CORBA::ULong timeout ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -174,58 +173,58 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::PollableSet_ptr create_pollable_set ( 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. Pollable (void); - + virtual ~Pollable (void); - + private: // Private and unimplemented for concrete interfaces. Pollable (const Pollable &); - + void operator= (const Pollable &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_DIIPOLLABLE__VAR_OUT_CH_) #define _CORBA_DIIPOLLABLE__VAR_OUT_CH_ - + class DIIPollable; typedef DIIPollable *DIIPollable_ptr; - + typedef TAO_Objref_Var_T< DIIPollable > DIIPollable_var; - + typedef TAO_Objref_Out_T< DIIPollable @@ -233,115 +232,115 @@ namespace CORBA DIIPollable_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_DIIPOLLABLE_CH_) #define _CORBA_DIIPOLLABLE_CH_ - + class TAO_Export DIIPollable : public virtual CORBA::Pollable { public: typedef DIIPollable_ptr _ptr_type; typedef DIIPollable_var _var_type; - + // The static operations. static DIIPollable_ptr _duplicate (DIIPollable_ptr obj); - + static DIIPollable_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static DIIPollable_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static DIIPollable_ptr _nil (void) { return (DIIPollable_ptr)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. DIIPollable (void); - + virtual ~DIIPollable (void); - + private: // Private and unimplemented for concrete interfaces. DIIPollable (const DIIPollable &); - + void operator= (const DIIPollable &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_POLLABLESET_CH_) #define _CORBA_POLLABLESET_CH_ - + class TAO_Export PollableSet : public virtual CORBA::Object { public: typedef PollableSet_ptr _ptr_type; typedef PollableSet_var _var_type; - + // The static operations. static PollableSet_ptr _duplicate (PollableSet_ptr obj); - + static PollableSet_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static PollableSet_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static PollableSet_ptr _nil (void) { return (PollableSet_ptr)0; } - - - + + + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_CORBA_POLLABLESET_NOPOSSIBLEPOLLABLE_CH_) #define _CORBA_POLLABLESET_NOPOSSIBLEPOLLABLE_CH_ - + class TAO_Export NoPossiblePollable : public CORBA::UserException { public: - + NoPossiblePollable (void); NoPossiblePollable (const NoPossiblePollable &); ~NoPossiblePollable (void); NoPossiblePollable &operator= (const NoPossiblePollable &); - + static NoPossiblePollable *_downcast (CORBA::Exception *); static CORBA::Exception *_alloc (void); @@ -353,34 +352,34 @@ namespace CORBA 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 }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_CORBA_POLLABLESET_UNKNOWNPOLLABLE_CH_) #define _CORBA_POLLABLESET_UNKNOWNPOLLABLE_CH_ - + class TAO_Export UnknownPollable : public CORBA::UserException { public: - + UnknownPollable (void); UnknownPollable (const UnknownPollable &); ~UnknownPollable (void); UnknownPollable &operator= (const UnknownPollable &); - + static UnknownPollable *_downcast (CORBA::Exception *); static CORBA::Exception *_alloc (void); @@ -392,31 +391,31 @@ namespace CORBA 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 }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::DIIPollable_ptr create_dii_pollable ( 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 add_pollable ( CORBA::Pollable_ptr potential ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -424,10 +423,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::Pollable_ptr poll ( CORBA::ULong timeout ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -436,10 +435,10 @@ namespace CORBA CORBA::SystemException , CORBA::PollableSet::NoPossiblePollable )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void remove ( CORBA::Pollable_ptr potential ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -448,38 +447,38 @@ namespace CORBA CORBA::SystemException , CORBA::PollableSet::UnknownPollable )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::UShort number_left ( 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. PollableSet (void); - + virtual ~PollableSet (void); - + private: // Private and unimplemented for concrete interfaces. PollableSet (const PollableSet &); - + void operator= (const PollableSet &); }; @@ -499,18 +498,18 @@ namespace TAO #if !defined (_CORBA_POLLABLESET__TRAITS_CH_) #define _CORBA_POLLABLESET__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<CORBA::PollableSet> { - static CORBA::PollableSet_ptr duplicate ( + static CORBA::PollableSet_ptr tao_duplicate ( CORBA::PollableSet_ptr ); - static void release ( + static void tao_release ( CORBA::PollableSet_ptr ); - static CORBA::PollableSet_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::PollableSet_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::PollableSet_ptr p, TAO_OutputCDR & cdr ); @@ -520,18 +519,18 @@ namespace TAO #if !defined (_CORBA_POLLABLE__TRAITS_CH_) #define _CORBA_POLLABLE__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<CORBA::Pollable> { - static CORBA::Pollable_ptr duplicate ( + static CORBA::Pollable_ptr tao_duplicate ( CORBA::Pollable_ptr ); - static void release ( + static void tao_release ( CORBA::Pollable_ptr ); - static CORBA::Pollable_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::Pollable_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::Pollable_ptr p, TAO_OutputCDR & cdr ); @@ -541,18 +540,18 @@ namespace TAO #if !defined (_CORBA_DIIPOLLABLE__TRAITS_CH_) #define _CORBA_DIIPOLLABLE__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<CORBA::DIIPollable> { - static CORBA::DIIPollable_ptr duplicate ( + static CORBA::DIIPollable_ptr tao_duplicate ( CORBA::DIIPollable_ptr ); - static void release ( + static void tao_release ( CORBA::DIIPollable_ptr ); - static CORBA::DIIPollable_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::DIIPollable_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::DIIPollable_ptr p, TAO_OutputCDR & cdr ); @@ -579,3 +578,4 @@ namespace TAO #include /**/ "ace/post.h" #endif /* ifndef */ + diff --git a/TAO/tao/PortableInterceptor.pidl b/TAO/tao/PortableInterceptor.pidl index 9a7d5978800..61dbfdcba82 100644 --- a/TAO/tao/PortableInterceptor.pidl +++ b/TAO/tao/PortableInterceptor.pidl @@ -49,12 +49,6 @@ module PortableInterceptor { typeprefix PortableInterceptor "omg.org"; - const AdapterState HOLDING = 0; - const AdapterState ACTIVE = 1; - const AdapterState DISCARDING = 2; - const AdapterState INACTIVE = 3; - const AdapterState NON_EXISTENT = 4; - local interface Interceptor { readonly attribute string name; diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp index 7b515073623..6a2fd23f1b9 100644 --- a/TAO/tao/PortableInterceptorC.cpp +++ b/TAO/tao/PortableInterceptorC.cpp @@ -32,8 +32,6 @@ #include "PortableInterceptorC.h" #include "tao/CDR.h" #include "tao/Typecode.h" -#include "tao/PolicyC.h" -#include "tao/SystemException.h" #include "ace/OS_NS_string.h" #if defined (__BORLANDC__) @@ -60,7 +58,7 @@ namespace TAO ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::Interceptor_ptr -TAO::Objref_Traits<PortableInterceptor::Interceptor>::duplicate ( +TAO::Objref_Traits<PortableInterceptor::Interceptor>::tao_duplicate ( PortableInterceptor::Interceptor_ptr p ) { @@ -69,7 +67,7 @@ TAO::Objref_Traits<PortableInterceptor::Interceptor>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableInterceptor::Interceptor>::release ( +TAO::Objref_Traits<PortableInterceptor::Interceptor>::tao_release ( PortableInterceptor::Interceptor_ptr p ) { @@ -78,14 +76,14 @@ TAO::Objref_Traits<PortableInterceptor::Interceptor>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::Interceptor_ptr -TAO::Objref_Traits<PortableInterceptor::Interceptor>::nil (void) +TAO::Objref_Traits<PortableInterceptor::Interceptor>::tao_nil (void) { return PortableInterceptor::Interceptor::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableInterceptor::Interceptor>::marshal ( +TAO::Objref_Traits<PortableInterceptor::Interceptor>::tao_marshal ( PortableInterceptor::Interceptor_ptr p, TAO_OutputCDR & cdr ) @@ -583,7 +581,7 @@ CORBA::TypeCode_ptr PortableInterceptor::InvalidSlot::_type (void) const ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::Current_ptr -TAO::Objref_Traits<PortableInterceptor::Current>::duplicate ( +TAO::Objref_Traits<PortableInterceptor::Current>::tao_duplicate ( PortableInterceptor::Current_ptr p ) { @@ -592,7 +590,7 @@ TAO::Objref_Traits<PortableInterceptor::Current>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableInterceptor::Current>::release ( +TAO::Objref_Traits<PortableInterceptor::Current>::tao_release ( PortableInterceptor::Current_ptr p ) { @@ -601,14 +599,14 @@ TAO::Objref_Traits<PortableInterceptor::Current>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::Current_ptr -TAO::Objref_Traits<PortableInterceptor::Current>::nil (void) +TAO::Objref_Traits<PortableInterceptor::Current>::tao_nil (void) { return PortableInterceptor::Current::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableInterceptor::Current>::marshal ( +TAO::Objref_Traits<PortableInterceptor::Current>::tao_marshal ( PortableInterceptor::Current_ptr p, TAO_OutputCDR & cdr ) @@ -732,7 +730,7 @@ PortableInterceptor::Current::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::RequestInfo_ptr -TAO::Objref_Traits<PortableInterceptor::RequestInfo>::duplicate ( +TAO::Objref_Traits<PortableInterceptor::RequestInfo>::tao_duplicate ( PortableInterceptor::RequestInfo_ptr p ) { @@ -741,7 +739,7 @@ TAO::Objref_Traits<PortableInterceptor::RequestInfo>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableInterceptor::RequestInfo>::release ( +TAO::Objref_Traits<PortableInterceptor::RequestInfo>::tao_release ( PortableInterceptor::RequestInfo_ptr p ) { @@ -750,14 +748,14 @@ TAO::Objref_Traits<PortableInterceptor::RequestInfo>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::RequestInfo_ptr -TAO::Objref_Traits<PortableInterceptor::RequestInfo>::nil (void) +TAO::Objref_Traits<PortableInterceptor::RequestInfo>::tao_nil (void) { return PortableInterceptor::RequestInfo::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableInterceptor::RequestInfo>::marshal ( +TAO::Objref_Traits<PortableInterceptor::RequestInfo>::tao_marshal ( PortableInterceptor::RequestInfo_ptr p, TAO_OutputCDR & cdr ) @@ -877,7 +875,7 @@ PortableInterceptor::RequestInfo::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::ClientRequestInfo_ptr -TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::duplicate ( +TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::tao_duplicate ( PortableInterceptor::ClientRequestInfo_ptr p ) { @@ -886,7 +884,7 @@ TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::release ( +TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::tao_release ( PortableInterceptor::ClientRequestInfo_ptr p ) { @@ -895,14 +893,14 @@ TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::ClientRequestInfo_ptr -TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::nil (void) +TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::tao_nil (void) { return PortableInterceptor::ClientRequestInfo::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::marshal ( +TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::tao_marshal ( PortableInterceptor::ClientRequestInfo_ptr p, TAO_OutputCDR & cdr ) @@ -1026,7 +1024,7 @@ PortableInterceptor::ClientRequestInfo::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::ServerRequestInfo_ptr -TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::duplicate ( +TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::tao_duplicate ( PortableInterceptor::ServerRequestInfo_ptr p ) { @@ -1035,7 +1033,7 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::release ( +TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::tao_release ( PortableInterceptor::ServerRequestInfo_ptr p ) { @@ -1044,14 +1042,14 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::ServerRequestInfo_ptr -TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::nil (void) +TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::tao_nil (void) { return PortableInterceptor::ServerRequestInfo::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::marshal ( +TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::tao_marshal ( PortableInterceptor::ServerRequestInfo_ptr p, TAO_OutputCDR & cdr ) @@ -1175,7 +1173,7 @@ PortableInterceptor::ServerRequestInfo::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::ClientRequestInterceptor_ptr -TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::duplicate ( +TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::tao_duplicate ( PortableInterceptor::ClientRequestInterceptor_ptr p ) { @@ -1184,7 +1182,7 @@ TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::release ( +TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::tao_release ( PortableInterceptor::ClientRequestInterceptor_ptr p ) { @@ -1193,14 +1191,14 @@ TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::ClientRequestInterceptor_ptr -TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::nil (void) +TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::tao_nil (void) { return PortableInterceptor::ClientRequestInterceptor::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::marshal ( +TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::tao_marshal ( PortableInterceptor::ClientRequestInterceptor_ptr p, TAO_OutputCDR & cdr ) @@ -1324,7 +1322,7 @@ PortableInterceptor::ClientRequestInterceptor::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::ServerRequestInterceptor_ptr -TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::duplicate ( +TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::tao_duplicate ( PortableInterceptor::ServerRequestInterceptor_ptr p ) { @@ -1333,7 +1331,7 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::release ( +TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::tao_release ( PortableInterceptor::ServerRequestInterceptor_ptr p ) { @@ -1342,14 +1340,14 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::ServerRequestInterceptor_ptr -TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::nil (void) +TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::tao_nil (void) { return PortableInterceptor::ServerRequestInterceptor::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::marshal ( +TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::tao_marshal ( PortableInterceptor::ServerRequestInterceptor_ptr p, TAO_OutputCDR & cdr ) @@ -1484,7 +1482,7 @@ PortableInterceptor::PolicyFactory::_create_policy (CORBA::PolicyType ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::PolicyFactory_ptr -TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::duplicate ( +TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::tao_duplicate ( PortableInterceptor::PolicyFactory_ptr p ) { @@ -1493,7 +1491,7 @@ TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::release ( +TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::tao_release ( PortableInterceptor::PolicyFactory_ptr p ) { @@ -1502,14 +1500,14 @@ TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::PolicyFactory_ptr -TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::nil (void) +TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::tao_nil (void) { return PortableInterceptor::PolicyFactory::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::marshal ( +TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::tao_marshal ( PortableInterceptor::PolicyFactory_ptr p, TAO_OutputCDR & cdr ) @@ -1629,7 +1627,7 @@ PortableInterceptor::PolicyFactory::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::ORBInitInfo_ptr -TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::duplicate ( +TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::tao_duplicate ( PortableInterceptor::ORBInitInfo_ptr p ) { @@ -1638,7 +1636,7 @@ TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::release ( +TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::tao_release ( PortableInterceptor::ORBInitInfo_ptr p ) { @@ -1647,14 +1645,14 @@ TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::ORBInitInfo_ptr -TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::nil (void) +TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::tao_nil (void) { return PortableInterceptor::ORBInitInfo::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::marshal ( +TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::tao_marshal ( PortableInterceptor::ORBInitInfo_ptr p, TAO_OutputCDR & cdr ) @@ -2070,7 +2068,7 @@ PortableInterceptor::ORBInitInfo::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::ORBInitializer_ptr -TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::duplicate ( +TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::tao_duplicate ( PortableInterceptor::ORBInitializer_ptr p ) { @@ -2079,7 +2077,7 @@ TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::release ( +TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::tao_release ( PortableInterceptor::ORBInitializer_ptr p ) { @@ -2088,14 +2086,14 @@ TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::ORBInitializer_ptr -TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::nil (void) +TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::tao_nil (void) { return PortableInterceptor::ORBInitializer::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::marshal ( +TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::tao_marshal ( PortableInterceptor::ORBInitializer_ptr p, TAO_OutputCDR & cdr ) diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h index 98d3b4e9bdb..677abef7e62 100644 --- a/TAO/tao/PortableInterceptorC.h +++ b/TAO/tao/PortableInterceptorC.h @@ -46,8 +46,7 @@ #include "PI_ForwardC.h" #include "tao/Messaging_SyncScopeC.h" #include "tao/IOP_CodecC.h" -#include "tao/PolicyC.h" -#include "tao/CurrentC.h" +#include "tao/Policy_ForwardC.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -99,31 +98,6 @@ namespace PortableInterceptor { // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - - const PortableInterceptor::AdapterState HOLDING = 0; - - // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - - const PortableInterceptor::AdapterState ACTIVE = 1; - - // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - - const PortableInterceptor::AdapterState DISCARDING = 2; - - // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - - const PortableInterceptor::AdapterState INACTIVE = 3; - - // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - - const PortableInterceptor::AdapterState NON_EXISTENT = 4; - - // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR__VAR_OUT_CH_) @@ -2004,14 +1978,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<PortableInterceptor::Interceptor> { - static PortableInterceptor::Interceptor_ptr duplicate ( + static PortableInterceptor::Interceptor_ptr tao_duplicate ( PortableInterceptor::Interceptor_ptr ); - static void release ( + static void tao_release ( PortableInterceptor::Interceptor_ptr ); - static PortableInterceptor::Interceptor_ptr nil (void); - static CORBA::Boolean marshal ( + static PortableInterceptor::Interceptor_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( PortableInterceptor::Interceptor_ptr p, TAO_OutputCDR & cdr ); @@ -2025,14 +1999,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<PortableInterceptor::Current> { - static PortableInterceptor::Current_ptr duplicate ( + static PortableInterceptor::Current_ptr tao_duplicate ( PortableInterceptor::Current_ptr ); - static void release ( + static void tao_release ( PortableInterceptor::Current_ptr ); - static PortableInterceptor::Current_ptr nil (void); - static CORBA::Boolean marshal ( + static PortableInterceptor::Current_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( PortableInterceptor::Current_ptr p, TAO_OutputCDR & cdr ); @@ -2046,14 +2020,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<PortableInterceptor::RequestInfo> { - static PortableInterceptor::RequestInfo_ptr duplicate ( + static PortableInterceptor::RequestInfo_ptr tao_duplicate ( PortableInterceptor::RequestInfo_ptr ); - static void release ( + static void tao_release ( PortableInterceptor::RequestInfo_ptr ); - static PortableInterceptor::RequestInfo_ptr nil (void); - static CORBA::Boolean marshal ( + static PortableInterceptor::RequestInfo_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( PortableInterceptor::RequestInfo_ptr p, TAO_OutputCDR & cdr ); @@ -2067,14 +2041,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<PortableInterceptor::ClientRequestInfo> { - static PortableInterceptor::ClientRequestInfo_ptr duplicate ( + static PortableInterceptor::ClientRequestInfo_ptr tao_duplicate ( PortableInterceptor::ClientRequestInfo_ptr ); - static void release ( + static void tao_release ( PortableInterceptor::ClientRequestInfo_ptr ); - static PortableInterceptor::ClientRequestInfo_ptr nil (void); - static CORBA::Boolean marshal ( + static PortableInterceptor::ClientRequestInfo_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( PortableInterceptor::ClientRequestInfo_ptr p, TAO_OutputCDR & cdr ); @@ -2088,14 +2062,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<PortableInterceptor::ServerRequestInfo> { - static PortableInterceptor::ServerRequestInfo_ptr duplicate ( + static PortableInterceptor::ServerRequestInfo_ptr tao_duplicate ( PortableInterceptor::ServerRequestInfo_ptr ); - static void release ( + static void tao_release ( PortableInterceptor::ServerRequestInfo_ptr ); - static PortableInterceptor::ServerRequestInfo_ptr nil (void); - static CORBA::Boolean marshal ( + static PortableInterceptor::ServerRequestInfo_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( PortableInterceptor::ServerRequestInfo_ptr p, TAO_OutputCDR & cdr ); @@ -2109,14 +2083,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<PortableInterceptor::ClientRequestInterceptor> { - static PortableInterceptor::ClientRequestInterceptor_ptr duplicate ( + static PortableInterceptor::ClientRequestInterceptor_ptr tao_duplicate ( PortableInterceptor::ClientRequestInterceptor_ptr ); - static void release ( + static void tao_release ( PortableInterceptor::ClientRequestInterceptor_ptr ); - static PortableInterceptor::ClientRequestInterceptor_ptr nil (void); - static CORBA::Boolean marshal ( + static PortableInterceptor::ClientRequestInterceptor_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( PortableInterceptor::ClientRequestInterceptor_ptr p, TAO_OutputCDR & cdr ); @@ -2130,14 +2104,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<PortableInterceptor::ServerRequestInterceptor> { - static PortableInterceptor::ServerRequestInterceptor_ptr duplicate ( + static PortableInterceptor::ServerRequestInterceptor_ptr tao_duplicate ( PortableInterceptor::ServerRequestInterceptor_ptr ); - static void release ( + static void tao_release ( PortableInterceptor::ServerRequestInterceptor_ptr ); - static PortableInterceptor::ServerRequestInterceptor_ptr nil (void); - static CORBA::Boolean marshal ( + static PortableInterceptor::ServerRequestInterceptor_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( PortableInterceptor::ServerRequestInterceptor_ptr p, TAO_OutputCDR & cdr ); @@ -2151,14 +2125,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<PortableInterceptor::PolicyFactory> { - static PortableInterceptor::PolicyFactory_ptr duplicate ( + static PortableInterceptor::PolicyFactory_ptr tao_duplicate ( PortableInterceptor::PolicyFactory_ptr ); - static void release ( + static void tao_release ( PortableInterceptor::PolicyFactory_ptr ); - static PortableInterceptor::PolicyFactory_ptr nil (void); - static CORBA::Boolean marshal ( + static PortableInterceptor::PolicyFactory_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( PortableInterceptor::PolicyFactory_ptr p, TAO_OutputCDR & cdr ); @@ -2172,14 +2146,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<PortableInterceptor::ORBInitInfo> { - static PortableInterceptor::ORBInitInfo_ptr duplicate ( + static PortableInterceptor::ORBInitInfo_ptr tao_duplicate ( PortableInterceptor::ORBInitInfo_ptr ); - static void release ( + static void tao_release ( PortableInterceptor::ORBInitInfo_ptr ); - static PortableInterceptor::ORBInitInfo_ptr nil (void); - static CORBA::Boolean marshal ( + static PortableInterceptor::ORBInitInfo_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( PortableInterceptor::ORBInitInfo_ptr p, TAO_OutputCDR & cdr ); @@ -2193,14 +2167,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<PortableInterceptor::ORBInitializer> { - static PortableInterceptor::ORBInitializer_ptr duplicate ( + static PortableInterceptor::ORBInitializer_ptr tao_duplicate ( PortableInterceptor::ORBInitializer_ptr ); - static void release ( + static void tao_release ( PortableInterceptor::ORBInitializer_ptr ); - static PortableInterceptor::ORBInitializer_ptr nil (void); - static CORBA::Boolean marshal ( + static PortableInterceptor::ORBInitializer_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( PortableInterceptor::ORBInitializer_ptr p, TAO_OutputCDR & cdr ); diff --git a/TAO/tao/PortableServer.mpc b/TAO/tao/PortableServer.mpc index a007761a246..06239a7fdc0 100644 --- a/TAO/tao/PortableServer.mpc +++ b/TAO/tao/PortableServer.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, core { +project : taolib, core, objreftemplate, iorinterceptor { sharedname = TAO_PortableServer dynamicflags = TAO_PORTABLESERVER_BUILD_DLL @@ -22,8 +22,4 @@ project : taolib, core { Resource_Files { PortableServer } - - PIDL_Files { - PortableServer - } } diff --git a/TAO/tao/PortableServer/AMH_Response_Handler.cpp b/TAO/tao/PortableServer/AMH_Response_Handler.cpp new file mode 100644 index 00000000000..b22c6deee0a --- /dev/null +++ b/TAO/tao/PortableServer/AMH_Response_Handler.cpp @@ -0,0 +1,273 @@ +// $Id$ + +#include "AMH_Response_Handler.h" +#include "tao/TAO_Server_Request.h" +#include "tao/Transport.h" +#include "tao/CDR.h" +#include "tao/ORB_Core.h" +#include "tao/ORB.h" +#include "tao/Pluggable_Messaging.h" +#include "tao/Pluggable_Messaging_Utils.h" +#include "tao/GIOP_Utils.h" +#include "tao/debug.h" +#include "tao/Buffer_Allocator_T.h" +#include "ace/Copy_Disabled.h" + +TAO_AMH_Response_Handler::TAO_AMH_Response_Handler () + : mesg_base_ (0) + , request_id_ (0) + , transport_ (0) + , orb_core_ (0) + , argument_flag_ (1) + , exception_type_ (TAO_GIOP_NO_EXCEPTION) + , reply_status_ (TAO_RS_UNINITIALIZED) + , allocator_ (0) +{ +} + +TAO_AMH_Response_Handler::~TAO_AMH_Response_Handler (void) +{ + this->transport_->remove_reference (); + + // Since we are destroying the object we put a huge lock around the + // whole destruction process (just paranoid). + { + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); + + if (this->response_expected_ == 0) //oneway ? + { + return; + } + + // If the ResponseHandler is being destroyed before a reply has + // been sent to the client, we send a system exception + // CORBA::NO_RESPONSE, with minor code to indicate the problem. + if (this->reply_status_ == TAO_RS_SENT) + { + return; + } + + // If sending the exception to the client fails, then we just give + // up, release the transport and return. + ACE_DECLARE_NEW_CORBA_ENV; + ACE_TRY + { + CORBA::NO_RESPONSE ex (CORBA::SystemException::_tao_minor_code + (TAO_AMH_REPLY_LOCATION_CODE, + EFAULT), + CORBA::COMPLETED_NO); + this->_tao_rh_send_exception (ex ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + } + ACE_CATCHALL + { + } + ACE_ENDTRY; + ACE_CHECK; + } +} + +void +TAO_AMH_Response_Handler::init(TAO_ServerRequest &server_request, + TAO_AMH_BUFFER_ALLOCATOR* allocator) +{ + mesg_base_ = server_request.mesg_base_; + request_id_ = server_request.request_id_; + response_expected_ = server_request.response_expected_; + transport_ = server_request.transport (); + orb_core_ = server_request.orb_core (); + allocator_ = allocator; + + this->transport_->add_reference (); +} + +void +TAO_AMH_Response_Handler::_tao_rh_init_reply (ACE_ENV_SINGLE_ARG_DECL) +{ + { + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); + if (this->reply_status_ != TAO_RS_UNINITIALIZED) + { + // Looks like someone is trying to call an AMH method + // more than once + // + // We assume that the servant has already processed the + // request and is now trying to send back the reply. Hence we + // say that the operation has completed but let the server + // anyway that it is not doing something right. + ACE_THROW (CORBA::BAD_INV_ORDER + (CORBA::SystemException::_tao_minor_code + (TAO_AMH_REPLY_LOCATION_CODE, + EEXIST), + CORBA::COMPLETED_YES)); + } + } + + // Construct our reply generator. + TAO_Pluggable_Reply_Params_Base reply_params; + reply_params.request_id_ = this->request_id_; + reply_params.service_context_notowned (&(this->reply_service_context_.service_info ())); + reply_params.argument_flag_ = this->argument_flag_; + + if (this->exception_type_ == TAO_GIOP_NO_EXCEPTION) + { + reply_params.reply_status_ = TAO_PLUGGABLE_MESSAGE_NO_EXCEPTION; + } + else + { + reply_params.reply_status_ = this->exception_type_; + } + + { + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); + + this->mesg_base_->generate_reply_header (this->_tao_out, + reply_params); + + // We are done initialising the reply + this->reply_status_ = TAO_RS_INITIALIZED; + } + +} + +void +TAO_AMH_Response_Handler::_tao_rh_send_reply (ACE_ENV_SINGLE_ARG_DECL) +{ + + { + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); + + // If the reply has not been initialised, raise an exception to the + // server-app saying it is not doing something right. + if (this->reply_status_ != TAO_RS_INITIALIZED) + { + ACE_THROW (CORBA::BAD_INV_ORDER ( + CORBA::SystemException::_tao_minor_code ( + TAO_AMH_REPLY_LOCATION_CODE, + ENOTSUP), + CORBA::COMPLETED_YES)); + } + this->reply_status_ = TAO_RS_SENDING; + } + + // Send the message. + int result = this->transport_->send_message (this->_tao_out, + 0, + TAO_Transport::TAO_REPLY); + + if (result == -1) + { + if (TAO_debug_level > 0) + { + // No exception but some kind of error, yet a response + // is required. + ACE_ERROR (( + LM_ERROR, + ACE_TEXT ("TAO: (%P|%t) %p: cannot send NO_EXCEPTION reply\n"), + ACE_TEXT ("TAO_AMH_Response_Handler::_tao_rh_send_reply") + )); + } + } + + { + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); + this->reply_status_ = TAO_RS_SENT; + } +} + +void +TAO_AMH_Response_Handler::_tao_rh_send_exception (CORBA::Exception &ex + ACE_ENV_ARG_DECL) +{ + { + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); + if (this->reply_status_ != TAO_RS_UNINITIALIZED) + { + ACE_THROW (CORBA::BAD_INV_ORDER ( + CORBA::SystemException::_tao_minor_code ( + TAO_AMH_REPLY_LOCATION_CODE, + ENOTSUP), + CORBA::COMPLETED_YES)); + } + this->reply_status_ = TAO_RS_SENDING; + } + + TAO_Pluggable_Reply_Params_Base reply_params; + reply_params.request_id_ = this->request_id_; + reply_params.svc_ctx_.length (0); + reply_params.service_context_notowned (&this->reply_service_context_.service_info ()); + reply_params.argument_flag_ = 1; + reply_params.reply_status_ = TAO_GIOP_USER_EXCEPTION; + // @@ It appears as if there should be a more efficient way to do + // this: the caller already knows this because it is part of the + // ExceptionHolder information. + if (CORBA::SystemException::_downcast (&ex)) + reply_params.reply_status_ = TAO_GIOP_SYSTEM_EXCEPTION; + + if (this->mesg_base_->generate_exception_reply (this->_tao_out, + reply_params, + ex) == -1) + { + ACE_THROW (CORBA::INTERNAL ()); + } + + // Send the Exception + if (this->transport_->send_message (this->_tao_out, + 0, + TAO_Transport::TAO_REPLY) == -1) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("TAO: (%P|%t|%N|%l): ") + ACE_TEXT ("TAO_AMH_Response_Handler: could not send exception reply\n"))); + } + + { + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); + this->reply_status_ = TAO_RS_SENT; + } +} + +void +TAO_AMH_Response_Handler::_remove_ref (void) +{ + { + ACE_GUARD (TAO_SYNCH_MUTEX, + mon, + this->refcount_lock_); + + --this->refcount_; + + if (this->refcount_ > 0) + return; + } + + if (this->allocator_) + { + TAO::TAO_Buffer_Allocator<TAO_AMH_Response_Handler, TAO_AMH_BUFFER_ALLOCATOR> allocator (allocator_); + + allocator.release(this); + } + else + { + delete this; + } + + return; +} + +namespace TAO +{ + void + ARH_Refcount_Functor::operator () ( + TAO_AMH_Response_Handler *arh) + ACE_THROW_SPEC (()) + { + (void) arh->_remove_ref (); + } +} + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/AMH_Response_Handler.h b/TAO/tao/PortableServer/AMH_Response_Handler.h new file mode 100644 index 00000000000..cd94fbab058 --- /dev/null +++ b/TAO/tao/PortableServer/AMH_Response_Handler.h @@ -0,0 +1,216 @@ +// -*- C++ -*- + +// ========================================================================= +/** + * @file AMH_Response_Handler.h + * + * $Id$ + * + * @author Mayur Deshpande <mayur@ics.uci.edu> + * + */ +// ========================================================================= + +#ifndef TAO_AMH_RESPONSE_HANDLER_H +#define TAO_AMH_RESPONSE_HANDLER_H + +#include "portableserver_export.h" + +#include "tao/Allocator.h" +#include "tao/Service_Context.h" +#include "tao/CDR.h" +#include "tao/LocalObject.h" +#include "tao/Buffer_Allocator_T.h" +#include "ace/Synch_Traits.h" +#include "ace/Thread_Mutex.h" +#include "ace/Null_Mutex.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +class TAO_Transport; +class TAO_Pluggable_Messaging; +class TAO_Output_CDR; +class TAO_ORB_Core; +class TAO_ServerRequest; +class ACE_Allocator; + +typedef ACE_Allocator TAO_AMH_BUFFER_ALLOCATOR; + +/** + * @class TAO_AMH_Response_Handler + * + * @brief Class representing an Asynchronous-Method-Handling (AMH) + * ResponseHandler (RH) object. + * + * Class encapsulates state required to send a response back to the + * client independent of the thread that originally created the state + * on the activation-record. Thus the required state (copied from + * TAO_Server_Request) is 'stored' on the heap. + * + * One RH is created for every client request and the RH can be used + * only once i.e., the asynchronous method can be called only once. + * This class also encapsulates various initialisation and + * response-sending functionality that is common to all RHs (generated + * by the IDL compiler). Thus the IDL-compiler has to generate less + * code which in turn reduces the overall code size for an + * application. + */ +class TAO_PortableServer_Export TAO_AMH_Response_Handler +// @@ Mayur, this is not the correct way to use +// TAO_LocalRefCounted_Object. Application code is supposed to use +// it when necessary. You're forcing applications to use a +// reference counted version of their AMH_Response_Handler. This +// isn't consistent with the specified semantics detailed in the +// CCM spec. Please remove this and place it where appropriate in +// your AMH tests and examples. + : virtual public TAO_Local_RefCounted_Object +{ +public: + + /// Constructor + TAO_AMH_Response_Handler (); + + /// Destructor + /** + * Releases the transport and in case of an error, sends the appropriate + * exception back to the client + */ + virtual ~TAO_AMH_Response_Handler (void); + + /** + * Stores necessary information from a TAO_Server_Request onto the heap + */ + virtual void init(TAO_ServerRequest &server_request, + TAO_AMH_BUFFER_ALLOCATOR* allocator); + + /// @name Mutators for refcount + //@{ + virtual void _remove_ref (void); + //@} + +protected: + + /// Sets up the various parameters in anticipation of returning a reply + /// to the client. return/OUT/INOUT arguments are marshalled into the + /// Output stream after this method has been called. + void _tao_rh_init_reply (ACE_ENV_SINGLE_ARG_DECL); + + /// Sends the marshalled reply back to the client. + void _tao_rh_send_reply (ACE_ENV_SINGLE_ARG_DECL); + + /// Send back an exception to the client. + void _tao_rh_send_exception (CORBA::Exception &ex + ACE_ENV_ARG_DECL); + +protected: + + /// The outgoing CDR stream + /** + * The IDL-generated ResponseHandler implementations used this field + * to marshal the response. + * Making it a field instead of a public accessor makes the code in + * the generated ResponseHandler implementation a lot more readable. + */ + TAO_OutputCDR _tao_out; + +private: + + // Private and undefined, standard C++ idiom to prohibit copying. + ACE_UNIMPLEMENTED_FUNC (TAO_AMH_Response_Handler (const TAO_AMH_Response_Handler&)) + ACE_UNIMPLEMENTED_FUNC (TAO_AMH_Response_Handler& operator= (const TAO_AMH_Response_Handler&)) + +private: + /// Pointer to the original message-base + TAO_Pluggable_Messaging *mesg_base_; + + /// Copy of the request-id of the original Server-Request + CORBA::ULong request_id_; + + CORBA::Boolean response_expected_; + + /// Handle to transport through which the reply will be sent + /// Copy of transport in original Server_Request + TAO_Transport *transport_; + + /// A pointer to the ORB Core for the context where the request was + /// created. + TAO_ORB_Core *orb_core_; + + /// The reply service context + TAO_Service_Context reply_service_context_; + + /// Alwyas set to true (we always have something to return to the + /// client + // @@ Mayur: I think not! This is used to generate padding in GIOP + // 1.2 messages (where the payload must start on an 8-byte + // boundary. But some replys have no payload (only header), in + // those cases you cannot insert the padding. We need the + // ResponseHandler to set this field correctly! + CORBA::Boolean argument_flag_; + + // TAO_GIOP_ReplyStatusType exception_type_; + /// Exception type (will be NO_EXCEPTION in the majority of the + /// cases). + // @@ Mayur: I do not think we need this one, we can deduce the type + // of reply depending on the _tao_rh_*() method called. + CORBA::ULong exception_type_; + + /** + * Various states the ResponseHandler can be in. + * + * These states represent various states the RH can be in and + * the states are used not only in implementing the 'once-only semantics of + * RHs, but in making sure well the call thread-safe as well. + */ + enum Reply_Status + { + TAO_RS_UNINITIALIZED, + TAO_RS_INITIALIZED, + TAO_RS_SENDING, + TAO_RS_SENT + }; + Reply_Status reply_status_; + // I would use the "state pattern".. + // Carlos, Isn't that an overkill? + // @@ Mayur: it depends on what form of the "State Pattern" you + // use. The more generic form, as described in GoF, uses a class + // for each state, super-elegant but indeed a bit heavy handed. + // The lighter-weight form (using a state variable + + /// Mutex to ensure the AMH-RH method call is thread-safe. + ACE_SYNCH_MUTEX mutex_; + + /// Allocator used to allocate this object. If zero then we are allocated + /// from the heap + TAO_AMH_BUFFER_ALLOCATOR* allocator_; +}; + +namespace TAO +{ + /** + * @class ARH_Refcount_Functor + * + * @brief Functor for refcounting of TAO_AMH_Response_Handler + * + * This is used to safely handle the destruction of + * TAO_AMH_Response_Handler objects which are created on the + * heap. We cannot use auto_ptr <> since it calls delete on the + * pointer, and calling delete on TAO_AMH_Response_Handler * + * will not work. Hence this functor will be used with Auto_Functor + * class to handle the memory safely. + * + * @todo Ideally, this class can be a generic class. But that + * requires quite a bit of cleanup within TAO to be more useful. + */ + class TAO_PortableServer_Export ARH_Refcount_Functor + { + public: + void operator() (TAO_AMH_Response_Handler *arh) + ACE_THROW_SPEC (()); + }; + +} + +#endif /* TAO_AMH_RESPONSE_HANDLER_H */ diff --git a/TAO/tao/PortableServer/Default_ORT.pidl b/TAO/tao/PortableServer/Default_ORT.pidl new file mode 100644 index 00000000000..0817f88a146 --- /dev/null +++ b/TAO/tao/PortableServer/Default_ORT.pidl @@ -0,0 +1,51 @@ +// -*- IDL -*- +/** + * @file Default_ORT.pidl + * + * $Id$ + * + * @brief Pre-compiled IDL source for the TAO_Default_ORT module. + * + * This file is used to generate Default_ORTC.{h,i,cpp}, using the following + * command: + * + * tao_idl.exe + * -o orig -Ge 1 -GT -Sc + * -I../.. + * -Wb,export_macro=TAO_PortableServer_Export \ + * -Wb,export_include="portableserver_export.h" \ + * -Wb,pre_include="ace/pre.h" + * -Wb,post_include="ace/post.h" + * Default_ORT.pidl + * + * and then: + * + * cp orig/Default_ORTC.{h,i,cpp} . + * patch < diffs/Default_ORT.diff + * + * The code left in Default_ORTC.{h,i,cpp} is + * ready for use. + * + * + * @note The diffs were generated using: + * + * rm diffs/Default_ORT.diff + * for i in Default_ORTC.{h,i,cpp}; do + * diff -wub orig/$i $i >> diffs/Default_ORT.diff + * done + */ + +#ifndef TAO_DEFAULT_ORT_PIDL +#define TAO_DEFAULT_ORT_PIDL + +#include "tao/ObjRefTemplate/ObjectReferenceTemplate.pidl" + +module TAO_Default_ORT +{ + valuetype ObjectReferenceTemplate + : PortableInterceptor::ObjectReferenceTemplate + { + }; +}; + +#endif /* TAO_DEFAULT_ORT_PIDL */ diff --git a/TAO/tao/PortableServer/Default_ORTC.cpp b/TAO/tao/PortableServer/Default_ORTC.cpp new file mode 100644 index 00000000000..030e2282cb1 --- /dev/null +++ b/TAO/tao/PortableServer/Default_ORTC.cpp @@ -0,0 +1,412 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +// TAO_IDL - Generated from +// be\be_codegen.cpp:323 + + +#include "Default_ORTC.h" +#include "tao/CDR.h" +#include "tao/Valuetype/ValueFactory.h" +#include "tao/Typecode.h" +#include "tao/Any_Impl_T.h" + +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ + +#if !defined (__ACE_INLINE__) +#include "Default_ORTC.i" +#endif /* !defined INLINE */ + +// TAO_IDL - Generated from +// be\be_visitor_arg_traits.cpp:64 + +// Arg traits specializations. +namespace TAO +{ +} + + +// TAO_IDL - Generated from +// be\be_visitor_typecode/typecode_defn.cpp:290 + +static const CORBA::Long _oc_TAO_Default_ORT_ObjectReferenceTemplate[] = +{ + TAO_ENCAP_BYTE_ORDER, // byte order + 48, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x54414f5f), + ACE_NTOHL (0x44656661), + ACE_NTOHL (0x756c745f), + ACE_NTOHL (0x4f52542f), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636554), + ACE_NTOHL (0x656d706c), + ACE_NTOHL (0x6174653a), + ACE_NTOHL (0x312e3000), // repository ID = IDL:TAO_Default_ORT/ObjectReferenceTemplate:1.0 + 24, + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636554), + ACE_NTOHL (0x656d706c), + ACE_NTOHL (0x61746500), // name = ObjectReferenceTemplate + 0, // value modifier + CORBA::tk_null, // no stateful base valuetype + +0, // member count + }; + +static CORBA::TypeCode _tc_TAO_tc_TAO_Default_ORT_ObjectReferenceTemplate ( + CORBA::tk_value, + sizeof (_oc_TAO_Default_ORT_ObjectReferenceTemplate), + (char *) &_oc_TAO_Default_ORT_ObjectReferenceTemplate, + 0, + sizeof (TAO_Default_ORT::ObjectReferenceTemplate) + ); + +namespace TAO_Default_ORT +{ + ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplate = + &_tc_TAO_tc_TAO_Default_ORT_ObjectReferenceTemplate; +} + +// TAO_IDL - Generated from +// be\be_visitor_valuetype/valuetype_cs.cpp:66 + +ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION +void +TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::tao_add_ref ( + TAO_Default_ORT::ObjectReferenceTemplate * p + ) +{ + CORBA::add_ref (p); +} + +ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION +void +TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::tao_remove_ref ( + TAO_Default_ORT::ObjectReferenceTemplate * p + ) +{ + CORBA::remove_ref (p); +} + +ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION +void +TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::tao_release ( + TAO_Default_ORT::ObjectReferenceTemplate * p + ) +{ + CORBA::remove_ref (p); +} + +TAO_Default_ORT::ObjectReferenceTemplate * +TAO_Default_ORT::ObjectReferenceTemplate::_downcast (CORBA::ValueBase *v) +{ + if (v == 0) + { + return 0; + } + + return dynamic_cast< ::TAO_Default_ORT::ObjectReferenceTemplate * > (v); +} + +const char * +TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_repository_id (void) const +{ + return this->_tao_obv_static_repository_id (); +} + +void +TAO_Default_ORT::ObjectReferenceTemplate::_tao_any_destructor (void *_tao_void_pointer) +{ + ObjectReferenceTemplate *_tao_tmp_pointer = + ACE_static_cast ( + ObjectReferenceTemplate *, + _tao_void_pointer + ); + CORBA::remove_ref (_tao_tmp_pointer); +} + +CORBA::Boolean TAO_Default_ORT::ObjectReferenceTemplate::_tao_marshal_v (TAO_OutputCDR & strm) +{ + return this->_tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (strm); +} + +CORBA::Boolean TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal_v (TAO_InputCDR & strm) +{ + return this->_tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (strm); +} + +CORBA::Boolean TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal ( + TAO_InputCDR &strm, + ObjectReferenceTemplate *&new_object + ) +{ + CORBA::ValueBase *base = 0; + CORBA::ValueFactory_var factory; + CORBA::Boolean retval = + CORBA::ValueBase::_tao_unmarshal_pre ( + strm, + factory.out (), + base, + ObjectReferenceTemplate::_tao_obv_static_repository_id () + ); + + if (retval == 0) + { + return 0; + } + + if (factory.in () != 0) + { + base = factory->create_for_unmarshal (); + + if (base == 0) + { + return 0; // %! except.? + } + + retval = base->_tao_unmarshal_v (strm); + + if (retval == 0) + { + return 0; + } + } + + // Now base must be null or point to the unmarshaled object. + // Align the pointer to the right subobject. + new_object = ObjectReferenceTemplate::_downcast (base); + return retval; +} + +// TAO_IDL - Generated from +// be\be_visitor_valuetype/valuetype_obv_cs.cpp:58 + +OBV_TAO_Default_ORT::ObjectReferenceTemplate::ObjectReferenceTemplate (void) +{} + +OBV_TAO_Default_ORT::ObjectReferenceTemplate::~ObjectReferenceTemplate (void) +{} + +CORBA::Boolean +OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &strm) +{ + return _tao_marshal_state (strm); +} + +CORBA::Boolean +OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_InputCDR &strm) +{ + return _tao_unmarshal_state (strm); +} + +// TAO_IDL - Generated from +// be\be_visitor_valuetype/any_op_cs.cpp:57 + + + +template<> +CORBA::Boolean +TAO::Any_Impl_T<TAO_Default_ORT::ObjectReferenceTemplate>::to_value ( + CORBA::ValueBase *&_tao_elem + ) const +{ + CORBA::add_ref (this->value_); + _tao_elem = this->value_; + return 1; +} +// Copying insertion. +void +operator<<= ( + CORBA::Any &_tao_any, + TAO_Default_ORT::ObjectReferenceTemplate *_tao_elem + ) +{ + CORBA::add_ref (_tao_elem); + _tao_any <<= &_tao_elem; +} + +// Non-copying insertion. +void +operator<<= ( + CORBA::Any &_tao_any, + TAO_Default_ORT::ObjectReferenceTemplate **_tao_elem + ) +{ + TAO::Any_Impl_T<TAO_Default_ORT::ObjectReferenceTemplate>::insert ( + _tao_any, + TAO_Default_ORT::ObjectReferenceTemplate::_tao_any_destructor, + TAO_Default_ORT::_tc_ObjectReferenceTemplate, + *_tao_elem + ); +} + +CORBA::Boolean +operator>>= ( + const CORBA::Any &_tao_any, + TAO_Default_ORT::ObjectReferenceTemplate *&_tao_elem + ) +{ + return + TAO::Any_Impl_T<TAO_Default_ORT::ObjectReferenceTemplate>::extract ( + _tao_any, + TAO_Default_ORT::ObjectReferenceTemplate::_tao_any_destructor, + TAO_Default_ORT::_tc_ObjectReferenceTemplate, + _tao_elem + ); +} + + + +// TAO_IDL - Generated from +// be\be_valuetype.cpp:490 + +void +CORBA::add_ref (TAO_Default_ORT::ObjectReferenceTemplate * vt) +{ + if (vt != 0) + { + vt->_add_ref (); + } +} + +void +CORBA::remove_ref (TAO_Default_ORT::ObjectReferenceTemplate * vt) +{ + if (vt != 0) + { + vt->_remove_ref (); + } +} + +// TAO_IDL - Generated from +// be\be_visitor_valuetype/cdr_op_cs.cpp:73 + +CORBA::Boolean +operator<< ( + TAO_OutputCDR &strm, + const TAO_Default_ORT::ObjectReferenceTemplate *_tao_valuetype + ) +{ + return + CORBA::ValueBase::_tao_marshal ( + strm, + ACE_const_cast ( + TAO_Default_ORT::ObjectReferenceTemplate *, + _tao_valuetype + ), + (ptrdiff_t) &TAO_Default_ORT::ObjectReferenceTemplate::_downcast + ); +} + +CORBA::Boolean +operator>> ( + TAO_InputCDR &strm, + TAO_Default_ORT::ObjectReferenceTemplate *&_tao_valuetype + ) +{ + return TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal (strm, _tao_valuetype); +} + +// TAO_IDL - Generated from +// be\be_visitor_valuetype/marshal_cs.cpp:44 + +CORBA::Boolean +OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_marshal_state (TAO_OutputCDR &) +{ + return ( + 1 + ); +} + +CORBA::Boolean +OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal_state (TAO_InputCDR &) +{ + return ( + 1 + ); +} + +// TAO_IDL - Generated from +// be\be_visitor_root/root.cpp:1628 + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + + template class + TAO::Value_Traits< + TAO_Default_ORT::ObjectReferenceTemplate + >; + + template class + TAO_Value_Var_T< + TAO_Default_ORT::ObjectReferenceTemplate + + >; + + template class + TAO_Value_Out_T< + TAO_Default_ORT::ObjectReferenceTemplate + + >; + + template class + TAO::Any_Impl_T< + TAO_Default_ORT::ObjectReferenceTemplate + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO::Value_Traits< \ + TAO_Default_ORT::ObjectReferenceTemplate \ + > + +# pragma instantiate \ + TAO_Value_Var_T< \ + TAO_Default_ORT::ObjectReferenceTemplate \ + + > + +# pragma instantiate \ + TAO_Value_Out_T< \ + TAO_Default_ORT::ObjectReferenceTemplate \ + + > + +# pragma instantiate \ + TAO::Any_Impl_T< \ + TAO_Default_ORT::ObjectReferenceTemplate \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/PortableServer/Default_ORTC.h b/TAO/tao/PortableServer/Default_ORTC.h new file mode 100644 index 00000000000..5ec169a3ec4 --- /dev/null +++ b/TAO/tao/PortableServer/Default_ORTC.h @@ -0,0 +1,257 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +// TAO_IDL - Generated from +// be\be_codegen.cpp:171 + +#ifndef _TAO_IDL_ORIG_DEFAULT_ORTC_H_ +#define _TAO_IDL_ORIG_DEFAULT_ORTC_H_ + +#include /**/ "ace/pre.h" + +#include "tao/ObjRefTemplate/ObjectReferenceTemplateC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "portableserver_export.h" + + +#if defined (TAO_EXPORT_MACRO) +#undef TAO_EXPORT_MACRO +#endif +#define TAO_EXPORT_MACRO TAO_PortableServer_Export + +#if defined (TAO_EXPORT_NESTED_CLASSES) +# if defined (TAO_EXPORT_NESTED_MACRO) +# undef TAO_EXPORT_NESTED_MACRO +# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ +# define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export +#endif /* TAO_EXPORT_NESTED_CLASSES */ + +#if defined(_MSC_VER) +#if (_MSC_VER >= 1200) +#pragma warning(push) +#endif /* _MSC_VER >= 1200 */ +#pragma warning(disable:4250) +#endif /* _MSC_VER */ + +#if defined (__BORLANDC__) +#pragma option push -w-rvl -w-rch -w-ccc -w-inl +#endif /* __BORLANDC__ */ + +// TAO_IDL - Generated from +// be\be_visitor_module/module_ch.cpp:48 + +namespace TAO_Default_ORT +{ + + // TAO_IDL - Generated from + // be\be_valuetype.cpp:527 + + + +#if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE__VAR_OUT_CH_) +#define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE__VAR_OUT_CH_ + + class ObjectReferenceTemplate; + typedef + TAO_Value_Var_T< + ObjectReferenceTemplate + > + ObjectReferenceTemplate_var; + + typedef + TAO_Value_Out_T< + ObjectReferenceTemplate + > + ObjectReferenceTemplate_out; + +#endif /* end #if !defined */ + + // TAO_IDL - Generated from + // be\be_visitor_valuetype/valuetype_ch.cpp:56 + +#if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE_CH_) +#define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE_CH_ + + class TAO_PortableServer_Export ObjectReferenceTemplate + : public virtual PortableInterceptor::ObjectReferenceTemplate + { + public: + typedef ObjectReferenceTemplate_var _var_type; + + static ObjectReferenceTemplate* _downcast (CORBA::ValueBase *); + + // (TAO extensions or internals) + static CORBA::Boolean _tao_unmarshal ( + TAO_InputCDR &, + ObjectReferenceTemplate *& + ); + + virtual const char* _tao_obv_repository_id (void) const; + + static const char* _tao_obv_static_repository_id (void); + + static void _tao_any_destructor (void *); + + // TAO_IDL - Generated from + // be\be_visitor_valuetype/valuetype_ch.cpp:250 + + protected: + ObjectReferenceTemplate (void); + + virtual ~ObjectReferenceTemplate (void); + + virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &); + virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &); + + private: + ObjectReferenceTemplate (const ObjectReferenceTemplate &); + void operator= (const ObjectReferenceTemplate &); + + protected: + virtual CORBA::Boolean + _tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &) = 0; + + virtual CORBA::Boolean + _tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_InputCDR &) = 0; + }; + +#endif /* end #if !defined */ + + // TAO_IDL - Generated from + // be\be_visitor_typecode/typecode_decl.cpp:44 + + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplate; + +// TAO_IDL - Generated from +// be\be_visitor_module/module_ch.cpp:66 + +} // module TAO_Default_ORT + +// TAO_IDL - Generated from +// be\be_visitor_valuetype/obv_module.cpp:55 + +namespace OBV_TAO_Default_ORT +{ + + // TAO_IDL - Generated from + // be\be_visitor_valuetype/valuetype_obv_ch.cpp:58 + +#if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___OBV_CH_) +#define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___OBV_CH_ + + // OBV_ class + class TAO_PortableServer_Export ObjectReferenceTemplate + : public virtual TAO_Default_ORT::ObjectReferenceTemplate + { + public: + + protected: + ObjectReferenceTemplate (void); + virtual ~ObjectReferenceTemplate (void); + + protected: + virtual CORBA::Boolean + _tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &); + + virtual CORBA::Boolean + _tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_InputCDR &); + + CORBA::Boolean _tao_marshal_state (TAO_OutputCDR &); + CORBA::Boolean _tao_unmarshal_state (TAO_InputCDR &); + + private: + }; + +#endif /* end #if !defined */ +} + +// TAO_IDL - Generated from +// be\be_visitor_traits.cpp:59 + +// Traits specializations. +namespace TAO +{ + +#if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE__TRAITS_CH_) +#define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE__TRAITS_CH_ + + ACE_TEMPLATE_SPECIALIZATION + struct TAO_PortableServer_Export Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate> + { + static void tao_add_ref (TAO_Default_ORT::ObjectReferenceTemplate *); + static void tao_remove_ref (TAO_Default_ORT::ObjectReferenceTemplate *); + static void tao_release (TAO_Default_ORT::ObjectReferenceTemplate *); + }; + +#endif /* end #if !defined */ +} + +// TAO_IDL - Generated from +// be\be_visitor_valuetype/any_op_ch.cpp:54 + +TAO_PortableServer_Export void operator<<= (CORBA::Any &, TAO_Default_ORT::ObjectReferenceTemplate *); // copying +TAO_PortableServer_Export void operator<<= (CORBA::Any &, TAO_Default_ORT::ObjectReferenceTemplate **); // non-copying +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_Default_ORT::ObjectReferenceTemplate *&); + +// TAO_IDL - Generated from +// be\be_valuetype.cpp:434 + +namespace CORBA +{ + TAO_NAMESPACE_STORAGE_CLASS void add_ref (TAO_Default_ORT::ObjectReferenceTemplate *); + TAO_NAMESPACE_STORAGE_CLASS void remove_ref (TAO_Default_ORT::ObjectReferenceTemplate *); +} + +// TAO_IDL - Generated from +// be\be_visitor_valuetype/cdr_op_ch.cpp:61 + +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_Default_ORT::ObjectReferenceTemplate *); +TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_Default_ORT::ObjectReferenceTemplate *&); + +// TAO_IDL - Generated from +// be\be_codegen.cpp:978 + +#if defined (__ACE_INLINE__) +#include "Default_ORTC.i" +#endif /* defined INLINE */ + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#pragma warning(pop) +#endif /* _MSC_VER */ + +#if defined (__BORLANDC__) +#pragma option pop +#endif /* __BORLANDC__ */ + +#include /**/ "ace/post.h" + +#endif /* ifndef */ + diff --git a/TAO/tao/PortableServer/Default_ORTC.i b/TAO/tao/PortableServer/Default_ORTC.i new file mode 100644 index 00000000000..dcda17bcba3 --- /dev/null +++ b/TAO/tao/PortableServer/Default_ORTC.i @@ -0,0 +1,45 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + + +// TAO_IDL - Generated from +// be\be_visitor_valuetype/valuetype_ci.cpp:56 + +ACE_INLINE +TAO_Default_ORT::ObjectReferenceTemplate::ObjectReferenceTemplate (void) +{} + +ACE_INLINE +TAO_Default_ORT::ObjectReferenceTemplate::~ObjectReferenceTemplate (void) +{} + +ACE_INLINE const char* +TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_static_repository_id () +{ + return "IDL:TAO_Default_ORT/ObjectReferenceTemplate:1.0"; +} + diff --git a/TAO/tao/PortableServer/IORInfo.cpp b/TAO/tao/PortableServer/IORInfo.cpp new file mode 100644 index 00000000000..df689cc906b --- /dev/null +++ b/TAO/tao/PortableServer/IORInfo.cpp @@ -0,0 +1,210 @@ +#include "tao/PortableServer/IORInfo.h" +#include "tao/PortableServer/POA.h" + +#include "tao/PolicyC.h" +#include "tao/IOPC.h" +#include "tao/ORB_Constants.h" + + +ACE_RCSID (PortableServer, + IORInfo, + "$Id$") + + +#if !defined (__ACE_INLINE__) +# include "IORInfo.inl" +#endif /* __ACE_INLINE__ */ + + +TAO_IORInfo::TAO_IORInfo (TAO_POA *poa) + : poa_ (poa), + components_established_ (0) +{ +} + +TAO_IORInfo::~TAO_IORInfo (void) +{ +} + +CORBA::Policy_ptr +TAO_IORInfo::get_effective_policy (CORBA::PolicyType type + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + + TAO_POA_Policy_Set &policies = + this->poa_->policies (); + + // @@ This brain damaged implementation exists due to the fact + // neither TAO_POA nor TAO_POA_Policy_Set exposes any methods + // useful for retrieving a given Policy in the POA's PolicyList. + // So, I use the lame interfaces for now. + // -Ossama + const CORBA::ULong num_policies = policies.num_policies (); + for (CORBA::ULong i = 0; i < num_policies; ++i) + { + // @@ This incurs at least two locks per loop iteration due + // to the reference counting found within the policy + // object reference!!! + CORBA::Policy_var policy = policies.get_policy_by_index (i); + + CORBA::PolicyType ptype = + policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + + if (ptype == type) + return policy._retn (); + } + + // TODO: Now check the global ORB policies. + // ........ + + // No policy matching the given PolicyType was found. + ACE_THROW_RETURN (CORBA::INV_POLICY (CORBA::OMGVMCID | 3, + CORBA::COMPLETED_NO), + CORBA::Policy::_nil ()); +} + +void +TAO_IORInfo::add_ior_component (const IOP::TaggedComponent &component + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; + + if (this->components_established_) + ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, + CORBA::COMPLETED_NO)); + + // Add the given tagged component to all profiles. + this->poa_->save_ior_component (component + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; +} + +void +TAO_IORInfo::add_ior_component_to_profile ( + const IOP::TaggedComponent &component, + IOP::ProfileId profile_id + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; + + if (this->components_established_) + ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, + CORBA::COMPLETED_NO)); + + this->poa_->save_ior_component_and_profile_id (component, + profile_id + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; +} + +PortableInterceptor::AdapterManagerId +TAO_IORInfo::manager_id (ACE_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (0); + + return this->poa_->get_manager_id (ACE_ENV_SINGLE_ARG_PARAMETER); +} + +PortableInterceptor::AdapterState +TAO_IORInfo::state (ACE_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (PortableInterceptor::NON_EXISTENT); + + return this->poa_->get_adapter_state (ACE_ENV_SINGLE_ARG_PARAMETER); +} + +PortableInterceptor::ObjectReferenceTemplate * +TAO_IORInfo::adapter_template (ACE_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (0); + + // Return the Object Reference Template whenever an IOR Interceptor + // is invoked. Its value is the template created for the adapter + // policies and the IOR Interceptor calls to add_ior_component and + // add_ior_component_to_profile. It's a const value and its value + // never changes. + PortableInterceptor::ObjectReferenceTemplate *adapter_template = + this->poa_->get_adapter_template (); + + if (adapter_template == 0) + { + ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, + CORBA::COMPLETED_NO), + 0); + } + + CORBA::add_ref (adapter_template); + + return adapter_template; +} + +PortableInterceptor::ObjectReferenceFactory * +TAO_IORInfo::current_factory (ACE_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (0); + + // Return the current_factory that is used to create the object + // references by the adapter. Though initially, its value is the + // same as the adapter_template, unlike adapter_template, its value + // can be changed. The value of the current_factory can be changed + // only during the call to components_established method. + PortableInterceptor::ObjectReferenceFactory *adapter_factory = + this->poa_->get_obj_ref_factory (); + + if (adapter_factory == 0) + { + ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, + CORBA::COMPLETED_NO), + 0); + } + + CORBA::add_ref (adapter_factory); + + return adapter_factory; +} + +void +TAO_IORInfo::current_factory ( + PortableInterceptor::ObjectReferenceFactory * current_factory + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; + + this->poa_->set_obj_ref_factory (current_factory + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; +} + +void +TAO_IORInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL) +{ + if (this->poa_ == 0) + { + // Although not defined by the spec, duplicate the behavior used + // by the ORBInitInfo object once CORBA::ORB_init() has been + // called. Specifically, the IORInfo object is no longer valid + // once the POA has invoked all IORInterceptor interception + // points. This also prevents memory access violations from + // occuring if the POA is destroyed before this IORInfo object. + ACE_THROW (CORBA::OBJECT_NOT_EXIST (TAO_DEFAULT_MINOR_CODE, + CORBA::COMPLETED_NO)); + } +} diff --git a/TAO/tao/PortableServer/IORInfo.h b/TAO/tao/PortableServer/IORInfo.h new file mode 100644 index 00000000000..5b168a59fe4 --- /dev/null +++ b/TAO/tao/PortableServer/IORInfo.h @@ -0,0 +1,173 @@ +// -*- C++ -*- + +// =================================================================== +/** + * @file IORInfo.h + * + * $Id$ + * + * @author Ossama Othman <ossama@uci.edu> + */ +// =================================================================== + +#ifndef TAO_IOR_INFO_H +#define TAO_IOR_INFO_H + +#include /**/ "ace/pre.h" + +#include "tao/IORInterceptor/IORInterceptorC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/LocalObject.h" + +// This is to remove "inherits via dominance" warnings from MSVC. +// MSVC is being a little too paranoid. +#if defined(_MSC_VER) +#if (_MSC_VER >= 1200) +#pragma warning(push) +#endif /* _MSC_VER >= 1200 */ +#pragma warning(disable:4250) +#endif /* _MSC_VER */ + + +/// Forward declarations. +class TAO_POA; + + +/** + * @class TAO_IORInfo + * + * @brief This class exposes an interface that allows IORInterceptors add + * tagged components to IORs. + */ +class TAO_IORInfo + : public virtual PortableInterceptor::IORInfo, + public virtual TAO_Local_RefCounted_Object +{ +public: + + /// Constructor. + TAO_IORInfo (TAO_POA *poa); + + /** + * @name PortableInterceptor::IORInfo Methods + * + * Methods exposed by the PortableInterceptor::IORInfo interface. + */ + //@{ + + /// Return the policy matching the given policy type that is in + /// effect for the object whose IOR is being created. + virtual CORBA::Policy_ptr get_effective_policy ( + CORBA::PolicyType type + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); + + /// Add the given tagged component to all profiles. + virtual void add_ior_component ( + const IOP::TaggedComponent & component + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); + + /// Add the given tagged component to all profiles matching the given + /// ProfileId. + virtual void add_ior_component_to_profile ( + const IOP::TaggedComponent & component, + IOP::ProfileId profile_id + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual PortableInterceptor::AdapterManagerId manager_id ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual PortableInterceptor::AdapterState state ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual PortableInterceptor::ObjectReferenceTemplate * adapter_template ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual PortableInterceptor::ObjectReferenceFactory * current_factory ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual void current_factory ( + PortableInterceptor::ObjectReferenceFactory * current_factory + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); + + //@} + + /// Invalidate this IORInfo instance. + /** + * Once the IOR interception points have been invoked, this IORInfo + * instance is no longer valid. + */ + void invalidate (void); + + /// Inform the this IORInfo object that the + /// IORInterceptor::components_established() interception point has + /// been called. + /** + * This method is used so to inform the IORInfo when the + * add_ior_component() and add_ior_component_to_profile() methods + * are invalid. They are only valid in the + * IORInterceptor::establish_components() interception point. + */ + void components_established (void); + +protected: + + /// Protected destructor to enforce proper memory managment through + /// the reference counting mechanism. + ~TAO_IORInfo (void); + + /// Check if this IORInfo instance is valid. + /** + * Once all IORInterceptor interception points have been called, + * this IORInfo object is no longer valid. Throw an exception in + * that case. + */ + void check_validity (ACE_ENV_SINGLE_ARG_DECL); + +private: + + /// Prevent copying through the copy constructor and the assignment + /// operator. + ACE_UNIMPLEMENTED_FUNC ( + TAO_IORInfo (const TAO_IORInfo &)) + ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_IORInfo &)) + +private: + + /// Pointer to POA + TAO_POA *poa_; + + /// True if the IORInterceptor::components_established() + /// interception point was called. False otherwise. + /** + * This flag is used to prevent the add_ior_component() and + * add_ior_component_to_profile() methods from being incorrectly + * called after the IORInterceptor::establish_components() + * interception point has been called. + */ + CORBA::Boolean components_established_; + +}; + +#if defined (__ACE_INLINE__) +# include "IORInfo.inl" +#endif /* __ACE_INLINE__ */ + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#pragma warning(pop) +#endif /* _MSC_VER */ + +#include /**/ "ace/post.h" + +#endif /* TAO_IOR_INFO_H */ diff --git a/TAO/tao/PortableServer/IORInfo.inl b/TAO/tao/PortableServer/IORInfo.inl new file mode 100644 index 00000000000..3a94b482656 --- /dev/null +++ b/TAO/tao/PortableServer/IORInfo.inl @@ -0,0 +1,15 @@ +// -*- C++ -*- +// +// $Id$ + +ACE_INLINE void +TAO_IORInfo::invalidate (void) +{ + this->poa_ = 0; +} + +ACE_INLINE void +TAO_IORInfo::components_established (void) +{ + this->components_established_ = 1; +} diff --git a/TAO/tao/PortableServer/ImR_LocatorC.cpp b/TAO/tao/PortableServer/ImR_LocatorC.cpp index 69eb28988f7..d41ca21cfa3 100644 --- a/TAO/tao/PortableServer/ImR_LocatorC.cpp +++ b/TAO/tao/PortableServer/ImR_LocatorC.cpp @@ -48,7 +48,7 @@ #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) -#include "ImR_LocatorC.inl" +#include "ImR_LocatorC.i" #endif /* !defined INLINE */ // TAO_IDL - Generated from @@ -60,7 +60,7 @@ namespace TAO #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_CS_) #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerObject> : public @@ -74,13 +74,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:618 #if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_CS_) #define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::StartupOptions> : public @@ -93,13 +93,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:618 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_CS_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformation> : public @@ -112,13 +112,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:379 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_CS_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformationList> : public @@ -134,7 +134,7 @@ namespace TAO #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_CS_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformationIterator> : public @@ -151,7 +151,7 @@ namespace TAO #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION__ARG_TRAITS_CS_) #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::Administration> : public @@ -165,13 +165,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:379 #if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR_SERVERNAMELIST__ARG_TRAITS_CS_) #define _IMPLEMENTATIONREPOSITORY_LOCATOR_SERVERNAMELIST__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::Locator::ServerNameList> : public @@ -194,7 +194,7 @@ namespace TAO ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION ImplementationRepository::Locator_ptr -TAO::Objref_Traits<ImplementationRepository::Locator>::duplicate ( +TAO::Objref_Traits<ImplementationRepository::Locator>::tao_duplicate ( ImplementationRepository::Locator_ptr p ) { @@ -203,7 +203,7 @@ TAO::Objref_Traits<ImplementationRepository::Locator>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<ImplementationRepository::Locator>::release ( +TAO::Objref_Traits<ImplementationRepository::Locator>::tao_release ( ImplementationRepository::Locator_ptr p ) { @@ -212,14 +212,14 @@ TAO::Objref_Traits<ImplementationRepository::Locator>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION ImplementationRepository::Locator_ptr -TAO::Objref_Traits<ImplementationRepository::Locator>::nil (void) +TAO::Objref_Traits<ImplementationRepository::Locator>::tao_nil (void) { return ImplementationRepository::Locator::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<ImplementationRepository::Locator>::marshal ( +TAO::Objref_Traits<ImplementationRepository::Locator>::tao_marshal ( ImplementationRepository::Locator_ptr p, TAO_OutputCDR & cdr ) @@ -228,12 +228,12 @@ TAO::Objref_Traits<ImplementationRepository::Locator>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR_SERVERNAMELIST_CS_) @@ -287,29 +287,29 @@ static const CORBA::Long _oc_ImplementationRepository_Locator_ServerNameList[] = { TAO_ENCAP_BYTE_ORDER, // byte order 56, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f4c6f63), - ACE_NTOHL (0x61746f72), - ACE_NTOHL (0x2f536572), - ACE_NTOHL (0x7665724e), - ACE_NTOHL (0x616d654c), - ACE_NTOHL (0x6973743a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f4c6f63), + ACE_NTOHL (0x61746f72), + ACE_NTOHL (0x2f536572), + ACE_NTOHL (0x7665724e), + ACE_NTOHL (0x616d654c), + ACE_NTOHL (0x6973743a), ACE_NTOHL (0x312e3000), // repository ID = IDL:ImplementationRepository/Locator/ServerNameList:1.0 15, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x65724e61), - ACE_NTOHL (0x6d654c69), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x65724e61), + ACE_NTOHL (0x6d654c69), ACE_NTOHL (0x73740000), // name = ServerNameList CORBA::tk_sequence, // typecode kind 16, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 0U, @@ -344,39 +344,39 @@ void ImplementationRepository::Locator::activate_server_in_activator ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_Locator_Proxy_Broker_ == 0) { ImplementationRepository_Locator_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server); TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_activator (activator); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_server, &_tao_activator }; - + static TAO::Exception_Data - _tao_ImplementationRepository_Locator_activate_server_in_activator_exceptiondata [] = + _tao_ImplementationRepository_Locator_activate_server_in_activator_exceptiondata [] = { { "IDL:ImplementationRepository/NotFound:1.0", ImplementationRepository::NotFound::_alloc, ImplementationRepository::_tc_NotFound }, - + { "IDL:ImplementationRepository/CannotActivate:1.0", ImplementationRepository::CannotActivate::_alloc, ImplementationRepository::_tc_CannotActivate } }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -385,7 +385,7 @@ void ImplementationRepository::Locator::activate_server_in_activator ( 28, this->the_TAO_Locator_Proxy_Broker_ ); - + _tao_call.invoke ( _tao_ImplementationRepository_Locator_activate_server_in_activator_exceptiondata, 2 @@ -411,25 +411,25 @@ void ImplementationRepository::Locator::remove_server_in_activator ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_Locator_Proxy_Broker_ == 0) { ImplementationRepository_Locator_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server); TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_activator (activator); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_server, &_tao_activator }; - + static TAO::Exception_Data - _tao_ImplementationRepository_Locator_remove_server_in_activator_exceptiondata [] = + _tao_ImplementationRepository_Locator_remove_server_in_activator_exceptiondata [] = { { "IDL:ImplementationRepository/NotFound:1.0", @@ -437,7 +437,7 @@ void ImplementationRepository::Locator::remove_server_in_activator ( ImplementationRepository::_tc_NotFound } }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -446,7 +446,7 @@ void ImplementationRepository::Locator::remove_server_in_activator ( 26, this->the_TAO_Locator_Proxy_Broker_ ); - + _tao_call.invoke ( _tao_ImplementationRepository_Locator_remove_server_in_activator_exceptiondata, 1 @@ -472,25 +472,25 @@ void ImplementationRepository::Locator::shutdown_server_in_activator ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_Locator_Proxy_Broker_ == 0) { ImplementationRepository_Locator_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server); TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_activator (activator); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_server, &_tao_activator }; - + static TAO::Exception_Data - _tao_ImplementationRepository_Locator_shutdown_server_in_activator_exceptiondata [] = + _tao_ImplementationRepository_Locator_shutdown_server_in_activator_exceptiondata [] = { { "IDL:ImplementationRepository/NotFound:1.0", @@ -498,7 +498,7 @@ void ImplementationRepository::Locator::shutdown_server_in_activator ( ImplementationRepository::_tc_NotFound } }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -507,7 +507,7 @@ void ImplementationRepository::Locator::shutdown_server_in_activator ( 28, this->the_TAO_Locator_Proxy_Broker_ ); - + _tao_call.invoke ( _tao_ImplementationRepository_Locator_shutdown_server_in_activator_exceptiondata, 1 @@ -533,25 +533,25 @@ void ImplementationRepository::Locator::server_is_shutting_down_in_activator ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_Locator_Proxy_Broker_ == 0) { ImplementationRepository_Locator_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server); TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_activator (activator); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_server, &_tao_activator }; - + static TAO::Exception_Data - _tao_ImplementationRepository_Locator_server_is_shutting_down_in_activator_exceptiondata [] = + _tao_ImplementationRepository_Locator_server_is_shutting_down_in_activator_exceptiondata [] = { { "IDL:ImplementationRepository/NotFound:1.0", @@ -559,7 +559,7 @@ void ImplementationRepository::Locator::server_is_shutting_down_in_activator ( ImplementationRepository::_tc_NotFound } }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -568,7 +568,7 @@ void ImplementationRepository::Locator::server_is_shutting_down_in_activator ( 36, this->the_TAO_Locator_Proxy_Broker_ ); - + _tao_call.invoke ( _tao_ImplementationRepository_Locator_server_is_shutting_down_in_activator_exceptiondata, 1 @@ -594,17 +594,17 @@ CORBA::Long ImplementationRepository::Locator::register_activator ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_Locator_Proxy_Broker_ == 0) { ImplementationRepository_Locator_setup_collocation (); } - + TAO::Arg_Traits< CORBA::Long>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_activator (activator); TAO::Arg_Traits< ::ImplementationRepository::Administration>::in_arg_val _tao_admin (admin); TAO::Arg_Traits< ::ImplementationRepository::Locator::ServerNameList>::in_arg_val _tao_servers (servers); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -612,7 +612,7 @@ CORBA::Long ImplementationRepository::Locator::register_activator ( &_tao_admin, &_tao_servers }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -621,10 +621,10 @@ CORBA::Long ImplementationRepository::Locator::register_activator ( 18, this->the_TAO_Locator_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -644,23 +644,23 @@ void ImplementationRepository::Locator::unregister_activator ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_Locator_Proxy_Broker_ == 0) { ImplementationRepository_Locator_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_activator (activator); TAO::Arg_Traits< CORBA::Long>::in_arg_val _tao_token (token); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_activator, &_tao_token }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -669,7 +669,7 @@ void ImplementationRepository::Locator::unregister_activator ( 20, this->the_TAO_Locator_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -693,18 +693,18 @@ void ImplementationRepository::Locator::server_is_running_in_activator ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_Locator_Proxy_Broker_ == 0) { ImplementationRepository_Locator_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server); TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_activator (activator); TAO::Arg_Traits< ::ImplementationRepository::Address>::in_arg_val _tao_addr (addr); TAO::Arg_Traits< ::ImplementationRepository::ServerObject>::in_arg_val _tao_server_object (server_object); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -713,9 +713,9 @@ void ImplementationRepository::Locator::server_is_running_in_activator ( &_tao_addr, &_tao_server_object }; - + static TAO::Exception_Data - _tao_ImplementationRepository_Locator_server_is_running_in_activator_exceptiondata [] = + _tao_ImplementationRepository_Locator_server_is_running_in_activator_exceptiondata [] = { { "IDL:ImplementationRepository/NotFound:1.0", @@ -723,7 +723,7 @@ void ImplementationRepository::Locator::server_is_running_in_activator ( ImplementationRepository::_tc_NotFound } }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -732,7 +732,7 @@ void ImplementationRepository::Locator::server_is_running_in_activator ( 30, this->the_TAO_Locator_Proxy_Broker_ ); - + _tao_call.invoke ( _tao_ImplementationRepository_Locator_server_is_running_in_activator_exceptiondata, 1 @@ -759,17 +759,17 @@ void ImplementationRepository::Locator::find_in_activator ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_Locator_Proxy_Broker_ == 0) { ImplementationRepository_Locator_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server); TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_activator (activator); TAO::Arg_Traits< ::ImplementationRepository::ServerInformation>::out_arg_val _tao_info (info); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -777,9 +777,9 @@ void ImplementationRepository::Locator::find_in_activator ( &_tao_activator, &_tao_info }; - + static TAO::Exception_Data - _tao_ImplementationRepository_Locator_find_in_activator_exceptiondata [] = + _tao_ImplementationRepository_Locator_find_in_activator_exceptiondata [] = { { "IDL:ImplementationRepository/NotFound:1.0", @@ -787,7 +787,7 @@ void ImplementationRepository::Locator::find_in_activator ( ImplementationRepository::_tc_NotFound } }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -796,7 +796,7 @@ void ImplementationRepository::Locator::find_in_activator ( 17, this->the_TAO_Locator_Proxy_Broker_ ); - + _tao_call.invoke ( _tao_ImplementationRepository_Locator_find_in_activator_exceptiondata, 1 @@ -819,14 +819,14 @@ ImplementationRepository::Locator::ImplementationRepository_Locator_setup_colloc this->the_TAO_Locator_Proxy_Broker_ = ::ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function_pointer (this); } - + this->ImplementationRepository_Administration_setup_collocation (); } ImplementationRepository::Locator::~Locator (void) {} -void +void ImplementationRepository::Locator::_tao_any_destructor (void *_tao_void_pointer) { Locator *_tao_tmp_pointer = @@ -871,7 +871,7 @@ ImplementationRepository::Locator::_duplicate (Locator_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -925,19 +925,19 @@ static const CORBA::Long _oc_ImplementationRepository_Locator[] = { TAO_ENCAP_BYTE_ORDER, // byte order 41, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f4c6f63), - ACE_NTOHL (0x61746f72), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f4c6f63), + ACE_NTOHL (0x61746f72), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/Locator:1.0 8, - ACE_NTOHL (0x4c6f6361), + ACE_NTOHL (0x4c6f6361), ACE_NTOHL (0x746f7200), // name = Locator }; @@ -1010,7 +1010,7 @@ operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. @@ -1080,20 +1080,20 @@ CORBA::Boolean operator<< ( ) { const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - + if (strm << _tao_seq_len) { // Encode all elements. CORBA::Boolean _tao_marshal_flag = 1; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = (strm << _tao_sequence[i].in ()); } - + return _tao_marshal_flag; } - + return 0; } @@ -1103,7 +1103,7 @@ CORBA::Boolean operator>> ( ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -1113,27 +1113,27 @@ 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. CORBA::Boolean _tao_marshal_flag = 1; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = (strm >> _tao_sequence[i].out ()); - + } - + return _tao_marshal_flag; - + } return 0; @@ -1159,21 +1159,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if ((strm >> obj.inout ()) == 0) { return 0; } - + typedef ::ImplementationRepository::Locator RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -1346,7 +1346,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< ImplementationRepository::Locator >; - + template class TAO_Objref_Out_T< ImplementationRepository::Locator @@ -1528,7 +1528,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ ImplementationRepository::Locator > - + # pragma instantiate \ TAO_Objref_Out_T< \ ImplementationRepository::Locator @@ -1544,4 +1544,5 @@ CORBA::Boolean operator>> ( ImplementationRepository::Locator \ > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/PortableServer/ImR_LocatorC.h b/TAO/tao/PortableServer/ImR_LocatorC.h index 04204a62336..4ef0decde0c 100644 --- a/TAO/tao/PortableServer/ImR_LocatorC.h +++ b/TAO/tao/PortableServer/ImR_LocatorC.h @@ -74,13 +74,13 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\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; } @@ -90,22 +90,22 @@ namespace TAO namespace ImplementationRepository { - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:611 #if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR__VAR_OUT_CH_) #define _IMPLEMENTATIONREPOSITORY_LOCATOR__VAR_OUT_CH_ - + class Locator; typedef Locator *Locator_ptr; - + typedef TAO_Objref_Var_T< Locator > Locator_var; - + typedef TAO_Objref_Out_T< Locator @@ -113,13 +113,13 @@ namespace ImplementationRepository Locator_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR_CH_) #define _IMPLEMENTATIONREPOSITORY_LOCATOR_CH_ - + class TAO_PortableServer_Export Locator : public virtual ::ImplementationRepository::Administration { @@ -127,42 +127,42 @@ namespace ImplementationRepository friend class TAO::Narrow_Utils<Locator>; typedef Locator_ptr _ptr_type; typedef Locator_var _var_type; - + // The static operations. static Locator_ptr _duplicate (Locator_ptr obj); - + static Locator_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Locator_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Locator_ptr _nil (void) { return (Locator_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR_SERVERNAMELIST_CH_) #define _IMPLEMENTATIONREPOSITORY_LOCATOR_SERVERNAMELIST_CH_ - + class ServerNameList; - + typedef TAO_MngSeq_Var_T< ServerNameList, TAO_SeqElem_String_Manager > ServerNameList_var; - + typedef TAO_MngSeq_Out_T< ServerNameList, @@ -170,7 +170,7 @@ namespace ImplementationRepository TAO_SeqElem_String_Manager > ServerNameList_out; - + class TAO_PortableServer_Export ServerNameList : public TAO_Unbounded_String_Sequence @@ -181,27 +181,27 @@ namespace ImplementationRepository ServerNameList ( CORBA::ULong max, CORBA::ULong length, - char ** buffer, + char ** buffer, CORBA::Boolean release = 0 ); ServerNameList (const ServerNameList &); ~ServerNameList (void); - + static void _tao_any_destructor (void *); - + typedef ServerNameList_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + static ::CORBA::TypeCode_ptr _tc_ServerNameList; - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual void activate_server_in_activator ( const char * server, const char * activator @@ -212,10 +212,10 @@ namespace ImplementationRepository ::ImplementationRepository::NotFound, ::ImplementationRepository::CannotActivate )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual void remove_server_in_activator ( const char * server, const char * activator @@ -225,10 +225,10 @@ namespace ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual void shutdown_server_in_activator ( const char * server, const char * activator @@ -238,10 +238,10 @@ namespace ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual void server_is_shutting_down_in_activator ( const char * server, const char * activator @@ -251,10 +251,10 @@ namespace ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Long register_activator ( const char * activator, ::ImplementationRepository::Administration_ptr admin, @@ -264,10 +264,10 @@ namespace ImplementationRepository ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual void unregister_activator ( const char * activator, ::CORBA::Long token @@ -276,10 +276,10 @@ namespace ImplementationRepository ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual void server_is_running_in_activator ( const char * server, const char * activator, @@ -291,10 +291,10 @@ namespace ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual void find_in_activator ( const char * server, const char * activator, @@ -305,34 +305,34 @@ namespace ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\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); private: TAO::Collocation_Proxy_Broker *the_TAO_Locator_Proxy_Broker_; - + protected: // Concrete interface only. Locator (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void ImplementationRepository_Locator_setup_collocation (void); - + // Concrete non-local interface only. Locator ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. Locator ( TAO_Stub *objref, @@ -340,21 +340,21 @@ namespace ImplementationRepository TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~Locator (void); - + private: // Private and unimplemented for concrete interfaces. Locator (const Locator &); - + void operator= (const Locator &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Locator; // TAO_IDL - Generated from @@ -382,18 +382,18 @@ namespace TAO #if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR__TRAITS_CH_) #define _IMPLEMENTATIONREPOSITORY_LOCATOR__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits<ImplementationRepository::Locator> { - static ImplementationRepository::Locator_ptr duplicate ( + static ImplementationRepository::Locator_ptr tao_duplicate ( ImplementationRepository::Locator_ptr ); - static void release ( + static void tao_release ( ImplementationRepository::Locator_ptr ); - static ImplementationRepository::Locator_ptr nil (void); - static CORBA::Boolean marshal ( + static ImplementationRepository::Locator_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( ImplementationRepository::Locator_ptr p, TAO_OutputCDR & cdr ); @@ -444,7 +444,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> ( // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:976 #if defined (__ACE_INLINE__) -#include "ImR_LocatorC.inl" +#include "ImR_LocatorC.i" #endif /* defined INLINE */ #if defined(_MSC_VER) && (_MSC_VER >= 1200) @@ -458,3 +458,4 @@ TAO_PortableServer_Export CORBA::Boolean operator>> ( #include /**/ "ace/post.h" #endif /* ifndef */ + diff --git a/TAO/tao/PortableServer/ImR_LocatorC.i b/TAO/tao/PortableServer/ImR_LocatorC.i new file mode 100644 index 00000000000..4908d458454 --- /dev/null +++ b/TAO/tao/PortableServer/ImR_LocatorC.i @@ -0,0 +1,64 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:70 + +#if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR___CI_) +#define _IMPLEMENTATIONREPOSITORY_LOCATOR___CI_ + +ACE_INLINE +ImplementationRepository::Locator::Locator ( + TAO_Stub *objref, + CORBA::Boolean _tao_collocated, + TAO_Abstract_ServantBase *servant, + TAO_ORB_Core *oc + ) + : ACE_NESTED_CLASS (CORBA, Object) ( + objref, + _tao_collocated, + servant, + oc + ), + the_TAO_Locator_Proxy_Broker_ (0) +{ + this->ImplementationRepository_Locator_setup_collocation (); +} + +ACE_INLINE +ImplementationRepository::Locator::Locator ( + IOP::IOR *ior, + TAO_ORB_Core *oc + ) + : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + the_TAO_Locator_Proxy_Broker_ (0) +{ +} + +#endif /* end #if !defined */ + diff --git a/TAO/tao/PortableServer/ImR_LocatorS.cpp b/TAO/tao/PortableServer/ImR_LocatorS.cpp index fed027a95c4..9dc87f23eac 100644 --- a/TAO/tao/PortableServer/ImR_LocatorS.cpp +++ b/TAO/tao/PortableServer/ImR_LocatorS.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:629 #ifndef _TAO_IDL_IMR_LOCATORS_CPP_ @@ -66,7 +66,7 @@ #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) -#include "ImR_LocatorS.inl" +#include "ImR_LocatorS.i" #endif /* !defined INLINE */ // TAO_IDL - Generated from @@ -78,7 +78,7 @@ namespace TAO #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_SS_) #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_SS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerObject> : public @@ -92,13 +92,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:618 #if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_SS_) #define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_SS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::StartupOptions> : public @@ -111,13 +111,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:618 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_SS_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_SS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformation> : public @@ -130,13 +130,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:379 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_SS_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_SS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformationList> : public @@ -152,7 +152,7 @@ namespace TAO #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_SS_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_SS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformationIterator> : public @@ -169,7 +169,7 @@ namespace TAO #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION__ARG_TRAITS_SS_) #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION__ARG_TRAITS_SS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::Administration> : public @@ -183,13 +183,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:379 #if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR_SERVERNAMELIST__ARG_TRAITS_SS_) #define _IMPLEMENTATIONREPOSITORY_LOCATOR_SERVERNAMELIST__ARG_TRAITS_SS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::Locator::ServerNameList> : public diff --git a/TAO/tao/PortableServer/ImR_LocatorS.h b/TAO/tao/PortableServer/ImR_LocatorS.h index 95551511324..47a4e377bfc 100644 --- a/TAO/tao/PortableServer/ImR_LocatorS.h +++ b/TAO/tao/PortableServer/ImR_LocatorS.h @@ -60,85 +60,85 @@ namespace POA_ImplementationRepository { - - + + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:90 - + class Locator; typedef Locator *Locator_ptr; - + class _TAO_Locator_ThruPOA_Proxy_Impl; class _TAO_Locator_Direct_Proxy_Impl; class _TAO_Locator_Strategized_Proxy_Broker; - + class TAO_PortableServer_Export Locator : public virtual POA_ImplementationRepository::Administration { protected: Locator (void); - + public: // Useful for template programming. typedef ::ImplementationRepository::Locator _stub_type; typedef ::ImplementationRepository::Locator_ptr _stub_ptr_type; typedef ::ImplementationRepository::Locator_var _stub_var_type; - + Locator (const Locator& rhs); virtual ~Locator (void); - + virtual CORBA::Boolean _is_a ( const char* logical_type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual void* _downcast ( const char* logical_type_id ); - + static void _is_a_skel ( TAO_ServerRequest &req, void *servant, void *servant_upcall ACE_ENV_ARG_DECL ); - + static void _non_existent_skel ( TAO_ServerRequest &req, void *servant, void *servant_upcall ACE_ENV_ARG_DECL ); - + static void _interface_skel ( TAO_ServerRequest &req, void *servant, void *servant_upcall ACE_ENV_ARG_DECL ); - + static void _component_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall ACE_ENV_ARG_DECL ); - + virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall ACE_ENV_ARG_DECL ); - + ::ImplementationRepository::Locator *_this ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45 - + virtual void activate_server_in_activator ( const char * server, const char * activator @@ -149,17 +149,17 @@ namespace POA_ImplementationRepository ::ImplementationRepository::NotFound, ::ImplementationRepository::CannotActivate )) = 0; - + static void activate_server_in_activator_skel ( TAO_ServerRequest &_tao_req, void *_tao_servant, void *_tao_servant_upcall ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45 - + virtual void remove_server_in_activator ( const char * server, const char * activator @@ -169,17 +169,17 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )) = 0; - + static void remove_server_in_activator_skel ( TAO_ServerRequest &_tao_req, void *_tao_servant, void *_tao_servant_upcall ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45 - + virtual void shutdown_server_in_activator ( const char * server, const char * activator @@ -189,17 +189,17 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )) = 0; - + static void shutdown_server_in_activator_skel ( TAO_ServerRequest &_tao_req, void *_tao_servant, void *_tao_servant_upcall ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45 - + virtual void server_is_shutting_down_in_activator ( const char * server, const char * activator @@ -209,17 +209,17 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )) = 0; - + static void server_is_shutting_down_in_activator_skel ( TAO_ServerRequest &_tao_req, void *_tao_servant, void *_tao_servant_upcall ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45 - + virtual CORBA::Long register_activator ( const char * activator, ::ImplementationRepository::Administration_ptr admin, @@ -229,17 +229,17 @@ namespace POA_ImplementationRepository ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + static void register_activator_skel ( TAO_ServerRequest &_tao_req, void *_tao_servant, void *_tao_servant_upcall ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45 - + virtual void unregister_activator ( const char * activator, ::CORBA::Long token @@ -248,17 +248,17 @@ namespace POA_ImplementationRepository ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + static void unregister_activator_skel ( TAO_ServerRequest &_tao_req, void *_tao_servant, void *_tao_servant_upcall ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45 - + virtual void server_is_running_in_activator ( const char * server, const char * activator, @@ -270,17 +270,17 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )) = 0; - + static void server_is_running_in_activator_skel ( TAO_ServerRequest &_tao_req, void *_tao_servant, void *_tao_servant_upcall ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45 - + virtual void find_in_activator ( const char * server, const char * activator, @@ -291,169 +291,169 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )) = 0; - + static void find_in_activator_skel ( TAO_ServerRequest &_tao_req, void *_tao_servant, void *_tao_servant_upcall ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026 - + static void activate_server_skel ( - TAO_ServerRequest &req, + TAO_ServerRequest &req, void *obj, void *context ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026 - + static void activate_server_with_startup_skel ( - TAO_ServerRequest &req, + TAO_ServerRequest &req, void *obj, void *context ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026 - + static void register_server_skel ( - TAO_ServerRequest &req, + TAO_ServerRequest &req, void *obj, void *context ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026 - + static void reregister_server_skel ( - TAO_ServerRequest &req, + TAO_ServerRequest &req, void *obj, void *context ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026 - + static void remove_server_skel ( - TAO_ServerRequest &req, + TAO_ServerRequest &req, void *obj, void *context ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026 - + static void shutdown_server_skel ( - TAO_ServerRequest &req, + TAO_ServerRequest &req, void *obj, void *context ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026 - + static void server_is_running_skel ( - TAO_ServerRequest &req, + TAO_ServerRequest &req, void *obj, void *context ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026 - + static void server_is_shutting_down_skel ( - TAO_ServerRequest &req, + TAO_ServerRequest &req, void *obj, void *context ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026 - + static void find_skel ( - TAO_ServerRequest &req, + TAO_ServerRequest &req, void *obj, void *context ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026 - + static void list_skel ( - TAO_ServerRequest &req, + TAO_ServerRequest &req, void *obj, void *context ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026 - + static void shutdown_repo_skel ( - TAO_ServerRequest &req, + TAO_ServerRequest &req, void *obj, void *context ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026 - + static void find_ior_skel ( - TAO_ServerRequest &req, + TAO_ServerRequest &req, void *obj, void *context ACE_ENV_ARG_DECL_WITH_DEFAULTS ); }; - + /////////////////////////////////////////////////////////////////////// - // Strategized Proxy Broker Declaration + // Strategized Proxy Broker Declaration // - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36 - + class TAO_PortableServer_Export _TAO_Locator_Strategized_Proxy_Broker : public virtual TAO::Collocation_Proxy_Broker { - public: + public: _TAO_Locator_Strategized_Proxy_Broker (void); - + virtual ~_TAO_Locator_Strategized_Proxy_Broker (void); - + TAO::Collocation_Strategy get_strategy ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)); - + void dispatch ( CORBA::Object_ptr obj, @@ -466,34 +466,34 @@ namespace POA_ImplementationRepository ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::Exception)); - + static _TAO_Locator_Strategized_Proxy_Broker * the_TAO_Locator_Strategized_Proxy_Broker (void); }; - + // - // End Strategized Proxy Broker Declaration + // End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// - - + + /////////////////////////////////////////////////////////////////////// // ThruPOA Proxy Impl. Declaration // - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37 - + class TAO_PortableServer_Export _TAO_Locator_ThruPOA_Proxy_Impl : public virtual ::POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl { public: _TAO_Locator_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_Locator_ThruPOA_Proxy_Impl (void) {} - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void activate_server_in_activator ( TAO_Abstract_ServantBase *servant, @@ -506,10 +506,10 @@ namespace POA_ImplementationRepository ::ImplementationRepository::NotFound, ::ImplementationRepository::CannotActivate )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void remove_server_in_activator ( TAO_Abstract_ServantBase *servant, @@ -521,10 +521,10 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void shutdown_server_in_activator ( TAO_Abstract_ServantBase *servant, @@ -536,10 +536,10 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void server_is_shutting_down_in_activator ( TAO_Abstract_ServantBase *servant, @@ -551,10 +551,10 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void register_activator ( TAO_Abstract_ServantBase *servant, @@ -565,10 +565,10 @@ namespace POA_ImplementationRepository ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void unregister_activator ( TAO_Abstract_ServantBase *servant, @@ -579,10 +579,10 @@ namespace POA_ImplementationRepository ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void server_is_running_in_activator ( TAO_Abstract_ServantBase *servant, @@ -594,10 +594,10 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void find_in_activator ( TAO_Abstract_ServantBase *servant, @@ -609,13 +609,13 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214 - + static void activate_server ( - TAO_Abstract_ServantBase *servant, + TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int num_args ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -625,13 +625,13 @@ namespace POA_ImplementationRepository ::ImplementationRepository::NotFound, ::ImplementationRepository::CannotActivate )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214 - + static void activate_server_with_startup ( - TAO_Abstract_ServantBase *servant, + TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int num_args ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -641,13 +641,13 @@ namespace POA_ImplementationRepository ::ImplementationRepository::NotFound, ::ImplementationRepository::CannotActivate )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214 - + static void register_server ( - TAO_Abstract_ServantBase *servant, + TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int num_args ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -657,13 +657,13 @@ namespace POA_ImplementationRepository ::ImplementationRepository::AlreadyRegistered, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214 - + static void reregister_server ( - TAO_Abstract_ServantBase *servant, + TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int num_args ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -673,13 +673,13 @@ namespace POA_ImplementationRepository ::ImplementationRepository::AlreadyRegistered, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214 - + static void remove_server ( - TAO_Abstract_ServantBase *servant, + TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int num_args ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -688,13 +688,13 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214 - + static void shutdown_server ( - TAO_Abstract_ServantBase *servant, + TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int num_args ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -703,13 +703,13 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214 - + static void server_is_running ( - TAO_Abstract_ServantBase *servant, + TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int num_args ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -718,13 +718,13 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214 - + static void server_is_shutting_down ( - TAO_Abstract_ServantBase *servant, + TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int num_args ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -733,13 +733,13 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214 - + static void find ( - TAO_Abstract_ServantBase *servant, + TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int num_args ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -748,13 +748,13 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214 - + static void list ( - TAO_Abstract_ServantBase *servant, + TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int num_args ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -762,13 +762,13 @@ namespace POA_ImplementationRepository ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214 - + static void shutdown_repo ( - TAO_Abstract_ServantBase *servant, + TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int num_args ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -776,13 +776,13 @@ namespace POA_ImplementationRepository ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214 - + static void find_ior ( - TAO_Abstract_ServantBase *servant, + TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int num_args ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -792,29 +792,29 @@ namespace POA_ImplementationRepository ::ImplementationRepository::NotFound )); }; - + // // ThruPOA Proxy Impl. Declaration /////////////////////////////////////////////////////////////////////// - - // TAO_IDL - Generated from + + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/direct_proxy_impl_sh.cpp:31 - + /////////////////////////////////////////////////////////////////////// // Direct Impl. Declaration // - + class TAO_PortableServer_Export _TAO_Locator_Direct_Proxy_Impl : public virtual ::POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl { public: _TAO_Locator_Direct_Proxy_Impl (void); - + virtual ~_TAO_Locator_Direct_Proxy_Impl (void) {} - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void activate_server_in_activator ( TAO_Abstract_ServantBase *servant, @@ -827,10 +827,10 @@ namespace POA_ImplementationRepository ::ImplementationRepository::NotFound, ::ImplementationRepository::CannotActivate )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void remove_server_in_activator ( TAO_Abstract_ServantBase *servant, @@ -842,10 +842,10 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void shutdown_server_in_activator ( TAO_Abstract_ServantBase *servant, @@ -857,10 +857,10 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void server_is_shutting_down_in_activator ( TAO_Abstract_ServantBase *servant, @@ -872,10 +872,10 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void register_activator ( TAO_Abstract_ServantBase *servant, @@ -886,10 +886,10 @@ namespace POA_ImplementationRepository ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void unregister_activator ( TAO_Abstract_ServantBase *servant, @@ -900,10 +900,10 @@ namespace POA_ImplementationRepository ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void server_is_running_in_activator ( TAO_Abstract_ServantBase *servant, @@ -915,10 +915,10 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void find_in_activator ( TAO_Abstract_ServantBase *servant, @@ -930,13 +930,13 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214 - + static void activate_server ( - TAO_Abstract_ServantBase *servant, + TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int num_args ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -946,13 +946,13 @@ namespace POA_ImplementationRepository ::ImplementationRepository::NotFound, ::ImplementationRepository::CannotActivate )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214 - + static void activate_server_with_startup ( - TAO_Abstract_ServantBase *servant, + TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int num_args ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -962,13 +962,13 @@ namespace POA_ImplementationRepository ::ImplementationRepository::NotFound, ::ImplementationRepository::CannotActivate )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214 - + static void register_server ( - TAO_Abstract_ServantBase *servant, + TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int num_args ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -978,13 +978,13 @@ namespace POA_ImplementationRepository ::ImplementationRepository::AlreadyRegistered, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214 - + static void reregister_server ( - TAO_Abstract_ServantBase *servant, + TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int num_args ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -994,13 +994,13 @@ namespace POA_ImplementationRepository ::ImplementationRepository::AlreadyRegistered, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214 - + static void remove_server ( - TAO_Abstract_ServantBase *servant, + TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int num_args ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1009,13 +1009,13 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214 - + static void shutdown_server ( - TAO_Abstract_ServantBase *servant, + TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int num_args ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1024,13 +1024,13 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214 - + static void server_is_running ( - TAO_Abstract_ServantBase *servant, + TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int num_args ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1039,13 +1039,13 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214 - + static void server_is_shutting_down ( - TAO_Abstract_ServantBase *servant, + TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int num_args ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1054,13 +1054,13 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214 - + static void find ( - TAO_Abstract_ServantBase *servant, + TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int num_args ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1069,13 +1069,13 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214 - + static void list ( - TAO_Abstract_ServantBase *servant, + TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int num_args ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1083,13 +1083,13 @@ namespace POA_ImplementationRepository ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214 - + static void shutdown_repo ( - TAO_Abstract_ServantBase *servant, + TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int num_args ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1097,13 +1097,13 @@ namespace POA_ImplementationRepository ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214 - + static void find_ior ( - TAO_Abstract_ServantBase *servant, + TAO_Abstract_ServantBase *servant, TAO::Argument ** args, int num_args ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1113,24 +1113,24 @@ namespace POA_ImplementationRepository ::ImplementationRepository::NotFound )); }; - + // // Direct Proxy Impl. Declaration /////////////////////////////////////////////////////////////////////// - - + + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:80 } // module ImplementationRepository -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1012 #if defined (__ACE_INLINE__) -#include "ImR_LocatorS.inl" +#include "ImR_LocatorS.i" #endif /* defined INLINE */ #if defined(_MSC_VER) && (_MSC_VER >= 1200) diff --git a/TAO/tao/PortableServer/ImR_LocatorS.i b/TAO/tao/PortableServer/ImR_LocatorS.i new file mode 100644 index 00000000000..3c6b37372ed --- /dev/null +++ b/TAO/tao/PortableServer/ImR_LocatorS.i @@ -0,0 +1,858 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026 + +ACE_INLINE +void +POA_ImplementationRepository::Locator::activate_server_skel ( + TAO_ServerRequest &req, + void *obj, + void *context + ACE_ENV_ARG_DECL + ) +{ + POA_ImplementationRepository::Administration_ptr impl = (POA_ImplementationRepository::Locator_ptr) obj; + POA_ImplementationRepository::Administration::activate_server_skel ( + req, + (POA_ImplementationRepository::Administration_ptr) impl, + context + ACE_ENV_ARG_PARAMETER + ); +} + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026 + +ACE_INLINE +void +POA_ImplementationRepository::Locator::activate_server_with_startup_skel ( + TAO_ServerRequest &req, + void *obj, + void *context + ACE_ENV_ARG_DECL + ) +{ + POA_ImplementationRepository::Administration_ptr impl = (POA_ImplementationRepository::Locator_ptr) obj; + POA_ImplementationRepository::Administration::activate_server_with_startup_skel ( + req, + (POA_ImplementationRepository::Administration_ptr) impl, + context + ACE_ENV_ARG_PARAMETER + ); +} + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026 + +ACE_INLINE +void +POA_ImplementationRepository::Locator::register_server_skel ( + TAO_ServerRequest &req, + void *obj, + void *context + ACE_ENV_ARG_DECL + ) +{ + POA_ImplementationRepository::Administration_ptr impl = (POA_ImplementationRepository::Locator_ptr) obj; + POA_ImplementationRepository::Administration::register_server_skel ( + req, + (POA_ImplementationRepository::Administration_ptr) impl, + context + ACE_ENV_ARG_PARAMETER + ); +} + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026 + +ACE_INLINE +void +POA_ImplementationRepository::Locator::reregister_server_skel ( + TAO_ServerRequest &req, + void *obj, + void *context + ACE_ENV_ARG_DECL + ) +{ + POA_ImplementationRepository::Administration_ptr impl = (POA_ImplementationRepository::Locator_ptr) obj; + POA_ImplementationRepository::Administration::reregister_server_skel ( + req, + (POA_ImplementationRepository::Administration_ptr) impl, + context + ACE_ENV_ARG_PARAMETER + ); +} + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026 + +ACE_INLINE +void +POA_ImplementationRepository::Locator::remove_server_skel ( + TAO_ServerRequest &req, + void *obj, + void *context + ACE_ENV_ARG_DECL + ) +{ + POA_ImplementationRepository::Administration_ptr impl = (POA_ImplementationRepository::Locator_ptr) obj; + POA_ImplementationRepository::Administration::remove_server_skel ( + req, + (POA_ImplementationRepository::Administration_ptr) impl, + context + ACE_ENV_ARG_PARAMETER + ); +} + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026 + +ACE_INLINE +void +POA_ImplementationRepository::Locator::shutdown_server_skel ( + TAO_ServerRequest &req, + void *obj, + void *context + ACE_ENV_ARG_DECL + ) +{ + POA_ImplementationRepository::Administration_ptr impl = (POA_ImplementationRepository::Locator_ptr) obj; + POA_ImplementationRepository::Administration::shutdown_server_skel ( + req, + (POA_ImplementationRepository::Administration_ptr) impl, + context + ACE_ENV_ARG_PARAMETER + ); +} + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026 + +ACE_INLINE +void +POA_ImplementationRepository::Locator::server_is_running_skel ( + TAO_ServerRequest &req, + void *obj, + void *context + ACE_ENV_ARG_DECL + ) +{ + POA_ImplementationRepository::Administration_ptr impl = (POA_ImplementationRepository::Locator_ptr) obj; + POA_ImplementationRepository::Administration::server_is_running_skel ( + req, + (POA_ImplementationRepository::Administration_ptr) impl, + context + ACE_ENV_ARG_PARAMETER + ); +} + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026 + +ACE_INLINE +void +POA_ImplementationRepository::Locator::server_is_shutting_down_skel ( + TAO_ServerRequest &req, + void *obj, + void *context + ACE_ENV_ARG_DECL + ) +{ + POA_ImplementationRepository::Administration_ptr impl = (POA_ImplementationRepository::Locator_ptr) obj; + POA_ImplementationRepository::Administration::server_is_shutting_down_skel ( + req, + (POA_ImplementationRepository::Administration_ptr) impl, + context + ACE_ENV_ARG_PARAMETER + ); +} + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026 + +ACE_INLINE +void +POA_ImplementationRepository::Locator::find_skel ( + TAO_ServerRequest &req, + void *obj, + void *context + ACE_ENV_ARG_DECL + ) +{ + POA_ImplementationRepository::Administration_ptr impl = (POA_ImplementationRepository::Locator_ptr) obj; + POA_ImplementationRepository::Administration::find_skel ( + req, + (POA_ImplementationRepository::Administration_ptr) impl, + context + ACE_ENV_ARG_PARAMETER + ); +} + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026 + +ACE_INLINE +void +POA_ImplementationRepository::Locator::list_skel ( + TAO_ServerRequest &req, + void *obj, + void *context + ACE_ENV_ARG_DECL + ) +{ + POA_ImplementationRepository::Administration_ptr impl = (POA_ImplementationRepository::Locator_ptr) obj; + POA_ImplementationRepository::Administration::list_skel ( + req, + (POA_ImplementationRepository::Administration_ptr) impl, + context + ACE_ENV_ARG_PARAMETER + ); +} + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026 + +ACE_INLINE +void +POA_ImplementationRepository::Locator::shutdown_repo_skel ( + TAO_ServerRequest &req, + void *obj, + void *context + ACE_ENV_ARG_DECL + ) +{ + POA_ImplementationRepository::Administration_ptr impl = (POA_ImplementationRepository::Locator_ptr) obj; + POA_ImplementationRepository::Administration::shutdown_repo_skel ( + req, + (POA_ImplementationRepository::Administration_ptr) impl, + context + ACE_ENV_ARG_PARAMETER + ); +} + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026 + +ACE_INLINE +void +POA_ImplementationRepository::Locator::find_ior_skel ( + TAO_ServerRequest &req, + void *obj, + void *context + ACE_ENV_ARG_DECL + ) +{ + POA_ImplementationRepository::Administration_ptr impl = (POA_ImplementationRepository::Locator_ptr) obj; + POA_ImplementationRepository::Administration::find_ior_skel ( + req, + (POA_ImplementationRepository::Administration_ptr) impl, + context + ACE_ENV_ARG_PARAMETER + ); +} + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334 + +ACE_INLINE void +POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::activate_server ( + TAO_Abstract_ServantBase *servant, + TAO::Argument ** args, + int num_args + ACE_ENV_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ::ImplementationRepository::NotFound, + ::ImplementationRepository::CannotActivate + )) +{ + POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activate_server ( + servant, + args, + num_args + ACE_ENV_ARG_PARAMETER + ); +} + + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334 + +ACE_INLINE void +POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::activate_server ( + TAO_Abstract_ServantBase *servant, + TAO::Argument ** args, + int num_args + ACE_ENV_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ::ImplementationRepository::NotFound, + ::ImplementationRepository::CannotActivate + )) +{ + POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_server ( + servant, + args, + num_args + ACE_ENV_ARG_PARAMETER + ); +} + + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334 + +ACE_INLINE void +POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::activate_server_with_startup ( + TAO_Abstract_ServantBase *servant, + TAO::Argument ** args, + int num_args + ACE_ENV_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ::ImplementationRepository::NotFound, + ::ImplementationRepository::CannotActivate + )) +{ + POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activate_server_with_startup ( + servant, + args, + num_args + ACE_ENV_ARG_PARAMETER + ); +} + + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334 + +ACE_INLINE void +POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::activate_server_with_startup ( + TAO_Abstract_ServantBase *servant, + TAO::Argument ** args, + int num_args + ACE_ENV_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ::ImplementationRepository::NotFound, + ::ImplementationRepository::CannotActivate + )) +{ + POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_server_with_startup ( + servant, + args, + num_args + ACE_ENV_ARG_PARAMETER + ); +} + + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334 + +ACE_INLINE void +POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::register_server ( + TAO_Abstract_ServantBase *servant, + TAO::Argument ** args, + int num_args + ACE_ENV_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ::ImplementationRepository::AlreadyRegistered, + ::ImplementationRepository::NotFound + )) +{ + POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::register_server ( + servant, + args, + num_args + ACE_ENV_ARG_PARAMETER + ); +} + + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334 + +ACE_INLINE void +POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::register_server ( + TAO_Abstract_ServantBase *servant, + TAO::Argument ** args, + int num_args + ACE_ENV_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ::ImplementationRepository::AlreadyRegistered, + ::ImplementationRepository::NotFound + )) +{ + POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::register_server ( + servant, + args, + num_args + ACE_ENV_ARG_PARAMETER + ); +} + + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334 + +ACE_INLINE void +POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::reregister_server ( + TAO_Abstract_ServantBase *servant, + TAO::Argument ** args, + int num_args + ACE_ENV_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ::ImplementationRepository::AlreadyRegistered, + ::ImplementationRepository::NotFound + )) +{ + POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::reregister_server ( + servant, + args, + num_args + ACE_ENV_ARG_PARAMETER + ); +} + + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334 + +ACE_INLINE void +POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::reregister_server ( + TAO_Abstract_ServantBase *servant, + TAO::Argument ** args, + int num_args + ACE_ENV_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ::ImplementationRepository::AlreadyRegistered, + ::ImplementationRepository::NotFound + )) +{ + POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregister_server ( + servant, + args, + num_args + ACE_ENV_ARG_PARAMETER + ); +} + + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334 + +ACE_INLINE void +POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::remove_server ( + TAO_Abstract_ServantBase *servant, + TAO::Argument ** args, + int num_args + ACE_ENV_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ::ImplementationRepository::NotFound + )) +{ + POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remove_server ( + servant, + args, + num_args + ACE_ENV_ARG_PARAMETER + ); +} + + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334 + +ACE_INLINE void +POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::remove_server ( + TAO_Abstract_ServantBase *servant, + TAO::Argument ** args, + int num_args + ACE_ENV_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ::ImplementationRepository::NotFound + )) +{ + POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove_server ( + servant, + args, + num_args + ACE_ENV_ARG_PARAMETER + ); +} + + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334 + +ACE_INLINE void +POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::shutdown_server ( + TAO_Abstract_ServantBase *servant, + TAO::Argument ** args, + int num_args + ACE_ENV_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ::ImplementationRepository::NotFound + )) +{ + POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutdown_server ( + servant, + args, + num_args + ACE_ENV_ARG_PARAMETER + ); +} + + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334 + +ACE_INLINE void +POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::shutdown_server ( + TAO_Abstract_ServantBase *servant, + TAO::Argument ** args, + int num_args + ACE_ENV_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ::ImplementationRepository::NotFound + )) +{ + POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown_server ( + servant, + args, + num_args + ACE_ENV_ARG_PARAMETER + ); +} + + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334 + +ACE_INLINE void +POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::server_is_running ( + TAO_Abstract_ServantBase *servant, + TAO::Argument ** args, + int num_args + ACE_ENV_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ::ImplementationRepository::NotFound + )) +{ + POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::server_is_running ( + servant, + args, + num_args + ACE_ENV_ARG_PARAMETER + ); +} + + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334 + +ACE_INLINE void +POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::server_is_running ( + TAO_Abstract_ServantBase *servant, + TAO::Argument ** args, + int num_args + ACE_ENV_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ::ImplementationRepository::NotFound + )) +{ + POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_running ( + servant, + args, + num_args + ACE_ENV_ARG_PARAMETER + ); +} + + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334 + +ACE_INLINE void +POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::server_is_shutting_down ( + TAO_Abstract_ServantBase *servant, + TAO::Argument ** args, + int num_args + ACE_ENV_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ::ImplementationRepository::NotFound + )) +{ + POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::server_is_shutting_down ( + servant, + args, + num_args + ACE_ENV_ARG_PARAMETER + ); +} + + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334 + +ACE_INLINE void +POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::server_is_shutting_down ( + TAO_Abstract_ServantBase *servant, + TAO::Argument ** args, + int num_args + ACE_ENV_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ::ImplementationRepository::NotFound + )) +{ + POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_shutting_down ( + servant, + args, + num_args + ACE_ENV_ARG_PARAMETER + ); +} + + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334 + +ACE_INLINE void +POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::find ( + TAO_Abstract_ServantBase *servant, + TAO::Argument ** args, + int num_args + ACE_ENV_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ::ImplementationRepository::NotFound + )) +{ + POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find ( + servant, + args, + num_args + ACE_ENV_ARG_PARAMETER + ); +} + + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334 + +ACE_INLINE void +POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::find ( + TAO_Abstract_ServantBase *servant, + TAO::Argument ** args, + int num_args + ACE_ENV_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ::ImplementationRepository::NotFound + )) +{ + POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find ( + servant, + args, + num_args + ACE_ENV_ARG_PARAMETER + ); +} + + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334 + +ACE_INLINE void +POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::list ( + TAO_Abstract_ServantBase *servant, + TAO::Argument ** args, + int num_args + ACE_ENV_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) +{ + POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::list ( + servant, + args, + num_args + ACE_ENV_ARG_PARAMETER + ); +} + + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334 + +ACE_INLINE void +POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::list ( + TAO_Abstract_ServantBase *servant, + TAO::Argument ** args, + int num_args + ACE_ENV_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) +{ + POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list ( + servant, + args, + num_args + ACE_ENV_ARG_PARAMETER + ); +} + + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334 + +ACE_INLINE void +POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::shutdown_repo ( + TAO_Abstract_ServantBase *servant, + TAO::Argument ** args, + int num_args + ACE_ENV_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) +{ + POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutdown_repo ( + servant, + args, + num_args + ACE_ENV_ARG_PARAMETER + ); +} + + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334 + +ACE_INLINE void +POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::shutdown_repo ( + TAO_Abstract_ServantBase *servant, + TAO::Argument ** args, + int num_args + ACE_ENV_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) +{ + POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown_repo ( + servant, + args, + num_args + ACE_ENV_ARG_PARAMETER + ); +} + + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334 + +ACE_INLINE void +POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::find_ior ( + TAO_Abstract_ServantBase *servant, + TAO::Argument ** args, + int num_args + ACE_ENV_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ::ImplementationRepository::NotFound + )) +{ + POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find_ior ( + servant, + args, + num_args + ACE_ENV_ARG_PARAMETER + ); +} + + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334 + +ACE_INLINE void +POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::find_ior ( + TAO_Abstract_ServantBase *servant, + TAO::Argument ** args, + int num_args + ACE_ENV_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ::ImplementationRepository::NotFound + )) +{ + POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find_ior ( + servant, + args, + num_args + ACE_ENV_ARG_PARAMETER + ); +} diff --git a/TAO/tao/PortableServer/ImplRepo.pidl b/TAO/tao/PortableServer/ImplRepo.pidl index cbeb5fc3708..2cc3e94bfe9 100644 --- a/TAO/tao/PortableServer/ImplRepo.pidl +++ b/TAO/tao/PortableServer/ImplRepo.pidl @@ -17,52 +17,52 @@ module ImplementationRepository { - /** - * @brief Server Side IR Object - * - * This object, which exists on the servers that use the - * Implementation Repository (IR), is used to control or check the - * status of the server by the IR. - */ interface ServerObject + // = TITLE + // Server Side IR Object + // + // = DESCRIPTION + // This object, which exists on the servers that use the + // Implementation Repository (IR), is used to control or check the + // status of the server by the IR. { - /// Check the liveness of a server. void ping (); + // Check the liveness of a server. - /// Try to shutdown the server gracefully. void shutdown (); + // Try to shutdown the server gracefully. }; // = Exceptions - /// Object already bound in the Implementation Repository exception AlreadyRegistered {}; + // Object already bound in the Implementation Repository - /// The server could not be restarted. exception CannotActivate { string reason; }; + // The server could not be restarted. - /// Object not found in the Implementation Repository exception NotFound {}; + // Object not found in the Implementation Repository - /// One environment variable/value pair. struct EnvironmentVariable + // One environment variable/value pair. { string name; string value; }; - /// This is used in places that require a partial IOR with - /// just the ObjectKey missing. typedef string Address; + // This is used in places that require a partial IOR with + // just the ObjectKey missing. - /// Complete Environment. typedef sequence<EnvironmentVariable> EnvironmentList; + // Complete Environment. - /// The type of Activation enum ActivationMode {NORMAL, MANUAL, PER_CLIENT, AUTO_START}; + // The type of Activation /// Options used to start up the server. struct StartupOptions @@ -83,8 +83,8 @@ module ImplementationRepository string activator; }; - /// All the information about one server. struct ServerInformation + // All the information about one server. { /// The logical server this server is part of. string logical_server; @@ -104,115 +104,118 @@ module ImplementationRepository /// Forward declaration. interface ServerInformationIterator; - /** - * @brief The Implementation Repository Administration Interface - * - * This interface exports all the administration functionality of - * the Implementation Repository. - */ + interface Administration + // = TITLE + // The Implementation Repository Administration Interface + // + // = DESCRIPTION + // This interface exports all the administration functionality of + // the Implementation Repository. { - /// Activate server that is named @a server. - /// - /// The <NotFound> exception is raised when <server> is not found - /// in the Implementation Repository. The <CannotActivate> exception - /// is raised when <server> is found in the Repository but could not be - /// activated. void activate_server (in string server) raises (NotFound, CannotActivate); + // Activate server that is named <server>. + // + // The <NotFound> exception is raised when <server> is not found + // in the Implementation Repository. The <CannotActivate> exception + // is raised when <server> is found in the Repository but could not be + // activated. string activate_server_with_startup (in string server, in long check_startup) raises (NotFound, CannotActivate); - /// Register the <options> to specify how the <server> should be - /// restarted when a client asks for it. - /// - /// The <AlreadyRegistered> exception is raised when <server> has - /// already been registered with the Implementation Repository. - /// The <NotFound> exception is raised when the activator specified - /// in the options is not registered. void register_server (in string server, in StartupOptions options) raises (AlreadyRegistered, NotFound); + // Register the <options> to specify how the <server> should be + // restarted when a client asks for it. + // + // The <AlreadyRegistered> exception is raised when <server> has + // already been registered with the Implementation Repository. + // The <NotFound> exception is raised when the activator specified + // in the options is not registered. - /// Update the <options> to specify how the <server> should be - /// restarted when a client asks for it. Will register the server - /// if not already registered. - /// The <AlreadyRegistered> exception is raised when <server> has - /// already been registered with a different activator. - /// The <NotFound> exception is raised when the activator specified - /// in the options is not registered. void reregister_server (in string server, in StartupOptions options) raises(AlreadyRegistered, NotFound); + // Update the <options> to specify how the <server> should be + // restarted when a client asks for it. Will register the server + // if not already registered. + // The <AlreadyRegistered> exception is raised when <server> has + // already been registered with a different activator. + // The <NotFound> exception is raised when the activator specified + // in the options is not registered. - /// Remove <server> from the Implementation Repository. - /// - /// The <NotFound> exception is raised when <server> is not found - /// in the Implementation Repository. void remove_server (in string server) raises (NotFound); + // Remove <server> from the Implementation Repository. + // + // The <NotFound> exception is raised when <server> is not found + // in the Implementation Repository. - /// Tries to shutdown the server, first gracefully, then ungracefully. - /// - /// The <NotFound> exception is raised when <server> is not found - /// in the Implementation Repository. void shutdown_server (in string server) raises (NotFound); + // Tries to shutdown the server, first gracefully, then ungracefully. + // + // The <NotFound> exception is raised when <server> is not found + // in the Implementation Repository. - /// Used to notify the Implementation Repository that <server> is alive - /// and well at <addr>. - /// - /// The <NotFound> exception is raised when <server> is not found - /// in the Implementation Repository. void server_is_running (in string server, in Address addr, in ServerObject server_object) raises (NotFound); + // Used to notify the Implementation Repository that <server> is alive + // and well at <addr>. + // + // The <NotFound> exception is raised when <server> is not found + // in the Implementation Repository. - /// Used to tell the Implementation Repository that <server> is shutting - /// down. - /// - /// The <NotFound> exception is raised when <server> is not found - /// in the Implementation Repository. void server_is_shutting_down (in string server) raises (NotFound); + // Used to tell the Implementation Repository that <server> is shutting + // down. + // + // The <NotFound> exception is raised when <server> is not found + // in the Implementation Repository. - /// Returns the startup information for a given <server>. - /// - /// The <NotFound> exception is raised when <server> is not found - /// in the Implementation Repository. void find (in string server, out ServerInformation info) raises (NotFound); + // Returns the startup information for a given <server>. + // + // The <NotFound> exception is raised when <server> is not found + // in the Implementation Repository. - /// Returns at most <how_many> servers in <server_list>. If there - /// are additional servers, they can be received through the - /// <server_iterator>. If there are no more servers, then - /// <server_iterator> is null. void list (in unsigned long how_many, out ServerInformationList server_list, out ServerInformationIterator server_iterator); + // Returns at most <how_many> servers in <server_list>. If there + // are additional servers, they can be received through the + // <server_iterator>. If there are no more servers, then + // <server_iterator> is null. - /// Shuts down the repository void shutdown_repo() ; + // Shuts down the repository string find_ior (in string object_name) raises (NotFound); }; - /// Interface for iterating over servers returned with - /// Administration::list (). interface ServerInformationIterator { - /// This operation returns at most the requested number of - /// servers. + // = TITLE + // Interface for iterating over servers returned with + // Administration::list (). + boolean next_n (in unsigned long how_many, out ServerInformationList server_list); + // This operation returns at most the requested number of + // servers. - /// This operation destroys the iterator. void destroy (); + // This operation destroys the iterator. }; }; diff --git a/TAO/tao/PortableServer/ImplRepoC.cpp b/TAO/tao/PortableServer/ImplRepoC.cpp index 143506a5db1..c524a0b68cf 100644 --- a/TAO/tao/PortableServer/ImplRepoC.cpp +++ b/TAO/tao/PortableServer/ImplRepoC.cpp @@ -50,7 +50,7 @@ #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) -#include "ImplRepoC.inl" +#include "ImplRepoC.i" #endif /* !defined INLINE */ // TAO_IDL - Generated from @@ -62,7 +62,7 @@ namespace TAO #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_CS_) #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerObject> : public @@ -76,13 +76,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:618 #if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_CS_) #define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::StartupOptions> : public @@ -95,13 +95,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:618 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_CS_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformation> : public @@ -114,13 +114,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:379 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_CS_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformationList> : public @@ -136,7 +136,7 @@ namespace TAO #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_CS_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformationIterator> : public @@ -160,7 +160,7 @@ namespace TAO ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION ImplementationRepository::ServerObject_ptr -TAO::Objref_Traits<ImplementationRepository::ServerObject>::duplicate ( +TAO::Objref_Traits<ImplementationRepository::ServerObject>::tao_duplicate ( ImplementationRepository::ServerObject_ptr p ) { @@ -169,7 +169,7 @@ TAO::Objref_Traits<ImplementationRepository::ServerObject>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<ImplementationRepository::ServerObject>::release ( +TAO::Objref_Traits<ImplementationRepository::ServerObject>::tao_release ( ImplementationRepository::ServerObject_ptr p ) { @@ -178,14 +178,14 @@ TAO::Objref_Traits<ImplementationRepository::ServerObject>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION ImplementationRepository::ServerObject_ptr -TAO::Objref_Traits<ImplementationRepository::ServerObject>::nil (void) +TAO::Objref_Traits<ImplementationRepository::ServerObject>::tao_nil (void) { return ImplementationRepository::ServerObject::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<ImplementationRepository::ServerObject>::marshal ( +TAO::Objref_Traits<ImplementationRepository::ServerObject>::tao_marshal ( ImplementationRepository::ServerObject_ptr p, TAO_OutputCDR & cdr ) @@ -194,7 +194,7 @@ TAO::Objref_Traits<ImplementationRepository::ServerObject>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -213,19 +213,19 @@ void ImplementationRepository::ServerObject::ping ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_ServerObject_Proxy_Broker_ == 0) { ImplementationRepository_ServerObject_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -234,7 +234,7 @@ void ImplementationRepository::ServerObject::ping ( 4, this->the_TAO_ServerObject_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -253,19 +253,19 @@ void ImplementationRepository::ServerObject::shutdown ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_ServerObject_Proxy_Broker_ == 0) { ImplementationRepository_ServerObject_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -274,7 +274,7 @@ void ImplementationRepository::ServerObject::shutdown ( 8, this->the_TAO_ServerObject_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -298,7 +298,7 @@ ImplementationRepository::ServerObject::ImplementationRepository_ServerObject_se ImplementationRepository::ServerObject::~ServerObject (void) {} -void +void ImplementationRepository::ServerObject::_tao_any_destructor (void *_tao_void_pointer) { ServerObject *_tao_tmp_pointer = @@ -343,7 +343,7 @@ ImplementationRepository::ServerObject::_duplicate (ServerObject_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -393,22 +393,22 @@ static const CORBA::Long _oc_ImplementationRepository_ServerObject[] = { TAO_ENCAP_BYTE_ORDER, // byte order 46, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f536572), - ACE_NTOHL (0x7665724f), - ACE_NTOHL (0x626a6563), - ACE_NTOHL (0x743a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f536572), + ACE_NTOHL (0x7665724f), + ACE_NTOHL (0x626a6563), + ACE_NTOHL (0x743a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:ImplementationRepository/ServerObject:1.0 13, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x65724f62), - ACE_NTOHL (0x6a656374), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x65724f62), + ACE_NTOHL (0x6a656374), ACE_NTOHL (0x0), // name = ServerObject }; @@ -426,7 +426,7 @@ namespace ImplementationRepository &_tc_TAO_tc_ImplementationRepository_ServerObject; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63 ImplementationRepository::AlreadyRegistered::AlreadyRegistered (void) @@ -509,7 +509,7 @@ void ImplementationRepository::AlreadyRegistered::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -522,7 +522,7 @@ void ImplementationRepository::AlreadyRegistered::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -539,24 +539,24 @@ static const CORBA::Long _oc_ImplementationRepository_AlreadyRegistered[] = { TAO_ENCAP_BYTE_ORDER, // byte order 51, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f416c72), - ACE_NTOHL (0x65616479), - ACE_NTOHL (0x52656769), - ACE_NTOHL (0x73746572), - ACE_NTOHL (0x65643a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f416c72), + ACE_NTOHL (0x65616479), + ACE_NTOHL (0x52656769), + ACE_NTOHL (0x73746572), + ACE_NTOHL (0x65643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:ImplementationRepository/AlreadyRegistered:1.0 18, - ACE_NTOHL (0x416c7265), - ACE_NTOHL (0x61647952), - ACE_NTOHL (0x65676973), - ACE_NTOHL (0x74657265), + ACE_NTOHL (0x416c7265), + ACE_NTOHL (0x61647952), + ACE_NTOHL (0x65676973), + ACE_NTOHL (0x74657265), ACE_NTOHL (0x64000000), // name = AlreadyRegistered 0, // member count }; @@ -575,7 +575,7 @@ namespace ImplementationRepository &_tc_TAO_tc_ImplementationRepository_AlreadyRegistered; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63 ImplementationRepository::CannotActivate::CannotActivate (void) @@ -660,7 +660,7 @@ void ImplementationRepository::CannotActivate::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -673,7 +673,7 @@ void ImplementationRepository::CannotActivate::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -706,28 +706,28 @@ static const CORBA::Long _oc_ImplementationRepository_CannotActivate[] = { TAO_ENCAP_BYTE_ORDER, // byte order 48, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f43616e), - ACE_NTOHL (0x6e6f7441), - ACE_NTOHL (0x63746976), - ACE_NTOHL (0x6174653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f43616e), + ACE_NTOHL (0x6e6f7441), + ACE_NTOHL (0x63746976), + ACE_NTOHL (0x6174653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:ImplementationRepository/CannotActivate:1.0 15, - ACE_NTOHL (0x43616e6e), - ACE_NTOHL (0x6f744163), - ACE_NTOHL (0x74697661), + ACE_NTOHL (0x43616e6e), + ACE_NTOHL (0x6f744163), + ACE_NTOHL (0x74697661), ACE_NTOHL (0x74650000), // name = CannotActivate 1, // member count 7, - ACE_NTOHL (0x72656173), + ACE_NTOHL (0x72656173), ACE_NTOHL (0x6f6e0000), // name = reason - CORBA::tk_string, + CORBA::tk_string, 0U, // string length }; @@ -745,7 +745,7 @@ namespace ImplementationRepository &_tc_TAO_tc_ImplementationRepository_CannotActivate; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63 ImplementationRepository::NotFound::NotFound (void) @@ -828,7 +828,7 @@ void ImplementationRepository::NotFound::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -841,7 +841,7 @@ void ImplementationRepository::NotFound::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -858,20 +858,20 @@ static const CORBA::Long _oc_ImplementationRepository_NotFound[] = { TAO_ENCAP_BYTE_ORDER, // byte order 42, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f4e6f74), - ACE_NTOHL (0x466f756e), - ACE_NTOHL (0x643a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f4e6f74), + ACE_NTOHL (0x466f756e), + ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:ImplementationRepository/NotFound:1.0 9, - ACE_NTOHL (0x4e6f7446), - ACE_NTOHL (0x6f756e64), + ACE_NTOHL (0x4e6f7446), + ACE_NTOHL (0x6f756e64), ACE_NTOHL (0x0), // name = NotFound 0, // member count }; @@ -897,36 +897,36 @@ static const CORBA::Long _oc_ImplementationRepository_EnvironmentVariable[] = { TAO_ENCAP_BYTE_ORDER, // byte order 53, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f456e76), - ACE_NTOHL (0x69726f6e), - ACE_NTOHL (0x6d656e74), - ACE_NTOHL (0x56617269), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f456e76), + ACE_NTOHL (0x69726f6e), + ACE_NTOHL (0x6d656e74), + ACE_NTOHL (0x56617269), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0 20, - ACE_NTOHL (0x456e7669), - ACE_NTOHL (0x726f6e6d), - ACE_NTOHL (0x656e7456), - ACE_NTOHL (0x61726961), + ACE_NTOHL (0x456e7669), + ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e7456), + ACE_NTOHL (0x61726961), ACE_NTOHL (0x626c6500), // name = EnvironmentVariable 2, // member count 5, - ACE_NTOHL (0x6e616d65), + ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 6, - ACE_NTOHL (0x76616c75), + ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000), // name = value - CORBA::tk_string, + CORBA::tk_string, 0U, // string length }; @@ -944,10 +944,10 @@ namespace ImplementationRepository &_tc_TAO_tc_ImplementationRepository_EnvironmentVariable; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 -void +void ImplementationRepository::EnvironmentVariable::_tao_any_destructor ( void *_tao_void_pointer ) @@ -964,21 +964,21 @@ static const CORBA::Long _oc_ImplementationRepository_Address[] = { TAO_ENCAP_BYTE_ORDER, // byte order 41, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f416464), - ACE_NTOHL (0x72657373), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f416464), + ACE_NTOHL (0x72657373), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/Address:1.0 8, - ACE_NTOHL (0x41646472), + ACE_NTOHL (0x41646472), ACE_NTOHL (0x65737300), // name = Address - CORBA::tk_string, + CORBA::tk_string, 0U, // string length }; @@ -996,7 +996,7 @@ namespace ImplementationRepository &_tc_TAO_tc_ImplementationRepository_Address; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_) @@ -1056,23 +1056,23 @@ static const CORBA::Long _oc_ImplementationRepository_EnvironmentList[] = { TAO_ENCAP_BYTE_ORDER, // byte order 49, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f456e76), - ACE_NTOHL (0x69726f6e), - ACE_NTOHL (0x6d656e74), - ACE_NTOHL (0x4c697374), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f456e76), + ACE_NTOHL (0x69726f6e), + ACE_NTOHL (0x6d656e74), + ACE_NTOHL (0x4c697374), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0 16, - ACE_NTOHL (0x456e7669), - ACE_NTOHL (0x726f6e6d), - ACE_NTOHL (0x656e744c), + ACE_NTOHL (0x456e7669), + ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e744c), ACE_NTOHL (0x69737400), // name = EnvironmentList CORBA::tk_sequence, // typecode kind 148, // encapsulation length @@ -1081,36 +1081,36 @@ static const CORBA::Long _oc_ImplementationRepository_EnvironmentList[] = 132, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 53, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f456e76), - ACE_NTOHL (0x69726f6e), - ACE_NTOHL (0x6d656e74), - ACE_NTOHL (0x56617269), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f456e76), + ACE_NTOHL (0x69726f6e), + ACE_NTOHL (0x6d656e74), + ACE_NTOHL (0x56617269), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0 20, - ACE_NTOHL (0x456e7669), - ACE_NTOHL (0x726f6e6d), - ACE_NTOHL (0x656e7456), - ACE_NTOHL (0x61726961), + ACE_NTOHL (0x456e7669), + ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e7456), + ACE_NTOHL (0x61726961), ACE_NTOHL (0x626c6500), // name = EnvironmentVariable 2, // member count 5, - ACE_NTOHL (0x6e616d65), + ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 6, - ACE_NTOHL (0x76616c75), + ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000), // name = value - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 0U, @@ -1138,37 +1138,37 @@ static const CORBA::Long _oc_ImplementationRepository_ActivationMode[] = { TAO_ENCAP_BYTE_ORDER, // byte order 48, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f416374), - ACE_NTOHL (0x69766174), - ACE_NTOHL (0x696f6e4d), - ACE_NTOHL (0x6f64653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f416374), + ACE_NTOHL (0x69766174), + ACE_NTOHL (0x696f6e4d), + ACE_NTOHL (0x6f64653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:ImplementationRepository/ActivationMode:1.0 15, - ACE_NTOHL (0x41637469), - ACE_NTOHL (0x76617469), - ACE_NTOHL (0x6f6e4d6f), + ACE_NTOHL (0x41637469), + ACE_NTOHL (0x76617469), + ACE_NTOHL (0x6f6e4d6f), ACE_NTOHL (0x64650000), // name = ActivationMode 4, // member count 7, - ACE_NTOHL (0x4e4f524d), + ACE_NTOHL (0x4e4f524d), ACE_NTOHL (0x414c0000), // name = NORMAL 7, - ACE_NTOHL (0x4d414e55), + ACE_NTOHL (0x4d414e55), ACE_NTOHL (0x414c0000), // name = MANUAL 11, - ACE_NTOHL (0x5045525f), - ACE_NTOHL (0x434c4945), + ACE_NTOHL (0x5045525f), + ACE_NTOHL (0x434c4945), ACE_NTOHL (0x4e540000), // name = PER_CLIENT 11, - ACE_NTOHL (0x4155544f), - ACE_NTOHL (0x5f535441), + ACE_NTOHL (0x4155544f), + ACE_NTOHL (0x5f535441), ACE_NTOHL (0x52540000), // name = AUTO_START }; @@ -1193,56 +1193,56 @@ static const CORBA::Long _oc_ImplementationRepository_StartupOptions[] = { TAO_ENCAP_BYTE_ORDER, // byte order 48, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f537461), - ACE_NTOHL (0x72747570), - ACE_NTOHL (0x4f707469), - ACE_NTOHL (0x6f6e733a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f537461), + ACE_NTOHL (0x72747570), + ACE_NTOHL (0x4f707469), + ACE_NTOHL (0x6f6e733a), ACE_NTOHL (0x312e3000), // repository ID = IDL:ImplementationRepository/StartupOptions:1.0 15, - ACE_NTOHL (0x53746172), - ACE_NTOHL (0x7475704f), - ACE_NTOHL (0x7074696f), + ACE_NTOHL (0x53746172), + ACE_NTOHL (0x7475704f), + ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = StartupOptions 5, // member count 13, - ACE_NTOHL (0x636f6d6d), - ACE_NTOHL (0x616e645f), - ACE_NTOHL (0x6c696e65), + ACE_NTOHL (0x636f6d6d), + ACE_NTOHL (0x616e645f), + ACE_NTOHL (0x6c696e65), ACE_NTOHL (0x0), // name = command_line - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 12, - ACE_NTOHL (0x656e7669), - ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e7669), + ACE_NTOHL (0x726f6e6d), ACE_NTOHL (0x656e7400), // name = environment CORBA::tk_alias, // typecode kind for typedefs 236, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 49, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f456e76), - ACE_NTOHL (0x69726f6e), - ACE_NTOHL (0x6d656e74), - ACE_NTOHL (0x4c697374), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f456e76), + ACE_NTOHL (0x69726f6e), + ACE_NTOHL (0x6d656e74), + ACE_NTOHL (0x4c697374), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0 16, - ACE_NTOHL (0x456e7669), - ACE_NTOHL (0x726f6e6d), - ACE_NTOHL (0x656e744c), + ACE_NTOHL (0x456e7669), + ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e744c), ACE_NTOHL (0x69737400), // name = EnvironmentList CORBA::tk_sequence, // typecode kind 148, // encapsulation length @@ -1251,95 +1251,95 @@ static const CORBA::Long _oc_ImplementationRepository_StartupOptions[] = 132, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 53, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f456e76), - ACE_NTOHL (0x69726f6e), - ACE_NTOHL (0x6d656e74), - ACE_NTOHL (0x56617269), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f456e76), + ACE_NTOHL (0x69726f6e), + ACE_NTOHL (0x6d656e74), + ACE_NTOHL (0x56617269), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0 20, - ACE_NTOHL (0x456e7669), - ACE_NTOHL (0x726f6e6d), - ACE_NTOHL (0x656e7456), - ACE_NTOHL (0x61726961), + ACE_NTOHL (0x456e7669), + ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e7456), + ACE_NTOHL (0x61726961), ACE_NTOHL (0x626c6500), // name = EnvironmentVariable 2, // member count 5, - ACE_NTOHL (0x6e616d65), + ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 6, - ACE_NTOHL (0x76616c75), + ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000), // name = value - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 0U, 18, - ACE_NTOHL (0x776f726b), - ACE_NTOHL (0x696e675f), - ACE_NTOHL (0x64697265), - ACE_NTOHL (0x63746f72), + ACE_NTOHL (0x776f726b), + ACE_NTOHL (0x696e675f), + ACE_NTOHL (0x64697265), + ACE_NTOHL (0x63746f72), ACE_NTOHL (0x79000000), // name = working_directory - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 11, - ACE_NTOHL (0x61637469), - ACE_NTOHL (0x76617469), + ACE_NTOHL (0x61637469), + ACE_NTOHL (0x76617469), ACE_NTOHL (0x6f6e0000), // name = activation CORBA::tk_enum, // typecode kind 136, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 48, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f416374), - ACE_NTOHL (0x69766174), - ACE_NTOHL (0x696f6e4d), - ACE_NTOHL (0x6f64653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f416374), + ACE_NTOHL (0x69766174), + ACE_NTOHL (0x696f6e4d), + ACE_NTOHL (0x6f64653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:ImplementationRepository/ActivationMode:1.0 15, - ACE_NTOHL (0x41637469), - ACE_NTOHL (0x76617469), - ACE_NTOHL (0x6f6e4d6f), + ACE_NTOHL (0x41637469), + ACE_NTOHL (0x76617469), + ACE_NTOHL (0x6f6e4d6f), ACE_NTOHL (0x64650000), // name = ActivationMode 4, // member count 7, - ACE_NTOHL (0x4e4f524d), + ACE_NTOHL (0x4e4f524d), ACE_NTOHL (0x414c0000), // name = NORMAL 7, - ACE_NTOHL (0x4d414e55), + ACE_NTOHL (0x4d414e55), ACE_NTOHL (0x414c0000), // name = MANUAL 11, - ACE_NTOHL (0x5045525f), - ACE_NTOHL (0x434c4945), + ACE_NTOHL (0x5045525f), + ACE_NTOHL (0x434c4945), ACE_NTOHL (0x4e540000), // name = PER_CLIENT 11, - ACE_NTOHL (0x4155544f), - ACE_NTOHL (0x5f535441), + ACE_NTOHL (0x4155544f), + ACE_NTOHL (0x5f535441), ACE_NTOHL (0x52540000), // name = AUTO_START - + 10, - ACE_NTOHL (0x61637469), - ACE_NTOHL (0x7661746f), + ACE_NTOHL (0x61637469), + ACE_NTOHL (0x7661746f), ACE_NTOHL (0x72000000), // name = activator - CORBA::tk_string, + CORBA::tk_string, 0U, // string length }; @@ -1357,10 +1357,10 @@ namespace ImplementationRepository &_tc_TAO_tc_ImplementationRepository_StartupOptions; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 -void +void ImplementationRepository::StartupOptions::_tao_any_destructor ( void *_tao_void_pointer ) @@ -1377,95 +1377,95 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformation[] = { TAO_ENCAP_BYTE_ORDER, // byte order 51, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f536572), - ACE_NTOHL (0x76657249), - ACE_NTOHL (0x6e666f72), - ACE_NTOHL (0x6d617469), - ACE_NTOHL (0x6f6e3a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f536572), + ACE_NTOHL (0x76657249), + ACE_NTOHL (0x6e666f72), + ACE_NTOHL (0x6d617469), + ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:ImplementationRepository/ServerInformation:1.0 18, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x6572496e), - ACE_NTOHL (0x666f726d), - ACE_NTOHL (0x6174696f), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x6572496e), + ACE_NTOHL (0x666f726d), + ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e000000), // name = ServerInformation 4, // member count 15, - ACE_NTOHL (0x6c6f6769), - ACE_NTOHL (0x63616c5f), - ACE_NTOHL (0x73657276), + ACE_NTOHL (0x6c6f6769), + ACE_NTOHL (0x63616c5f), + ACE_NTOHL (0x73657276), ACE_NTOHL (0x65720000), // name = logical_server - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 7, - ACE_NTOHL (0x73657276), + ACE_NTOHL (0x73657276), ACE_NTOHL (0x65720000), // name = server - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 8, - ACE_NTOHL (0x73746172), + ACE_NTOHL (0x73746172), ACE_NTOHL (0x74757000), // name = startup CORBA::tk_struct, // typecode kind 584, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 48, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f537461), - ACE_NTOHL (0x72747570), - ACE_NTOHL (0x4f707469), - ACE_NTOHL (0x6f6e733a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f537461), + ACE_NTOHL (0x72747570), + ACE_NTOHL (0x4f707469), + ACE_NTOHL (0x6f6e733a), ACE_NTOHL (0x312e3000), // repository ID = IDL:ImplementationRepository/StartupOptions:1.0 15, - ACE_NTOHL (0x53746172), - ACE_NTOHL (0x7475704f), - ACE_NTOHL (0x7074696f), + ACE_NTOHL (0x53746172), + ACE_NTOHL (0x7475704f), + ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = StartupOptions 5, // member count 13, - ACE_NTOHL (0x636f6d6d), - ACE_NTOHL (0x616e645f), - ACE_NTOHL (0x6c696e65), + ACE_NTOHL (0x636f6d6d), + ACE_NTOHL (0x616e645f), + ACE_NTOHL (0x6c696e65), ACE_NTOHL (0x0), // name = command_line - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 12, - ACE_NTOHL (0x656e7669), - ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e7669), + ACE_NTOHL (0x726f6e6d), ACE_NTOHL (0x656e7400), // name = environment CORBA::tk_alias, // typecode kind for typedefs 236, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 49, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f456e76), - ACE_NTOHL (0x69726f6e), - ACE_NTOHL (0x6d656e74), - ACE_NTOHL (0x4c697374), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f456e76), + ACE_NTOHL (0x69726f6e), + ACE_NTOHL (0x6d656e74), + ACE_NTOHL (0x4c697374), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0 16, - ACE_NTOHL (0x456e7669), - ACE_NTOHL (0x726f6e6d), - ACE_NTOHL (0x656e744c), + ACE_NTOHL (0x456e7669), + ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e744c), ACE_NTOHL (0x69737400), // name = EnvironmentList CORBA::tk_sequence, // typecode kind 148, // encapsulation length @@ -1474,120 +1474,120 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformation[] = 132, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 53, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f456e76), - ACE_NTOHL (0x69726f6e), - ACE_NTOHL (0x6d656e74), - ACE_NTOHL (0x56617269), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f456e76), + ACE_NTOHL (0x69726f6e), + ACE_NTOHL (0x6d656e74), + ACE_NTOHL (0x56617269), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0 20, - ACE_NTOHL (0x456e7669), - ACE_NTOHL (0x726f6e6d), - ACE_NTOHL (0x656e7456), - ACE_NTOHL (0x61726961), + ACE_NTOHL (0x456e7669), + ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e7456), + ACE_NTOHL (0x61726961), ACE_NTOHL (0x626c6500), // name = EnvironmentVariable 2, // member count 5, - ACE_NTOHL (0x6e616d65), + ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 6, - ACE_NTOHL (0x76616c75), + ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000), // name = value - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 0U, 18, - ACE_NTOHL (0x776f726b), - ACE_NTOHL (0x696e675f), - ACE_NTOHL (0x64697265), - ACE_NTOHL (0x63746f72), + ACE_NTOHL (0x776f726b), + ACE_NTOHL (0x696e675f), + ACE_NTOHL (0x64697265), + ACE_NTOHL (0x63746f72), ACE_NTOHL (0x79000000), // name = working_directory - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 11, - ACE_NTOHL (0x61637469), - ACE_NTOHL (0x76617469), + ACE_NTOHL (0x61637469), + ACE_NTOHL (0x76617469), ACE_NTOHL (0x6f6e0000), // name = activation CORBA::tk_enum, // typecode kind 136, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 48, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f416374), - ACE_NTOHL (0x69766174), - ACE_NTOHL (0x696f6e4d), - ACE_NTOHL (0x6f64653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f416374), + ACE_NTOHL (0x69766174), + ACE_NTOHL (0x696f6e4d), + ACE_NTOHL (0x6f64653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:ImplementationRepository/ActivationMode:1.0 15, - ACE_NTOHL (0x41637469), - ACE_NTOHL (0x76617469), - ACE_NTOHL (0x6f6e4d6f), + ACE_NTOHL (0x41637469), + ACE_NTOHL (0x76617469), + ACE_NTOHL (0x6f6e4d6f), ACE_NTOHL (0x64650000), // name = ActivationMode 4, // member count 7, - ACE_NTOHL (0x4e4f524d), + ACE_NTOHL (0x4e4f524d), ACE_NTOHL (0x414c0000), // name = NORMAL 7, - ACE_NTOHL (0x4d414e55), + ACE_NTOHL (0x4d414e55), ACE_NTOHL (0x414c0000), // name = MANUAL 11, - ACE_NTOHL (0x5045525f), - ACE_NTOHL (0x434c4945), + ACE_NTOHL (0x5045525f), + ACE_NTOHL (0x434c4945), ACE_NTOHL (0x4e540000), // name = PER_CLIENT 11, - ACE_NTOHL (0x4155544f), - ACE_NTOHL (0x5f535441), + ACE_NTOHL (0x4155544f), + ACE_NTOHL (0x5f535441), ACE_NTOHL (0x52540000), // name = AUTO_START - + 10, - ACE_NTOHL (0x61637469), - ACE_NTOHL (0x7661746f), + ACE_NTOHL (0x61637469), + ACE_NTOHL (0x7661746f), ACE_NTOHL (0x72000000), // name = activator - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 9, - ACE_NTOHL (0x6c6f6361), - ACE_NTOHL (0x74696f6e), + ACE_NTOHL (0x6c6f6361), + ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = location CORBA::tk_alias, // typecode kind for typedefs 72, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 41, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f416464), - ACE_NTOHL (0x72657373), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f416464), + ACE_NTOHL (0x72657373), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/Address:1.0 8, - ACE_NTOHL (0x41646472), + ACE_NTOHL (0x41646472), ACE_NTOHL (0x65737300), // name = Address - CORBA::tk_string, + CORBA::tk_string, 0U, // string length }; @@ -1606,10 +1606,10 @@ namespace ImplementationRepository &_tc_TAO_tc_ImplementationRepository_ServerInformation; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 -void +void ImplementationRepository::ServerInformation::_tao_any_destructor ( void *_tao_void_pointer ) @@ -1619,7 +1619,7 @@ ImplementationRepository::ServerInformation::_tao_any_destructor ( delete _tao_tmp_pointer; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_) @@ -1679,26 +1679,26 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationList[] = { TAO_ENCAP_BYTE_ORDER, // byte order 55, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f536572), - ACE_NTOHL (0x76657249), - ACE_NTOHL (0x6e666f72), - ACE_NTOHL (0x6d617469), - ACE_NTOHL (0x6f6e4c69), - ACE_NTOHL (0x73743a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f536572), + ACE_NTOHL (0x76657249), + ACE_NTOHL (0x6e666f72), + ACE_NTOHL (0x6d617469), + ACE_NTOHL (0x6f6e4c69), + ACE_NTOHL (0x73743a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:ImplementationRepository/ServerInformationList:1.0 22, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x6572496e), - ACE_NTOHL (0x666f726d), - ACE_NTOHL (0x6174696f), - ACE_NTOHL (0x6e4c6973), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x6572496e), + ACE_NTOHL (0x666f726d), + ACE_NTOHL (0x6174696f), + ACE_NTOHL (0x6e4c6973), ACE_NTOHL (0x74000000), // name = ServerInformationList CORBA::tk_sequence, // typecode kind 852, // encapsulation length @@ -1707,95 +1707,95 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationList[] = 836, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 51, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f536572), - ACE_NTOHL (0x76657249), - ACE_NTOHL (0x6e666f72), - ACE_NTOHL (0x6d617469), - ACE_NTOHL (0x6f6e3a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f536572), + ACE_NTOHL (0x76657249), + ACE_NTOHL (0x6e666f72), + ACE_NTOHL (0x6d617469), + ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:ImplementationRepository/ServerInformation:1.0 18, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x6572496e), - ACE_NTOHL (0x666f726d), - ACE_NTOHL (0x6174696f), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x6572496e), + ACE_NTOHL (0x666f726d), + ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e000000), // name = ServerInformation 4, // member count 15, - ACE_NTOHL (0x6c6f6769), - ACE_NTOHL (0x63616c5f), - ACE_NTOHL (0x73657276), + ACE_NTOHL (0x6c6f6769), + ACE_NTOHL (0x63616c5f), + ACE_NTOHL (0x73657276), ACE_NTOHL (0x65720000), // name = logical_server - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 7, - ACE_NTOHL (0x73657276), + ACE_NTOHL (0x73657276), ACE_NTOHL (0x65720000), // name = server - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 8, - ACE_NTOHL (0x73746172), + ACE_NTOHL (0x73746172), ACE_NTOHL (0x74757000), // name = startup CORBA::tk_struct, // typecode kind 584, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 48, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f537461), - ACE_NTOHL (0x72747570), - ACE_NTOHL (0x4f707469), - ACE_NTOHL (0x6f6e733a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f537461), + ACE_NTOHL (0x72747570), + ACE_NTOHL (0x4f707469), + ACE_NTOHL (0x6f6e733a), ACE_NTOHL (0x312e3000), // repository ID = IDL:ImplementationRepository/StartupOptions:1.0 15, - ACE_NTOHL (0x53746172), - ACE_NTOHL (0x7475704f), - ACE_NTOHL (0x7074696f), + ACE_NTOHL (0x53746172), + ACE_NTOHL (0x7475704f), + ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = StartupOptions 5, // member count 13, - ACE_NTOHL (0x636f6d6d), - ACE_NTOHL (0x616e645f), - ACE_NTOHL (0x6c696e65), + ACE_NTOHL (0x636f6d6d), + ACE_NTOHL (0x616e645f), + ACE_NTOHL (0x6c696e65), ACE_NTOHL (0x0), // name = command_line - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 12, - ACE_NTOHL (0x656e7669), - ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e7669), + ACE_NTOHL (0x726f6e6d), ACE_NTOHL (0x656e7400), // name = environment CORBA::tk_alias, // typecode kind for typedefs 236, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 49, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f456e76), - ACE_NTOHL (0x69726f6e), - ACE_NTOHL (0x6d656e74), - ACE_NTOHL (0x4c697374), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f456e76), + ACE_NTOHL (0x69726f6e), + ACE_NTOHL (0x6d656e74), + ACE_NTOHL (0x4c697374), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0 16, - ACE_NTOHL (0x456e7669), - ACE_NTOHL (0x726f6e6d), - ACE_NTOHL (0x656e744c), + ACE_NTOHL (0x456e7669), + ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e744c), ACE_NTOHL (0x69737400), // name = EnvironmentList CORBA::tk_sequence, // typecode kind 148, // encapsulation length @@ -1804,120 +1804,120 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationList[] = 132, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 53, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f456e76), - ACE_NTOHL (0x69726f6e), - ACE_NTOHL (0x6d656e74), - ACE_NTOHL (0x56617269), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f456e76), + ACE_NTOHL (0x69726f6e), + ACE_NTOHL (0x6d656e74), + ACE_NTOHL (0x56617269), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0 20, - ACE_NTOHL (0x456e7669), - ACE_NTOHL (0x726f6e6d), - ACE_NTOHL (0x656e7456), - ACE_NTOHL (0x61726961), + ACE_NTOHL (0x456e7669), + ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e7456), + ACE_NTOHL (0x61726961), ACE_NTOHL (0x626c6500), // name = EnvironmentVariable 2, // member count 5, - ACE_NTOHL (0x6e616d65), + ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 6, - ACE_NTOHL (0x76616c75), + ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000), // name = value - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 0U, 18, - ACE_NTOHL (0x776f726b), - ACE_NTOHL (0x696e675f), - ACE_NTOHL (0x64697265), - ACE_NTOHL (0x63746f72), + ACE_NTOHL (0x776f726b), + ACE_NTOHL (0x696e675f), + ACE_NTOHL (0x64697265), + ACE_NTOHL (0x63746f72), ACE_NTOHL (0x79000000), // name = working_directory - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 11, - ACE_NTOHL (0x61637469), - ACE_NTOHL (0x76617469), + ACE_NTOHL (0x61637469), + ACE_NTOHL (0x76617469), ACE_NTOHL (0x6f6e0000), // name = activation CORBA::tk_enum, // typecode kind 136, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 48, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f416374), - ACE_NTOHL (0x69766174), - ACE_NTOHL (0x696f6e4d), - ACE_NTOHL (0x6f64653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f416374), + ACE_NTOHL (0x69766174), + ACE_NTOHL (0x696f6e4d), + ACE_NTOHL (0x6f64653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:ImplementationRepository/ActivationMode:1.0 15, - ACE_NTOHL (0x41637469), - ACE_NTOHL (0x76617469), - ACE_NTOHL (0x6f6e4d6f), + ACE_NTOHL (0x41637469), + ACE_NTOHL (0x76617469), + ACE_NTOHL (0x6f6e4d6f), ACE_NTOHL (0x64650000), // name = ActivationMode 4, // member count 7, - ACE_NTOHL (0x4e4f524d), + ACE_NTOHL (0x4e4f524d), ACE_NTOHL (0x414c0000), // name = NORMAL 7, - ACE_NTOHL (0x4d414e55), + ACE_NTOHL (0x4d414e55), ACE_NTOHL (0x414c0000), // name = MANUAL 11, - ACE_NTOHL (0x5045525f), - ACE_NTOHL (0x434c4945), + ACE_NTOHL (0x5045525f), + ACE_NTOHL (0x434c4945), ACE_NTOHL (0x4e540000), // name = PER_CLIENT 11, - ACE_NTOHL (0x4155544f), - ACE_NTOHL (0x5f535441), + ACE_NTOHL (0x4155544f), + ACE_NTOHL (0x5f535441), ACE_NTOHL (0x52540000), // name = AUTO_START - + 10, - ACE_NTOHL (0x61637469), - ACE_NTOHL (0x7661746f), + ACE_NTOHL (0x61637469), + ACE_NTOHL (0x7661746f), ACE_NTOHL (0x72000000), // name = activator - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 9, - ACE_NTOHL (0x6c6f6361), - ACE_NTOHL (0x74696f6e), + ACE_NTOHL (0x6c6f6361), + ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = location CORBA::tk_alias, // typecode kind for typedefs 72, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 41, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f416464), - ACE_NTOHL (0x72657373), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f416464), + ACE_NTOHL (0x72657373), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/Address:1.0 8, - ACE_NTOHL (0x41646472), + ACE_NTOHL (0x41646472), ACE_NTOHL (0x65737300), // name = Address - CORBA::tk_string, + CORBA::tk_string, 0U, // string length @@ -1946,7 +1946,7 @@ namespace ImplementationRepository ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION ImplementationRepository::Administration_ptr -TAO::Objref_Traits<ImplementationRepository::Administration>::duplicate ( +TAO::Objref_Traits<ImplementationRepository::Administration>::tao_duplicate ( ImplementationRepository::Administration_ptr p ) { @@ -1955,7 +1955,7 @@ TAO::Objref_Traits<ImplementationRepository::Administration>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<ImplementationRepository::Administration>::release ( +TAO::Objref_Traits<ImplementationRepository::Administration>::tao_release ( ImplementationRepository::Administration_ptr p ) { @@ -1964,14 +1964,14 @@ TAO::Objref_Traits<ImplementationRepository::Administration>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION ImplementationRepository::Administration_ptr -TAO::Objref_Traits<ImplementationRepository::Administration>::nil (void) +TAO::Objref_Traits<ImplementationRepository::Administration>::tao_nil (void) { return ImplementationRepository::Administration::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<ImplementationRepository::Administration>::marshal ( +TAO::Objref_Traits<ImplementationRepository::Administration>::tao_marshal ( ImplementationRepository::Administration_ptr p, TAO_OutputCDR & cdr ) @@ -1980,7 +1980,7 @@ TAO::Objref_Traits<ImplementationRepository::Administration>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -2002,37 +2002,37 @@ void ImplementationRepository::Administration::activate_server ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_Administration_Proxy_Broker_ == 0) { ImplementationRepository_Administration_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_server }; - + static TAO::Exception_Data - _tao_ImplementationRepository_Administration_activate_server_exceptiondata [] = + _tao_ImplementationRepository_Administration_activate_server_exceptiondata [] = { { "IDL:ImplementationRepository/NotFound:1.0", ImplementationRepository::NotFound::_alloc, ImplementationRepository::_tc_NotFound }, - + { "IDL:ImplementationRepository/CannotActivate:1.0", ImplementationRepository::CannotActivate::_alloc, ImplementationRepository::_tc_CannotActivate } }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2041,7 +2041,7 @@ void ImplementationRepository::Administration::activate_server ( 15, this->the_TAO_Administration_Proxy_Broker_ ); - + _tao_call.invoke ( _tao_ImplementationRepository_Administration_activate_server_exceptiondata, 2 @@ -2068,39 +2068,39 @@ char * ImplementationRepository::Administration::activate_server_with_startup ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_Administration_Proxy_Broker_ == 0) { ImplementationRepository_Administration_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::Char *>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server); TAO::Arg_Traits< CORBA::Long>::in_arg_val _tao_check_startup (check_startup); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_server, &_tao_check_startup }; - + static TAO::Exception_Data - _tao_ImplementationRepository_Administration_activate_server_with_startup_exceptiondata [] = + _tao_ImplementationRepository_Administration_activate_server_with_startup_exceptiondata [] = { { "IDL:ImplementationRepository/NotFound:1.0", ImplementationRepository::NotFound::_alloc, ImplementationRepository::_tc_NotFound }, - + { "IDL:ImplementationRepository/CannotActivate:1.0", ImplementationRepository::CannotActivate::_alloc, ImplementationRepository::_tc_CannotActivate } }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2109,14 +2109,14 @@ char * ImplementationRepository::Administration::activate_server_with_startup ( 28, this->the_TAO_Administration_Proxy_Broker_ ); - + _tao_call.invoke ( _tao_ImplementationRepository_Administration_activate_server_with_startup_exceptiondata, 2 ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -2138,39 +2138,39 @@ void ImplementationRepository::Administration::register_server ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_Administration_Proxy_Broker_ == 0) { ImplementationRepository_Administration_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server); TAO::Arg_Traits< ::ImplementationRepository::StartupOptions>::in_arg_val _tao_options (options); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_server, &_tao_options }; - + static TAO::Exception_Data - _tao_ImplementationRepository_Administration_register_server_exceptiondata [] = + _tao_ImplementationRepository_Administration_register_server_exceptiondata [] = { { "IDL:ImplementationRepository/AlreadyRegistered:1.0", ImplementationRepository::AlreadyRegistered::_alloc, ImplementationRepository::_tc_AlreadyRegistered }, - + { "IDL:ImplementationRepository/NotFound:1.0", ImplementationRepository::NotFound::_alloc, ImplementationRepository::_tc_NotFound } }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2179,7 +2179,7 @@ void ImplementationRepository::Administration::register_server ( 15, this->the_TAO_Administration_Proxy_Broker_ ); - + _tao_call.invoke ( _tao_ImplementationRepository_Administration_register_server_exceptiondata, 2 @@ -2206,39 +2206,39 @@ void ImplementationRepository::Administration::reregister_server ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_Administration_Proxy_Broker_ == 0) { ImplementationRepository_Administration_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server); TAO::Arg_Traits< ::ImplementationRepository::StartupOptions>::in_arg_val _tao_options (options); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_server, &_tao_options }; - + static TAO::Exception_Data - _tao_ImplementationRepository_Administration_reregister_server_exceptiondata [] = + _tao_ImplementationRepository_Administration_reregister_server_exceptiondata [] = { { "IDL:ImplementationRepository/AlreadyRegistered:1.0", ImplementationRepository::AlreadyRegistered::_alloc, ImplementationRepository::_tc_AlreadyRegistered }, - + { "IDL:ImplementationRepository/NotFound:1.0", ImplementationRepository::NotFound::_alloc, ImplementationRepository::_tc_NotFound } }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2247,7 +2247,7 @@ void ImplementationRepository::Administration::reregister_server ( 17, this->the_TAO_Administration_Proxy_Broker_ ); - + _tao_call.invoke ( _tao_ImplementationRepository_Administration_reregister_server_exceptiondata, 2 @@ -2272,23 +2272,23 @@ void ImplementationRepository::Administration::remove_server ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_Administration_Proxy_Broker_ == 0) { ImplementationRepository_Administration_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_server }; - + static TAO::Exception_Data - _tao_ImplementationRepository_Administration_remove_server_exceptiondata [] = + _tao_ImplementationRepository_Administration_remove_server_exceptiondata [] = { { "IDL:ImplementationRepository/NotFound:1.0", @@ -2296,7 +2296,7 @@ void ImplementationRepository::Administration::remove_server ( ImplementationRepository::_tc_NotFound } }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2305,7 +2305,7 @@ void ImplementationRepository::Administration::remove_server ( 13, this->the_TAO_Administration_Proxy_Broker_ ); - + _tao_call.invoke ( _tao_ImplementationRepository_Administration_remove_server_exceptiondata, 1 @@ -2330,23 +2330,23 @@ void ImplementationRepository::Administration::shutdown_server ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_Administration_Proxy_Broker_ == 0) { ImplementationRepository_Administration_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_server }; - + static TAO::Exception_Data - _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata [] = + _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata [] = { { "IDL:ImplementationRepository/NotFound:1.0", @@ -2354,7 +2354,7 @@ void ImplementationRepository::Administration::shutdown_server ( ImplementationRepository::_tc_NotFound } }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2363,7 +2363,7 @@ void ImplementationRepository::Administration::shutdown_server ( 15, this->the_TAO_Administration_Proxy_Broker_ ); - + _tao_call.invoke ( _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata, 1 @@ -2390,17 +2390,17 @@ void ImplementationRepository::Administration::server_is_running ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_Administration_Proxy_Broker_ == 0) { ImplementationRepository_Administration_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server); TAO::Arg_Traits< ::ImplementationRepository::Address>::in_arg_val _tao_addr (addr); TAO::Arg_Traits< ::ImplementationRepository::ServerObject>::in_arg_val _tao_server_object (server_object); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -2408,9 +2408,9 @@ void ImplementationRepository::Administration::server_is_running ( &_tao_addr, &_tao_server_object }; - + static TAO::Exception_Data - _tao_ImplementationRepository_Administration_server_is_running_exceptiondata [] = + _tao_ImplementationRepository_Administration_server_is_running_exceptiondata [] = { { "IDL:ImplementationRepository/NotFound:1.0", @@ -2418,7 +2418,7 @@ void ImplementationRepository::Administration::server_is_running ( ImplementationRepository::_tc_NotFound } }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2427,7 +2427,7 @@ void ImplementationRepository::Administration::server_is_running ( 17, this->the_TAO_Administration_Proxy_Broker_ ); - + _tao_call.invoke ( _tao_ImplementationRepository_Administration_server_is_running_exceptiondata, 1 @@ -2452,23 +2452,23 @@ void ImplementationRepository::Administration::server_is_shutting_down ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_Administration_Proxy_Broker_ == 0) { ImplementationRepository_Administration_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_server }; - + static TAO::Exception_Data - _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata [] = + _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata [] = { { "IDL:ImplementationRepository/NotFound:1.0", @@ -2476,7 +2476,7 @@ void ImplementationRepository::Administration::server_is_shutting_down ( ImplementationRepository::_tc_NotFound } }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2485,7 +2485,7 @@ void ImplementationRepository::Administration::server_is_shutting_down ( 23, this->the_TAO_Administration_Proxy_Broker_ ); - + _tao_call.invoke ( _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata, 1 @@ -2511,25 +2511,25 @@ void ImplementationRepository::Administration::find ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_Administration_Proxy_Broker_ == 0) { ImplementationRepository_Administration_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server); TAO::Arg_Traits< ::ImplementationRepository::ServerInformation>::out_arg_val _tao_info (info); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_server, &_tao_info }; - + static TAO::Exception_Data - _tao_ImplementationRepository_Administration_find_exceptiondata [] = + _tao_ImplementationRepository_Administration_find_exceptiondata [] = { { "IDL:ImplementationRepository/NotFound:1.0", @@ -2537,7 +2537,7 @@ void ImplementationRepository::Administration::find ( ImplementationRepository::_tc_NotFound } }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2546,7 +2546,7 @@ void ImplementationRepository::Administration::find ( 4, this->the_TAO_Administration_Proxy_Broker_ ); - + _tao_call.invoke ( _tao_ImplementationRepository_Administration_find_exceptiondata, 1 @@ -2572,17 +2572,17 @@ void ImplementationRepository::Administration::list ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_Administration_Proxy_Broker_ == 0) { ImplementationRepository_Administration_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< CORBA::ULong>::in_arg_val _tao_how_many (how_many); TAO::Arg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_val _tao_server_list (server_list); TAO::Arg_Traits< ::ImplementationRepository::ServerInformationIterator>::out_arg_val _tao_server_iterator (server_iterator); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -2590,7 +2590,7 @@ void ImplementationRepository::Administration::list ( &_tao_server_list, &_tao_server_iterator }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2599,7 +2599,7 @@ void ImplementationRepository::Administration::list ( 4, this->the_TAO_Administration_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -2618,19 +2618,19 @@ void ImplementationRepository::Administration::shutdown_repo ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_Administration_Proxy_Broker_ == 0) { ImplementationRepository_Administration_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2639,7 +2639,7 @@ void ImplementationRepository::Administration::shutdown_repo ( 13, this->the_TAO_Administration_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -2660,23 +2660,23 @@ char * ImplementationRepository::Administration::find_ior ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_Administration_Proxy_Broker_ == 0) { ImplementationRepository_Administration_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::Char *>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_object_name (object_name); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_object_name }; - + static TAO::Exception_Data - _tao_ImplementationRepository_Administration_find_ior_exceptiondata [] = + _tao_ImplementationRepository_Administration_find_ior_exceptiondata [] = { { "IDL:ImplementationRepository/NotFound:1.0", @@ -2684,7 +2684,7 @@ char * ImplementationRepository::Administration::find_ior ( ImplementationRepository::_tc_NotFound } }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2693,14 +2693,14 @@ char * ImplementationRepository::Administration::find_ior ( 8, this->the_TAO_Administration_Proxy_Broker_ ); - + _tao_call.invoke ( _tao_ImplementationRepository_Administration_find_ior_exceptiondata, 1 ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -2723,7 +2723,7 @@ ImplementationRepository::Administration::ImplementationRepository_Administratio ImplementationRepository::Administration::~Administration (void) {} -void +void ImplementationRepository::Administration::_tao_any_destructor (void *_tao_void_pointer) { Administration *_tao_tmp_pointer = @@ -2768,7 +2768,7 @@ ImplementationRepository::Administration::_duplicate (Administration_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -2818,22 +2818,22 @@ static const CORBA::Long _oc_ImplementationRepository_Administration[] = { TAO_ENCAP_BYTE_ORDER, // byte order 48, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f41646d), - ACE_NTOHL (0x696e6973), - ACE_NTOHL (0x74726174), - ACE_NTOHL (0x696f6e3a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f41646d), + ACE_NTOHL (0x696e6973), + ACE_NTOHL (0x74726174), + ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:ImplementationRepository/Administration:1.0 15, - ACE_NTOHL (0x41646d69), - ACE_NTOHL (0x6e697374), - ACE_NTOHL (0x72617469), + ACE_NTOHL (0x41646d69), + ACE_NTOHL (0x6e697374), + ACE_NTOHL (0x72617469), ACE_NTOHL (0x6f6e0000), // name = Administration }; @@ -2858,7 +2858,7 @@ namespace ImplementationRepository ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION ImplementationRepository::ServerInformationIterator_ptr -TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::duplicate ( +TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::tao_duplicate ( ImplementationRepository::ServerInformationIterator_ptr p ) { @@ -2867,7 +2867,7 @@ TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::duplica ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::release ( +TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::tao_release ( ImplementationRepository::ServerInformationIterator_ptr p ) { @@ -2876,14 +2876,14 @@ TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::release ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION ImplementationRepository::ServerInformationIterator_ptr -TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::nil (void) +TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::tao_nil (void) { return ImplementationRepository::ServerInformationIterator::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::marshal ( +TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::tao_marshal ( ImplementationRepository::ServerInformationIterator_ptr p, TAO_OutputCDR & cdr ) @@ -2892,7 +2892,7 @@ TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::marshal } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -2913,23 +2913,23 @@ CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_ServerInformationIterator_Proxy_Broker_ == 0) { ImplementationRepository_ServerInformationIterator_setup_collocation (); } - + TAO::Arg_Traits< ACE_InputCDR::to_boolean>::ret_val _tao_retval; TAO::Arg_Traits< CORBA::ULong>::in_arg_val _tao_how_many (how_many); TAO::Arg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_val _tao_server_list (server_list); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_how_many, &_tao_server_list }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2938,10 +2938,10 @@ CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n ( 6, this->the_TAO_ServerInformationIterator_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -2959,19 +2959,19 @@ void ImplementationRepository::ServerInformationIterator::destroy ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_ServerInformationIterator_Proxy_Broker_ == 0) { ImplementationRepository_ServerInformationIterator_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2980,7 +2980,7 @@ void ImplementationRepository::ServerInformationIterator::destroy ( 7, this->the_TAO_ServerInformationIterator_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -3004,7 +3004,7 @@ ImplementationRepository::ServerInformationIterator::ImplementationRepository_Se ImplementationRepository::ServerInformationIterator::~ServerInformationIterator (void) {} -void +void ImplementationRepository::ServerInformationIterator::_tao_any_destructor (void *_tao_void_pointer) { ServerInformationIterator *_tao_tmp_pointer = @@ -3049,7 +3049,7 @@ ImplementationRepository::ServerInformationIterator::_duplicate (ServerInformati { obj->_add_ref (); } - + return obj; } @@ -3099,28 +3099,28 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationIterator[ { TAO_ENCAP_BYTE_ORDER, // byte order 59, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f536572), - ACE_NTOHL (0x76657249), - ACE_NTOHL (0x6e666f72), - ACE_NTOHL (0x6d617469), - ACE_NTOHL (0x6f6e4974), - ACE_NTOHL (0x65726174), - ACE_NTOHL (0x6f723a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f536572), + ACE_NTOHL (0x76657249), + ACE_NTOHL (0x6e666f72), + ACE_NTOHL (0x6d617469), + ACE_NTOHL (0x6f6e4974), + ACE_NTOHL (0x65726174), + ACE_NTOHL (0x6f723a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:ImplementationRepository/ServerInformationIterator:1.0 26, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x6572496e), - ACE_NTOHL (0x666f726d), - ACE_NTOHL (0x6174696f), - ACE_NTOHL (0x6e497465), - ACE_NTOHL (0x7261746f), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x6572496e), + ACE_NTOHL (0x666f726d), + ACE_NTOHL (0x6174696f), + ACE_NTOHL (0x6e497465), + ACE_NTOHL (0x7261746f), ACE_NTOHL (0x72000000), // name = ServerInformationIterator }; @@ -3193,7 +3193,7 @@ operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:50 ACE_TEMPLATE_SPECIALIZATION @@ -3203,12 +3203,12 @@ TAO::Any_Dual_Impl_T<ImplementationRepository::AlreadyRegistered>::demarshal_val ) { CORBA::String_var id; - + if ((cdr >> id.out ()) == 0) { return 0; } - + ACE_TRY_NEW_ENV { this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER); @@ -3219,7 +3219,7 @@ TAO::Any_Dual_Impl_T<ImplementationRepository::AlreadyRegistered>::demarshal_val return 0; } ACE_ENDTRY; - + return 1; } @@ -3278,7 +3278,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:50 ACE_TEMPLATE_SPECIALIZATION @@ -3288,12 +3288,12 @@ TAO::Any_Dual_Impl_T<ImplementationRepository::CannotActivate>::demarshal_value ) { CORBA::String_var id; - + if ((cdr >> id.out ()) == 0) { return 0; } - + ACE_TRY_NEW_ENV { this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER); @@ -3304,7 +3304,7 @@ TAO::Any_Dual_Impl_T<ImplementationRepository::CannotActivate>::demarshal_value return 0; } ACE_ENDTRY; - + return 1; } @@ -3363,7 +3363,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:50 ACE_TEMPLATE_SPECIALIZATION @@ -3373,12 +3373,12 @@ TAO::Any_Dual_Impl_T<ImplementationRepository::NotFound>::demarshal_value ( ) { CORBA::String_var id; - + if ((cdr >> id.out ()) == 0) { return 0; } - + ACE_TRY_NEW_ENV { this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER); @@ -3389,7 +3389,7 @@ TAO::Any_Dual_Impl_T<ImplementationRepository::NotFound>::demarshal_value ( return 0; } ACE_ENDTRY; - + return 1; } @@ -3448,7 +3448,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -3506,7 +3506,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. @@ -3588,11 +3588,11 @@ CORBA::Boolean operator>>= ( TAO::Any_Basic_Impl_T<ImplementationRepository::ActivationMode>::extract ( _tao_any, ImplementationRepository::_tc_ActivationMode, - _tao_elem + _tao_elem ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -3650,7 +3650,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -3708,7 +3708,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. @@ -3894,21 +3894,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if ((strm >> obj.inout ()) == 0) { return 0; } - + typedef ::ImplementationRepository::ServerObject RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -4048,20 +4048,20 @@ CORBA::Boolean operator<< ( ) { const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - + if (strm << _tao_seq_len) { // Encode all elements. CORBA::Boolean _tao_marshal_flag = 1; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = (strm << _tao_sequence[i]); } - + return _tao_marshal_flag; } - + return 0; } @@ -4071,7 +4071,7 @@ CORBA::Boolean operator>> ( ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -4081,28 +4081,28 @@ 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. CORBA::Boolean _tao_marshal_flag = 1; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = (strm >> _tao_sequence[i]); } - + return _tao_marshal_flag; - + } - + return 0; } @@ -4121,12 +4121,12 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationRepository::Activat { CORBA::ULong _tao_temp = 0; CORBA::Boolean _tao_result = strm >> _tao_temp; - + if (_tao_result == 1) { _tao_enumval = static_cast<ImplementationRepository::ActivationMode> (_tao_temp); } - + return _tao_result; } @@ -4198,20 +4198,20 @@ CORBA::Boolean operator<< ( ) { const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - + if (strm << _tao_seq_len) { // Encode all elements. CORBA::Boolean _tao_marshal_flag = 1; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = (strm << _tao_sequence[i]); } - + return _tao_marshal_flag; } - + return 0; } @@ -4221,7 +4221,7 @@ CORBA::Boolean operator>> ( ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -4231,28 +4231,28 @@ 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. CORBA::Boolean _tao_marshal_flag = 1; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = (strm >> _tao_sequence[i]); } - + return _tao_marshal_flag; - + } - + return 0; } @@ -4276,21 +4276,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if ((strm >> obj.inout ()) == 0) { return 0; } - + typedef ::ImplementationRepository::Administration RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -4312,21 +4312,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if ((strm >> obj.inout ()) == 0) { return 0; } - + typedef ::ImplementationRepository::ServerInformationIterator RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -4362,7 +4362,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< ImplementationRepository::ServerObject >; - + template class TAO_Objref_Out_T< ImplementationRepository::ServerObject @@ -4604,7 +4604,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< ImplementationRepository::ServerInformationIterator >; - + template class TAO_Objref_Out_T< ImplementationRepository::ServerInformationIterator @@ -4651,7 +4651,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< ImplementationRepository::Administration >; - + template class TAO_Objref_Out_T< ImplementationRepository::Administration @@ -4696,7 +4696,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ ImplementationRepository::ServerObject > - + # pragma instantiate \ TAO_Objref_Out_T< \ ImplementationRepository::ServerObject @@ -4938,7 +4938,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ ImplementationRepository::ServerInformationIterator > - + # pragma instantiate \ TAO_Objref_Out_T< \ ImplementationRepository::ServerInformationIterator @@ -4985,7 +4985,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ ImplementationRepository::Administration > - + # pragma instantiate \ TAO_Objref_Out_T< \ ImplementationRepository::Administration @@ -5001,4 +5001,5 @@ CORBA::Boolean operator>> ( ImplementationRepository::Administration \ > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/PortableServer/ImplRepoC.h b/TAO/tao/PortableServer/ImplRepoC.h index 099445a71e4..dcbe6abf993 100644 --- a/TAO/tao/PortableServer/ImplRepoC.h +++ b/TAO/tao/PortableServer/ImplRepoC.h @@ -49,7 +49,6 @@ #include "tao/Seq_Var_T.h" #include "tao/Seq_Out_T.h" #include "tao/VarOut_T.h" -#include "tao/SystemException.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -74,13 +73,13 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\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; } @@ -90,22 +89,22 @@ namespace TAO namespace ImplementationRepository { - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:611 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__VAR_OUT_CH_) #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__VAR_OUT_CH_ - + class ServerObject; typedef ServerObject *ServerObject_ptr; - + typedef TAO_Objref_Var_T< ServerObject > ServerObject_var; - + typedef TAO_Objref_Out_T< ServerObject @@ -113,13 +112,13 @@ namespace ImplementationRepository ServerObject_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_) #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_ - + class TAO_PortableServer_Export ServerObject : public virtual CORBA::Object { @@ -127,74 +126,74 @@ namespace ImplementationRepository friend class TAO::Narrow_Utils<ServerObject>; typedef ServerObject_ptr _ptr_type; typedef ServerObject_var _var_type; - + // The static operations. static ServerObject_ptr _duplicate (ServerObject_ptr obj); - + static ServerObject_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ServerObject_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ServerObject_ptr _nil (void) { return (ServerObject_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual void ping ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual void shutdown ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\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); private: TAO::Collocation_Proxy_Broker *the_TAO_ServerObject_Proxy_Broker_; - + protected: // Concrete interface only. ServerObject (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void ImplementationRepository_ServerObject_setup_collocation (void); - + // Concrete non-local interface only. ServerObject ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. ServerObject ( TAO_Stub *objref, @@ -202,41 +201,41 @@ namespace ImplementationRepository TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~ServerObject (void); - + private: // Private and unimplemented for concrete interfaces. ServerObject (const ServerObject &); - + void operator= (const ServerObject &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerObject; - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_IMPLEMENTATIONREPOSITORY_ALREADYREGISTERED_CH_) #define _IMPLEMENTATIONREPOSITORY_ALREADYREGISTERED_CH_ - + class TAO_PortableServer_Export AlreadyRegistered : public CORBA::UserException { public: - + AlreadyRegistered (void); AlreadyRegistered (const AlreadyRegistered &); ~AlreadyRegistered (void); AlreadyRegistered &operator= (const AlreadyRegistered &); - + static void _tao_any_destructor (void *); - + static AlreadyRegistered *_downcast (CORBA::Exception *); static CORBA::Exception *_alloc (void); @@ -248,44 +247,44 @@ namespace ImplementationRepository TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125 - + virtual CORBA::TypeCode_ptr _type (void) const; }; - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AlreadyRegistered; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_IMPLEMENTATIONREPOSITORY_CANNOTACTIVATE_CH_) #define _IMPLEMENTATIONREPOSITORY_CANNOTACTIVATE_CH_ - + class TAO_PortableServer_Export CannotActivate : public CORBA::UserException { public: - + TAO_String_Manager reason; CannotActivate (void); CannotActivate (const CannotActivate &); ~CannotActivate (void); CannotActivate &operator= (const CannotActivate &); - + static void _tao_any_destructor (void *); - + static CannotActivate *_downcast (CORBA::Exception *); static CORBA::Exception *_alloc (void); @@ -297,50 +296,50 @@ namespace ImplementationRepository TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66 - + CannotActivate ( const char * _tao_reason ); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125 - + virtual CORBA::TypeCode_ptr _type (void) const; }; - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CannotActivate; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_IMPLEMENTATIONREPOSITORY_NOTFOUND_CH_) #define _IMPLEMENTATIONREPOSITORY_NOTFOUND_CH_ - + class TAO_PortableServer_Export NotFound : public CORBA::UserException { public: - + NotFound (void); NotFound (const NotFound &); ~NotFound (void); NotFound &operator= (const NotFound &); - + static void _tao_any_destructor (void *); - + static NotFound *_downcast (CORBA::Exception *); static CORBA::Exception *_alloc (void); @@ -352,87 +351,87 @@ namespace ImplementationRepository TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125 - + virtual CORBA::TypeCode_ptr _type (void) const; }; - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:258 - + struct EnvironmentVariable; - + typedef TAO_Var_Var_T< EnvironmentVariable > EnvironmentVariable_var; - + typedef TAO_Out_T< EnvironmentVariable, EnvironmentVariable_var > EnvironmentVariable_out; - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52 - + struct TAO_PortableServer_Export EnvironmentVariable { typedef EnvironmentVariable_var _var_type; - + static void _tao_any_destructor (void *); TAO_String_Manager name; TAO_String_Manager value; }; - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EnvironmentVariable; - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:376 - + typedef char * Address; typedef CORBA::String_var Address_var; typedef CORBA::String_out Address_out; - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Address; - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_) #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_ - + class EnvironmentList; - + typedef TAO_VarSeq_Var_T< EnvironmentList, EnvironmentVariable > EnvironmentList_var; - + typedef TAO_Seq_Out_T< EnvironmentList, @@ -440,7 +439,7 @@ namespace ImplementationRepository EnvironmentVariable > EnvironmentList_out; - + class TAO_PortableServer_Export EnvironmentList : public TAO_Unbounded_Sequence< @@ -453,27 +452,27 @@ namespace ImplementationRepository EnvironmentList ( CORBA::ULong max, CORBA::ULong length, - EnvironmentVariable* buffer, + EnvironmentVariable* buffer, CORBA::Boolean release = 0 ); EnvironmentList (const EnvironmentList &); ~EnvironmentList (void); - + static void _tao_any_destructor (void *); - + typedef EnvironmentList_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EnvironmentList; - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57 - + enum ActivationMode { NORMAL, @@ -481,39 +480,39 @@ namespace ImplementationRepository PER_CLIENT, AUTO_START }; - + typedef ActivationMode &ActivationMode_out; - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ActivationMode; - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:258 - + struct StartupOptions; - + typedef TAO_Var_Var_T< StartupOptions > StartupOptions_var; - + typedef TAO_Out_T< StartupOptions, StartupOptions_var > StartupOptions_out; - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52 - + struct TAO_PortableServer_Export StartupOptions { typedef StartupOptions_var _var_type; - + static void _tao_any_destructor (void *); TAO_String_Manager command_line; ImplementationRepository::EnvironmentList environment; @@ -521,64 +520,64 @@ namespace ImplementationRepository ImplementationRepository::ActivationMode activation; TAO_String_Manager activator; }; - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StartupOptions; - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:258 - + struct ServerInformation; - + typedef TAO_Var_Var_T< ServerInformation > ServerInformation_var; - + typedef TAO_Out_T< ServerInformation, ServerInformation_var > ServerInformation_out; - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52 - + struct TAO_PortableServer_Export ServerInformation { typedef ServerInformation_var _var_type; - + static void _tao_any_destructor (void *); TAO_String_Manager logical_server; TAO_String_Manager server; ImplementationRepository::StartupOptions startup; TAO_String_Manager location; }; - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerInformation; - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_ - + class ServerInformationList; - + typedef TAO_VarSeq_Var_T< ServerInformationList, ServerInformation > ServerInformationList_var; - + typedef TAO_Seq_Out_T< ServerInformationList, @@ -586,7 +585,7 @@ namespace ImplementationRepository ServerInformation > ServerInformationList_out; - + class TAO_PortableServer_Export ServerInformationList : public TAO_Unbounded_Sequence< @@ -599,39 +598,39 @@ namespace ImplementationRepository ServerInformationList ( CORBA::ULong max, CORBA::ULong length, - ServerInformation* buffer, + ServerInformation* buffer, CORBA::Boolean release = 0 ); ServerInformationList (const ServerInformationList &); ~ServerInformationList (void); - + static void _tao_any_destructor (void *); - + typedef ServerInformationList_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerInformationList; - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:611 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__VAR_OUT_CH_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__VAR_OUT_CH_ - + class ServerInformationIterator; typedef ServerInformationIterator *ServerInformationIterator_ptr; - + typedef TAO_Objref_Var_T< ServerInformationIterator > ServerInformationIterator_var; - + typedef TAO_Objref_Out_T< ServerInformationIterator @@ -639,22 +638,22 @@ namespace ImplementationRepository ServerInformationIterator_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:611 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION__VAR_OUT_CH_) #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION__VAR_OUT_CH_ - + class Administration; typedef Administration *Administration_ptr; - + typedef TAO_Objref_Var_T< Administration > Administration_var; - + typedef TAO_Objref_Out_T< Administration @@ -662,13 +661,13 @@ namespace ImplementationRepository Administration_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_) #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_ - + class TAO_PortableServer_Export Administration : public virtual CORBA::Object { @@ -676,30 +675,30 @@ namespace ImplementationRepository friend class TAO::Narrow_Utils<Administration>; typedef Administration_ptr _ptr_type; typedef Administration_var _var_type; - + // The static operations. static Administration_ptr _duplicate (Administration_ptr obj); - + static Administration_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Administration_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Administration_ptr _nil (void) { return (Administration_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual void activate_server ( const char * server ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -709,10 +708,10 @@ namespace ImplementationRepository ::ImplementationRepository::NotFound, ::ImplementationRepository::CannotActivate )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual char * activate_server_with_startup ( const char * server, ::CORBA::Long check_startup @@ -723,10 +722,10 @@ namespace ImplementationRepository ::ImplementationRepository::NotFound, ::ImplementationRepository::CannotActivate )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual void register_server ( const char * server, const ::ImplementationRepository::StartupOptions & options @@ -737,10 +736,10 @@ namespace ImplementationRepository ::ImplementationRepository::AlreadyRegistered, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual void reregister_server ( const char * server, const ::ImplementationRepository::StartupOptions & options @@ -751,10 +750,10 @@ namespace ImplementationRepository ::ImplementationRepository::AlreadyRegistered, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual void remove_server ( const char * server ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -763,10 +762,10 @@ namespace ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual void shutdown_server ( const char * server ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -775,10 +774,10 @@ namespace ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual void server_is_running ( const char * server, const char * addr, @@ -789,10 +788,10 @@ namespace ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual void server_is_shutting_down ( const char * server ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -801,10 +800,10 @@ namespace ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual void find ( const char * server, ::ImplementationRepository::ServerInformation_out info @@ -814,10 +813,10 @@ namespace ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual void list ( ::CORBA::ULong how_many, ::ImplementationRepository::ServerInformationList_out server_list, @@ -827,20 +826,20 @@ namespace ImplementationRepository ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual void shutdown_repo ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual char * find_ior ( const char * object_name ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -849,34 +848,34 @@ namespace ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\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); private: TAO::Collocation_Proxy_Broker *the_TAO_Administration_Proxy_Broker_; - + protected: // Concrete interface only. Administration (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void ImplementationRepository_Administration_setup_collocation (void); - + // Concrete non-local interface only. Administration ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. Administration ( TAO_Stub *objref, @@ -884,29 +883,29 @@ namespace ImplementationRepository TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~Administration (void); - + private: // Private and unimplemented for concrete interfaces. Administration (const Administration &); - + void operator= (const Administration &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Administration; - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_ - + class TAO_PortableServer_Export ServerInformationIterator : public virtual CORBA::Object { @@ -914,30 +913,30 @@ namespace ImplementationRepository friend class TAO::Narrow_Utils<ServerInformationIterator>; typedef ServerInformationIterator_ptr _ptr_type; typedef ServerInformationIterator_var _var_type; - + // The static operations. static ServerInformationIterator_ptr _duplicate (ServerInformationIterator_ptr obj); - + static ServerInformationIterator_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ServerInformationIterator_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ServerInformationIterator_ptr _nil (void) { return (ServerInformationIterator_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Boolean next_n ( ::CORBA::ULong how_many, ::ImplementationRepository::ServerInformationList_out server_list @@ -946,44 +945,44 @@ namespace ImplementationRepository ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual void destroy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\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); private: TAO::Collocation_Proxy_Broker *the_TAO_ServerInformationIterator_Proxy_Broker_; - + protected: // Concrete interface only. ServerInformationIterator (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void ImplementationRepository_ServerInformationIterator_setup_collocation (void); - + // Concrete non-local interface only. ServerInformationIterator ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. ServerInformationIterator ( TAO_Stub *objref, @@ -991,21 +990,21 @@ namespace ImplementationRepository TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~ServerInformationIterator (void); - + private: // Private and unimplemented for concrete interfaces. ServerInformationIterator (const ServerInformationIterator &); - + void operator= (const ServerInformationIterator &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerInformationIterator; // TAO_IDL - Generated from @@ -1045,18 +1044,18 @@ namespace TAO #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__TRAITS_CH_) #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits<ImplementationRepository::ServerObject> { - static ImplementationRepository::ServerObject_ptr duplicate ( + static ImplementationRepository::ServerObject_ptr tao_duplicate ( ImplementationRepository::ServerObject_ptr ); - static void release ( + static void tao_release ( ImplementationRepository::ServerObject_ptr ); - static ImplementationRepository::ServerObject_ptr nil (void); - static CORBA::Boolean marshal ( + static ImplementationRepository::ServerObject_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( ImplementationRepository::ServerObject_ptr p, TAO_OutputCDR & cdr ); @@ -1066,18 +1065,18 @@ namespace TAO #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__TRAITS_CH_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits<ImplementationRepository::ServerInformationIterator> { - static ImplementationRepository::ServerInformationIterator_ptr duplicate ( + static ImplementationRepository::ServerInformationIterator_ptr tao_duplicate ( ImplementationRepository::ServerInformationIterator_ptr ); - static void release ( + static void tao_release ( ImplementationRepository::ServerInformationIterator_ptr ); - static ImplementationRepository::ServerInformationIterator_ptr nil (void); - static CORBA::Boolean marshal ( + static ImplementationRepository::ServerInformationIterator_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( ImplementationRepository::ServerInformationIterator_ptr p, TAO_OutputCDR & cdr ); @@ -1087,18 +1086,18 @@ namespace TAO #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION__TRAITS_CH_) #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits<ImplementationRepository::Administration> { - static ImplementationRepository::Administration_ptr duplicate ( + static ImplementationRepository::Administration_ptr tao_duplicate ( ImplementationRepository::Administration_ptr ); - static void release ( + static void tao_release ( ImplementationRepository::Administration_ptr ); - static ImplementationRepository::Administration_ptr nil (void); - static CORBA::Boolean marshal ( + static ImplementationRepository::Administration_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( ImplementationRepository::Administration_ptr p, TAO_OutputCDR & cdr ); @@ -1296,7 +1295,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, Implementat // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:976 #if defined (__ACE_INLINE__) -#include "ImplRepoC.inl" +#include "ImplRepoC.i" #endif /* defined INLINE */ #if defined(_MSC_VER) && (_MSC_VER >= 1200) @@ -1310,3 +1309,4 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, Implementat #include /**/ "ace/post.h" #endif /* ifndef */ + diff --git a/TAO/tao/PortableServer/ImplRepoC.i b/TAO/tao/PortableServer/ImplRepoC.i new file mode 100644 index 00000000000..36cc19fe639 --- /dev/null +++ b/TAO/tao/PortableServer/ImplRepoC.i @@ -0,0 +1,136 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:70 + +#if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___CI_) +#define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___CI_ + +ACE_INLINE +ImplementationRepository::ServerObject::ServerObject ( + TAO_Stub *objref, + CORBA::Boolean _tao_collocated, + TAO_Abstract_ServantBase *servant, + TAO_ORB_Core *oc + ) + : ACE_NESTED_CLASS (CORBA, Object) ( + objref, + _tao_collocated, + servant, + oc + ), + the_TAO_ServerObject_Proxy_Broker_ (0) +{ + this->ImplementationRepository_ServerObject_setup_collocation (); +} + +ACE_INLINE +ImplementationRepository::ServerObject::ServerObject ( + IOP::IOR *ior, + TAO_ORB_Core *oc + ) + : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + the_TAO_ServerObject_Proxy_Broker_ (0) +{ +} + +#endif /* end #if !defined */ + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:70 + +#if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___CI_) +#define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___CI_ + +ACE_INLINE +ImplementationRepository::Administration::Administration ( + TAO_Stub *objref, + CORBA::Boolean _tao_collocated, + TAO_Abstract_ServantBase *servant, + TAO_ORB_Core *oc + ) + : ACE_NESTED_CLASS (CORBA, Object) ( + objref, + _tao_collocated, + servant, + oc + ), + the_TAO_Administration_Proxy_Broker_ (0) +{ + this->ImplementationRepository_Administration_setup_collocation (); +} + +ACE_INLINE +ImplementationRepository::Administration::Administration ( + IOP::IOR *ior, + TAO_ORB_Core *oc + ) + : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + the_TAO_Administration_Proxy_Broker_ (0) +{ +} + +#endif /* end #if !defined */ + +// TAO_IDL - Generated from +// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:70 + +#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___CI_) +#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___CI_ + +ACE_INLINE +ImplementationRepository::ServerInformationIterator::ServerInformationIterator ( + TAO_Stub *objref, + CORBA::Boolean _tao_collocated, + TAO_Abstract_ServantBase *servant, + TAO_ORB_Core *oc + ) + : ACE_NESTED_CLASS (CORBA, Object) ( + objref, + _tao_collocated, + servant, + oc + ), + the_TAO_ServerInformationIterator_Proxy_Broker_ (0) +{ + this->ImplementationRepository_ServerInformationIterator_setup_collocation (); +} + +ACE_INLINE +ImplementationRepository::ServerInformationIterator::ServerInformationIterator ( + IOP::IOR *ior, + TAO_ORB_Core *oc + ) + : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + the_TAO_ServerInformationIterator_Proxy_Broker_ (0) +{ +} + +#endif /* end #if !defined */ + diff --git a/TAO/tao/PortableServer/ImplRepoS.cpp b/TAO/tao/PortableServer/ImplRepoS.cpp index ebc7d0a163e..033fa1df0b4 100644 --- a/TAO/tao/PortableServer/ImplRepoS.cpp +++ b/TAO/tao/PortableServer/ImplRepoS.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:629 #ifndef _TAO_IDL_IMPLREPOS_CPP_ @@ -67,7 +67,7 @@ #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) -#include "ImplRepoS.inl" +#include "ImplRepoS.i" #endif /* !defined INLINE */ // TAO_IDL - Generated from @@ -79,7 +79,7 @@ namespace TAO #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_SS_) #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_SS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerObject> : public @@ -93,13 +93,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:618 #if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_SS_) #define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_SS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::StartupOptions> : public @@ -112,13 +112,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:618 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_SS_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_SS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformation> : public @@ -131,13 +131,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:379 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_SS_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_SS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformationList> : public @@ -153,7 +153,7 @@ namespace TAO #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_SS_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_SS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformationIterator> : public diff --git a/TAO/tao/PortableServer/ImplRepoS.h b/TAO/tao/PortableServer/ImplRepoS.h index a7fc6e3a573..f3d282459c7 100644 --- a/TAO/tao/PortableServer/ImplRepoS.h +++ b/TAO/tao/PortableServer/ImplRepoS.h @@ -59,109 +59,109 @@ namespace POA_ImplementationRepository { - - + + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:90 - + class ServerObject; typedef ServerObject *ServerObject_ptr; - + class _TAO_ServerObject_ThruPOA_Proxy_Impl; class _TAO_ServerObject_Direct_Proxy_Impl; class _TAO_ServerObject_Strategized_Proxy_Broker; - + class TAO_PortableServer_Export ServerObject : public virtual PortableServer::ServantBase { protected: ServerObject (void); - + public: // Useful for template programming. typedef ::ImplementationRepository::ServerObject _stub_type; typedef ::ImplementationRepository::ServerObject_ptr _stub_ptr_type; typedef ::ImplementationRepository::ServerObject_var _stub_var_type; - + ServerObject (const ServerObject& rhs); virtual ~ServerObject (void); - + virtual CORBA::Boolean _is_a ( const char* logical_type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual void* _downcast ( const char* logical_type_id ); - + static void _is_a_skel ( TAO_ServerRequest &req, void *servant, void *servant_upcall ACE_ENV_ARG_DECL ); - + static void _non_existent_skel ( TAO_ServerRequest &req, void *servant, void *servant_upcall ACE_ENV_ARG_DECL ); - + static void _interface_skel ( TAO_ServerRequest &req, void *servant, void *servant_upcall ACE_ENV_ARG_DECL ); - + static void _component_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall ACE_ENV_ARG_DECL ); - + virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall ACE_ENV_ARG_DECL ); - + ::ImplementationRepository::ServerObject *_this ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45 - + virtual void ping ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + static void ping_skel ( TAO_ServerRequest &_tao_req, void *_tao_servant, void *_tao_servant_upcall ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45 - + virtual void shutdown ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + static void shutdown_skel ( TAO_ServerRequest &_tao_req, void *_tao_servant, @@ -169,29 +169,29 @@ namespace POA_ImplementationRepository ACE_ENV_ARG_DECL ); }; - + /////////////////////////////////////////////////////////////////////// - // Strategized Proxy Broker Declaration + // Strategized Proxy Broker Declaration // - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36 - + class TAO_PortableServer_Export _TAO_ServerObject_Strategized_Proxy_Broker : public virtual TAO::Collocation_Proxy_Broker { - public: + public: _TAO_ServerObject_Strategized_Proxy_Broker (void); - + virtual ~_TAO_ServerObject_Strategized_Proxy_Broker (void); - + TAO::Collocation_Strategy get_strategy ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)); - + void dispatch ( CORBA::Object_ptr obj, @@ -204,33 +204,33 @@ namespace POA_ImplementationRepository ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::Exception)); - + static _TAO_ServerObject_Strategized_Proxy_Broker * the_TAO_ServerObject_Strategized_Proxy_Broker (void); }; - + // - // End Strategized Proxy Broker Declaration + // End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// - - + + /////////////////////////////////////////////////////////////////////// // ThruPOA Proxy Impl. Declaration // - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37 - + class TAO_PortableServer_Export _TAO_ServerObject_ThruPOA_Proxy_Impl { public: _TAO_ServerObject_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_ServerObject_ThruPOA_Proxy_Impl (void) {} - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void ping ( TAO_Abstract_ServantBase *servant, @@ -241,10 +241,10 @@ namespace POA_ImplementationRepository ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void shutdown ( TAO_Abstract_ServantBase *servant, @@ -256,28 +256,28 @@ namespace POA_ImplementationRepository CORBA::SystemException )); }; - + // // ThruPOA Proxy Impl. Declaration /////////////////////////////////////////////////////////////////////// - - // TAO_IDL - Generated from + + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/direct_proxy_impl_sh.cpp:31 - + /////////////////////////////////////////////////////////////////////// // Direct Impl. Declaration // - + class TAO_PortableServer_Export _TAO_ServerObject_Direct_Proxy_Impl { public: _TAO_ServerObject_Direct_Proxy_Impl (void); - + virtual ~_TAO_ServerObject_Direct_Proxy_Impl (void) {} - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void ping ( TAO_Abstract_ServantBase *servant, @@ -288,10 +288,10 @@ namespace POA_ImplementationRepository ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void shutdown ( TAO_Abstract_ServantBase *servant, @@ -303,90 +303,90 @@ namespace POA_ImplementationRepository CORBA::SystemException )); }; - + // // Direct Proxy Impl. Declaration /////////////////////////////////////////////////////////////////////// - - - + + + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:90 - + class Administration; typedef Administration *Administration_ptr; - + class _TAO_Administration_ThruPOA_Proxy_Impl; class _TAO_Administration_Direct_Proxy_Impl; class _TAO_Administration_Strategized_Proxy_Broker; - + class TAO_PortableServer_Export Administration : public virtual PortableServer::ServantBase { protected: Administration (void); - + public: // Useful for template programming. typedef ::ImplementationRepository::Administration _stub_type; typedef ::ImplementationRepository::Administration_ptr _stub_ptr_type; typedef ::ImplementationRepository::Administration_var _stub_var_type; - + Administration (const Administration& rhs); virtual ~Administration (void); - + virtual CORBA::Boolean _is_a ( const char* logical_type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual void* _downcast ( const char* logical_type_id ); - + static void _is_a_skel ( TAO_ServerRequest &req, void *servant, void *servant_upcall ACE_ENV_ARG_DECL ); - + static void _non_existent_skel ( TAO_ServerRequest &req, void *servant, void *servant_upcall ACE_ENV_ARG_DECL ); - + static void _interface_skel ( TAO_ServerRequest &req, void *servant, void *servant_upcall ACE_ENV_ARG_DECL ); - + static void _component_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall ACE_ENV_ARG_DECL ); - + virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall ACE_ENV_ARG_DECL ); - + ::ImplementationRepository::Administration *_this ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45 - + virtual void activate_server ( const char * server ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -396,17 +396,17 @@ namespace POA_ImplementationRepository ::ImplementationRepository::NotFound, ::ImplementationRepository::CannotActivate )) = 0; - + static void activate_server_skel ( TAO_ServerRequest &_tao_req, void *_tao_servant, void *_tao_servant_upcall ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45 - + virtual char * activate_server_with_startup ( const char * server, ::CORBA::Long check_startup @@ -417,17 +417,17 @@ namespace POA_ImplementationRepository ::ImplementationRepository::NotFound, ::ImplementationRepository::CannotActivate )) = 0; - + static void activate_server_with_startup_skel ( TAO_ServerRequest &_tao_req, void *_tao_servant, void *_tao_servant_upcall ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45 - + virtual void register_server ( const char * server, const ::ImplementationRepository::StartupOptions & options @@ -438,17 +438,17 @@ namespace POA_ImplementationRepository ::ImplementationRepository::AlreadyRegistered, ::ImplementationRepository::NotFound )) = 0; - + static void register_server_skel ( TAO_ServerRequest &_tao_req, void *_tao_servant, void *_tao_servant_upcall ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45 - + virtual void reregister_server ( const char * server, const ::ImplementationRepository::StartupOptions & options @@ -459,17 +459,17 @@ namespace POA_ImplementationRepository ::ImplementationRepository::AlreadyRegistered, ::ImplementationRepository::NotFound )) = 0; - + static void reregister_server_skel ( TAO_ServerRequest &_tao_req, void *_tao_servant, void *_tao_servant_upcall ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45 - + virtual void remove_server ( const char * server ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -478,17 +478,17 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )) = 0; - + static void remove_server_skel ( TAO_ServerRequest &_tao_req, void *_tao_servant, void *_tao_servant_upcall ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45 - + virtual void shutdown_server ( const char * server ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -497,17 +497,17 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )) = 0; - + static void shutdown_server_skel ( TAO_ServerRequest &_tao_req, void *_tao_servant, void *_tao_servant_upcall ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45 - + virtual void server_is_running ( const char * server, const char * addr, @@ -518,17 +518,17 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )) = 0; - + static void server_is_running_skel ( TAO_ServerRequest &_tao_req, void *_tao_servant, void *_tao_servant_upcall ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45 - + virtual void server_is_shutting_down ( const char * server ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -537,17 +537,17 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )) = 0; - + static void server_is_shutting_down_skel ( TAO_ServerRequest &_tao_req, void *_tao_servant, void *_tao_servant_upcall ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45 - + virtual void find ( const char * server, ::ImplementationRepository::ServerInformation_out info @@ -557,17 +557,17 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )) = 0; - + static void find_skel ( TAO_ServerRequest &_tao_req, void *_tao_servant, void *_tao_servant_upcall ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45 - + virtual void list ( ::CORBA::ULong how_many, ::ImplementationRepository::ServerInformationList_out server_list, @@ -577,34 +577,34 @@ namespace POA_ImplementationRepository ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + static void list_skel ( TAO_ServerRequest &_tao_req, void *_tao_servant, void *_tao_servant_upcall ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45 - + virtual void shutdown_repo ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + static void shutdown_repo_skel ( TAO_ServerRequest &_tao_req, void *_tao_servant, void *_tao_servant_upcall ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45 - + virtual char * find_ior ( const char * object_name ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -613,7 +613,7 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )) = 0; - + static void find_ior_skel ( TAO_ServerRequest &_tao_req, void *_tao_servant, @@ -621,29 +621,29 @@ namespace POA_ImplementationRepository ACE_ENV_ARG_DECL ); }; - + /////////////////////////////////////////////////////////////////////// - // Strategized Proxy Broker Declaration + // Strategized Proxy Broker Declaration // - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36 - + class TAO_PortableServer_Export _TAO_Administration_Strategized_Proxy_Broker : public virtual TAO::Collocation_Proxy_Broker { - public: + public: _TAO_Administration_Strategized_Proxy_Broker (void); - + virtual ~_TAO_Administration_Strategized_Proxy_Broker (void); - + TAO::Collocation_Strategy get_strategy ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)); - + void dispatch ( CORBA::Object_ptr obj, @@ -656,33 +656,33 @@ namespace POA_ImplementationRepository ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::Exception)); - + static _TAO_Administration_Strategized_Proxy_Broker * the_TAO_Administration_Strategized_Proxy_Broker (void); }; - + // - // End Strategized Proxy Broker Declaration + // End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// - - + + /////////////////////////////////////////////////////////////////////// // ThruPOA Proxy Impl. Declaration // - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37 - + class TAO_PortableServer_Export _TAO_Administration_ThruPOA_Proxy_Impl { public: _TAO_Administration_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_Administration_ThruPOA_Proxy_Impl (void) {} - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void activate_server ( TAO_Abstract_ServantBase *servant, @@ -695,10 +695,10 @@ namespace POA_ImplementationRepository ::ImplementationRepository::NotFound, ::ImplementationRepository::CannotActivate )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void activate_server_with_startup ( TAO_Abstract_ServantBase *servant, @@ -711,10 +711,10 @@ namespace POA_ImplementationRepository ::ImplementationRepository::NotFound, ::ImplementationRepository::CannotActivate )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void register_server ( TAO_Abstract_ServantBase *servant, @@ -727,10 +727,10 @@ namespace POA_ImplementationRepository ::ImplementationRepository::AlreadyRegistered, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void reregister_server ( TAO_Abstract_ServantBase *servant, @@ -743,10 +743,10 @@ namespace POA_ImplementationRepository ::ImplementationRepository::AlreadyRegistered, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void remove_server ( TAO_Abstract_ServantBase *servant, @@ -758,10 +758,10 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void shutdown_server ( TAO_Abstract_ServantBase *servant, @@ -773,10 +773,10 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void server_is_running ( TAO_Abstract_ServantBase *servant, @@ -788,10 +788,10 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void server_is_shutting_down ( TAO_Abstract_ServantBase *servant, @@ -803,10 +803,10 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void find ( TAO_Abstract_ServantBase *servant, @@ -818,10 +818,10 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void list ( TAO_Abstract_ServantBase *servant, @@ -832,10 +832,10 @@ namespace POA_ImplementationRepository ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void shutdown_repo ( TAO_Abstract_ServantBase *servant, @@ -846,10 +846,10 @@ namespace POA_ImplementationRepository ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void find_ior ( TAO_Abstract_ServantBase *servant, @@ -862,28 +862,28 @@ namespace POA_ImplementationRepository ::ImplementationRepository::NotFound )); }; - + // // ThruPOA Proxy Impl. Declaration /////////////////////////////////////////////////////////////////////// - - // TAO_IDL - Generated from + + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/direct_proxy_impl_sh.cpp:31 - + /////////////////////////////////////////////////////////////////////// // Direct Impl. Declaration // - + class TAO_PortableServer_Export _TAO_Administration_Direct_Proxy_Impl { public: _TAO_Administration_Direct_Proxy_Impl (void); - + virtual ~_TAO_Administration_Direct_Proxy_Impl (void) {} - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void activate_server ( TAO_Abstract_ServantBase *servant, @@ -896,10 +896,10 @@ namespace POA_ImplementationRepository ::ImplementationRepository::NotFound, ::ImplementationRepository::CannotActivate )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void activate_server_with_startup ( TAO_Abstract_ServantBase *servant, @@ -912,10 +912,10 @@ namespace POA_ImplementationRepository ::ImplementationRepository::NotFound, ::ImplementationRepository::CannotActivate )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void register_server ( TAO_Abstract_ServantBase *servant, @@ -928,10 +928,10 @@ namespace POA_ImplementationRepository ::ImplementationRepository::AlreadyRegistered, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void reregister_server ( TAO_Abstract_ServantBase *servant, @@ -944,10 +944,10 @@ namespace POA_ImplementationRepository ::ImplementationRepository::AlreadyRegistered, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void remove_server ( TAO_Abstract_ServantBase *servant, @@ -959,10 +959,10 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void shutdown_server ( TAO_Abstract_ServantBase *servant, @@ -974,10 +974,10 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void server_is_running ( TAO_Abstract_ServantBase *servant, @@ -989,10 +989,10 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void server_is_shutting_down ( TAO_Abstract_ServantBase *servant, @@ -1004,10 +1004,10 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void find ( TAO_Abstract_ServantBase *servant, @@ -1019,10 +1019,10 @@ namespace POA_ImplementationRepository CORBA::SystemException, ::ImplementationRepository::NotFound )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void list ( TAO_Abstract_ServantBase *servant, @@ -1033,10 +1033,10 @@ namespace POA_ImplementationRepository ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void shutdown_repo ( TAO_Abstract_ServantBase *servant, @@ -1047,10 +1047,10 @@ namespace POA_ImplementationRepository ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void find_ior ( TAO_Abstract_ServantBase *servant, @@ -1063,90 +1063,90 @@ namespace POA_ImplementationRepository ::ImplementationRepository::NotFound )); }; - + // // Direct Proxy Impl. Declaration /////////////////////////////////////////////////////////////////////// - - - + + + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:90 - + class ServerInformationIterator; typedef ServerInformationIterator *ServerInformationIterator_ptr; - + class _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl; class _TAO_ServerInformationIterator_Direct_Proxy_Impl; class _TAO_ServerInformationIterator_Strategized_Proxy_Broker; - + class TAO_PortableServer_Export ServerInformationIterator : public virtual PortableServer::ServantBase { protected: ServerInformationIterator (void); - + public: // Useful for template programming. typedef ::ImplementationRepository::ServerInformationIterator _stub_type; typedef ::ImplementationRepository::ServerInformationIterator_ptr _stub_ptr_type; typedef ::ImplementationRepository::ServerInformationIterator_var _stub_var_type; - + ServerInformationIterator (const ServerInformationIterator& rhs); virtual ~ServerInformationIterator (void); - + virtual CORBA::Boolean _is_a ( const char* logical_type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual void* _downcast ( const char* logical_type_id ); - + static void _is_a_skel ( TAO_ServerRequest &req, void *servant, void *servant_upcall ACE_ENV_ARG_DECL ); - + static void _non_existent_skel ( TAO_ServerRequest &req, void *servant, void *servant_upcall ACE_ENV_ARG_DECL ); - + static void _interface_skel ( TAO_ServerRequest &req, void *servant, void *servant_upcall ACE_ENV_ARG_DECL ); - + static void _component_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall ACE_ENV_ARG_DECL ); - + virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall ACE_ENV_ARG_DECL ); - + ::ImplementationRepository::ServerInformationIterator *_this ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45 - + virtual CORBA::Boolean next_n ( ::CORBA::ULong how_many, ::ImplementationRepository::ServerInformationList_out server_list @@ -1155,24 +1155,24 @@ namespace POA_ImplementationRepository ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + static void next_n_skel ( TAO_ServerRequest &_tao_req, void *_tao_servant, void *_tao_servant_upcall ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45 - + virtual void destroy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + static void destroy_skel ( TAO_ServerRequest &_tao_req, void *_tao_servant, @@ -1180,29 +1180,29 @@ namespace POA_ImplementationRepository ACE_ENV_ARG_DECL ); }; - + /////////////////////////////////////////////////////////////////////// - // Strategized Proxy Broker Declaration + // Strategized Proxy Broker Declaration // - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36 - + class TAO_PortableServer_Export _TAO_ServerInformationIterator_Strategized_Proxy_Broker : public virtual TAO::Collocation_Proxy_Broker { - public: + public: _TAO_ServerInformationIterator_Strategized_Proxy_Broker (void); - + virtual ~_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void); - + TAO::Collocation_Strategy get_strategy ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)); - + void dispatch ( CORBA::Object_ptr obj, @@ -1215,33 +1215,33 @@ namespace POA_ImplementationRepository ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::Exception)); - + static _TAO_ServerInformationIterator_Strategized_Proxy_Broker * the_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void); }; - + // - // End Strategized Proxy Broker Declaration + // End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// - - + + /////////////////////////////////////////////////////////////////////// // ThruPOA Proxy Impl. Declaration // - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37 - + class TAO_PortableServer_Export _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl { public: _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl (void) {} - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void next_n ( TAO_Abstract_ServantBase *servant, @@ -1252,10 +1252,10 @@ namespace POA_ImplementationRepository ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void destroy ( TAO_Abstract_ServantBase *servant, @@ -1267,28 +1267,28 @@ namespace POA_ImplementationRepository CORBA::SystemException )); }; - + // // ThruPOA Proxy Impl. Declaration /////////////////////////////////////////////////////////////////////// - - // TAO_IDL - Generated from + + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/direct_proxy_impl_sh.cpp:31 - + /////////////////////////////////////////////////////////////////////// // Direct Impl. Declaration // - + class TAO_PortableServer_Export _TAO_ServerInformationIterator_Direct_Proxy_Impl { public: _TAO_ServerInformationIterator_Direct_Proxy_Impl (void); - + virtual ~_TAO_ServerInformationIterator_Direct_Proxy_Impl (void) {} - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void next_n ( TAO_Abstract_ServantBase *servant, @@ -1299,10 +1299,10 @@ namespace POA_ImplementationRepository ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void destroy ( TAO_Abstract_ServantBase *servant, @@ -1314,24 +1314,24 @@ namespace POA_ImplementationRepository CORBA::SystemException )); }; - + // // Direct Proxy Impl. Declaration /////////////////////////////////////////////////////////////////////// - - + + // TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:80 } // module ImplementationRepository -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1012 #if defined (__ACE_INLINE__) -#include "ImplRepoS.inl" +#include "ImplRepoS.i" #endif /* defined INLINE */ #if defined(_MSC_VER) && (_MSC_VER >= 1200) diff --git a/TAO/tao/PortableServer/ImplRepoS.i b/TAO/tao/PortableServer/ImplRepoS.i new file mode 100644 index 00000000000..1d2df31bd57 --- /dev/null +++ b/TAO/tao/PortableServer/ImplRepoS.i @@ -0,0 +1,26 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html diff --git a/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp b/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp new file mode 100644 index 00000000000..d34fb729be7 --- /dev/null +++ b/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp @@ -0,0 +1,102 @@ +#include "ObjectReferenceTemplate.h" +#include "POA.h" + +#include "tao/CORBA_String.h" +#include "tao/ORB_Constants.h" + + +ACE_RCSID (PortableServer, + ObjectReferenceTemplate, + "$Id$") + + +#if !defined (__ACE_INLINE__) +# include "ObjectReferenceTemplate.inl" +#endif /* ! __ACE_INLINE__ */ + + +TAO_ObjectReferenceTemplate::TAO_ObjectReferenceTemplate ( + const char *server_id, + const char *orb_id, + TAO_POA * poa) + : server_id_ (server_id), + orb_id_ (orb_id), + poa_ (poa) +{ +} + +TAO_ObjectReferenceTemplate::~TAO_ObjectReferenceTemplate (void) +{ +} + +char * +TAO_ObjectReferenceTemplate::server_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + return CORBA::string_dup (this->server_id_); +} + +char * +TAO_ObjectReferenceTemplate::orb_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + return CORBA::string_dup (this->orb_id_); +} + +PortableInterceptor::AdapterName * +TAO_ObjectReferenceTemplate::adapter_name (ACE_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + PortableInterceptor::AdapterName *adapter_name = 0; + + if (this->adapter_name_ != 0) + { + ACE_NEW_THROW_EX (adapter_name, + PortableInterceptor::AdapterName ( + *(this->adapter_name_)), + CORBA::NO_MEMORY ( + CORBA::SystemException::_tao_minor_code ( + TAO_DEFAULT_MINOR_CODE, + ENOMEM), + CORBA::COMPLETED_NO)); + ACE_CHECK_RETURN (0); + + return adapter_name; + } + else + { + if (this->poa_ == 0) + ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0); + + this->adapter_name_ = + this->poa_->adapter_name (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (0); + + ACE_NEW_THROW_EX (adapter_name, + PortableInterceptor::AdapterName ( + *(this->adapter_name_)), + CORBA::NO_MEMORY ( + CORBA::SystemException::_tao_minor_code ( + TAO_DEFAULT_MINOR_CODE, + ENOMEM), + CORBA::COMPLETED_NO)); + ACE_CHECK_RETURN (0); + + return adapter_name; + } +} + +CORBA::Object_ptr +TAO_ObjectReferenceTemplate::make_object ( + const char *, + const PortableInterceptor::ObjectId & + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC (( + CORBA::SystemException + )) +{ + if (this->poa_ == 0) + ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), CORBA::Object::_nil ()); + + return this->poa_->invoke_key_to_object (ACE_ENV_SINGLE_ARG_PARAMETER); +} diff --git a/TAO/tao/PortableServer/ObjectReferenceTemplate.h b/TAO/tao/PortableServer/ObjectReferenceTemplate.h new file mode 100644 index 00000000000..6d805313cf7 --- /dev/null +++ b/TAO/tao/PortableServer/ObjectReferenceTemplate.h @@ -0,0 +1,127 @@ +// -*- C++ -*- + +//============================================================================= +/** + * @file ObjectReferenceTemplate.h + * + * $Id$ + * + * This is the implementation of the + * PortableInterceptor::ObjectReferenceTemplate ValueType. + * + * @author Priyanka Gontla <gontla_p@ociweb.com> + */ +//============================================================================= + +#ifndef TAO_OBJECT_REFERENCE_TEMPLATE_H +#define TAO_OBJECT_REFERENCE_TEMPLATE_H + +#include /**/ "ace/pre.h" + +#include "tao/PortableServer/portableserver_export.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "Default_ORTC.h" + +#if defined(_MSC_VER) +#if (_MSC_VER >= 1200) +#pragma warning(push) +#endif /* _MSC_VER >= 1200 */ +#pragma warning(disable:4250) +#endif /* _MSC_VER */ + +class TAO_POA; + +/** + * @class TAO_ObjectReferenceTemplate + * + * @brief Implementation of the PortableInterceptor::ObjectReferenceTemplate + * interface. + */ +class TAO_PortableServer_Export TAO_ObjectReferenceTemplate + : public virtual OBV_TAO_Default_ORT::ObjectReferenceTemplate, + public virtual CORBA::DefaultValueRefCountBase +{ +public: + + /// Constructor + TAO_ObjectReferenceTemplate (const char *server_id, + const char *orb_id, + TAO_POA *poa); + + /** + * @name PortableInterceptor::ObjectReferenceTemplate Methods + * + * Methods required by the + * PortableInterceptor::ObjectReferenceTemplate ValueType. + */ + //@{ + virtual char * server_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual char * orb_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual PortableInterceptor::AdapterName * adapter_name ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); + //@} + + /** + * @name PortableInterceptor::ObjectReferenceFactory Methods + * + * Methods required by the + * PortableInterceptor::ObjectReferenceFactory ValueType. + */ + //@{ + virtual CORBA::Object_ptr make_object ( + const char * repository_id, + const PortableInterceptor::ObjectId & id + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( + CORBA::SystemException + )); + //@} + + /// Set the underlying POA pointer. + /** + * Upon destruction of the POA that this ObjectReferenceTemplate is + * associated with, the underlying POA pointer will be set to zero + * to forcibly break all ties with the POA. This is necessary to + * prevent this ObjectReferenceTemplate from invoking the POA after + * it has been destroyed. + */ + void poa (TAO_POA * poa); + +protected: + + /// Destructor + /** + * Protected destructor to enforce proper memory management via + * reference counting. + */ + ~TAO_ObjectReferenceTemplate (void); + +private: + + const char *server_id_; + const char *orb_id_; + PortableInterceptor::AdapterName_var adapter_name_; + TAO_POA *poa_; + +}; + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#pragma warning(pop) +#endif /* _MSC_VER */ + +#if defined (__ACE_INLINE__) +# include "ObjectReferenceTemplate.inl" +#endif /* ! __ACE_INLINE__ */ + +#include /**/ "ace/post.h" + +#endif /* TAO_OBJECT_REFERENCE_TEMPLATE_H */ diff --git a/TAO/tao/PortableServer/ObjectReferenceTemplate.inl b/TAO/tao/PortableServer/ObjectReferenceTemplate.inl new file mode 100644 index 00000000000..14de581cafc --- /dev/null +++ b/TAO/tao/PortableServer/ObjectReferenceTemplate.inl @@ -0,0 +1,9 @@ +// -*- C++ -*- +// +// $Id$ + +ACE_INLINE void +TAO_ObjectReferenceTemplate::poa (TAO_POA * poa) +{ + this->poa_ = poa; +} diff --git a/TAO/tao/PortableServer/Object_Adapter.i b/TAO/tao/PortableServer/Object_Adapter.i index e51bd87f527..d1cb1630b7f 100644 --- a/TAO/tao/PortableServer/Object_Adapter.i +++ b/TAO/tao/PortableServer/Object_Adapter.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -#include "tao/SystemException.h" - ACE_INLINE TAO_POA_Current::TAO_POA_Current (void) diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp index 5ee4eb96c18..e8b042b4ab7 100644 --- a/TAO/tao/PortableServer/POA.cpp +++ b/TAO/tao/PortableServer/POA.cpp @@ -14,10 +14,10 @@ ACE_RCSID (PortableServer, #include "tao/StringSeqC.h" +#include "tao/PortableServer/IORInfo.h" +#include "tao/PortableServer/ObjectReferenceTemplate.h" #include "tao/PortableServer/Default_Acceptor_Filter.h" -#include "tao/PortableServer/ORT_Adapter.h" -#include "tao/PortableServer/ORT_Adapter_Factory.h" -#include "tao/PortableInterceptorC.h" + #include "tao/ORB_Core.h" #include "tao/ORB.h" #include "tao/Server_Strategy_Factory.h" @@ -28,8 +28,8 @@ ACE_RCSID (PortableServer, #include "tao/Stub.h" #include "tao/Profile.h" #include "tao/TSS_Resources.h" -#include "tao/IORInterceptor_Adapter.h" #include "tao/debug.h" +#include "tao/IORInterceptor/IORInterceptor_List.h" #include "Default_Acceptor_Filter.h" #include "ace/OS_NS_wchar.h" #include "ace/OS_NS_sys_time.h" @@ -41,7 +41,6 @@ ACE_RCSID (PortableServer, // auto_ptr class #include "ace/Auto_Ptr.h" -#include "ace/Dynamic_Service.h" #if !defined (__ACE_INLINE__) # include "POA.i" @@ -172,14 +171,10 @@ TAO_POA::create_request_processing_policy (PortableServer::RequestProcessingPoli void TAO_POA::set_obj_ref_factory ( PortableInterceptor::ObjectReferenceFactory *current_factory - ACE_ENV_ARG_DECL) + ACE_ENV_ARG_DECL_NOT_USED) { - if (this->ORT_adapter (ACE_ENV_SINGLE_ARG_PARAMETER)) - { - // Activate a different factory - this->ort_adapter_->set_obj_ref_factory (current_factory - ACE_ENV_ARG_PARAMETER); - } + CORBA::add_ref (current_factory); + this->obj_ref_factory_ = current_factory; } TAO_POA::TAO_POA (const TAO_POA::String &name, @@ -199,7 +194,6 @@ TAO_POA::TAO_POA (const TAO_POA::String &name, policies_ (policies), parent_ (parent), active_object_map_ (0), - ort_adapter_ (0), adapter_state_ (PortableInterceptor::HOLDING), #if (TAO_HAS_MINIMUM_POA == 0) @@ -351,6 +345,22 @@ TAO_POA::TAO_POA (const TAO_POA::String &name, } #endif /* TAO_HAS_MINIMUM_CORBA */ + + // Create an ObjectReferenceTemplate for this POA. + ACE_NEW_THROW_EX (this->def_ort_template_, + TAO_ObjectReferenceTemplate ( + this->orb_core_.server_id (), + this->orb_core_.orbid (), + this), + CORBA::NO_MEMORY ()); + ACE_CHECK; + + this->ort_template_ = this->def_ort_template_; + + // Must increase ref count since this->obj_ref_factory_ will + // descrease it upon destruction. + CORBA::add_ref (this->ort_template_.in ()); + this->obj_ref_factory_ = this->ort_template_; } TAO_POA::~TAO_POA (void) @@ -366,7 +376,6 @@ TAO_POA::complete_destruction_i (ACE_ENV_SINGLE_ARG_DECL) // Delete the active object map. delete this->active_object_map_; - active_object_map_ = 0; // Remove POA from the POAManager. int result = this->poa_manager_.remove_poa (this); @@ -417,17 +426,6 @@ TAO_POA::complete_destruction_i (ACE_ENV_SINGLE_ARG_DECL) } - if (this->ort_adapter_ != 0) - { - TAO::ORT_Adapter_Factory *ort_factory = - this->ORT_adapter_factory (); - - ort_factory->destroy (this->ort_adapter_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - this->ort_adapter_ = 0; - } - CORBA::release (this); } @@ -733,12 +731,11 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects, } } - TAO::ORT_Array array_obj_ref_template; + PortableInterceptor::ObjectReferenceTemplateSeq seq_obj_ref_template; CORBA::ULong i = 0; - // Gather all ObjectReferenceTemplates and change all adapter states - // to inactivate + // Remove all children POAs for (CHILDREN::iterator iterator = this->children_.begin (); iterator != this->children_.end (); ++iterator) @@ -747,47 +744,35 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects, // Get the adapter template related to the ChildPOA PortableInterceptor::ObjectReferenceTemplate *child_at = - child_poa->get_adapter_template_i (); + child_poa->get_adapter_template (); - // In case no ORT library is linked we get zero - if (child_at != 0) - { - // Add it to the sequence of object reference templates that - // will be destroyed. - array_obj_ref_template.size (i + 1); + CORBA::add_ref (child_at); - array_obj_ref_template[i] = child_at; - } + // Add it to the sequence of object reference templates that + // will be destroyed. + seq_obj_ref_template.length (i + 1); - child_poa->adapter_state_ = - PortableInterceptor::INACTIVE; + seq_obj_ref_template[i] = child_at; - ++i; - } + child_poa->adapter_state_ = PortableInterceptor::INACTIVE; - // Notify the state changes to the IORInterceptors - this->adapter_state_changed (array_obj_ref_template, - PortableInterceptor::INACTIVE - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + child_poa->adapter_state_changed (seq_obj_ref_template, + child_poa->adapter_state_ + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; - // Destroy all child POA's now. - for (CHILDREN::iterator destroy_iterator = this->children_.begin (); - destroy_iterator != this->children_.end (); - ++destroy_iterator) - { - TAO_POA *destroy_child_poa = (*destroy_iterator).int_id_; + ++i; - destroy_child_poa->destroy_i (etherealize_objects, - wait_for_completion - ACE_ENV_ARG_PARAMETER); + child_poa->destroy_i (etherealize_objects, + wait_for_completion + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } -#if (TAO_HAS_MINIMUM_CORBA == 0) // // ImplRepo related. // +#if (TAO_HAS_MINIMUM_CORBA == 0) if (this->cached_policies_.lifespan () == PortableServer::PERSISTENT) { this->imr_notify_shutdown (); @@ -840,21 +825,6 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects, (non_servant_upcall_in_progress == 0 || &non_servant_upcall_in_progress->poa () != this)) { - TAO::ORT_Array my_array_obj_ref_template; - - // Get the adapter template - PortableInterceptor::ObjectReferenceTemplate *adapter = - this->get_adapter_template_i (); - - if (adapter != 0) - { - // Add it to the sequence of object reference templates, we just notify - // for ourselves that we are now non_existent, our childs will do it - // for themselves. - array_obj_ref_template.size (1); - array_obj_ref_template[0] = adapter; - } - // According to the ORT spec, after a POA is destroyed, its state // has to be changed to NON_EXISTENT and all the registered // interceptors are to be informed. Since, the POA is destroyed @@ -868,10 +838,14 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects, this->adapter_state_ = PortableInterceptor::NON_EXISTENT; - this->adapter_state_changed (array_obj_ref_template, + this->adapter_state_changed (seq_obj_ref_template, this->adapter_state_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; + + // Break all ties between the ObjectReferenceTemplate and this + // POA. + this->def_ort_template_->poa (0); } else { @@ -1043,19 +1017,31 @@ TAO_POA::add_ior_component_to_profile ( void TAO_POA::adapter_state_changed ( - const TAO::ORT_Array &array_obj_ref_template, + const PortableInterceptor::ObjectReferenceTemplateSeq &seq_obj_ref_template, PortableInterceptor::AdapterState state ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IORInterceptor_Adapter *ior_adapter = - this->orb_core_.ior_interceptor_adapter (); + /// First get a list of all the interceptors. + TAO_IORInterceptor_List * interceptor_list = + this->orb_core_.ior_interceptor_list (); - if (ior_adapter) + if (interceptor_list == 0) + return; + + TAO_IORInterceptor_List::TYPE & interceptors = + interceptor_list->interceptors (); + + const size_t interceptor_count = interceptors.size (); + + if (interceptor_count == 0) + return; + + for (size_t i = 0; i < interceptor_count; ++i) { - ior_adapter->adapter_state_changed (array_obj_ref_template, - state - ACE_ENV_ARG_PARAMETER); + interceptors[i]->adapter_state_changed (seq_obj_ref_template, + state + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -1069,8 +1055,7 @@ TAO_POA::get_servant_manager_i (ACE_ENV_SINGLE_ARG_DECL) { // This operation requires the USE_SERVANT_MANAGER policy; if not // present, the WrongPolicy exception is raised. - if (this->cached_policies_.request_processing () != - PortableServer::USE_SERVANT_MANAGER) + if (this->cached_policies_.request_processing () != PortableServer::USE_SERVANT_MANAGER) { ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (), PortableServer::ServantManager::_nil ()); @@ -1079,8 +1064,7 @@ TAO_POA::get_servant_manager_i (ACE_ENV_SINGLE_ARG_DECL) // This operation returns the servant manager associated with the // POA. If no servant manager has been associated with the POA, it // returns a null reference. - if (this->cached_policies_.servant_retention () == - PortableServer::RETAIN) + if (this->cached_policies_.servant_retention () == PortableServer::RETAIN) return PortableServer::ServantManager::_duplicate (this->servant_activator_.in ()); else return PortableServer::ServantManager::_duplicate (this->servant_locator_.in ()); @@ -1937,32 +1921,14 @@ TAO_POA::create_reference_i (const char *intf, 1, priority); - return this->invoke_key_to_object_helper_i (intf, - user_id - ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object_ptr -TAO_POA::invoke_key_to_object_helper_i (const char * repository_id, - const PortableServer::ObjectId & id - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ const PortableInterceptor::ObjectId &user_oid = - reinterpret_cast <const PortableInterceptor::ObjectId &>(id); + ACE_reinterpret_cast (const PortableInterceptor::ObjectId &, + user_id); // Ask the ORT to create the object. - if (this->ORT_adapter_i ()) - { - // Ask the ORT to create the object. - return this->ort_adapter_->make_object (repository_id, + return this->obj_ref_factory_->make_object (intf, user_oid ACE_ENV_ARG_PARAMETER); - } - else - { - return this->invoke_key_to_object (ACE_ENV_SINGLE_ARG_PARAMETER); - } } CORBA::Object_ptr @@ -2039,8 +2005,13 @@ TAO_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_id, 1, priority); - return this->invoke_key_to_object_helper_i (intf, - user_id + const PortableInterceptor::ObjectId &user_oid = + ACE_reinterpret_cast (const PortableInterceptor::ObjectId &, + user_id); + + // Ask the ORT to create the object. + return this->obj_ref_factory_->make_object (intf, + user_oid ACE_ENV_ARG_PARAMETER); } @@ -2282,14 +2253,19 @@ TAO_POA::servant_to_reference_i (PortableServer::Servant servant 1, priority); + const PortableInterceptor::ObjectId &user_oid = + ACE_reinterpret_cast (const PortableInterceptor::ObjectId &, + user_id); + // Ask the ORT to create the object. // @@NOTE:There is a possible deadlock lurking here. We held the // lock, and we are possibly trying to make a call into the // application code. Think what would happen if the app calls us // back. We need to get to this at some point. - return this->invoke_key_to_object_helper_i (servant->_interface_repository_id (), - user_id - ACE_ENV_ARG_PARAMETER); + return this->obj_ref_factory_->make_object ( + servant->_interface_repository_id (), + user_oid + ACE_ENV_ARG_PARAMETER); } PortableServer::Servant @@ -2629,8 +2605,13 @@ TAO_POA::id_to_reference_i (const PortableServer::ObjectId &id 1, priority); - return this->invoke_key_to_object_helper_i (servant->_interface_repository_id (), - id + const PortableInterceptor::ObjectId &user_oid = + ACE_reinterpret_cast (const PortableInterceptor::ObjectId &, + id); + + // Ask the ORT to create the object. + return this->obj_ref_factory_->make_object (servant->_interface_repository_id (), + user_oid ACE_ENV_ARG_PARAMETER); } else @@ -3759,26 +3740,127 @@ TAO_POA::key_to_stub_i (const TAO::ObjectKey &key, void TAO_POA::establish_components (ACE_ENV_SINGLE_ARG_DECL) { - TAO_IORInterceptor_Adapter *ior_adapter = - this->orb_core_.ior_interceptor_adapter (); + // Iterate over the registered IOR interceptors so that they may be + // given the opportunity to add tagged components to the profiles + // for this servant. + /// First get a list of all the interceptors. + TAO_IORInterceptor_List * interceptor_list = + this->orb_core_.ior_interceptor_list (); + + if (interceptor_list == 0) + return; + + TAO_IORInterceptor_List::TYPE & interceptors = + interceptor_list->interceptors (); + + const size_t interceptor_count = interceptors.size (); + + if (interceptor_count == 0) + return; - if (ior_adapter) + TAO_IORInfo *tao_info = 0; + ACE_NEW_THROW_EX (tao_info, + TAO_IORInfo (this), + CORBA::NO_MEMORY ( + CORBA::SystemException::_tao_minor_code ( + TAO_DEFAULT_MINOR_CODE, + ENOMEM), + CORBA::COMPLETED_NO)); + ACE_CHECK; + + PortableInterceptor::IORInfo_var info = tao_info; + + // Release the POA during IORInterceptor calls to avoid potential + // deadlocks. + TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this); + ACE_UNUSED_ARG (non_servant_upcall); + + for (size_t i = 0; i < interceptor_count; ++i) { - ior_adapter->establish_components (this ACE_ENV_ARG_PARAMETER); + ACE_TRY + { + interceptors[i]->establish_components (info.in () + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + // According to the Portable Interceptors specification, + // IORInterceptor::establish_components() must not throw an + // exception. If it does, then the ORB is supposed to + // ignore it and continue processing the remaining + // IORInterceptors. + if (TAO_debug_level > 1) + { + CORBA::String_var name = interceptors[i]->name ( + ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + // @@ What do we do if we get an exception here? + + if (name.in () != 0) + { + ACE_DEBUG ((LM_WARNING, + "(%P|%t) Exception thrown while processing " + "IORInterceptor \"%s\">\n", + ACE_TEXT_CHAR_TO_TCHAR (name.in ()))); + } + + ACE_PRINT_TAO_EXCEPTION (ACE_ANY_EXCEPTION, + "Ignoring exception in " + "IORInterceptor::establish_components"); + } + } + ACE_ENDTRY; ACE_CHECK; } + + tao_info->components_established (); + + this->components_established (info.in () + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; + + // The IORInfo instance is no longer valid. Invalidate it to + // prevent the user from peforming "illegal" operations. + tao_info->invalidate (); } void TAO_POA::components_established (PortableInterceptor::IORInfo_ptr info ACE_ENV_ARG_DECL) { - TAO_IORInterceptor_Adapter *ior_adapter = - this->orb_core_.ior_interceptor_adapter (); + // Iterate over the registered IOR interceptors so that they may be + // given the opportunity to add tagged components to the profiles + // for this servant. + TAO_IORInterceptor_List * interceptor_list = + this->orb_core_.ior_interceptor_list (); - if (ior_adapter) + if (interceptor_list == 0) + return; + + TAO_IORInterceptor_List::TYPE & interceptors = + interceptor_list->interceptors (); + + const size_t interceptor_count = interceptors.size (); + + // All the establish_components() interception points have been + // invoked. Now call the components_established() interception point + // on all the IORInterceptors. + for (size_t j = 0; j < interceptor_count; ++j) { - ior_adapter->components_established (info ACE_ENV_ARG_PARAMETER); + ACE_TRY + { + interceptors[j]->components_established ( + info + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + ACE_THROW (CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 6, + CORBA::COMPLETED_NO)); + } + ACE_ENDTRY; ACE_CHECK; } } @@ -4088,82 +4170,6 @@ TAO_POA::imr_notify_shutdown (void) #endif /* TAO_HAS_MINIMUM_CORBA */ -TAO::ORT_Adapter_Factory * -TAO_POA::ORT_adapter_factory (void) -{ - return ACE_Dynamic_Service<TAO::ORT_Adapter_Factory>::instance ( - TAO_POA::ort_adapter_factory_name ()); -} - -TAO::ORT_Adapter * -TAO_POA::ORT_adapter_i (void) -{ - if (this->ort_adapter_ != 0) - return this->ort_adapter_; - - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY - { - TAO::ORT_Adapter_Factory * ort_ap_factory = - this->ORT_adapter_factory (); - - if (!ort_ap_factory) - return 0; - - // Get the full adapter name of this POA, do this before we - // create the adapter so that in case this fails, we just - // return 0 and not a not activated adapter - PortableInterceptor::AdapterName *adapter_name = - this->adapter_name_i (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - this->ort_adapter_ = - ort_ap_factory->create (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (!ort_adapter_) - return 0; - - // @todo We have to look at this, we activate it but hold the POA lock, - // in case we are called by ORT_adapter, we shouldn't keep the lock - // here, but then the ort_adapter should be guarded against multiple - // activations. - this->ort_adapter_->activate (this->orb_core_.server_id (), - this->orb_core_.orbid (), - adapter_name, - this - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "(%P|%t) Cannot initialize the " - "object_reference_template_adapter\n"); - } - ACE_ENDTRY; - ACE_CHECK_RETURN (0); - - return this->ort_adapter_; -} - -TAO::ORT_Adapter * -TAO_POA::ORT_adapter (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - if (this->ort_adapter_ != 0) - return this->ort_adapter_; - - // Lock access for the duration of this transaction. - TAO_POA_GUARD_RETURN (0); - - // DCL .. - if (this->ort_adapter_ != 0) - return this->ort_adapter_; - - return this->ORT_adapter_i (); -} - TAO_POA_Guard::TAO_POA_Guard (TAO_POA &poa ACE_ENV_ARG_DECL, int check_for_destruction) @@ -4298,53 +4304,6 @@ TAO_POA::Key_To_Object_Params::set (PortableServer::ObjectId_var &system_id, this->priority_ = priority; } -void -TAO_POA::ort_adapter_factory_name (const char *name) -{ - TAO_POA_Static_Resources::instance ()->ort_adapter_factory_name_ = - name; -} - -const char * -TAO_POA::ort_adapter_factory_name (void) -{ - return TAO_POA_Static_Resources::instance ()->ort_adapter_factory_name_.c_str(); -} - -// Initialize instance_ to 0, since this is what we test for in the call -// to instance (). Note that this does not require a constructor call, so -// it is always initialized by the time that instance () can be called. -TAO_POA_Static_Resources* TAO_POA_Static_Resources::instance_ = 0; - -// Force an instance to be created at module initialization time, -// since we do not want to worry about double checked locking and -// the race condition to initialize the lock. -TAO_POA_Static_Resources* TAO_POA_Static_Resources::initialization_reference_ = - TAO_POA_Static_Resources::instance (); - -TAO_POA_Static_Resources* -TAO_POA_Static_Resources::instance (void) -{ - if (TAO_POA_Static_Resources::instance_ == 0) - { - // This new is never freed on purpose. The data specified by - // it needs to be around for the last shared library that references - // this class. This could occur in a destructor in a shared library - // that is unloaded after this one. One solution to avoid this - // harmless memory leak would be to use reference counting. - ACE_NEW_RETURN (TAO_POA_Static_Resources::instance_, - TAO_POA_Static_Resources (), - 0); - } - - return TAO_POA_Static_Resources::instance_; -} - -TAO_POA_Static_Resources::TAO_POA_Static_Resources (void) - : ort_adapter_factory_name_ ("ORT_Adapter_Factory") -{ -} - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Array_Base<TAO_Active_Object_Map::Map_Entry *>; @@ -4362,11 +4321,13 @@ template class ACE_Write_Guard<ACE_Lock>; template class ACE_Read_Guard<ACE_Lock>; template class ACE_Array_Base <IOP::ProfileId>; +//template class auto_ptr<TAO_Active_Object_Map_Iterator_Impl>; template class auto_ptr<TAO_Active_Object_Map>; # if defined (ACE_LACKS_AUTO_PTR) \ || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \ && (ACE_HAS_STANDARD_CPP_LIBRARY != 0)) +//template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map_Iterator_Impl>; template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map>; # endif /* ACE_LACKS_AUTO_PTR */ @@ -4388,11 +4349,13 @@ template class ACE_Node<TAO_POA *>; #pragma instantiate ACE_Write_Guard<ACE_Lock> #pragma instantiate ACE_Read_Guard<ACE_Lock> +//#pragma instantiate auto_ptr<TAO_Active_Object_Map_Iterator_Impl> #pragma instantiate auto_ptr<TAO_Active_Object_Map> # if defined (ACE_LACKS_AUTO_PTR) \ || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \ && (ACE_HAS_STANDARD_CPP_LIBRARY != 0)) +//# pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map_Iterator_Impl> # pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map> # endif /* ACE_LACKS_AUTO_PTR */ diff --git a/TAO/tao/PortableServer/POA.h b/TAO/tao/PortableServer/POA.h index 6de036d8770..a3c7f13b7b6 100644 --- a/TAO/tao/PortableServer/POA.h +++ b/TAO/tao/PortableServer/POA.h @@ -42,9 +42,12 @@ #include "tao/LocalObject.h" // Portable Interceptor -#include "tao/PI_ForwardC.h" +#include "tao/PortableInterceptorC.h" +// Map #include "ace/Hash_Map_Manager_T.h" + +// ACE_Array_Base #include "ace/Array_Base.h" // Locking @@ -56,8 +59,6 @@ // OctetSeq #include "tao/OctetSeqC.h" -#include "ORT_Adapter.h" - // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. #if defined(_MSC_VER) @@ -67,11 +68,15 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +class TAO_Acceptor_Filter; +class TAO_Acceptor_Registry; class TAO_Temporary_Creation_Time; +class TAO_ObjectReferenceTemplate; class TAO_Creation_Time { public: + TAO_Creation_Time (const ACE_Time_Value &creation_time); TAO_Creation_Time (void); @@ -131,9 +136,6 @@ protected: // Forward Declaration class ServerObject_i; -class TAO_Acceptor_Filter; -class TAO_Acceptor_Registry; -class TAO_IORInfo; namespace PortableInterceptor { @@ -141,12 +143,6 @@ namespace PortableInterceptor typedef IORInfo *IORInfo_ptr; } -namespace TAO -{ - class ORT_Adapter; - class ORT_Adapter_Factory; -} - /** * @class TAO_POA * @@ -166,7 +162,7 @@ public: friend class TAO_POA_Current_Impl; friend class TAO_POA_Manager; friend class TAO_RT_Collocation_Resolver; - friend class TAO_IORInfo; + friend class TAO_ObjectReferenceTemplate; typedef ACE_CString String; @@ -276,6 +272,20 @@ public: PortableInterceptor::AdapterName *adapter_name (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); + /// Accessor methods to ObjectReferenceTemplate + PortableInterceptor::ObjectReferenceTemplate * get_adapter_template (void); + + void set_adapter_template (PortableInterceptor::ObjectReferenceTemplate * + object_ref_template + ACE_ENV_ARG_DECL); + + /// Accessor methods to PortableInterceptor::ObjectReferenceFactory + PortableInterceptor::ObjectReferenceFactory * get_obj_ref_factory (void); + + void set_obj_ref_factory ( + PortableInterceptor::ObjectReferenceFactory *current_factory + ACE_ENV_ARG_DECL); + /// Store the given TaggedComponent for eventual insertion into all /// object reference profiles. void save_ior_component (const IOP::TaggedComponent &component @@ -396,9 +406,8 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); #if (TAO_HAS_MINIMUM_POA == 0) - // Methods added by the - /// @name MIOP specification methods - //@{ + // Methods added by the MIOP specification. + virtual PortableServer::ObjectId * create_id_for_reference ( CORBA::Object_ptr the_ref ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -437,23 +446,26 @@ public: CORBA::SystemException, PortableServer::NotAGroupObject )); - //@} + + // End methods added by MIOP. #endif /* TAO_HAS_MINIMUM_POA == 0 */ + /// Accessor for POA policies. TAO_POA_Policy_Set &policies (void); /// Accessor for cached POA policies. TAO_POA_Cached_Policies &cached_policies (void); - /// This method gives the policies that are exposed to the client. - /// These policies are shipped within the IOR. virtual CORBA::PolicyList *client_exposed_policies ( CORBA::Short object_priority ACE_ENV_ARG_DECL ); + // This method gives the policies that are exposed to the client. + // These policies are shipped within the IOR. + - /// Utility functions for the other + // Utility functions for the other static char* ObjectId_to_string (const PortableServer::ObjectId &id); static CORBA::WChar* ObjectId_to_wstring ( @@ -507,9 +519,9 @@ public: CORBA::Boolean cleanup_in_progress (void); - /// Calls protected static method used when POACurrent is not appropriate. static int parse_ir_object_key (const TAO::ObjectKey &object_key, PortableServer::ObjectId &user_id); + // Calls protected static method used when POACurrent is not appropriate. TAO_Object_Adapter &object_adapter (void); @@ -546,12 +558,6 @@ public: CORBA::Boolean waiting_destruction (void) const; - static void ort_adapter_factory_name (const char *name); - - static const char *ort_adapter_factory_name (void); - - CORBA::Object_ptr invoke_key_to_object (ACE_ENV_SINGLE_ARG_DECL); - protected: /// Template method for creating new POA's of this type. @@ -608,9 +614,10 @@ protected: /// Method to notify the IOR Interceptors when there is a state /// changed not related to POAManager. void adapter_state_changed ( - const TAO::ORT_Array &array_obj_ref_template, + const PortableInterceptor::ObjectReferenceTemplateSeq &seq_obj_ref_template, PortableInterceptor::AdapterState state - ACE_ENV_ARG_DECL) + ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Add the given tagged component to all profiles. @@ -652,32 +659,35 @@ protected: #endif /* TAO_HAS_MINIMUM_POA == 0 */ +// +// ImplRepo related. +// #if (TAO_HAS_MINIMUM_CORBA == 0) - /// @name Implementation repository related methods - //@{ - /// ImplRepo helper method, notify the ImplRepo on startup void imr_notify_startup (ACE_ENV_SINGLE_ARG_DECL); + // ImplRepo helper method, notify the ImplRepo on startup - /// ImplRepo helper method, notify the ImplRepo on shutdown void imr_notify_shutdown (void); - //@} + // ImplRepo helper method, notify the ImplRepo on shutdown + #endif /* TAO_HAS_MINIMUM_CORBA */ - /// Wrapper for the ORB's key_to_object that will alter the object pointer - /// if the ImplRepo is used. + CORBA::Object_ptr invoke_key_to_object (ACE_ENV_SINGLE_ARG_DECL); + CORBA::Object_ptr key_to_object (const TAO::ObjectKey &key, const char *type_id, TAO_ServantBase *servant, CORBA::Boolean collocated, CORBA::Short priority ACE_ENV_ARG_DECL); + // Wrapper for the ORB's key_to_object that will alter the object pointer + // if the ImplRepo is used. - /// Like key_to_stub() but assume that the ORB is not shutting down. virtual TAO_Stub* key_to_stub_i (const TAO::ObjectKey &key, const char *type_id, CORBA::Short priority ACE_ENV_ARG_DECL); + // Like key_to_stub() but assume that the ORB is not shutting down. TAO_Stub *create_stub_object (const TAO::ObjectKey &object_key, const char *type_id, @@ -850,24 +860,6 @@ protected: static TAO_POA_Policy_Set &default_poa_policies (void); protected: - /// Accessor methods to ObjectReferenceTemplate - PortableInterceptor::ObjectReferenceTemplate * - get_adapter_template (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - /// Accessor methods to ObjectReferenceTemplate, non locked version - PortableInterceptor::ObjectReferenceTemplate *get_adapter_template_i (void); - - /// Accessor methods to PortableInterceptor::ObjectReferenceFactory - PortableInterceptor::ObjectReferenceFactory * - get_obj_ref_factory (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - /// Set the object reference factory - void set_obj_ref_factory ( - PortableInterceptor::ObjectReferenceFactory *current_factory - ACE_ENV_ARG_DECL); - TAO_SERVANT_LOCATION locate_servant_i (const PortableServer::ObjectId &id, PortableServer::Servant &servant @@ -882,23 +874,6 @@ protected: ACE_ENV_ARG_DECL ); - CORBA::Object_ptr - invoke_key_to_object_helper_i (const char * repository_id, - const PortableServer::ObjectId & id - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - /// Get the ORT adapter, in case there is no adapter yet, this method will - /// try to create one and hold the POA lock - TAO::ORT_Adapter *ORT_adapter (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - /// Get the ORT adapter, in case there is no adapter yet, this method will - /// try to create one but assumes the POA lock is already hole - TAO::ORT_Adapter *ORT_adapter_i (void); - - TAO::ORT_Adapter_Factory *ORT_adapter_factory (void); - const TAO_Creation_Time &creation_time (void); CORBA::Boolean persistent (void); @@ -961,8 +936,13 @@ protected: CORBA::OctetSeq id_; - /// Pointer to the object reference template adapter. - TAO::ORT_Adapter *ort_adapter_; + /// Keep a copy of the pointer to the actual implementation around + /// so that we can call some TAO-specific methods on it. + TAO_ObjectReferenceTemplate * def_ort_template_; + + PortableInterceptor::ObjectReferenceTemplate_var ort_template_; + + PortableInterceptor::ObjectReferenceFactory_var obj_ref_factory_; /// Adapter can be accepting, rejecting etc. PortableInterceptor::AdapterState adapter_state_; @@ -1010,7 +990,7 @@ protected: TAO_ORB_Core &orb_core_; - /// The object adapter we belong to + // The object adapter we belong to TAO_Object_Adapter *object_adapter_; CORBA::Boolean cleanup_in_progress_; @@ -1094,56 +1074,6 @@ protected: #endif /* TAO_HAS_MINIMUM_POA == 0 */ -/** - * @class TAO_POA_Static_Resources - * - * @brief The static (global) resoures of all POA's. - * - * This class is used by the POA to store the resources global to - * all POA's. All instance variables that would have been - * declared "static" in TAO_POA, should be declared in this class - * to avoid the "static initialization order fiasco" as described in - * http://www.parashift.com/c++-faq-lite/ctors.html#faq-10.11. - * Briefly, this is the problem that occurs if any static initializers - * in any other code call into set static members of TAO_POA. - * Since the order in which these initializers execute is unspecified, - * uninitialized members can be accessed. - */ -class TAO_PortableServer_Export TAO_POA_Static_Resources -{ -public: - - /// Return the singleton instance. - static TAO_POA_Static_Resources* instance (void); - -public: - - /** - * Name of the factory object used to adapt function calls on the - * PortableInterceptor interfaces ORT. The default value is - * "ObjectReferenceTemplate_Adapter_Factory". If the ORT library is linked, - * the corresponding accessor function - * objectreferencefactory_adapter_factory_name() will be called to set - * the value to "Concrete_ObjectReferenceTemplate_Adapter_Factory". - */ - ACE_CString ort_adapter_factory_name_; - -private: - /// Constructor. - TAO_POA_Static_Resources (void); - -private: - /// The singleton instance. - static TAO_POA_Static_Resources* instance_; - - /// Mostly unused variable whose sole purpose is to enforce - /// the instantiation of a TAO_POA_Static_Resources instance - /// at initialization time. - static TAO_POA_Static_Resources* initialization_reference_; -}; - -// **************************************************************** - #if defined(_MSC_VER) && (_MSC_VER >= 1200) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/PortableServer/POA.i b/TAO/tao/PortableServer/POA.i index 9821fa6efb4..761d5d67c13 100644 --- a/TAO/tao/PortableServer/POA.i +++ b/TAO/tao/PortableServer/POA.i @@ -464,38 +464,15 @@ TAO_POA::adapter_name (ACE_ENV_SINGLE_ARG_DECL) } ACE_INLINE PortableInterceptor::ObjectReferenceTemplate * -TAO_POA::get_adapter_template (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - if (this->ORT_adapter (ACE_ENV_SINGLE_ARG_PARAMETER)) - { - return this->ort_adapter_->get_adapter_template(); - } - - return 0; -} - -ACE_INLINE PortableInterceptor::ObjectReferenceTemplate * -TAO_POA::get_adapter_template_i () +TAO_POA::get_adapter_template () { - if (this->ORT_adapter_i ()) - { - return this->ort_adapter_->get_adapter_template (); - } - - return 0; + return this->ort_template_; } ACE_INLINE PortableInterceptor::ObjectReferenceFactory * -TAO_POA::get_obj_ref_factory (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) +TAO_POA::get_obj_ref_factory () { - if (this->ORT_adapter (ACE_ENV_SINGLE_ARG_PARAMETER)) - { - return this->ort_adapter_->get_obj_ref_factory(); - } - - return 0; + return this->obj_ref_factory_; } #if (TAO_HAS_MINIMUM_POA == 0) diff --git a/TAO/tao/PortableServer/POAManager.cpp b/TAO/tao/PortableServer/POAManager.cpp index 3c484a85c23..66a9c9eba95 100644 --- a/TAO/tao/PortableServer/POAManager.cpp +++ b/TAO/tao/PortableServer/POAManager.cpp @@ -3,9 +3,11 @@ #include "POAManager.h" #include "POA.h" #include "poa_macros.h" +#include "tao/IORInterceptor/IORInterceptorC.h" #include "tao/Server_Strategy_Factory.h" +#include "tao/Interceptor_List.h" #include "tao/ORB_Core.h" -#include "tao/IORInterceptor_Adapter.h" +#include "tao/IORInterceptor/IORInterceptor_List.h" #if !defined (__ACE_INLINE__) # include "POAManager.i" @@ -138,14 +140,29 @@ TAO_POA_Manager::adapter_manager_state_changed (PortableServer::POAManager::Stat { PortableInterceptor::AdapterState adapter_state = state; - TAO_IORInterceptor_Adapter *ior_adapter = - this->object_adapter_.orb_core ().ior_interceptor_adapter (); + /// Whenever the POAManager state is changed, the + /// adapter_manager_state_changed method is to be invoked on all the IOR + /// Interceptors. + TAO_IORInterceptor_List *interceptor_list = + this->object_adapter_.orb_core ().ior_interceptor_list (); - if (ior_adapter) + if (interceptor_list == 0) + return; + + TAO_IORInterceptor_List::TYPE &interceptors = + interceptor_list->interceptors (); + + const size_t interceptor_count = interceptors.size (); + + if (interceptor_count == 0) + return; + + for (size_t i = 0; i < interceptor_count; ++i) { - ior_adapter->adapter_manager_state_changed (TAO_POA_Manager::poa_manager_id_, - adapter_state - ACE_ENV_ARG_PARAMETER); + interceptors[i]->adapter_manager_state_changed ( + TAO_POA_Manager::poa_manager_id_, + adapter_state + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/tao/PortableServer/POAManager.h b/TAO/tao/PortableServer/POAManager.h index 93db1c0d551..c0e8019d9a3 100644 --- a/TAO/tao/PortableServer/POAManager.h +++ b/TAO/tao/PortableServer/POAManager.h @@ -29,6 +29,7 @@ #include "tao/LocalObject.h" #include "tao/PortableInterceptorC.h" +#include "tao/ObjRefTemplate/ObjectReferenceTemplateC.h" #include "ace/Unbounded_Set.h" // Forward decl. diff --git a/TAO/tao/PortableServer/POAManager.i b/TAO/tao/PortableServer/POAManager.i index d60d3dd08f7..b97eddf2681 100644 --- a/TAO/tao/PortableServer/POAManager.i +++ b/TAO/tao/PortableServer/POAManager.i @@ -3,8 +3,6 @@ // $Id$ #include "tao/Environment.h" -#include "tao/SystemException.h" - ACE_INLINE ACE_Lock & TAO_POA_Manager::lock (void) diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp index 485a2f16eaa..69813eb8593 100644 --- a/TAO/tao/PortableServer/PolicyS.cpp +++ b/TAO/tao/PortableServer/PolicyS.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_codegen.cpp:631 #ifndef _TAO_IDL_ORIG_POLICYS_CPP_ @@ -64,7 +64,7 @@ #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) -#include "PolicyS.inl" +#include "PolicyS.i" #endif /* !defined INLINE */ // TAO_IDL - Generated from @@ -76,7 +76,7 @@ namespace TAO #if !defined (_CORBA_POLICY__ARG_TRAITS_SS_) #define _CORBA_POLICY__ARG_TRAITS_SS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_PortableServer_Export Arg_Traits<CORBA::Policy> : public diff --git a/TAO/tao/PortableServer/PolicyS.h b/TAO/tao/PortableServer/PolicyS.h index 712882698eb..8eca9c7ef37 100644 --- a/TAO/tao/PortableServer/PolicyS.h +++ b/TAO/tao/PortableServer/PolicyS.h @@ -59,126 +59,126 @@ namespace POA_CORBA { - - + + // TAO_IDL - Generated from // be\be_visitor_interface/interface_sh.cpp:90 - + class Policy; typedef Policy *Policy_ptr; - + class _TAO_Policy_ThruPOA_Proxy_Impl; class _TAO_Policy_Direct_Proxy_Impl; class _TAO_Policy_Strategized_Proxy_Broker; - + class TAO_PortableServer_Export Policy : public virtual PortableServer::ServantBase { protected: Policy (void); - + public: // Useful for template programming. typedef ::CORBA::Policy _stub_type; typedef ::CORBA::Policy_ptr _stub_ptr_type; typedef ::CORBA::Policy_var _stub_var_type; - + Policy (const Policy& rhs); virtual ~Policy (void); - + virtual CORBA::Boolean _is_a ( const char* logical_type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual void* _downcast ( const char* logical_type_id ); - + static void _is_a_skel ( TAO_ServerRequest &req, void *servant, void *servant_upcall ACE_ENV_ARG_DECL ); - + static void _non_existent_skel ( TAO_ServerRequest &req, void *servant, void *servant_upcall ACE_ENV_ARG_DECL ); - + static void _interface_skel ( TAO_ServerRequest &req, void *servant, void *servant_upcall ACE_ENV_ARG_DECL ); - + static void _component_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall ACE_ENV_ARG_DECL ); - + virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall ACE_ENV_ARG_DECL ); - + ::CORBA::Policy *_this ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_sh.cpp:45 - + virtual CORBA::PolicyType policy_type ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + static void _get_policy_type_skel ( TAO_ServerRequest &_tao_req, void *_tao_servant, void *_tao_servant_upcall ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_sh.cpp:45 - + virtual ::CORBA::Policy_ptr copy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + static void copy_skel ( TAO_ServerRequest &_tao_req, void *_tao_servant, void *_tao_servant_upcall ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_sh.cpp:45 - + virtual void destroy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + static void destroy_skel ( TAO_ServerRequest &_tao_req, void *_tao_servant, @@ -186,29 +186,29 @@ namespace POA_CORBA ACE_ENV_ARG_DECL ); }; - + /////////////////////////////////////////////////////////////////////// - // Strategized Proxy Broker Declaration + // Strategized Proxy Broker Declaration // - + // TAO_IDL - Generated from // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36 - + class TAO_PortableServer_Export _TAO_Policy_Strategized_Proxy_Broker : public virtual TAO::Collocation_Proxy_Broker { - public: + public: _TAO_Policy_Strategized_Proxy_Broker (void); - + virtual ~_TAO_Policy_Strategized_Proxy_Broker (void); - + TAO::Collocation_Strategy get_strategy ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)); - + void dispatch ( CORBA::Object_ptr obj, @@ -221,33 +221,33 @@ namespace POA_CORBA ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::Exception)); - + static _TAO_Policy_Strategized_Proxy_Broker * the_TAO_Policy_Strategized_Proxy_Broker (void); }; - + // - // End Strategized Proxy Broker Declaration + // End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// - - + + /////////////////////////////////////////////////////////////////////// // ThruPOA Proxy Impl. Declaration // - + // TAO_IDL - Generated from // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37 - + class TAO_PortableServer_Export _TAO_Policy_ThruPOA_Proxy_Impl { public: _TAO_Policy_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_Policy_ThruPOA_Proxy_Impl (void) {} - + // TAO_IDL - Generated from // be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void _get_policy_type ( TAO_Abstract_ServantBase *servant, @@ -258,10 +258,10 @@ namespace POA_CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void copy ( TAO_Abstract_ServantBase *servant, @@ -272,10 +272,10 @@ namespace POA_CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void destroy ( TAO_Abstract_ServantBase *servant, @@ -287,28 +287,28 @@ namespace POA_CORBA CORBA::SystemException )); }; - + // // ThruPOA Proxy Impl. Declaration /////////////////////////////////////////////////////////////////////// - - // TAO_IDL - Generated from + + // TAO_IDL - Generated from // be\be_visitor_interface/direct_proxy_impl_sh.cpp:31 - + /////////////////////////////////////////////////////////////////////// // Direct Impl. Declaration // - + class TAO_PortableServer_Export _TAO_Policy_Direct_Proxy_Impl { public: _TAO_Policy_Direct_Proxy_Impl (void); - + virtual ~_TAO_Policy_Direct_Proxy_Impl (void) {} - + // TAO_IDL - Generated from // be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void _get_policy_type ( TAO_Abstract_ServantBase *servant, @@ -319,10 +319,10 @@ class TAO_PortableServer_Export _TAO_Policy_Direct_Proxy_Impl ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void copy ( TAO_Abstract_ServantBase *servant, @@ -333,10 +333,10 @@ class TAO_PortableServer_Export _TAO_Policy_Direct_Proxy_Impl ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void destroy ( TAO_Abstract_ServantBase *servant, @@ -348,25 +348,25 @@ class TAO_PortableServer_Export _TAO_Policy_Direct_Proxy_Impl CORBA::SystemException )); }; - + // // Direct Proxy Impl. Declaration /////////////////////////////////////////////////////////////////////// - - + + // TAO_IDL - Generated from // be\be_visitor_module/module_sh.cpp:80 } // module CORBA -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_codegen.cpp:1014 #include "PolicyS_T.h" #if defined (__ACE_INLINE__) -#include "PolicyS.inl" +#include "PolicyS.i" #endif /* defined INLINE */ #if defined(_MSC_VER) && (_MSC_VER >= 1200) diff --git a/TAO/tao/PortableServer/PolicyS.i b/TAO/tao/PortableServer/PolicyS.i new file mode 100644 index 00000000000..1d2df31bd57 --- /dev/null +++ b/TAO/tao/PortableServer/PolicyS.i @@ -0,0 +1,26 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html diff --git a/TAO/tao/PortableServer/PolicyS_T.cpp b/TAO/tao/PortableServer/PolicyS_T.cpp index 1bc94beb745..4630c6cffcb 100644 --- a/TAO/tao/PortableServer/PolicyS_T.cpp +++ b/TAO/tao/PortableServer/PolicyS_T.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from +// TAO_IDL - Generated from // C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:720 #ifndef _TAO_IDL_ORIG_POLICYS_T_CPP_ @@ -34,7 +34,7 @@ #include "PolicyS_T.h" #if !defined (__ACE_INLINE__) -#include "PolicyS_T.inl" +#include "PolicyS_T.i" #endif /* !defined INLINE */ diff --git a/TAO/tao/PortableServer/PolicyS_T.h b/TAO/tao/PortableServer/PolicyS_T.h index dceb6d07e98..0228d829356 100644 --- a/TAO/tao/PortableServer/PolicyS_T.h +++ b/TAO/tao/PortableServer/PolicyS_T.h @@ -41,16 +41,16 @@ #endif /* _MSC_VER */ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_sth.cpp:116 #if defined (ACE_HAS_USING_KEYWORD) namespace POA_CORBA { - + // TAO_IDL - Generated from // C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87 - + // TIE class: Refer to CORBA v2.2, Section 20.34.4 template <class T> class Policy_tie : public Policy @@ -70,7 +70,7 @@ namespace POA_CORBA // ctor with T*, ownership flag and a POA ~Policy_tie (void); // dtor - + // TIE specific functions T *_tied_object (void); // return the underlying object @@ -82,47 +82,47 @@ namespace POA_CORBA // do we own it void _is_owner (CORBA::Boolean b); // set the ownership - + // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ); - + // TAO_IDL - Generated from // C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60 - + CORBA::PolicyType policy_type ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60 - + ::CORBA::Policy_ptr copy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60 - + void destroy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + private: T *ptr_; PortableServer::POA_var poa_; CORBA::Boolean rel_; - + // copy and assignment are not allowed Policy_tie (const Policy_tie &); void operator= (const Policy_tie &); @@ -130,11 +130,11 @@ namespace POA_CORBA } // module CORBA #endif /* ACE_HAS_USING_KEYWORD */ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1193 #if defined (__ACE_INLINE__) -#include "PolicyS_T.inl" +#include "PolicyS_T.i" #endif /* defined INLINE */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/tao/PortableServer/PolicyS_T.i b/TAO/tao/PortableServer/PolicyS_T.i new file mode 100644 index 00000000000..0305db45663 --- /dev/null +++ b/TAO/tao/PortableServer/PolicyS_T.i @@ -0,0 +1,173 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + + +// TAO_IDL - Generated from +// C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96 + +#if defined (ACE_HAS_USING_KEYWORD) + +template <class T> ACE_INLINE +POA_CORBA::Policy_tie<T>::Policy_tie (T &t) + : ptr_ (&t), + poa_ (PortableServer::POA::_nil ()), + rel_ (0) +{} + +template <class T> ACE_INLINE +POA_CORBA::Policy_tie<T>::Policy_tie (T &t, PortableServer::POA_ptr poa) + : ptr_ (&t), + poa_ (PortableServer::POA::_duplicate (poa)), + rel_ (0) +{} + +template <class T> ACE_INLINE +POA_CORBA::Policy_tie<T>::Policy_tie (T *tp, CORBA::Boolean release) + : ptr_ (tp), + poa_ (PortableServer::POA::_nil ()), + rel_ (release) +{} + +template <class T> ACE_INLINE +POA_CORBA::Policy_tie<T>::Policy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release) + : ptr_ (tp), + poa_ (PortableServer::POA::_duplicate (poa)), + rel_ (release) +{} + +template <class T> ACE_INLINE +POA_CORBA::Policy_tie<T>::~Policy_tie (void) +{ + if (this->rel_) + { + delete this->ptr_; + } +} + +template <class T> ACE_INLINE T * +POA_CORBA::Policy_tie<T>::_tied_object (void) +{ + return this->ptr_; +} + +template <class T> ACE_INLINE void +POA_CORBA::Policy_tie<T>::_tied_object (T &obj) +{ + if (this->rel_) + { + delete this->ptr_; + } + + this->ptr_ = &obj; + this->rel_ = 0; +} + +template <class T> ACE_INLINE void +POA_CORBA::Policy_tie<T>::_tied_object (T *obj, CORBA::Boolean release) +{ + if (this->rel_) + { + delete this->ptr_; + } + + this->ptr_ = obj; + this->rel_ = release; +} + +template <class T> ACE_INLINE CORBA::Boolean +POA_CORBA::Policy_tie<T>::_is_owner (void) +{ + return this->rel_; +} + +template <class T> ACE_INLINE void +POA_CORBA::Policy_tie<T>::_is_owner (CORBA::Boolean b) +{ + this->rel_ = b; +} + +template <class T> ACE_INLINE PortableServer::POA_ptr +POA_CORBA::Policy_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) +{ + if (!CORBA::is_nil (this->poa_.in ())) + { + return PortableServer::POA::_duplicate (this->poa_.in ()); + } + + return this->Policy::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); +} + +// TAO_IDL - Generated from +// C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68 + +template <class T> ACE_INLINE +CORBA::PolicyType POA_CORBA::Policy_tie<T>::policy_type ( + ACE_ENV_SINGLE_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) +{ + return this->ptr_->policy_type ( + ACE_ENV_SINGLE_ARG_PARAMETER + ); +} + +// TAO_IDL - Generated from +// C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68 + +template <class T> ACE_INLINE +::CORBA::Policy_ptr POA_CORBA::Policy_tie<T>::copy ( + ACE_ENV_SINGLE_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) +{ + return this->ptr_->copy ( + ACE_ENV_SINGLE_ARG_PARAMETER + ); +} + +// TAO_IDL - Generated from +// C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68 + +template <class T> ACE_INLINE +void POA_CORBA::Policy_tie<T>::destroy ( + ACE_ENV_SINGLE_ARG_DECL + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) +{ + this->ptr_->destroy ( + ACE_ENV_SINGLE_ARG_PARAMETER + ); +} + +#endif /* ACE_HAS_USING_KEYWORD */ + diff --git a/TAO/tao/PortableServer/PortableServer.pidl b/TAO/tao/PortableServer/PortableServer.pidl index 55a2d2d6c2e..ece8be6870c 100644 --- a/TAO/tao/PortableServer/PortableServer.pidl +++ b/TAO/tao/PortableServer/PortableServer.pidl @@ -54,7 +54,7 @@ module PortableServer { # pragma version PortableServer 2.3 - local interface POA; // forward declaration + local interface POA; // forward declaration typedef sequence<POA> POAList; native Servant; typedef CORBA::OctetSeq ObjectId; @@ -255,7 +255,7 @@ module PortableServer in POAManager a_POAManager, in CORBA::PolicyList policies) raises (AdapterAlreadyExists, - InvalidPolicy); + InvalidPolicy); POA find_POA (in string adapter_name, in boolean activate_it) @@ -269,7 +269,7 @@ module PortableServer ThreadPolicy create_thread_policy (in ThreadPolicyValue value); LifespanPolicy create_lifespan_policy ( - in LifespanPolicyValue value + in LifespanPolicyValue value ); IdUniquenessPolicy create_id_uniqueness_policy ( @@ -281,7 +281,7 @@ module PortableServer ); ImplicitActivationPolicy create_implicit_activation_policy ( - in ImplicitActivationPolicyValue value + in ImplicitActivationPolicyValue value\ ); ServantRetentionPolicy create_servant_retention_policy ( @@ -289,7 +289,7 @@ module PortableServer ); RequestProcessingPolicy create_request_processing_policy ( - in RequestProcessingPolicyValue value + in RequestProcessingPolicyValue value ); // POA attributes @@ -311,7 +311,7 @@ module PortableServer Servant get_servant () raises (NoServant, - WrongPolicy); + WrongPolicy); void set_servant (in Servant p_servant) raises (WrongPolicy); @@ -320,13 +320,13 @@ module PortableServer ObjectId activate_object (in Servant p_servant) raises (ServantAlreadyActive, - WrongPolicy); + WrongPolicy); void activate_object_with_id (in ObjectId id, in Servant p_servant) raises (ServantAlreadyActive, - ObjectAlreadyActive, - WrongPolicy); + ObjectAlreadyActive, + WrongPolicy); void deactivate_object (in ObjectId oid) raises (ObjectNotActive, WrongPolicy); @@ -337,32 +337,32 @@ module PortableServer raises (WrongPolicy); Object create_reference_with_id (in ObjectId oid, - in CORBA::RepositoryId intf) + in CORBA::RepositoryId intf) raises (WrongPolicy); // Identity mapping operations:. ObjectId servant_to_id (in Servant p_servant) raises (ServantNotActive, - WrongPolicy); + WrongPolicy); Object servant_to_reference (in Servant p_servant) raises (ServantNotActive, WrongPolicy); Servant reference_to_servant (in Object reference) raises (ObjectNotActive, - WrongAdapter, - WrongPolicy); + WrongAdapter, + WrongPolicy); ObjectId reference_to_id (in Object reference) raises (WrongAdapter, - WrongPolicy); + WrongPolicy); Servant id_to_servant (in ObjectId oid) raises (ObjectNotActive, WrongPolicy); Object id_to_reference (in ObjectId oid) raises (ObjectNotActive, - WrongPolicy); + WrongPolicy); readonly attribute CORBA::OctetSeq id; diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp index f9e777c153b..d4d2f055929 100644 --- a/TAO/tao/PortableServer/PortableServerC.cpp +++ b/TAO/tao/PortableServer/PortableServerC.cpp @@ -42,7 +42,7 @@ #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) -#include "PortableServerC.inl" +#include "PortableServerC.i" #endif /* !defined INLINE */ // TAO_IDL - Generated from @@ -466,7 +466,7 @@ void PortableServer::IDs::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::ThreadPolicy_ptr -TAO::Objref_Traits<PortableServer::ThreadPolicy>::duplicate ( +TAO::Objref_Traits<PortableServer::ThreadPolicy>::tao_duplicate ( PortableServer::ThreadPolicy_ptr p ) { @@ -475,7 +475,7 @@ TAO::Objref_Traits<PortableServer::ThreadPolicy>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableServer::ThreadPolicy>::release ( +TAO::Objref_Traits<PortableServer::ThreadPolicy>::tao_release ( PortableServer::ThreadPolicy_ptr p ) { @@ -484,14 +484,14 @@ TAO::Objref_Traits<PortableServer::ThreadPolicy>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::ThreadPolicy_ptr -TAO::Objref_Traits<PortableServer::ThreadPolicy>::nil (void) +TAO::Objref_Traits<PortableServer::ThreadPolicy>::tao_nil (void) { return PortableServer::ThreadPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableServer::ThreadPolicy>::marshal ( +TAO::Objref_Traits<PortableServer::ThreadPolicy>::tao_marshal ( PortableServer::ThreadPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -617,7 +617,7 @@ PortableServer::ThreadPolicy::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::LifespanPolicy_ptr -TAO::Objref_Traits<PortableServer::LifespanPolicy>::duplicate ( +TAO::Objref_Traits<PortableServer::LifespanPolicy>::tao_duplicate ( PortableServer::LifespanPolicy_ptr p ) { @@ -626,7 +626,7 @@ TAO::Objref_Traits<PortableServer::LifespanPolicy>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableServer::LifespanPolicy>::release ( +TAO::Objref_Traits<PortableServer::LifespanPolicy>::tao_release ( PortableServer::LifespanPolicy_ptr p ) { @@ -635,14 +635,14 @@ TAO::Objref_Traits<PortableServer::LifespanPolicy>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::LifespanPolicy_ptr -TAO::Objref_Traits<PortableServer::LifespanPolicy>::nil (void) +TAO::Objref_Traits<PortableServer::LifespanPolicy>::tao_nil (void) { return PortableServer::LifespanPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableServer::LifespanPolicy>::marshal ( +TAO::Objref_Traits<PortableServer::LifespanPolicy>::tao_marshal ( PortableServer::LifespanPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -766,7 +766,7 @@ PortableServer::LifespanPolicy::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::IdUniquenessPolicy_ptr -TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::duplicate ( +TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::tao_duplicate ( PortableServer::IdUniquenessPolicy_ptr p ) { @@ -775,7 +775,7 @@ TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::release ( +TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::tao_release ( PortableServer::IdUniquenessPolicy_ptr p ) { @@ -784,14 +784,14 @@ TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::IdUniquenessPolicy_ptr -TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::nil (void) +TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::tao_nil (void) { return PortableServer::IdUniquenessPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::marshal ( +TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::tao_marshal ( PortableServer::IdUniquenessPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -915,7 +915,7 @@ PortableServer::IdUniquenessPolicy::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::IdAssignmentPolicy_ptr -TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::duplicate ( +TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::tao_duplicate ( PortableServer::IdAssignmentPolicy_ptr p ) { @@ -924,7 +924,7 @@ TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::release ( +TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::tao_release ( PortableServer::IdAssignmentPolicy_ptr p ) { @@ -933,14 +933,14 @@ TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::IdAssignmentPolicy_ptr -TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::nil (void) +TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::tao_nil (void) { return PortableServer::IdAssignmentPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::marshal ( +TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::tao_marshal ( PortableServer::IdAssignmentPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -1066,7 +1066,7 @@ PortableServer::IdAssignmentPolicy::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::ImplicitActivationPolicy_ptr -TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::duplicate ( +TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::tao_duplicate ( PortableServer::ImplicitActivationPolicy_ptr p ) { @@ -1075,7 +1075,7 @@ TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::release ( +TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::tao_release ( PortableServer::ImplicitActivationPolicy_ptr p ) { @@ -1084,14 +1084,14 @@ TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::ImplicitActivationPolicy_ptr -TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::nil (void) +TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::tao_nil (void) { return PortableServer::ImplicitActivationPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::marshal ( +TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::tao_marshal ( PortableServer::ImplicitActivationPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -1219,7 +1219,7 @@ PortableServer::ImplicitActivationPolicy::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::ServantRetentionPolicy_ptr -TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::duplicate ( +TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::tao_duplicate ( PortableServer::ServantRetentionPolicy_ptr p ) { @@ -1228,7 +1228,7 @@ TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::release ( +TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::tao_release ( PortableServer::ServantRetentionPolicy_ptr p ) { @@ -1237,14 +1237,14 @@ TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::ServantRetentionPolicy_ptr -TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::nil (void) +TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::tao_nil (void) { return PortableServer::ServantRetentionPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::marshal ( +TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::tao_marshal ( PortableServer::ServantRetentionPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -1372,7 +1372,7 @@ PortableServer::ServantRetentionPolicy::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::RequestProcessingPolicy_ptr -TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::duplicate ( +TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::tao_duplicate ( PortableServer::RequestProcessingPolicy_ptr p ) { @@ -1381,7 +1381,7 @@ TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::release ( +TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::tao_release ( PortableServer::RequestProcessingPolicy_ptr p ) { @@ -1390,14 +1390,14 @@ TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::RequestProcessingPolicy_ptr -TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::nil (void) +TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::tao_nil (void) { return PortableServer::RequestProcessingPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::marshal ( +TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::tao_marshal ( PortableServer::RequestProcessingPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -1523,7 +1523,7 @@ PortableServer::RequestProcessingPolicy::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::POAManager_ptr -TAO::Objref_Traits<PortableServer::POAManager>::duplicate ( +TAO::Objref_Traits<PortableServer::POAManager>::tao_duplicate ( PortableServer::POAManager_ptr p ) { @@ -1532,7 +1532,7 @@ TAO::Objref_Traits<PortableServer::POAManager>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableServer::POAManager>::release ( +TAO::Objref_Traits<PortableServer::POAManager>::tao_release ( PortableServer::POAManager_ptr p ) { @@ -1541,14 +1541,14 @@ TAO::Objref_Traits<PortableServer::POAManager>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::POAManager_ptr -TAO::Objref_Traits<PortableServer::POAManager>::nil (void) +TAO::Objref_Traits<PortableServer::POAManager>::tao_nil (void) { return PortableServer::POAManager::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableServer::POAManager>::marshal ( +TAO::Objref_Traits<PortableServer::POAManager>::tao_marshal ( PortableServer::POAManager_ptr p, TAO_OutputCDR & cdr ) @@ -1771,7 +1771,7 @@ PortableServer::POAManager::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::AdapterActivator_ptr -TAO::Objref_Traits<PortableServer::AdapterActivator>::duplicate ( +TAO::Objref_Traits<PortableServer::AdapterActivator>::tao_duplicate ( PortableServer::AdapterActivator_ptr p ) { @@ -1780,7 +1780,7 @@ TAO::Objref_Traits<PortableServer::AdapterActivator>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableServer::AdapterActivator>::release ( +TAO::Objref_Traits<PortableServer::AdapterActivator>::tao_release ( PortableServer::AdapterActivator_ptr p ) { @@ -1789,14 +1789,14 @@ TAO::Objref_Traits<PortableServer::AdapterActivator>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::AdapterActivator_ptr -TAO::Objref_Traits<PortableServer::AdapterActivator>::nil (void) +TAO::Objref_Traits<PortableServer::AdapterActivator>::tao_nil (void) { return PortableServer::AdapterActivator::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableServer::AdapterActivator>::marshal ( +TAO::Objref_Traits<PortableServer::AdapterActivator>::tao_marshal ( PortableServer::AdapterActivator_ptr p, TAO_OutputCDR & cdr ) @@ -1916,7 +1916,7 @@ PortableServer::AdapterActivator::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::ServantManager_ptr -TAO::Objref_Traits<PortableServer::ServantManager>::duplicate ( +TAO::Objref_Traits<PortableServer::ServantManager>::tao_duplicate ( PortableServer::ServantManager_ptr p ) { @@ -1925,7 +1925,7 @@ TAO::Objref_Traits<PortableServer::ServantManager>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableServer::ServantManager>::release ( +TAO::Objref_Traits<PortableServer::ServantManager>::tao_release ( PortableServer::ServantManager_ptr p ) { @@ -1934,14 +1934,14 @@ TAO::Objref_Traits<PortableServer::ServantManager>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::ServantManager_ptr -TAO::Objref_Traits<PortableServer::ServantManager>::nil (void) +TAO::Objref_Traits<PortableServer::ServantManager>::tao_nil (void) { return PortableServer::ServantManager::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableServer::ServantManager>::marshal ( +TAO::Objref_Traits<PortableServer::ServantManager>::tao_marshal ( PortableServer::ServantManager_ptr p, TAO_OutputCDR & cdr ) @@ -2061,7 +2061,7 @@ PortableServer::ServantManager::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::ServantActivator_ptr -TAO::Objref_Traits<PortableServer::ServantActivator>::duplicate ( +TAO::Objref_Traits<PortableServer::ServantActivator>::tao_duplicate ( PortableServer::ServantActivator_ptr p ) { @@ -2070,7 +2070,7 @@ TAO::Objref_Traits<PortableServer::ServantActivator>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableServer::ServantActivator>::release ( +TAO::Objref_Traits<PortableServer::ServantActivator>::tao_release ( PortableServer::ServantActivator_ptr p ) { @@ -2079,14 +2079,14 @@ TAO::Objref_Traits<PortableServer::ServantActivator>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::ServantActivator_ptr -TAO::Objref_Traits<PortableServer::ServantActivator>::nil (void) +TAO::Objref_Traits<PortableServer::ServantActivator>::tao_nil (void) { return PortableServer::ServantActivator::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableServer::ServantActivator>::marshal ( +TAO::Objref_Traits<PortableServer::ServantActivator>::tao_marshal ( PortableServer::ServantActivator_ptr p, TAO_OutputCDR & cdr ) @@ -2210,7 +2210,7 @@ PortableServer::ServantActivator::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::ServantLocator_ptr -TAO::Objref_Traits<PortableServer::ServantLocator>::duplicate ( +TAO::Objref_Traits<PortableServer::ServantLocator>::tao_duplicate ( PortableServer::ServantLocator_ptr p ) { @@ -2219,7 +2219,7 @@ TAO::Objref_Traits<PortableServer::ServantLocator>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableServer::ServantLocator>::release ( +TAO::Objref_Traits<PortableServer::ServantLocator>::tao_release ( PortableServer::ServantLocator_ptr p ) { @@ -2228,14 +2228,14 @@ TAO::Objref_Traits<PortableServer::ServantLocator>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::ServantLocator_ptr -TAO::Objref_Traits<PortableServer::ServantLocator>::nil (void) +TAO::Objref_Traits<PortableServer::ServantLocator>::tao_nil (void) { return PortableServer::ServantLocator::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableServer::ServantLocator>::marshal ( +TAO::Objref_Traits<PortableServer::ServantLocator>::tao_marshal ( PortableServer::ServantLocator_ptr p, TAO_OutputCDR & cdr ) @@ -2361,7 +2361,7 @@ PortableServer::ServantLocator::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::POA_ptr -TAO::Objref_Traits<PortableServer::POA>::duplicate ( +TAO::Objref_Traits<PortableServer::POA>::tao_duplicate ( PortableServer::POA_ptr p ) { @@ -2370,7 +2370,7 @@ TAO::Objref_Traits<PortableServer::POA>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableServer::POA>::release ( +TAO::Objref_Traits<PortableServer::POA>::tao_release ( PortableServer::POA_ptr p ) { @@ -2379,14 +2379,14 @@ TAO::Objref_Traits<PortableServer::POA>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::POA_ptr -TAO::Objref_Traits<PortableServer::POA>::nil (void) +TAO::Objref_Traits<PortableServer::POA>::tao_nil (void) { return PortableServer::POA::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableServer::POA>::marshal ( +TAO::Objref_Traits<PortableServer::POA>::tao_marshal ( PortableServer::POA_ptr p, TAO_OutputCDR & cdr ) @@ -3538,7 +3538,7 @@ PortableServer::POA::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::Current_ptr -TAO::Objref_Traits<PortableServer::Current>::duplicate ( +TAO::Objref_Traits<PortableServer::Current>::tao_duplicate ( PortableServer::Current_ptr p ) { @@ -3547,7 +3547,7 @@ TAO::Objref_Traits<PortableServer::Current>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableServer::Current>::release ( +TAO::Objref_Traits<PortableServer::Current>::tao_release ( PortableServer::Current_ptr p ) { @@ -3556,14 +3556,14 @@ TAO::Objref_Traits<PortableServer::Current>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::Current_ptr -TAO::Objref_Traits<PortableServer::Current>::nil (void) +TAO::Objref_Traits<PortableServer::Current>::tao_nil (void) { return PortableServer::Current::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableServer::Current>::marshal ( +TAO::Objref_Traits<PortableServer::Current>::tao_marshal ( PortableServer::Current_ptr p, TAO_OutputCDR & cdr ) @@ -4767,3 +4767,4 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::RequestProcessing > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h index 4d3f66bc31b..f0e092c8013 100644 --- a/TAO/tao/PortableServer/PortableServerC.h +++ b/TAO/tao/PortableServer/PortableServerC.h @@ -3206,14 +3206,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits<PortableServer::POA> { - static PortableServer::POA_ptr duplicate ( + static PortableServer::POA_ptr tao_duplicate ( PortableServer::POA_ptr ); - static void release ( + static void tao_release ( PortableServer::POA_ptr ); - static PortableServer::POA_ptr nil (void); - static CORBA::Boolean marshal ( + static PortableServer::POA_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( PortableServer::POA_ptr p, TAO_OutputCDR & cdr ); @@ -3229,14 +3229,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits<PortableServer::ThreadPolicy> { - static PortableServer::ThreadPolicy_ptr duplicate ( + static PortableServer::ThreadPolicy_ptr tao_duplicate ( PortableServer::ThreadPolicy_ptr ); - static void release ( + static void tao_release ( PortableServer::ThreadPolicy_ptr ); - static PortableServer::ThreadPolicy_ptr nil (void); - static CORBA::Boolean marshal ( + static PortableServer::ThreadPolicy_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( PortableServer::ThreadPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -3252,14 +3252,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits<PortableServer::LifespanPolicy> { - static PortableServer::LifespanPolicy_ptr duplicate ( + static PortableServer::LifespanPolicy_ptr tao_duplicate ( PortableServer::LifespanPolicy_ptr ); - static void release ( + static void tao_release ( PortableServer::LifespanPolicy_ptr ); - static PortableServer::LifespanPolicy_ptr nil (void); - static CORBA::Boolean marshal ( + static PortableServer::LifespanPolicy_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( PortableServer::LifespanPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -3273,14 +3273,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits<PortableServer::IdUniquenessPolicy> { - static PortableServer::IdUniquenessPolicy_ptr duplicate ( + static PortableServer::IdUniquenessPolicy_ptr tao_duplicate ( PortableServer::IdUniquenessPolicy_ptr ); - static void release ( + static void tao_release ( PortableServer::IdUniquenessPolicy_ptr ); - static PortableServer::IdUniquenessPolicy_ptr nil (void); - static CORBA::Boolean marshal ( + static PortableServer::IdUniquenessPolicy_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( PortableServer::IdUniquenessPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -3294,14 +3294,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits<PortableServer::IdAssignmentPolicy> { - static PortableServer::IdAssignmentPolicy_ptr duplicate ( + static PortableServer::IdAssignmentPolicy_ptr tao_duplicate ( PortableServer::IdAssignmentPolicy_ptr ); - static void release ( + static void tao_release ( PortableServer::IdAssignmentPolicy_ptr ); - static PortableServer::IdAssignmentPolicy_ptr nil (void); - static CORBA::Boolean marshal ( + static PortableServer::IdAssignmentPolicy_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( PortableServer::IdAssignmentPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -3317,14 +3317,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits<PortableServer::ImplicitActivationPolicy> { - static PortableServer::ImplicitActivationPolicy_ptr duplicate ( + static PortableServer::ImplicitActivationPolicy_ptr tao_duplicate ( PortableServer::ImplicitActivationPolicy_ptr ); - static void release ( + static void tao_release ( PortableServer::ImplicitActivationPolicy_ptr ); - static PortableServer::ImplicitActivationPolicy_ptr nil (void); - static CORBA::Boolean marshal ( + static PortableServer::ImplicitActivationPolicy_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( PortableServer::ImplicitActivationPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -3338,14 +3338,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits<PortableServer::ServantRetentionPolicy> { - static PortableServer::ServantRetentionPolicy_ptr duplicate ( + static PortableServer::ServantRetentionPolicy_ptr tao_duplicate ( PortableServer::ServantRetentionPolicy_ptr ); - static void release ( + static void tao_release ( PortableServer::ServantRetentionPolicy_ptr ); - static PortableServer::ServantRetentionPolicy_ptr nil (void); - static CORBA::Boolean marshal ( + static PortableServer::ServantRetentionPolicy_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( PortableServer::ServantRetentionPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -3359,14 +3359,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits<PortableServer::RequestProcessingPolicy> { - static PortableServer::RequestProcessingPolicy_ptr duplicate ( + static PortableServer::RequestProcessingPolicy_ptr tao_duplicate ( PortableServer::RequestProcessingPolicy_ptr ); - static void release ( + static void tao_release ( PortableServer::RequestProcessingPolicy_ptr ); - static PortableServer::RequestProcessingPolicy_ptr nil (void); - static CORBA::Boolean marshal ( + static PortableServer::RequestProcessingPolicy_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( PortableServer::RequestProcessingPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -3382,14 +3382,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits<PortableServer::POAManager> { - static PortableServer::POAManager_ptr duplicate ( + static PortableServer::POAManager_ptr tao_duplicate ( PortableServer::POAManager_ptr ); - static void release ( + static void tao_release ( PortableServer::POAManager_ptr ); - static PortableServer::POAManager_ptr nil (void); - static CORBA::Boolean marshal ( + static PortableServer::POAManager_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( PortableServer::POAManager_ptr p, TAO_OutputCDR & cdr ); @@ -3405,14 +3405,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits<PortableServer::AdapterActivator> { - static PortableServer::AdapterActivator_ptr duplicate ( + static PortableServer::AdapterActivator_ptr tao_duplicate ( PortableServer::AdapterActivator_ptr ); - static void release ( + static void tao_release ( PortableServer::AdapterActivator_ptr ); - static PortableServer::AdapterActivator_ptr nil (void); - static CORBA::Boolean marshal ( + static PortableServer::AdapterActivator_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( PortableServer::AdapterActivator_ptr p, TAO_OutputCDR & cdr ); @@ -3426,14 +3426,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits<PortableServer::ServantManager> { - static PortableServer::ServantManager_ptr duplicate ( + static PortableServer::ServantManager_ptr tao_duplicate ( PortableServer::ServantManager_ptr ); - static void release ( + static void tao_release ( PortableServer::ServantManager_ptr ); - static PortableServer::ServantManager_ptr nil (void); - static CORBA::Boolean marshal ( + static PortableServer::ServantManager_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( PortableServer::ServantManager_ptr p, TAO_OutputCDR & cdr ); @@ -3447,14 +3447,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits<PortableServer::ServantActivator> { - static PortableServer::ServantActivator_ptr duplicate ( + static PortableServer::ServantActivator_ptr tao_duplicate ( PortableServer::ServantActivator_ptr ); - static void release ( + static void tao_release ( PortableServer::ServantActivator_ptr ); - static PortableServer::ServantActivator_ptr nil (void); - static CORBA::Boolean marshal ( + static PortableServer::ServantActivator_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( PortableServer::ServantActivator_ptr p, TAO_OutputCDR & cdr ); @@ -3468,14 +3468,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits<PortableServer::ServantLocator> { - static PortableServer::ServantLocator_ptr duplicate ( + static PortableServer::ServantLocator_ptr tao_duplicate ( PortableServer::ServantLocator_ptr ); - static void release ( + static void tao_release ( PortableServer::ServantLocator_ptr ); - static PortableServer::ServantLocator_ptr nil (void); - static CORBA::Boolean marshal ( + static PortableServer::ServantLocator_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( PortableServer::ServantLocator_ptr p, TAO_OutputCDR & cdr ); @@ -3491,14 +3491,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits<PortableServer::Current> { - static PortableServer::Current_ptr duplicate ( + static PortableServer::Current_ptr tao_duplicate ( PortableServer::Current_ptr ); - static void release ( + static void tao_release ( PortableServer::Current_ptr ); - static PortableServer::Current_ptr nil (void); - static CORBA::Boolean marshal ( + static PortableServer::Current_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( PortableServer::Current_ptr p, TAO_OutputCDR & cdr ); @@ -3892,7 +3892,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer // be\be_codegen.cpp:978 #if defined (__ACE_INLINE__) -#include "PortableServerC.inl" +#include "PortableServerC.i" #endif /* defined INLINE */ #if defined(_MSC_VER) && (_MSC_VER >= 1200) @@ -3906,3 +3906,4 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer #include /**/ "ace/post.h" #endif /* ifndef */ + diff --git a/TAO/tao/PortableServer/PortableServerC.i b/TAO/tao/PortableServer/PortableServerC.i new file mode 100644 index 00000000000..38aa32569ba --- /dev/null +++ b/TAO/tao/PortableServer/PortableServerC.i @@ -0,0 +1,28 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + + diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp index 4e6f1ed2dd0..ff320d9ee3c 100644 --- a/TAO/tao/PortableServer/Servant_Base.cpp +++ b/TAO/tao/PortableServer/Servant_Base.cpp @@ -152,8 +152,8 @@ TAO_ServantBase::_create_stub (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub *stub = 0; TAO_POA_Current_Impl *poa_current_impl = - static_cast<TAO_POA_Current_Impl *> - (TAO_TSS_RESOURCES::instance ()->poa_current_impl_); + ACE_static_cast(TAO_POA_Current_Impl *, + TAO_TSS_RESOURCES::instance ()->poa_current_impl_); CORBA::ORB_ptr servant_orb = 0; @@ -162,6 +162,7 @@ TAO_ServantBase::_create_stub (ACE_ENV_SINGLE_ARG_DECL) { servant_orb = poa_current_impl->orb_core ().orb () ; + stub = poa_current_impl->poa ()->key_to_stub ( poa_current_impl->object_key (), @@ -215,7 +216,7 @@ void TAO_ServantBase::synchronous_upcall_dispatch (TAO_ServerRequest &req, // Fetch the skeleton for this operation if (this->_find (opname, skel, - static_cast <unsigned int> (req.operation_length())) == -1) + ACE_static_cast (unsigned int, req.operation_length())) == -1) { ACE_THROW (CORBA::BAD_OPERATION ()); } @@ -281,7 +282,7 @@ void TAO_ServantBase::asynchronous_upcall_dispatch (TAO_ServerRequest &req, // Fetch the skeleton for this operation if (this->_find (opname, skel, - static_cast <unsigned int> (req.operation_length())) == -1) + ACE_static_cast (unsigned int, req.operation_length())) == -1) { ACE_THROW (CORBA::BAD_OPERATION ()); } diff --git a/TAO/tao/PortableServer/ServerRequestInfo.cpp b/TAO/tao/PortableServer/ServerRequestInfo.cpp index 9ca8fb1a055..be7712f6f00 100644 --- a/TAO/tao/PortableServer/ServerRequestInfo.cpp +++ b/TAO/tao/PortableServer/ServerRequestInfo.cpp @@ -56,14 +56,14 @@ TAO_ServerRequestInfo::request_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) // 64-bit platforms. if (sizeof (this) == 4) // 32 bit address - id = static_cast <CORBA::ULong> ( - reinterpret_cast <ptrdiff_t> - (&(this->server_request_))); + id = ACE_static_cast (CORBA::ULong, + ACE_reinterpret_cast (ptrdiff_t, + &(this->server_request_))); else if (sizeof (this) == 8) // 64 bit address -- use lower 32 bits - id = static_cast <CORBA::ULong> ( - reinterpret_cast <ptrdiff_t> - (&(this->server_request_)) & 0xFFFFFFFFu); + id = ACE_static_cast (CORBA::ULong, + ACE_reinterpret_cast (ptrdiff_t, + &(this->server_request_)) & 0xFFFFFFFFu); else // @@ Rather than fallback on the GIOP request ID, we should use diff --git a/TAO/tao/PortableServer/diffs/Default_ORT.diff b/TAO/tao/PortableServer/diffs/Default_ORT.diff new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/TAO/tao/PortableServer/diffs/Default_ORT.diff diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp index 8d0280f1a96..2562b36e5ee 100644 --- a/TAO/tao/Profile.cpp +++ b/TAO/tao/Profile.cpp @@ -8,7 +8,6 @@ #include "tao/ORB_Core.h" #include "tao/Client_Strategy_Factory.h" #include "tao/CDR.h" -#include "tao/SystemException.h" #include "ace/ACE.h" #include "ace/OS_NS_string.h" @@ -298,7 +297,7 @@ TAO_Profile::create_tagged_profile (void) #else this->tagged_profile_->profile_data.length (length); CORBA::Octet *buffer = - this->tagged_profile_->profile_data.get_buffer (); + this->tagged_profile_.profile_data.get_buffer (); for (const ACE_Message_Block *i = encap.begin (); i != encap.end (); @@ -593,7 +592,7 @@ TAO_Profile::verify_orb_configuration (ACE_ENV_SINGLE_ARG_DECL) // updated. ACE_THROW (CORBA::BAD_PARAM ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, EINVAL), CORBA::COMPLETED_NO)); } @@ -624,7 +623,7 @@ TAO_Profile::verify_profile_version (ACE_ENV_SINGLE_ARG_DECL) // updated. ACE_THROW (CORBA::BAD_PARAM ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, EINVAL), CORBA::COMPLETED_NO)); } @@ -637,12 +636,6 @@ TAO_Profile::supports_multicast (void) const return 0; } -bool -TAO_Profile::supports_non_blocking_oneways (void) const -{ - return !(this->version_.major == 1 && this->version_.minor == 0); -} - void TAO_Profile::addressing_mode (CORBA::Short addr ACE_ENV_ARG_DECL) @@ -659,7 +652,7 @@ TAO_Profile::addressing_mode (CORBA::Short addr default: ACE_THROW (CORBA::BAD_PARAM ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, EINVAL), CORBA::COMPLETED_NO)); } @@ -673,7 +666,7 @@ TAO_Profile::parse_string (const char *ior { ACE_THROW (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, EINVAL), CORBA::COMPLETED_NO)); } @@ -705,7 +698,7 @@ TAO_Profile::parse_string (const char *ior { ACE_THROW (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, EINVAL), CORBA::COMPLETED_NO)); } diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h index 4a2e5227c05..455101ebb2c 100644 --- a/TAO/tao/Profile.h +++ b/TAO/tao/Profile.h @@ -150,9 +150,6 @@ public: /// Returns true if this profile can specify multicast endpoints. virtual int supports_multicast (void) const; - /// Returns true if this profile supports non blocking oneways - virtual bool supports_non_blocking_oneways (void) const; - /** * Set the addressing mode if a remote servant replies with * an addressing mode exception. If this profile doesn't diff --git a/TAO/tao/Profile_Transport_Resolver.cpp b/TAO/tao/Profile_Transport_Resolver.cpp index 42a79a32eb5..8e79ec8879d 100644 --- a/TAO/tao/Profile_Transport_Resolver.cpp +++ b/TAO/tao/Profile_Transport_Resolver.cpp @@ -1,5 +1,4 @@ // $Id$ - #include "Profile_Transport_Resolver.h" #include "Profile.h" #include "Transport.h" @@ -11,7 +10,6 @@ #include "Connector_Registry.h" #include "Transport_Connector.h" #include "Endpoint.h" -#include "SystemException.h" #if !defined (__ACE_INLINE__) # include "Profile_Transport_Resolver.inl" @@ -79,7 +77,6 @@ namespace TAO ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - // Select the endpoint es->select_endpoint (this, max_time_val ACE_ENV_ARG_PARAMETER); @@ -98,7 +95,7 @@ namespace TAO { ACE_THROW (CORBA::INTERNAL ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, EINVAL), CORBA::COMPLETED_NO)); } @@ -111,7 +108,6 @@ namespace TAO } } - bool Profile_Transport_Resolver::try_connect ( TAO_Transport_Descriptor_Interface *desc, @@ -121,17 +117,18 @@ namespace TAO { TAO_Connector_Registry *conn_reg = this->stub_->orb_core ()->connector_registry ( - ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_ENV_SINGLE_ARG_PARAMETER + ); ACE_CHECK_RETURN (false); if (conn_reg == 0) { ACE_THROW_RETURN (CORBA::INTERNAL ( - CORBA::SystemException::_tao_minor_code ( - 0, - EINVAL), - CORBA::COMPLETED_NO), - false); + CORBA::SystemException::_tao_minor_code ( + TAO_DEFAULT_MINOR_CODE, + EINVAL), + CORBA::COMPLETED_NO), + 0); } ACE_Time_Value connection_timeout; @@ -151,7 +148,6 @@ namespace TAO max_wait_time = max_time_value; } - // Obtain a connection. this->transport_ = conn_reg->get_connector (desc->endpoint ()->tag ())->connect ( @@ -161,20 +157,20 @@ namespace TAO ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (false); - // A timeout error occurred. - // If the user has set a roundtrip timeout policy, throw a timeout - // exception. Otherwise, just fall through and return false to - // look at the next endpoint. - if (this->transport_ == 0 - && is_conn_timeout == false - && errno == ETIME) + // A timeout error occurred + // If the user has set a roundtrip timeout policy, then throw a + // timeout exception, else just fall through and return false to + // look at the next endpoint + if (this->transport_ == 0 && + errno == ETIME && + is_conn_timeout == false) { ACE_THROW_RETURN (CORBA::TIMEOUT ( - CORBA::SystemException::_tao_minor_code ( - TAO_TIMEOUT_CONNECT_MINOR_CODE, - errno), - CORBA::COMPLETED_NO), - false); + CORBA::SystemException::_tao_minor_code ( + TAO_TIMEOUT_CONNECT_MINOR_CODE, + errno), + CORBA::COMPLETED_NO), + false); } else if (this->transport_ == 0) { @@ -208,7 +204,7 @@ namespace TAO CORBA::PolicyList (0), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOMEM), CORBA::COMPLETED_NO)); } diff --git a/TAO/tao/Profile_Transport_Resolver.h b/TAO/tao/Profile_Transport_Resolver.h index 2dadf94bb98..482ce0a9f18 100644 --- a/TAO/tao/Profile_Transport_Resolver.h +++ b/TAO/tao/Profile_Transport_Resolver.h @@ -23,7 +23,7 @@ #include "ace/CORBA_macros.h" -#include "tao/SystemException.h" +#include "tao/Exception.h" class TAO_Stub; class TAO_Profile; @@ -34,6 +34,7 @@ class TAO_Transport_Descriptor_Interface; namespace CORBA { + class SystemException; class Environment; class Object; class PolicyList; @@ -57,22 +58,13 @@ namespace TAO * object. This class helps in choosing the right profile, and pick * a transport from cache (or create a new transport if needed) that * represents the profile. + * */ class TAO_Export Profile_Transport_Resolver { public: - /// Constructor - /** - * With @a block we tell whether this resolved should always deliver - * a connection by blocking or unblock before the connection is - * completely established. Please note that this has *nothing* to - * do with the synchronous or asynch connect strategy used for - * making connections. This is a local flag used by the clients of - * this to dictate some local behavior. - */ - Profile_Transport_Resolver (CORBA::Object *p, - TAO_Stub *stub, - bool block = true); + Profile_Transport_Resolver (CORBA::Object *ep, + TAO_Stub *); ~Profile_Transport_Resolver (void); @@ -87,11 +79,11 @@ namespace TAO ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); + //@{ /** * Accessors and mutators for this class. The following methods - * are used by the clients of this class to access strategies and - * other internal workings. + * are used by the clients of this class to access. */ /// Mutator for profile. @@ -108,10 +100,6 @@ namespace TAO /// Accessor for the transport reserved for this invocation. TAO_Transport *transport (void) const; - - /// Accessor to indicate whether we should deliver a connection - /// blocking for completed connections - bool blocked (void) const; //@} /// Signal to let the resolver know that the transport has been @@ -175,9 +163,6 @@ namespace TAO * avoid. */ CORBA::PolicyList *inconsistent_policies_; - - /// Should we block while trying to make a connection - const bool blocked_; }; } // TAO namespace end diff --git a/TAO/tao/Profile_Transport_Resolver.inl b/TAO/tao/Profile_Transport_Resolver.inl index 69b8c78e9e7..6f660433689 100644 --- a/TAO/tao/Profile_Transport_Resolver.inl +++ b/TAO/tao/Profile_Transport_Resolver.inl @@ -5,15 +5,13 @@ namespace TAO ACE_INLINE Profile_Transport_Resolver:: Profile_Transport_Resolver (CORBA::Object *p, - TAO_Stub *stub, - bool block) + TAO_Stub *stub) : obj_ (p) , stub_ (stub) , transport_ (0) , profile_ (0) , is_released_ (false) , inconsistent_policies_ (0) - , blocked_ (block) { } @@ -41,12 +39,6 @@ namespace TAO return this->transport_; } - ACE_INLINE bool - Profile_Transport_Resolver::blocked (void) const - { - return this->blocked_; - } - ACE_INLINE void Profile_Transport_Resolver::transport_released (void) const { diff --git a/TAO/tao/RTCORBA.mpc b/TAO/tao/RTCORBA.mpc index ebf39bedab6..7af02255e7d 100644 --- a/TAO/tao/RTCORBA.mpc +++ b/TAO/tao/RTCORBA.mpc @@ -24,8 +24,4 @@ project : taolib, core { Resource_Files { RTCORBA } - - PIDL_Files { - RTCORBA - } } diff --git a/TAO/tao/RTCORBA/RTCORBA.pidl b/TAO/tao/RTCORBA/RTCORBA.pidl index ddc3c2c9dc9..47554523c2d 100644 --- a/TAO/tao/RTCORBA/RTCORBA.pidl +++ b/TAO/tao/RTCORBA/RTCORBA.pidl @@ -52,6 +52,7 @@ #ifndef _RT_CORBA_IDL_ #define _RT_CORBA_IDL_ +#include <orb.idl> #include <IOP.pidl> #include <TimeBase.pidl> diff --git a/TAO/tao/RTCORBA/RTCORBAC.cpp b/TAO/tao/RTCORBA/RTCORBAC.cpp index 7c31e119b55..b6cec146889 100644 --- a/TAO/tao/RTCORBA/RTCORBAC.cpp +++ b/TAO/tao/RTCORBA/RTCORBAC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:303 +// be\be_codegen.cpp:323 #include "RTCORBA.h" @@ -45,7 +45,7 @@ #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) -#include "RTCORBAC.inl" +#include "RTCORBAC.i" #endif /* !defined INLINE */ // TAO_IDL - Generated from @@ -74,26 +74,28 @@ RTCORBA::ProtocolProperties::_tao_decode (TAO_InputCDR &) return 1; } + +// TAO_IDL - Generated from // be\be_visitor_typecode/typecode_defn.cpp:290 static const CORBA::Long _oc_RTCORBA_NativePriority[] = { TAO_ENCAP_BYTE_ORDER, // byte order 39, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x4e617469), - ACE_NTOHL (0x76655072), - ACE_NTOHL (0x696f7269), - ACE_NTOHL (0x74793a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x4e617469), + ACE_NTOHL (0x76655072), + ACE_NTOHL (0x696f7269), + ACE_NTOHL (0x74793a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/RTCORBA/NativePriority:1.0 15, - ACE_NTOHL (0x4e617469), - ACE_NTOHL (0x76655072), - ACE_NTOHL (0x696f7269), + ACE_NTOHL (0x4e617469), + ACE_NTOHL (0x76655072), + ACE_NTOHL (0x696f7269), ACE_NTOHL (0x74790000), // name = NativePriority CORBA::tk_short, @@ -120,18 +122,18 @@ static const CORBA::Long _oc_RTCORBA_Priority[] = { TAO_ENCAP_BYTE_ORDER, // byte order 33, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x5072696f), - ACE_NTOHL (0x72697479), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x5072696f), + ACE_NTOHL (0x72697479), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/RTCORBA/Priority:1.0 9, - ACE_NTOHL (0x5072696f), - ACE_NTOHL (0x72697479), + ACE_NTOHL (0x5072696f), + ACE_NTOHL (0x72697479), ACE_NTOHL (0x0), // name = Priority CORBA::tk_short, @@ -158,20 +160,20 @@ static const CORBA::Long _oc_RTCORBA_NetworkPriority[] = { TAO_ENCAP_BYTE_ORDER, // byte order 40, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x4e657477), - ACE_NTOHL (0x6f726b50), - ACE_NTOHL (0x72696f72), - ACE_NTOHL (0x6974793a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x4e657477), + ACE_NTOHL (0x6f726b50), + ACE_NTOHL (0x72696f72), + ACE_NTOHL (0x6974793a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/RTCORBA/NetworkPriority:1.0 16, - ACE_NTOHL (0x4e657477), - ACE_NTOHL (0x6f726b50), - ACE_NTOHL (0x72696f72), + ACE_NTOHL (0x4e657477), + ACE_NTOHL (0x6f726b50), + ACE_NTOHL (0x72696f72), ACE_NTOHL (0x69747900), // name = NetworkPriority CORBA::tk_long, @@ -198,20 +200,20 @@ static const CORBA::Long _oc_RTCORBA_ThreadpoolId[] = { TAO_ENCAP_BYTE_ORDER, // byte order 37, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x54687265), - ACE_NTOHL (0x6164706f), - ACE_NTOHL (0x6f6c4964), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x54687265), + ACE_NTOHL (0x6164706f), + ACE_NTOHL (0x6f6c4964), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/RTCORBA/ThreadpoolId:1.0 13, - ACE_NTOHL (0x54687265), - ACE_NTOHL (0x6164706f), - ACE_NTOHL (0x6f6c4964), + ACE_NTOHL (0x54687265), + ACE_NTOHL (0x6164706f), + ACE_NTOHL (0x6f6c4964), ACE_NTOHL (0x0), // name = ThreadpoolId CORBA::tk_ulong, @@ -238,58 +240,58 @@ static const CORBA::Long _oc_RTCORBA_ThreadpoolLane[] = { TAO_ENCAP_BYTE_ORDER, // byte order 39, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x54687265), - ACE_NTOHL (0x6164706f), - ACE_NTOHL (0x6f6c4c61), - ACE_NTOHL (0x6e653a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x54687265), + ACE_NTOHL (0x6164706f), + ACE_NTOHL (0x6f6c4c61), + ACE_NTOHL (0x6e653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/RTCORBA/ThreadpoolLane:1.0 15, - ACE_NTOHL (0x54687265), - ACE_NTOHL (0x6164706f), - ACE_NTOHL (0x6f6c4c61), + ACE_NTOHL (0x54687265), + ACE_NTOHL (0x6164706f), + ACE_NTOHL (0x6f6c4c61), ACE_NTOHL (0x6e650000), // name = ThreadpoolLane 3, // member count 14, - ACE_NTOHL (0x6c616e65), - ACE_NTOHL (0x5f707269), - ACE_NTOHL (0x6f726974), + ACE_NTOHL (0x6c616e65), + ACE_NTOHL (0x5f707269), + ACE_NTOHL (0x6f726974), ACE_NTOHL (0x79000000), // name = lane_priority CORBA::tk_alias, // typecode kind for typedefs 64, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 33, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x5072696f), - ACE_NTOHL (0x72697479), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x5072696f), + ACE_NTOHL (0x72697479), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/RTCORBA/Priority:1.0 9, - ACE_NTOHL (0x5072696f), - ACE_NTOHL (0x72697479), + ACE_NTOHL (0x5072696f), + ACE_NTOHL (0x72697479), ACE_NTOHL (0x0), // name = Priority CORBA::tk_short, 15, - ACE_NTOHL (0x73746174), - ACE_NTOHL (0x69635f74), - ACE_NTOHL (0x68726561), + ACE_NTOHL (0x73746174), + ACE_NTOHL (0x69635f74), + ACE_NTOHL (0x68726561), ACE_NTOHL (0x64730000), // name = static_threads CORBA::tk_ulong, 16, - ACE_NTOHL (0x64796e61), - ACE_NTOHL (0x6d69635f), - ACE_NTOHL (0x74687265), + ACE_NTOHL (0x64796e61), + ACE_NTOHL (0x6d69635f), + ACE_NTOHL (0x74687265), ACE_NTOHL (0x61647300), // name = dynamic_threads CORBA::tk_ulong, @@ -309,20 +311,20 @@ namespace RTCORBA &_tc_TAO_tc_RTCORBA_ThreadpoolLane; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/structure_cs.cpp:66 -void +void RTCORBA::ThreadpoolLane::_tao_any_destructor ( void *_tao_void_pointer ) { ThreadpoolLane *_tao_tmp_pointer = - static_cast<ThreadpoolLane *> (_tao_void_pointer); + ACE_static_cast (ThreadpoolLane *, _tao_void_pointer); delete _tao_tmp_pointer; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_RTCORBA_THREADPOOLLANES_CS_) @@ -369,7 +371,7 @@ void RTCORBA::ThreadpoolLanes::_tao_any_destructor ( ) { ThreadpoolLanes * _tao_tmp_pointer = - static_cast<ThreadpoolLanes *> (_tao_void_pointer); + ACE_static_cast (ThreadpoolLanes *, _tao_void_pointer); delete _tao_tmp_pointer; } @@ -382,20 +384,20 @@ static const CORBA::Long _oc_RTCORBA_ThreadpoolLanes[] = { TAO_ENCAP_BYTE_ORDER, // byte order 40, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x54687265), - ACE_NTOHL (0x6164706f), - ACE_NTOHL (0x6f6c4c61), - ACE_NTOHL (0x6e65733a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x54687265), + ACE_NTOHL (0x6164706f), + ACE_NTOHL (0x6f6c4c61), + ACE_NTOHL (0x6e65733a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/RTCORBA/ThreadpoolLanes:1.0 16, - ACE_NTOHL (0x54687265), - ACE_NTOHL (0x6164706f), - ACE_NTOHL (0x6f6c4c61), + ACE_NTOHL (0x54687265), + ACE_NTOHL (0x6164706f), + ACE_NTOHL (0x6f6c4c61), ACE_NTOHL (0x6e657300), // name = ThreadpoolLanes CORBA::tk_sequence, // typecode kind 228, // encapsulation length @@ -404,58 +406,58 @@ static const CORBA::Long _oc_RTCORBA_ThreadpoolLanes[] = 212, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 39, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x54687265), - ACE_NTOHL (0x6164706f), - ACE_NTOHL (0x6f6c4c61), - ACE_NTOHL (0x6e653a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x54687265), + ACE_NTOHL (0x6164706f), + ACE_NTOHL (0x6f6c4c61), + ACE_NTOHL (0x6e653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/RTCORBA/ThreadpoolLane:1.0 15, - ACE_NTOHL (0x54687265), - ACE_NTOHL (0x6164706f), - ACE_NTOHL (0x6f6c4c61), + ACE_NTOHL (0x54687265), + ACE_NTOHL (0x6164706f), + ACE_NTOHL (0x6f6c4c61), ACE_NTOHL (0x6e650000), // name = ThreadpoolLane 3, // member count 14, - ACE_NTOHL (0x6c616e65), - ACE_NTOHL (0x5f707269), - ACE_NTOHL (0x6f726974), + ACE_NTOHL (0x6c616e65), + ACE_NTOHL (0x5f707269), + ACE_NTOHL (0x6f726974), ACE_NTOHL (0x79000000), // name = lane_priority CORBA::tk_alias, // typecode kind for typedefs 64, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 33, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x5072696f), - ACE_NTOHL (0x72697479), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x5072696f), + ACE_NTOHL (0x72697479), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/RTCORBA/Priority:1.0 9, - ACE_NTOHL (0x5072696f), - ACE_NTOHL (0x72697479), + ACE_NTOHL (0x5072696f), + ACE_NTOHL (0x72697479), ACE_NTOHL (0x0), // name = Priority CORBA::tk_short, 15, - ACE_NTOHL (0x73746174), - ACE_NTOHL (0x69635f74), - ACE_NTOHL (0x68726561), + ACE_NTOHL (0x73746174), + ACE_NTOHL (0x69635f74), + ACE_NTOHL (0x68726561), ACE_NTOHL (0x64730000), // name = static_threads CORBA::tk_ulong, 16, - ACE_NTOHL (0x64796e61), - ACE_NTOHL (0x6d69635f), - ACE_NTOHL (0x74687265), + ACE_NTOHL (0x64796e61), + ACE_NTOHL (0x6d69635f), + ACE_NTOHL (0x74687265), ACE_NTOHL (0x61647300), // name = dynamic_threads CORBA::tk_ulong, @@ -485,32 +487,32 @@ static const CORBA::Long _oc_RTCORBA_PriorityModel[] = { TAO_ENCAP_BYTE_ORDER, // byte order 38, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x5072696f), - ACE_NTOHL (0x72697479), - ACE_NTOHL (0x4d6f6465), - ACE_NTOHL (0x6c3a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x5072696f), + ACE_NTOHL (0x72697479), + ACE_NTOHL (0x4d6f6465), + ACE_NTOHL (0x6c3a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/RTCORBA/PriorityModel:1.0 14, - ACE_NTOHL (0x5072696f), - ACE_NTOHL (0x72697479), - ACE_NTOHL (0x4d6f6465), + ACE_NTOHL (0x5072696f), + ACE_NTOHL (0x72697479), + ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x6c000000), // name = PriorityModel 2, // member count 18, - ACE_NTOHL (0x434c4945), - ACE_NTOHL (0x4e545f50), - ACE_NTOHL (0x524f5041), - ACE_NTOHL (0x47415445), + ACE_NTOHL (0x434c4945), + ACE_NTOHL (0x4e545f50), + ACE_NTOHL (0x524f5041), + ACE_NTOHL (0x47415445), ACE_NTOHL (0x44000000), // name = CLIENT_PROPAGATED 16, - ACE_NTOHL (0x53455256), - ACE_NTOHL (0x45525f44), - ACE_NTOHL (0x45434c41), + ACE_NTOHL (0x53455256), + ACE_NTOHL (0x45525f44), + ACE_NTOHL (0x45434c41), ACE_NTOHL (0x52454400), // name = SERVER_DECLARED }; @@ -535,7 +537,7 @@ namespace RTCORBA ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::PriorityModelPolicy_ptr -TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::duplicate ( +TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::tao_duplicate ( RTCORBA::PriorityModelPolicy_ptr p ) { @@ -544,7 +546,7 @@ TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::release ( +TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::tao_release ( RTCORBA::PriorityModelPolicy_ptr p ) { @@ -553,14 +555,14 @@ TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::PriorityModelPolicy_ptr -TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::nil (void) +TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::tao_nil (void) { return RTCORBA::PriorityModelPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::marshal ( +TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::tao_marshal ( RTCORBA::PriorityModelPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -569,7 +571,7 @@ TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*RTCORBA__TAO_PriorityModelPolicy_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -580,11 +582,11 @@ RTCORBA::PriorityModelPolicy::PriorityModelPolicy (void) RTCORBA::PriorityModelPolicy::~PriorityModelPolicy (void) {} -void +void RTCORBA::PriorityModelPolicy::_tao_any_destructor (void *_tao_void_pointer) { PriorityModelPolicy *_tao_tmp_pointer = - static_cast<PriorityModelPolicy *> (_tao_void_pointer); + ACE_static_cast (PriorityModelPolicy *, _tao_void_pointer); CORBA::release (_tao_tmp_pointer); } @@ -598,10 +600,10 @@ RTCORBA::PriorityModelPolicy::_narrow ( { return PriorityModelPolicy::_nil (); } - + PriorityModelPolicy_ptr proxy = dynamic_cast<PriorityModelPolicy_ptr> (_tao_objref); - + return PriorityModelPolicy::_duplicate (proxy); } @@ -615,10 +617,10 @@ RTCORBA::PriorityModelPolicy::_unchecked_narrow ( { return PriorityModelPolicy::_nil (); } - + PriorityModelPolicy_ptr proxy = dynamic_cast<PriorityModelPolicy_ptr> (_tao_objref); - + return PriorityModelPolicy::_duplicate (proxy); } @@ -629,7 +631,7 @@ RTCORBA::PriorityModelPolicy::_duplicate (PriorityModelPolicy_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -684,22 +686,22 @@ static const CORBA::Long _oc_RTCORBA_PriorityModelPolicy[] = { TAO_ENCAP_BYTE_ORDER, // byte order 44, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x5072696f), - ACE_NTOHL (0x72697479), - ACE_NTOHL (0x4d6f6465), - ACE_NTOHL (0x6c506f6c), - ACE_NTOHL (0x6963793a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x5072696f), + ACE_NTOHL (0x72697479), + ACE_NTOHL (0x4d6f6465), + ACE_NTOHL (0x6c506f6c), + ACE_NTOHL (0x6963793a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/RTCORBA/PriorityModelPolicy:1.0 20, - ACE_NTOHL (0x5072696f), - ACE_NTOHL (0x72697479), - ACE_NTOHL (0x4d6f6465), - ACE_NTOHL (0x6c506f6c), + ACE_NTOHL (0x5072696f), + ACE_NTOHL (0x72697479), + ACE_NTOHL (0x4d6f6465), + ACE_NTOHL (0x6c506f6c), ACE_NTOHL (0x69637900), // name = PriorityModelPolicy }; @@ -724,7 +726,7 @@ namespace RTCORBA ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::ThreadpoolPolicy_ptr -TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::duplicate ( +TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::tao_duplicate ( RTCORBA::ThreadpoolPolicy_ptr p ) { @@ -733,7 +735,7 @@ TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::release ( +TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::tao_release ( RTCORBA::ThreadpoolPolicy_ptr p ) { @@ -742,14 +744,14 @@ TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::ThreadpoolPolicy_ptr -TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::nil (void) +TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::tao_nil (void) { return RTCORBA::ThreadpoolPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::marshal ( +TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::tao_marshal ( RTCORBA::ThreadpoolPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -758,7 +760,7 @@ TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*RTCORBA__TAO_ThreadpoolPolicy_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -769,11 +771,11 @@ RTCORBA::ThreadpoolPolicy::ThreadpoolPolicy (void) RTCORBA::ThreadpoolPolicy::~ThreadpoolPolicy (void) {} -void +void RTCORBA::ThreadpoolPolicy::_tao_any_destructor (void *_tao_void_pointer) { ThreadpoolPolicy *_tao_tmp_pointer = - static_cast<ThreadpoolPolicy *> (_tao_void_pointer); + ACE_static_cast (ThreadpoolPolicy *, _tao_void_pointer); CORBA::release (_tao_tmp_pointer); } @@ -787,10 +789,10 @@ RTCORBA::ThreadpoolPolicy::_narrow ( { return ThreadpoolPolicy::_nil (); } - + ThreadpoolPolicy_ptr proxy = dynamic_cast<ThreadpoolPolicy_ptr> (_tao_objref); - + return ThreadpoolPolicy::_duplicate (proxy); } @@ -804,10 +806,10 @@ RTCORBA::ThreadpoolPolicy::_unchecked_narrow ( { return ThreadpoolPolicy::_nil (); } - + ThreadpoolPolicy_ptr proxy = dynamic_cast<ThreadpoolPolicy_ptr> (_tao_objref); - + return ThreadpoolPolicy::_duplicate (proxy); } @@ -818,7 +820,7 @@ RTCORBA::ThreadpoolPolicy::_duplicate (ThreadpoolPolicy_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -873,22 +875,22 @@ static const CORBA::Long _oc_RTCORBA_ThreadpoolPolicy[] = { TAO_ENCAP_BYTE_ORDER, // byte order 41, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x54687265), - ACE_NTOHL (0x6164706f), - ACE_NTOHL (0x6f6c506f), - ACE_NTOHL (0x6c696379), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x54687265), + ACE_NTOHL (0x6164706f), + ACE_NTOHL (0x6f6c506f), + ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/RTCORBA/ThreadpoolPolicy:1.0 17, - ACE_NTOHL (0x54687265), - ACE_NTOHL (0x6164706f), - ACE_NTOHL (0x6f6c506f), - ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x54687265), + ACE_NTOHL (0x6164706f), + ACE_NTOHL (0x6f6c506f), + ACE_NTOHL (0x6c696379), ACE_NTOHL (0x0), // name = ThreadpoolPolicy }; @@ -913,7 +915,7 @@ namespace RTCORBA ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::ProtocolProperties_ptr -TAO::Objref_Traits<RTCORBA::ProtocolProperties>::duplicate ( +TAO::Objref_Traits<RTCORBA::ProtocolProperties>::tao_duplicate ( RTCORBA::ProtocolProperties_ptr p ) { @@ -922,7 +924,7 @@ TAO::Objref_Traits<RTCORBA::ProtocolProperties>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTCORBA::ProtocolProperties>::release ( +TAO::Objref_Traits<RTCORBA::ProtocolProperties>::tao_release ( RTCORBA::ProtocolProperties_ptr p ) { @@ -931,14 +933,14 @@ TAO::Objref_Traits<RTCORBA::ProtocolProperties>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::ProtocolProperties_ptr -TAO::Objref_Traits<RTCORBA::ProtocolProperties>::nil (void) +TAO::Objref_Traits<RTCORBA::ProtocolProperties>::tao_nil (void) { return RTCORBA::ProtocolProperties::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTCORBA::ProtocolProperties>::marshal ( +TAO::Objref_Traits<RTCORBA::ProtocolProperties>::tao_marshal ( RTCORBA::ProtocolProperties_ptr p, TAO_OutputCDR & cdr ) @@ -947,7 +949,7 @@ TAO::Objref_Traits<RTCORBA::ProtocolProperties>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*RTCORBA__TAO_ProtocolProperties_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -958,11 +960,11 @@ RTCORBA::ProtocolProperties::ProtocolProperties (void) RTCORBA::ProtocolProperties::~ProtocolProperties (void) {} -void +void RTCORBA::ProtocolProperties::_tao_any_destructor (void *_tao_void_pointer) { ProtocolProperties *_tao_tmp_pointer = - static_cast<ProtocolProperties *> (_tao_void_pointer); + ACE_static_cast (ProtocolProperties *, _tao_void_pointer); CORBA::release (_tao_tmp_pointer); } @@ -976,10 +978,10 @@ RTCORBA::ProtocolProperties::_narrow ( { return ProtocolProperties::_nil (); } - + ProtocolProperties_ptr proxy = dynamic_cast<ProtocolProperties_ptr> (_tao_objref); - + return ProtocolProperties::_duplicate (proxy); } @@ -993,10 +995,10 @@ RTCORBA::ProtocolProperties::_unchecked_narrow ( { return ProtocolProperties::_nil (); } - + ProtocolProperties_ptr proxy = dynamic_cast<ProtocolProperties_ptr> (_tao_objref); - + return ProtocolProperties::_duplicate (proxy); } @@ -1007,7 +1009,7 @@ RTCORBA::ProtocolProperties::_duplicate (ProtocolProperties_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -1058,22 +1060,22 @@ static const CORBA::Long _oc_RTCORBA_ProtocolProperties[] = { TAO_ENCAP_BYTE_ORDER, // byte order 43, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x50726f74), - ACE_NTOHL (0x6f636f6c), - ACE_NTOHL (0x50726f70), - ACE_NTOHL (0x65727469), - ACE_NTOHL (0x65733a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x50726f74), + ACE_NTOHL (0x6f636f6c), + ACE_NTOHL (0x50726f70), + ACE_NTOHL (0x65727469), + ACE_NTOHL (0x65733a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/RTCORBA/ProtocolProperties:1.0 19, - ACE_NTOHL (0x50726f74), - ACE_NTOHL (0x6f636f6c), - ACE_NTOHL (0x50726f70), - ACE_NTOHL (0x65727469), + ACE_NTOHL (0x50726f74), + ACE_NTOHL (0x6f636f6c), + ACE_NTOHL (0x50726f70), + ACE_NTOHL (0x65727469), ACE_NTOHL (0x65730000), // name = ProtocolProperties }; @@ -1098,104 +1100,104 @@ static const CORBA::Long _oc_RTCORBA_Protocol[] = { TAO_ENCAP_BYTE_ORDER, // byte order 33, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x50726f74), - ACE_NTOHL (0x6f636f6c), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x50726f74), + ACE_NTOHL (0x6f636f6c), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/RTCORBA/Protocol:1.0 9, - ACE_NTOHL (0x50726f74), - ACE_NTOHL (0x6f636f6c), + ACE_NTOHL (0x50726f74), + ACE_NTOHL (0x6f636f6c), ACE_NTOHL (0x0), // name = Protocol 3, // member count 14, - ACE_NTOHL (0x70726f74), - ACE_NTOHL (0x6f636f6c), - ACE_NTOHL (0x5f747970), + ACE_NTOHL (0x70726f74), + ACE_NTOHL (0x6f636f6c), + ACE_NTOHL (0x5f747970), ACE_NTOHL (0x65000000), // name = protocol_type CORBA::tk_alias, // typecode kind for typedefs 60, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 30, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x50726f66), - ACE_NTOHL (0x696c6549), - ACE_NTOHL (0x643a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x50726f66), + ACE_NTOHL (0x696c6549), + ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IOP/ProfileId:1.0 10, - ACE_NTOHL (0x50726f66), - ACE_NTOHL (0x696c6549), + ACE_NTOHL (0x50726f66), + ACE_NTOHL (0x696c6549), ACE_NTOHL (0x64000000), // name = ProfileId CORBA::tk_ulong, 24, - ACE_NTOHL (0x6f72625f), - ACE_NTOHL (0x70726f74), - ACE_NTOHL (0x6f636f6c), - ACE_NTOHL (0x5f70726f), - ACE_NTOHL (0x70657274), + ACE_NTOHL (0x6f72625f), + ACE_NTOHL (0x70726f74), + ACE_NTOHL (0x6f636f6c), + ACE_NTOHL (0x5f70726f), + ACE_NTOHL (0x70657274), ACE_NTOHL (0x69657300), // name = orb_protocol_properties CORBA::tk_objref, // typecode kind 76, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 43, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x50726f74), - ACE_NTOHL (0x6f636f6c), - ACE_NTOHL (0x50726f70), - ACE_NTOHL (0x65727469), - ACE_NTOHL (0x65733a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x50726f74), + ACE_NTOHL (0x6f636f6c), + ACE_NTOHL (0x50726f70), + ACE_NTOHL (0x65727469), + ACE_NTOHL (0x65733a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/RTCORBA/ProtocolProperties:1.0 19, - ACE_NTOHL (0x50726f74), - ACE_NTOHL (0x6f636f6c), - ACE_NTOHL (0x50726f70), - ACE_NTOHL (0x65727469), + ACE_NTOHL (0x50726f74), + ACE_NTOHL (0x6f636f6c), + ACE_NTOHL (0x50726f70), + ACE_NTOHL (0x65727469), ACE_NTOHL (0x65730000), // name = ProtocolProperties - + 30, - ACE_NTOHL (0x7472616e), - ACE_NTOHL (0x73706f72), - ACE_NTOHL (0x745f7072), - ACE_NTOHL (0x6f746f63), - ACE_NTOHL (0x6f6c5f70), - ACE_NTOHL (0x726f7065), - ACE_NTOHL (0x72746965), + ACE_NTOHL (0x7472616e), + ACE_NTOHL (0x73706f72), + ACE_NTOHL (0x745f7072), + ACE_NTOHL (0x6f746f63), + ACE_NTOHL (0x6f6c5f70), + ACE_NTOHL (0x726f7065), + ACE_NTOHL (0x72746965), ACE_NTOHL (0x73000000), // name = transport_protocol_properties CORBA::tk_objref, // typecode kind 76, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 43, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x50726f74), - ACE_NTOHL (0x6f636f6c), - ACE_NTOHL (0x50726f70), - ACE_NTOHL (0x65727469), - ACE_NTOHL (0x65733a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x50726f74), + ACE_NTOHL (0x6f636f6c), + ACE_NTOHL (0x50726f70), + ACE_NTOHL (0x65727469), + ACE_NTOHL (0x65733a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/RTCORBA/ProtocolProperties:1.0 19, - ACE_NTOHL (0x50726f74), - ACE_NTOHL (0x6f636f6c), - ACE_NTOHL (0x50726f70), - ACE_NTOHL (0x65727469), + ACE_NTOHL (0x50726f74), + ACE_NTOHL (0x6f636f6c), + ACE_NTOHL (0x50726f70), + ACE_NTOHL (0x65727469), ACE_NTOHL (0x65730000), // name = ProtocolProperties - + }; static CORBA::TypeCode _tc_TAO_tc_RTCORBA_Protocol ( @@ -1212,20 +1214,20 @@ namespace RTCORBA &_tc_TAO_tc_RTCORBA_Protocol; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/structure_cs.cpp:66 -void +void RTCORBA::Protocol::_tao_any_destructor ( void *_tao_void_pointer ) { Protocol *_tao_tmp_pointer = - static_cast<Protocol *> (_tao_void_pointer); + ACE_static_cast (Protocol *, _tao_void_pointer); delete _tao_tmp_pointer; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_RTCORBA_PROTOCOLLIST_CS_) @@ -1272,7 +1274,7 @@ void RTCORBA::ProtocolList::_tao_any_destructor ( ) { ProtocolList * _tao_tmp_pointer = - static_cast<ProtocolList *> (_tao_void_pointer); + ACE_static_cast (ProtocolList *, _tao_void_pointer); delete _tao_tmp_pointer; } @@ -1285,20 +1287,20 @@ static const CORBA::Long _oc_RTCORBA_ProtocolList[] = { TAO_ENCAP_BYTE_ORDER, // byte order 37, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x50726f74), - ACE_NTOHL (0x6f636f6c), - ACE_NTOHL (0x4c697374), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x50726f74), + ACE_NTOHL (0x6f636f6c), + ACE_NTOHL (0x4c697374), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/RTCORBA/ProtocolList:1.0 13, - ACE_NTOHL (0x50726f74), - ACE_NTOHL (0x6f636f6c), - ACE_NTOHL (0x4c697374), + ACE_NTOHL (0x50726f74), + ACE_NTOHL (0x6f636f6c), + ACE_NTOHL (0x4c697374), ACE_NTOHL (0x0), // name = ProtocolList CORBA::tk_sequence, // typecode kind 400, // encapsulation length @@ -1307,104 +1309,104 @@ static const CORBA::Long _oc_RTCORBA_ProtocolList[] = 384, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 33, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x50726f74), - ACE_NTOHL (0x6f636f6c), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x50726f74), + ACE_NTOHL (0x6f636f6c), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/RTCORBA/Protocol:1.0 9, - ACE_NTOHL (0x50726f74), - ACE_NTOHL (0x6f636f6c), + ACE_NTOHL (0x50726f74), + ACE_NTOHL (0x6f636f6c), ACE_NTOHL (0x0), // name = Protocol 3, // member count 14, - ACE_NTOHL (0x70726f74), - ACE_NTOHL (0x6f636f6c), - ACE_NTOHL (0x5f747970), + ACE_NTOHL (0x70726f74), + ACE_NTOHL (0x6f636f6c), + ACE_NTOHL (0x5f747970), ACE_NTOHL (0x65000000), // name = protocol_type CORBA::tk_alias, // typecode kind for typedefs 60, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 30, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x50726f66), - ACE_NTOHL (0x696c6549), - ACE_NTOHL (0x643a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x50726f66), + ACE_NTOHL (0x696c6549), + ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IOP/ProfileId:1.0 10, - ACE_NTOHL (0x50726f66), - ACE_NTOHL (0x696c6549), + ACE_NTOHL (0x50726f66), + ACE_NTOHL (0x696c6549), ACE_NTOHL (0x64000000), // name = ProfileId CORBA::tk_ulong, 24, - ACE_NTOHL (0x6f72625f), - ACE_NTOHL (0x70726f74), - ACE_NTOHL (0x6f636f6c), - ACE_NTOHL (0x5f70726f), - ACE_NTOHL (0x70657274), + ACE_NTOHL (0x6f72625f), + ACE_NTOHL (0x70726f74), + ACE_NTOHL (0x6f636f6c), + ACE_NTOHL (0x5f70726f), + ACE_NTOHL (0x70657274), ACE_NTOHL (0x69657300), // name = orb_protocol_properties CORBA::tk_objref, // typecode kind 76, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 43, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x50726f74), - ACE_NTOHL (0x6f636f6c), - ACE_NTOHL (0x50726f70), - ACE_NTOHL (0x65727469), - ACE_NTOHL (0x65733a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x50726f74), + ACE_NTOHL (0x6f636f6c), + ACE_NTOHL (0x50726f70), + ACE_NTOHL (0x65727469), + ACE_NTOHL (0x65733a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/RTCORBA/ProtocolProperties:1.0 19, - ACE_NTOHL (0x50726f74), - ACE_NTOHL (0x6f636f6c), - ACE_NTOHL (0x50726f70), - ACE_NTOHL (0x65727469), + ACE_NTOHL (0x50726f74), + ACE_NTOHL (0x6f636f6c), + ACE_NTOHL (0x50726f70), + ACE_NTOHL (0x65727469), ACE_NTOHL (0x65730000), // name = ProtocolProperties - + 30, - ACE_NTOHL (0x7472616e), - ACE_NTOHL (0x73706f72), - ACE_NTOHL (0x745f7072), - ACE_NTOHL (0x6f746f63), - ACE_NTOHL (0x6f6c5f70), - ACE_NTOHL (0x726f7065), - ACE_NTOHL (0x72746965), + ACE_NTOHL (0x7472616e), + ACE_NTOHL (0x73706f72), + ACE_NTOHL (0x745f7072), + ACE_NTOHL (0x6f746f63), + ACE_NTOHL (0x6f6c5f70), + ACE_NTOHL (0x726f7065), + ACE_NTOHL (0x72746965), ACE_NTOHL (0x73000000), // name = transport_protocol_properties CORBA::tk_objref, // typecode kind 76, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 43, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x50726f74), - ACE_NTOHL (0x6f636f6c), - ACE_NTOHL (0x50726f70), - ACE_NTOHL (0x65727469), - ACE_NTOHL (0x65733a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x50726f74), + ACE_NTOHL (0x6f636f6c), + ACE_NTOHL (0x50726f70), + ACE_NTOHL (0x65727469), + ACE_NTOHL (0x65733a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/RTCORBA/ProtocolProperties:1.0 19, - ACE_NTOHL (0x50726f74), - ACE_NTOHL (0x6f636f6c), - ACE_NTOHL (0x50726f70), - ACE_NTOHL (0x65727469), + ACE_NTOHL (0x50726f74), + ACE_NTOHL (0x6f636f6c), + ACE_NTOHL (0x50726f70), + ACE_NTOHL (0x65727469), ACE_NTOHL (0x65730000), // name = ProtocolProperties - + 0U, @@ -1431,7 +1433,7 @@ namespace RTCORBA ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::ServerProtocolPolicy_ptr -TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::duplicate ( +TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::tao_duplicate ( RTCORBA::ServerProtocolPolicy_ptr p ) { @@ -1440,7 +1442,7 @@ TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::release ( +TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::tao_release ( RTCORBA::ServerProtocolPolicy_ptr p ) { @@ -1449,14 +1451,14 @@ TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::ServerProtocolPolicy_ptr -TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::nil (void) +TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::tao_nil (void) { return RTCORBA::ServerProtocolPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::marshal ( +TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::tao_marshal ( RTCORBA::ServerProtocolPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -1465,7 +1467,7 @@ TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*RTCORBA__TAO_ServerProtocolPolicy_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -1476,11 +1478,11 @@ RTCORBA::ServerProtocolPolicy::ServerProtocolPolicy (void) RTCORBA::ServerProtocolPolicy::~ServerProtocolPolicy (void) {} -void +void RTCORBA::ServerProtocolPolicy::_tao_any_destructor (void *_tao_void_pointer) { ServerProtocolPolicy *_tao_tmp_pointer = - static_cast<ServerProtocolPolicy *> (_tao_void_pointer); + ACE_static_cast (ServerProtocolPolicy *, _tao_void_pointer); CORBA::release (_tao_tmp_pointer); } @@ -1494,10 +1496,10 @@ RTCORBA::ServerProtocolPolicy::_narrow ( { return ServerProtocolPolicy::_nil (); } - + ServerProtocolPolicy_ptr proxy = dynamic_cast<ServerProtocolPolicy_ptr> (_tao_objref); - + return ServerProtocolPolicy::_duplicate (proxy); } @@ -1511,10 +1513,10 @@ RTCORBA::ServerProtocolPolicy::_unchecked_narrow ( { return ServerProtocolPolicy::_nil (); } - + ServerProtocolPolicy_ptr proxy = dynamic_cast<ServerProtocolPolicy_ptr> (_tao_objref); - + return ServerProtocolPolicy::_duplicate (proxy); } @@ -1525,7 +1527,7 @@ RTCORBA::ServerProtocolPolicy::_duplicate (ServerProtocolPolicy_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -1580,24 +1582,24 @@ static const CORBA::Long _oc_RTCORBA_ServerProtocolPolicy[] = { TAO_ENCAP_BYTE_ORDER, // byte order 45, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x65725072), - ACE_NTOHL (0x6f746f63), - ACE_NTOHL (0x6f6c506f), - ACE_NTOHL (0x6c696379), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x65725072), + ACE_NTOHL (0x6f746f63), + ACE_NTOHL (0x6f6c506f), + ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/RTCORBA/ServerProtocolPolicy:1.0 21, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x65725072), - ACE_NTOHL (0x6f746f63), - ACE_NTOHL (0x6f6c506f), - ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x65725072), + ACE_NTOHL (0x6f746f63), + ACE_NTOHL (0x6f6c506f), + ACE_NTOHL (0x6c696379), ACE_NTOHL (0x0), // name = ServerProtocolPolicy }; @@ -1622,7 +1624,7 @@ namespace RTCORBA ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::ClientProtocolPolicy_ptr -TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::duplicate ( +TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::tao_duplicate ( RTCORBA::ClientProtocolPolicy_ptr p ) { @@ -1631,7 +1633,7 @@ TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::release ( +TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::tao_release ( RTCORBA::ClientProtocolPolicy_ptr p ) { @@ -1640,14 +1642,14 @@ TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::ClientProtocolPolicy_ptr -TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::nil (void) +TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::tao_nil (void) { return RTCORBA::ClientProtocolPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::marshal ( +TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::tao_marshal ( RTCORBA::ClientProtocolPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -1656,7 +1658,7 @@ TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*RTCORBA__TAO_ClientProtocolPolicy_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -1667,11 +1669,11 @@ RTCORBA::ClientProtocolPolicy::ClientProtocolPolicy (void) RTCORBA::ClientProtocolPolicy::~ClientProtocolPolicy (void) {} -void +void RTCORBA::ClientProtocolPolicy::_tao_any_destructor (void *_tao_void_pointer) { ClientProtocolPolicy *_tao_tmp_pointer = - static_cast<ClientProtocolPolicy *> (_tao_void_pointer); + ACE_static_cast (ClientProtocolPolicy *, _tao_void_pointer); CORBA::release (_tao_tmp_pointer); } @@ -1685,10 +1687,10 @@ RTCORBA::ClientProtocolPolicy::_narrow ( { return ClientProtocolPolicy::_nil (); } - + ClientProtocolPolicy_ptr proxy = dynamic_cast<ClientProtocolPolicy_ptr> (_tao_objref); - + return ClientProtocolPolicy::_duplicate (proxy); } @@ -1702,10 +1704,10 @@ RTCORBA::ClientProtocolPolicy::_unchecked_narrow ( { return ClientProtocolPolicy::_nil (); } - + ClientProtocolPolicy_ptr proxy = dynamic_cast<ClientProtocolPolicy_ptr> (_tao_objref); - + return ClientProtocolPolicy::_duplicate (proxy); } @@ -1716,7 +1718,7 @@ RTCORBA::ClientProtocolPolicy::_duplicate (ClientProtocolPolicy_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -1771,24 +1773,24 @@ static const CORBA::Long _oc_RTCORBA_ClientProtocolPolicy[] = { TAO_ENCAP_BYTE_ORDER, // byte order 45, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x436c6965), - ACE_NTOHL (0x6e745072), - ACE_NTOHL (0x6f746f63), - ACE_NTOHL (0x6f6c506f), - ACE_NTOHL (0x6c696379), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x436c6965), + ACE_NTOHL (0x6e745072), + ACE_NTOHL (0x6f746f63), + ACE_NTOHL (0x6f6c506f), + ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/RTCORBA/ClientProtocolPolicy:1.0 21, - ACE_NTOHL (0x436c6965), - ACE_NTOHL (0x6e745072), - ACE_NTOHL (0x6f746f63), - ACE_NTOHL (0x6f6c506f), - ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x436c6965), + ACE_NTOHL (0x6e745072), + ACE_NTOHL (0x6f746f63), + ACE_NTOHL (0x6f6c506f), + ACE_NTOHL (0x6c696379), ACE_NTOHL (0x0), // name = ClientProtocolPolicy }; @@ -1813,7 +1815,7 @@ namespace RTCORBA ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::PrivateConnectionPolicy_ptr -TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::duplicate ( +TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::tao_duplicate ( RTCORBA::PrivateConnectionPolicy_ptr p ) { @@ -1822,7 +1824,7 @@ TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::release ( +TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::tao_release ( RTCORBA::PrivateConnectionPolicy_ptr p ) { @@ -1831,14 +1833,14 @@ TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::PrivateConnectionPolicy_ptr -TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::nil (void) +TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::tao_nil (void) { return RTCORBA::PrivateConnectionPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::marshal ( +TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::tao_marshal ( RTCORBA::PrivateConnectionPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -1847,7 +1849,7 @@ TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*RTCORBA__TAO_PrivateConnectionPolicy_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -1858,11 +1860,11 @@ RTCORBA::PrivateConnectionPolicy::PrivateConnectionPolicy (void) RTCORBA::PrivateConnectionPolicy::~PrivateConnectionPolicy (void) {} -void +void RTCORBA::PrivateConnectionPolicy::_tao_any_destructor (void *_tao_void_pointer) { PrivateConnectionPolicy *_tao_tmp_pointer = - static_cast<PrivateConnectionPolicy *> (_tao_void_pointer); + ACE_static_cast (PrivateConnectionPolicy *, _tao_void_pointer); CORBA::release (_tao_tmp_pointer); } @@ -1876,10 +1878,10 @@ RTCORBA::PrivateConnectionPolicy::_narrow ( { return PrivateConnectionPolicy::_nil (); } - + PrivateConnectionPolicy_ptr proxy = dynamic_cast<PrivateConnectionPolicy_ptr> (_tao_objref); - + return PrivateConnectionPolicy::_duplicate (proxy); } @@ -1893,10 +1895,10 @@ RTCORBA::PrivateConnectionPolicy::_unchecked_narrow ( { return PrivateConnectionPolicy::_nil (); } - + PrivateConnectionPolicy_ptr proxy = dynamic_cast<PrivateConnectionPolicy_ptr> (_tao_objref); - + return PrivateConnectionPolicy::_duplicate (proxy); } @@ -1907,7 +1909,7 @@ RTCORBA::PrivateConnectionPolicy::_duplicate (PrivateConnectionPolicy_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -1962,24 +1964,24 @@ static const CORBA::Long _oc_RTCORBA_PrivateConnectionPolicy[] = { TAO_ENCAP_BYTE_ORDER, // byte order 48, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x50726976), - ACE_NTOHL (0x61746543), - ACE_NTOHL (0x6f6e6e65), - ACE_NTOHL (0x6374696f), - ACE_NTOHL (0x6e506f6c), - ACE_NTOHL (0x6963793a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x50726976), + ACE_NTOHL (0x61746543), + ACE_NTOHL (0x6f6e6e65), + ACE_NTOHL (0x6374696f), + ACE_NTOHL (0x6e506f6c), + ACE_NTOHL (0x6963793a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/RTCORBA/PrivateConnectionPolicy:1.0 24, - ACE_NTOHL (0x50726976), - ACE_NTOHL (0x61746543), - ACE_NTOHL (0x6f6e6e65), - ACE_NTOHL (0x6374696f), - ACE_NTOHL (0x6e506f6c), + ACE_NTOHL (0x50726976), + ACE_NTOHL (0x61746543), + ACE_NTOHL (0x6f6e6e65), + ACE_NTOHL (0x6374696f), + ACE_NTOHL (0x6e506f6c), ACE_NTOHL (0x69637900), // name = PrivateConnectionPolicy }; @@ -2004,7 +2006,7 @@ namespace RTCORBA ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::TCPProtocolProperties_ptr -TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::duplicate ( +TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::tao_duplicate ( RTCORBA::TCPProtocolProperties_ptr p ) { @@ -2013,7 +2015,7 @@ TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::release ( +TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::tao_release ( RTCORBA::TCPProtocolProperties_ptr p ) { @@ -2022,14 +2024,14 @@ TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::TCPProtocolProperties_ptr -TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::nil (void) +TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::tao_nil (void) { return RTCORBA::TCPProtocolProperties::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::marshal ( +TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::tao_marshal ( RTCORBA::TCPProtocolProperties_ptr p, TAO_OutputCDR & cdr ) @@ -2038,7 +2040,7 @@ TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*RTCORBA__TAO_TCPProtocolProperties_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -2049,11 +2051,11 @@ RTCORBA::TCPProtocolProperties::TCPProtocolProperties (void) RTCORBA::TCPProtocolProperties::~TCPProtocolProperties (void) {} -void +void RTCORBA::TCPProtocolProperties::_tao_any_destructor (void *_tao_void_pointer) { TCPProtocolProperties *_tao_tmp_pointer = - static_cast<TCPProtocolProperties *> (_tao_void_pointer); + ACE_static_cast (TCPProtocolProperties *, _tao_void_pointer); CORBA::release (_tao_tmp_pointer); } @@ -2067,10 +2069,10 @@ RTCORBA::TCPProtocolProperties::_narrow ( { return TCPProtocolProperties::_nil (); } - + TCPProtocolProperties_ptr proxy = dynamic_cast<TCPProtocolProperties_ptr> (_tao_objref); - + return TCPProtocolProperties::_duplicate (proxy); } @@ -2084,10 +2086,10 @@ RTCORBA::TCPProtocolProperties::_unchecked_narrow ( { return TCPProtocolProperties::_nil (); } - + TCPProtocolProperties_ptr proxy = dynamic_cast<TCPProtocolProperties_ptr> (_tao_objref); - + return TCPProtocolProperties::_duplicate (proxy); } @@ -2098,7 +2100,7 @@ RTCORBA::TCPProtocolProperties::_duplicate (TCPProtocolProperties_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -2153,24 +2155,24 @@ static const CORBA::Long _oc_RTCORBA_TCPProtocolProperties[] = { TAO_ENCAP_BYTE_ORDER, // byte order 46, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x54435050), - ACE_NTOHL (0x726f746f), - ACE_NTOHL (0x636f6c50), - ACE_NTOHL (0x726f7065), - ACE_NTOHL (0x72746965), - ACE_NTOHL (0x733a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x54435050), + ACE_NTOHL (0x726f746f), + ACE_NTOHL (0x636f6c50), + ACE_NTOHL (0x726f7065), + ACE_NTOHL (0x72746965), + ACE_NTOHL (0x733a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/RTCORBA/TCPProtocolProperties:1.0 22, - ACE_NTOHL (0x54435050), - ACE_NTOHL (0x726f746f), - ACE_NTOHL (0x636f6c50), - ACE_NTOHL (0x726f7065), - ACE_NTOHL (0x72746965), + ACE_NTOHL (0x54435050), + ACE_NTOHL (0x726f746f), + ACE_NTOHL (0x636f6c50), + ACE_NTOHL (0x726f7065), + ACE_NTOHL (0x72746965), ACE_NTOHL (0x73000000), // name = TCPProtocolProperties }; @@ -2195,7 +2197,7 @@ namespace RTCORBA ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::GIOPProtocolProperties_ptr -TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::duplicate ( +TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::tao_duplicate ( RTCORBA::GIOPProtocolProperties_ptr p ) { @@ -2204,7 +2206,7 @@ TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::release ( +TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::tao_release ( RTCORBA::GIOPProtocolProperties_ptr p ) { @@ -2213,14 +2215,14 @@ TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::GIOPProtocolProperties_ptr -TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::nil (void) +TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::tao_nil (void) { return RTCORBA::GIOPProtocolProperties::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::marshal ( +TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::tao_marshal ( RTCORBA::GIOPProtocolProperties_ptr p, TAO_OutputCDR & cdr ) @@ -2229,7 +2231,7 @@ TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*RTCORBA__TAO_GIOPProtocolProperties_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -2240,11 +2242,11 @@ RTCORBA::GIOPProtocolProperties::GIOPProtocolProperties (void) RTCORBA::GIOPProtocolProperties::~GIOPProtocolProperties (void) {} -void +void RTCORBA::GIOPProtocolProperties::_tao_any_destructor (void *_tao_void_pointer) { GIOPProtocolProperties *_tao_tmp_pointer = - static_cast<GIOPProtocolProperties *> (_tao_void_pointer); + ACE_static_cast (GIOPProtocolProperties *, _tao_void_pointer); CORBA::release (_tao_tmp_pointer); } @@ -2258,10 +2260,10 @@ RTCORBA::GIOPProtocolProperties::_narrow ( { return GIOPProtocolProperties::_nil (); } - + GIOPProtocolProperties_ptr proxy = dynamic_cast<GIOPProtocolProperties_ptr> (_tao_objref); - + return GIOPProtocolProperties::_duplicate (proxy); } @@ -2275,10 +2277,10 @@ RTCORBA::GIOPProtocolProperties::_unchecked_narrow ( { return GIOPProtocolProperties::_nil (); } - + GIOPProtocolProperties_ptr proxy = dynamic_cast<GIOPProtocolProperties_ptr> (_tao_objref); - + return GIOPProtocolProperties::_duplicate (proxy); } @@ -2289,7 +2291,7 @@ RTCORBA::GIOPProtocolProperties::_duplicate (GIOPProtocolProperties_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -2344,24 +2346,24 @@ static const CORBA::Long _oc_RTCORBA_GIOPProtocolProperties[] = { TAO_ENCAP_BYTE_ORDER, // byte order 47, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x47494f50), - ACE_NTOHL (0x50726f74), - ACE_NTOHL (0x6f636f6c), - ACE_NTOHL (0x50726f70), - ACE_NTOHL (0x65727469), - ACE_NTOHL (0x65733a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x47494f50), + ACE_NTOHL (0x50726f74), + ACE_NTOHL (0x6f636f6c), + ACE_NTOHL (0x50726f70), + ACE_NTOHL (0x65727469), + ACE_NTOHL (0x65733a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/RTCORBA/GIOPProtocolProperties:1.0 23, - ACE_NTOHL (0x47494f50), - ACE_NTOHL (0x50726f74), - ACE_NTOHL (0x6f636f6c), - ACE_NTOHL (0x50726f70), - ACE_NTOHL (0x65727469), + ACE_NTOHL (0x47494f50), + ACE_NTOHL (0x50726f74), + ACE_NTOHL (0x6f636f6c), + ACE_NTOHL (0x50726f70), + ACE_NTOHL (0x65727469), ACE_NTOHL (0x65730000), // name = GIOPProtocolProperties }; @@ -2386,7 +2388,7 @@ namespace RTCORBA ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::UnixDomainProtocolProperties_ptr -TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::duplicate ( +TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::tao_duplicate ( RTCORBA::UnixDomainProtocolProperties_ptr p ) { @@ -2395,7 +2397,7 @@ TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::release ( +TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::tao_release ( RTCORBA::UnixDomainProtocolProperties_ptr p ) { @@ -2404,14 +2406,14 @@ TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::UnixDomainProtocolProperties_ptr -TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::nil (void) +TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::tao_nil (void) { return RTCORBA::UnixDomainProtocolProperties::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::marshal ( +TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::tao_marshal ( RTCORBA::UnixDomainProtocolProperties_ptr p, TAO_OutputCDR & cdr ) @@ -2420,7 +2422,7 @@ TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*RTCORBA__TAO_UnixDomainProtocolProperties_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -2431,11 +2433,11 @@ RTCORBA::UnixDomainProtocolProperties::UnixDomainProtocolProperties (void) RTCORBA::UnixDomainProtocolProperties::~UnixDomainProtocolProperties (void) {} -void +void RTCORBA::UnixDomainProtocolProperties::_tao_any_destructor (void *_tao_void_pointer) { UnixDomainProtocolProperties *_tao_tmp_pointer = - static_cast<UnixDomainProtocolProperties *> (_tao_void_pointer); + ACE_static_cast (UnixDomainProtocolProperties *, _tao_void_pointer); CORBA::release (_tao_tmp_pointer); } @@ -2449,10 +2451,10 @@ RTCORBA::UnixDomainProtocolProperties::_narrow ( { return UnixDomainProtocolProperties::_nil (); } - + UnixDomainProtocolProperties_ptr proxy = dynamic_cast<UnixDomainProtocolProperties_ptr> (_tao_objref); - + return UnixDomainProtocolProperties::_duplicate (proxy); } @@ -2466,10 +2468,10 @@ RTCORBA::UnixDomainProtocolProperties::_unchecked_narrow ( { return UnixDomainProtocolProperties::_nil (); } - + UnixDomainProtocolProperties_ptr proxy = dynamic_cast<UnixDomainProtocolProperties_ptr> (_tao_objref); - + return UnixDomainProtocolProperties::_duplicate (proxy); } @@ -2480,7 +2482,7 @@ RTCORBA::UnixDomainProtocolProperties::_duplicate (UnixDomainProtocolProperties_ { obj->_add_ref (); } - + return obj; } @@ -2535,28 +2537,28 @@ static const CORBA::Long _oc_RTCORBA_UnixDomainProtocolProperties[] = { TAO_ENCAP_BYTE_ORDER, // byte order 53, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x556e6978), - ACE_NTOHL (0x446f6d61), - ACE_NTOHL (0x696e5072), - ACE_NTOHL (0x6f746f63), - ACE_NTOHL (0x6f6c5072), - ACE_NTOHL (0x6f706572), - ACE_NTOHL (0x74696573), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x556e6978), + ACE_NTOHL (0x446f6d61), + ACE_NTOHL (0x696e5072), + ACE_NTOHL (0x6f746f63), + ACE_NTOHL (0x6f6c5072), + ACE_NTOHL (0x6f706572), + ACE_NTOHL (0x74696573), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/RTCORBA/UnixDomainProtocolProperties:1.0 29, - ACE_NTOHL (0x556e6978), - ACE_NTOHL (0x446f6d61), - ACE_NTOHL (0x696e5072), - ACE_NTOHL (0x6f746f63), - ACE_NTOHL (0x6f6c5072), - ACE_NTOHL (0x6f706572), - ACE_NTOHL (0x74696573), + ACE_NTOHL (0x556e6978), + ACE_NTOHL (0x446f6d61), + ACE_NTOHL (0x696e5072), + ACE_NTOHL (0x6f746f63), + ACE_NTOHL (0x6f6c5072), + ACE_NTOHL (0x6f706572), + ACE_NTOHL (0x74696573), ACE_NTOHL (0x0), // name = UnixDomainProtocolProperties }; @@ -2581,7 +2583,7 @@ namespace RTCORBA ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::SharedMemoryProtocolProperties_ptr -TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::duplicate ( +TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::tao_duplicate ( RTCORBA::SharedMemoryProtocolProperties_ptr p ) { @@ -2590,7 +2592,7 @@ TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::release ( +TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::tao_release ( RTCORBA::SharedMemoryProtocolProperties_ptr p ) { @@ -2599,14 +2601,14 @@ TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::SharedMemoryProtocolProperties_ptr -TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::nil (void) +TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::tao_nil (void) { return RTCORBA::SharedMemoryProtocolProperties::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::marshal ( +TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::tao_marshal ( RTCORBA::SharedMemoryProtocolProperties_ptr p, TAO_OutputCDR & cdr ) @@ -2615,7 +2617,7 @@ TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*RTCORBA__TAO_SharedMemoryProtocolProperties_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -2626,11 +2628,11 @@ RTCORBA::SharedMemoryProtocolProperties::SharedMemoryProtocolProperties (void) RTCORBA::SharedMemoryProtocolProperties::~SharedMemoryProtocolProperties (void) {} -void +void RTCORBA::SharedMemoryProtocolProperties::_tao_any_destructor (void *_tao_void_pointer) { SharedMemoryProtocolProperties *_tao_tmp_pointer = - static_cast<SharedMemoryProtocolProperties *> (_tao_void_pointer); + ACE_static_cast (SharedMemoryProtocolProperties *, _tao_void_pointer); CORBA::release (_tao_tmp_pointer); } @@ -2644,10 +2646,10 @@ RTCORBA::SharedMemoryProtocolProperties::_narrow ( { return SharedMemoryProtocolProperties::_nil (); } - + SharedMemoryProtocolProperties_ptr proxy = dynamic_cast<SharedMemoryProtocolProperties_ptr> (_tao_objref); - + return SharedMemoryProtocolProperties::_duplicate (proxy); } @@ -2661,10 +2663,10 @@ RTCORBA::SharedMemoryProtocolProperties::_unchecked_narrow ( { return SharedMemoryProtocolProperties::_nil (); } - + SharedMemoryProtocolProperties_ptr proxy = dynamic_cast<SharedMemoryProtocolProperties_ptr> (_tao_objref); - + return SharedMemoryProtocolProperties::_duplicate (proxy); } @@ -2675,7 +2677,7 @@ RTCORBA::SharedMemoryProtocolProperties::_duplicate (SharedMemoryProtocolPropert { obj->_add_ref (); } - + return obj; } @@ -2730,28 +2732,28 @@ static const CORBA::Long _oc_RTCORBA_SharedMemoryProtocolProperties[] = { TAO_ENCAP_BYTE_ORDER, // byte order 55, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x53686172), - ACE_NTOHL (0x65644d65), - ACE_NTOHL (0x6d6f7279), - ACE_NTOHL (0x50726f74), - ACE_NTOHL (0x6f636f6c), - ACE_NTOHL (0x50726f70), - ACE_NTOHL (0x65727469), - ACE_NTOHL (0x65733a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x53686172), + ACE_NTOHL (0x65644d65), + ACE_NTOHL (0x6d6f7279), + ACE_NTOHL (0x50726f74), + ACE_NTOHL (0x6f636f6c), + ACE_NTOHL (0x50726f70), + ACE_NTOHL (0x65727469), + ACE_NTOHL (0x65733a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/RTCORBA/SharedMemoryProtocolProperties:1.0 31, - ACE_NTOHL (0x53686172), - ACE_NTOHL (0x65644d65), - ACE_NTOHL (0x6d6f7279), - ACE_NTOHL (0x50726f74), - ACE_NTOHL (0x6f636f6c), - ACE_NTOHL (0x50726f70), - ACE_NTOHL (0x65727469), + ACE_NTOHL (0x53686172), + ACE_NTOHL (0x65644d65), + ACE_NTOHL (0x6d6f7279), + ACE_NTOHL (0x50726f74), + ACE_NTOHL (0x6f636f6c), + ACE_NTOHL (0x50726f70), + ACE_NTOHL (0x65727469), ACE_NTOHL (0x65730000), // name = SharedMemoryProtocolProperties }; @@ -2776,20 +2778,20 @@ static const CORBA::Long _oc_RTCORBA_PriorityBand[] = { TAO_ENCAP_BYTE_ORDER, // byte order 37, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x5072696f), - ACE_NTOHL (0x72697479), - ACE_NTOHL (0x42616e64), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x5072696f), + ACE_NTOHL (0x72697479), + ACE_NTOHL (0x42616e64), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/RTCORBA/PriorityBand:1.0 13, - ACE_NTOHL (0x5072696f), - ACE_NTOHL (0x72697479), - ACE_NTOHL (0x42616e64), + ACE_NTOHL (0x5072696f), + ACE_NTOHL (0x72697479), + ACE_NTOHL (0x42616e64), ACE_NTOHL (0x0), // name = PriorityBand 2, // member count 4, @@ -2798,41 +2800,41 @@ static const CORBA::Long _oc_RTCORBA_PriorityBand[] = 64, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 33, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x5072696f), - ACE_NTOHL (0x72697479), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x5072696f), + ACE_NTOHL (0x72697479), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/RTCORBA/Priority:1.0 9, - ACE_NTOHL (0x5072696f), - ACE_NTOHL (0x72697479), + ACE_NTOHL (0x5072696f), + ACE_NTOHL (0x72697479), ACE_NTOHL (0x0), // name = Priority CORBA::tk_short, 5, - ACE_NTOHL (0x68696768), + ACE_NTOHL (0x68696768), ACE_NTOHL (0x0), // name = high CORBA::tk_alias, // typecode kind for typedefs 64, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 33, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x5072696f), - ACE_NTOHL (0x72697479), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x5072696f), + ACE_NTOHL (0x72697479), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/RTCORBA/Priority:1.0 9, - ACE_NTOHL (0x5072696f), - ACE_NTOHL (0x72697479), + ACE_NTOHL (0x5072696f), + ACE_NTOHL (0x72697479), ACE_NTOHL (0x0), // name = Priority CORBA::tk_short, @@ -2853,20 +2855,20 @@ namespace RTCORBA &_tc_TAO_tc_RTCORBA_PriorityBand; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/structure_cs.cpp:66 -void +void RTCORBA::PriorityBand::_tao_any_destructor ( void *_tao_void_pointer ) { PriorityBand *_tao_tmp_pointer = - static_cast<PriorityBand *> (_tao_void_pointer); + ACE_static_cast (PriorityBand *, _tao_void_pointer); delete _tao_tmp_pointer; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_RTCORBA_PRIORITYBANDS_CS_) @@ -2913,7 +2915,7 @@ void RTCORBA::PriorityBands::_tao_any_destructor ( ) { PriorityBands * _tao_tmp_pointer = - static_cast<PriorityBands *> (_tao_void_pointer); + ACE_static_cast (PriorityBands *, _tao_void_pointer); delete _tao_tmp_pointer; } @@ -2926,20 +2928,20 @@ static const CORBA::Long _oc_RTCORBA_PriorityBands[] = { TAO_ENCAP_BYTE_ORDER, // byte order 38, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x5072696f), - ACE_NTOHL (0x72697479), - ACE_NTOHL (0x42616e64), - ACE_NTOHL (0x733a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x5072696f), + ACE_NTOHL (0x72697479), + ACE_NTOHL (0x42616e64), + ACE_NTOHL (0x733a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/RTCORBA/PriorityBands:1.0 14, - ACE_NTOHL (0x5072696f), - ACE_NTOHL (0x72697479), - ACE_NTOHL (0x42616e64), + ACE_NTOHL (0x5072696f), + ACE_NTOHL (0x72697479), + ACE_NTOHL (0x42616e64), ACE_NTOHL (0x73000000), // name = PriorityBands CORBA::tk_sequence, // typecode kind 252, // encapsulation length @@ -2948,20 +2950,20 @@ static const CORBA::Long _oc_RTCORBA_PriorityBands[] = 236, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 37, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x5072696f), - ACE_NTOHL (0x72697479), - ACE_NTOHL (0x42616e64), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x5072696f), + ACE_NTOHL (0x72697479), + ACE_NTOHL (0x42616e64), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/RTCORBA/PriorityBand:1.0 13, - ACE_NTOHL (0x5072696f), - ACE_NTOHL (0x72697479), - ACE_NTOHL (0x42616e64), + ACE_NTOHL (0x5072696f), + ACE_NTOHL (0x72697479), + ACE_NTOHL (0x42616e64), ACE_NTOHL (0x0), // name = PriorityBand 2, // member count 4, @@ -2970,41 +2972,41 @@ static const CORBA::Long _oc_RTCORBA_PriorityBands[] = 64, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 33, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x5072696f), - ACE_NTOHL (0x72697479), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x5072696f), + ACE_NTOHL (0x72697479), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/RTCORBA/Priority:1.0 9, - ACE_NTOHL (0x5072696f), - ACE_NTOHL (0x72697479), + ACE_NTOHL (0x5072696f), + ACE_NTOHL (0x72697479), ACE_NTOHL (0x0), // name = Priority CORBA::tk_short, 5, - ACE_NTOHL (0x68696768), + ACE_NTOHL (0x68696768), ACE_NTOHL (0x0), // name = high CORBA::tk_alias, // typecode kind for typedefs 64, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 33, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x5072696f), - ACE_NTOHL (0x72697479), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x5072696f), + ACE_NTOHL (0x72697479), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/RTCORBA/Priority:1.0 9, - ACE_NTOHL (0x5072696f), - ACE_NTOHL (0x72697479), + ACE_NTOHL (0x5072696f), + ACE_NTOHL (0x72697479), ACE_NTOHL (0x0), // name = Priority CORBA::tk_short, @@ -3035,7 +3037,7 @@ namespace RTCORBA ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::PriorityBandedConnectionPolicy_ptr -TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::duplicate ( +TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::tao_duplicate ( RTCORBA::PriorityBandedConnectionPolicy_ptr p ) { @@ -3044,7 +3046,7 @@ TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::release ( +TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::tao_release ( RTCORBA::PriorityBandedConnectionPolicy_ptr p ) { @@ -3053,14 +3055,14 @@ TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::PriorityBandedConnectionPolicy_ptr -TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::nil (void) +TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::tao_nil (void) { return RTCORBA::PriorityBandedConnectionPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::marshal ( +TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::tao_marshal ( RTCORBA::PriorityBandedConnectionPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -3069,7 +3071,7 @@ TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*RTCORBA__TAO_PriorityBandedConnectionPolicy_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -3080,11 +3082,11 @@ RTCORBA::PriorityBandedConnectionPolicy::PriorityBandedConnectionPolicy (void) RTCORBA::PriorityBandedConnectionPolicy::~PriorityBandedConnectionPolicy (void) {} -void +void RTCORBA::PriorityBandedConnectionPolicy::_tao_any_destructor (void *_tao_void_pointer) { PriorityBandedConnectionPolicy *_tao_tmp_pointer = - static_cast<PriorityBandedConnectionPolicy *> (_tao_void_pointer); + ACE_static_cast (PriorityBandedConnectionPolicy *, _tao_void_pointer); CORBA::release (_tao_tmp_pointer); } @@ -3098,10 +3100,10 @@ RTCORBA::PriorityBandedConnectionPolicy::_narrow ( { return PriorityBandedConnectionPolicy::_nil (); } - + PriorityBandedConnectionPolicy_ptr proxy = dynamic_cast<PriorityBandedConnectionPolicy_ptr> (_tao_objref); - + return PriorityBandedConnectionPolicy::_duplicate (proxy); } @@ -3115,10 +3117,10 @@ RTCORBA::PriorityBandedConnectionPolicy::_unchecked_narrow ( { return PriorityBandedConnectionPolicy::_nil (); } - + PriorityBandedConnectionPolicy_ptr proxy = dynamic_cast<PriorityBandedConnectionPolicy_ptr> (_tao_objref); - + return PriorityBandedConnectionPolicy::_duplicate (proxy); } @@ -3129,7 +3131,7 @@ RTCORBA::PriorityBandedConnectionPolicy::_duplicate (PriorityBandedConnectionPol { obj->_add_ref (); } - + return obj; } @@ -3184,28 +3186,28 @@ static const CORBA::Long _oc_RTCORBA_PriorityBandedConnectionPolicy[] = { TAO_ENCAP_BYTE_ORDER, // byte order 55, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x5072696f), - ACE_NTOHL (0x72697479), - ACE_NTOHL (0x42616e64), - ACE_NTOHL (0x6564436f), - ACE_NTOHL (0x6e6e6563), - ACE_NTOHL (0x74696f6e), - ACE_NTOHL (0x506f6c69), - ACE_NTOHL (0x63793a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x5072696f), + ACE_NTOHL (0x72697479), + ACE_NTOHL (0x42616e64), + ACE_NTOHL (0x6564436f), + ACE_NTOHL (0x6e6e6563), + ACE_NTOHL (0x74696f6e), + ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x63793a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/RTCORBA/PriorityBandedConnectionPolicy:1.0 31, - ACE_NTOHL (0x5072696f), - ACE_NTOHL (0x72697479), - ACE_NTOHL (0x42616e64), - ACE_NTOHL (0x6564436f), - ACE_NTOHL (0x6e6e6563), - ACE_NTOHL (0x74696f6e), - ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x5072696f), + ACE_NTOHL (0x72697479), + ACE_NTOHL (0x42616e64), + ACE_NTOHL (0x6564436f), + ACE_NTOHL (0x6e6e6563), + ACE_NTOHL (0x74696f6e), + ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63790000), // name = PriorityBandedConnectionPolicy }; @@ -3230,7 +3232,7 @@ namespace RTCORBA ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::Current_ptr -TAO::Objref_Traits<RTCORBA::Current>::duplicate ( +TAO::Objref_Traits<RTCORBA::Current>::tao_duplicate ( RTCORBA::Current_ptr p ) { @@ -3239,7 +3241,7 @@ TAO::Objref_Traits<RTCORBA::Current>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTCORBA::Current>::release ( +TAO::Objref_Traits<RTCORBA::Current>::tao_release ( RTCORBA::Current_ptr p ) { @@ -3248,14 +3250,14 @@ TAO::Objref_Traits<RTCORBA::Current>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::Current_ptr -TAO::Objref_Traits<RTCORBA::Current>::nil (void) +TAO::Objref_Traits<RTCORBA::Current>::tao_nil (void) { return RTCORBA::Current::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTCORBA::Current>::marshal ( +TAO::Objref_Traits<RTCORBA::Current>::tao_marshal ( RTCORBA::Current_ptr p, TAO_OutputCDR & cdr ) @@ -3264,7 +3266,7 @@ TAO::Objref_Traits<RTCORBA::Current>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*RTCORBA__TAO_Current_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -3275,11 +3277,11 @@ RTCORBA::Current::Current (void) RTCORBA::Current::~Current (void) {} -void +void RTCORBA::Current::_tao_any_destructor (void *_tao_void_pointer) { Current *_tao_tmp_pointer = - static_cast<Current *> (_tao_void_pointer); + ACE_static_cast (Current *, _tao_void_pointer); CORBA::release (_tao_tmp_pointer); } @@ -3293,10 +3295,10 @@ RTCORBA::Current::_narrow ( { return Current::_nil (); } - + Current_ptr proxy = dynamic_cast<Current_ptr> (_tao_objref); - + return Current::_duplicate (proxy); } @@ -3310,10 +3312,10 @@ RTCORBA::Current::_unchecked_narrow ( { return Current::_nil (); } - + Current_ptr proxy = dynamic_cast<Current_ptr> (_tao_objref); - + return Current::_duplicate (proxy); } @@ -3324,7 +3326,7 @@ RTCORBA::Current::_duplicate (Current_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -3379,16 +3381,16 @@ static const CORBA::Long _oc_RTCORBA_Current[] = { TAO_ENCAP_BYTE_ORDER, // byte order 32, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x43757272), - ACE_NTOHL (0x656e743a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x43757272), + ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/RTCORBA/Current:1.0 8, - ACE_NTOHL (0x43757272), + ACE_NTOHL (0x43757272), ACE_NTOHL (0x656e7400), // name = Current }; @@ -3413,7 +3415,7 @@ namespace RTCORBA ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::Mutex_ptr -TAO::Objref_Traits<RTCORBA::Mutex>::duplicate ( +TAO::Objref_Traits<RTCORBA::Mutex>::tao_duplicate ( RTCORBA::Mutex_ptr p ) { @@ -3422,7 +3424,7 @@ TAO::Objref_Traits<RTCORBA::Mutex>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTCORBA::Mutex>::release ( +TAO::Objref_Traits<RTCORBA::Mutex>::tao_release ( RTCORBA::Mutex_ptr p ) { @@ -3431,14 +3433,14 @@ TAO::Objref_Traits<RTCORBA::Mutex>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::Mutex_ptr -TAO::Objref_Traits<RTCORBA::Mutex>::nil (void) +TAO::Objref_Traits<RTCORBA::Mutex>::tao_nil (void) { return RTCORBA::Mutex::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTCORBA::Mutex>::marshal ( +TAO::Objref_Traits<RTCORBA::Mutex>::tao_marshal ( RTCORBA::Mutex_ptr p, TAO_OutputCDR & cdr ) @@ -3447,7 +3449,7 @@ TAO::Objref_Traits<RTCORBA::Mutex>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*RTCORBA__TAO_Mutex_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -3458,11 +3460,11 @@ RTCORBA::Mutex::Mutex (void) RTCORBA::Mutex::~Mutex (void) {} -void +void RTCORBA::Mutex::_tao_any_destructor (void *_tao_void_pointer) { Mutex *_tao_tmp_pointer = - static_cast<Mutex *> (_tao_void_pointer); + ACE_static_cast (Mutex *, _tao_void_pointer); CORBA::release (_tao_tmp_pointer); } @@ -3476,10 +3478,10 @@ RTCORBA::Mutex::_narrow ( { return Mutex::_nil (); } - + Mutex_ptr proxy = dynamic_cast<Mutex_ptr> (_tao_objref); - + return Mutex::_duplicate (proxy); } @@ -3493,10 +3495,10 @@ RTCORBA::Mutex::_unchecked_narrow ( { return Mutex::_nil (); } - + Mutex_ptr proxy = dynamic_cast<Mutex_ptr> (_tao_objref); - + return Mutex::_duplicate (proxy); } @@ -3507,7 +3509,7 @@ RTCORBA::Mutex::_duplicate (Mutex_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -3558,16 +3560,16 @@ static const CORBA::Long _oc_RTCORBA_Mutex[] = { TAO_ENCAP_BYTE_ORDER, // byte order 30, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x4d757465), - ACE_NTOHL (0x783a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x4d757465), + ACE_NTOHL (0x783a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/RTCORBA/Mutex:1.0 6, - ACE_NTOHL (0x4d757465), + ACE_NTOHL (0x4d757465), ACE_NTOHL (0x78000000), // name = Mutex }; @@ -3592,7 +3594,7 @@ namespace RTCORBA ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::RTORB_ptr -TAO::Objref_Traits<RTCORBA::RTORB>::duplicate ( +TAO::Objref_Traits<RTCORBA::RTORB>::tao_duplicate ( RTCORBA::RTORB_ptr p ) { @@ -3601,7 +3603,7 @@ TAO::Objref_Traits<RTCORBA::RTORB>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTCORBA::RTORB>::release ( +TAO::Objref_Traits<RTCORBA::RTORB>::tao_release ( RTCORBA::RTORB_ptr p ) { @@ -3610,14 +3612,14 @@ TAO::Objref_Traits<RTCORBA::RTORB>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::RTORB_ptr -TAO::Objref_Traits<RTCORBA::RTORB>::nil (void) +TAO::Objref_Traits<RTCORBA::RTORB>::tao_nil (void) { return RTCORBA::RTORB::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTCORBA::RTORB>::marshal ( +TAO::Objref_Traits<RTCORBA::RTORB>::tao_marshal ( RTCORBA::RTORB_ptr p, TAO_OutputCDR & cdr ) @@ -3626,12 +3628,12 @@ TAO::Objref_Traits<RTCORBA::RTORB>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*RTCORBA__TAO_RTORB_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 RTCORBA::RTORB::MutexNotFound::MutexNotFound (void) @@ -3664,7 +3666,7 @@ RTCORBA::RTORB::MutexNotFound::operator= (const ::RTCORBA::RTORB::MutexNotFound void RTCORBA::RTORB::MutexNotFound::_tao_any_destructor (void *_tao_void_pointer) { MutexNotFound *_tao_tmp_pointer = - static_cast<MutexNotFound*> (_tao_void_pointer); + ACE_static_cast (MutexNotFound*, _tao_void_pointer); delete _tao_tmp_pointer; } @@ -3673,7 +3675,7 @@ RTCORBA::RTORB::MutexNotFound::_downcast (CORBA::Exception *_tao_excp) { if (!ACE_OS::strcmp ("IDL:omg.org/RTCORBA/RTORB/MutexNotFound:1.0", _tao_excp->_rep_id ())) { - return dynamic_cast<MutexNotFound *> (_tao_excp); + return ACE_dynamic_cast (MutexNotFound *, _tao_excp); } else { @@ -3724,6 +3726,11 @@ void RTCORBA::RTORB::MutexNotFound::_tao_decode ( // TAO extension - the virtual _type method. CORBA::TypeCode_ptr RTCORBA::RTORB::MutexNotFound::_type (void) const { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("This TAO-specific method is now") + ACE_TEXT (" deprecated and will be removed") + ACE_TEXT (" in future versions.\n"))); + return ::RTCORBA::RTORB::_tc_MutexNotFound; } @@ -3734,21 +3741,21 @@ static const CORBA::Long _oc_RTCORBA_RTORB_MutexNotFound[] = { TAO_ENCAP_BYTE_ORDER, // byte order 44, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x52544f52), - ACE_NTOHL (0x422f4d75), - ACE_NTOHL (0x7465784e), - ACE_NTOHL (0x6f74466f), - ACE_NTOHL (0x756e643a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x52544f52), + ACE_NTOHL (0x422f4d75), + ACE_NTOHL (0x7465784e), + ACE_NTOHL (0x6f74466f), + ACE_NTOHL (0x756e643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/RTCORBA/RTORB/MutexNotFound:1.0 14, - ACE_NTOHL (0x4d757465), - ACE_NTOHL (0x784e6f74), - ACE_NTOHL (0x466f756e), + ACE_NTOHL (0x4d757465), + ACE_NTOHL (0x784e6f74), + ACE_NTOHL (0x466f756e), ACE_NTOHL (0x64000000), // name = MutexNotFound 0, // member count }; @@ -3764,7 +3771,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_RTORB_MutexNotFound ( ::CORBA::TypeCode_ptr RTCORBA::RTORB::_tc_MutexNotFound = &_tc_TAO_tc_RTCORBA_RTORB_MutexNotFound; -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 RTCORBA::RTORB::InvalidThreadpool::InvalidThreadpool (void) @@ -3797,7 +3804,7 @@ RTCORBA::RTORB::InvalidThreadpool::operator= (const ::RTCORBA::RTORB::InvalidThr void RTCORBA::RTORB::InvalidThreadpool::_tao_any_destructor (void *_tao_void_pointer) { InvalidThreadpool *_tao_tmp_pointer = - static_cast<InvalidThreadpool*> (_tao_void_pointer); + ACE_static_cast (InvalidThreadpool*, _tao_void_pointer); delete _tao_tmp_pointer; } @@ -3806,7 +3813,7 @@ RTCORBA::RTORB::InvalidThreadpool::_downcast (CORBA::Exception *_tao_excp) { if (!ACE_OS::strcmp ("IDL:omg.org/RTCORBA/RTORB/InvalidThreadpool:1.0", _tao_excp->_rep_id ())) { - return dynamic_cast<InvalidThreadpool *> (_tao_excp); + return ACE_dynamic_cast (InvalidThreadpool *, _tao_excp); } else { @@ -3857,6 +3864,11 @@ void RTCORBA::RTORB::InvalidThreadpool::_tao_decode ( // TAO extension - the virtual _type method. CORBA::TypeCode_ptr RTCORBA::RTORB::InvalidThreadpool::_type (void) const { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("This TAO-specific method is now") + ACE_TEXT (" deprecated and will be removed") + ACE_TEXT (" in future versions.\n"))); + return ::RTCORBA::RTORB::_tc_InvalidThreadpool; } @@ -3867,23 +3879,23 @@ static const CORBA::Long _oc_RTCORBA_RTORB_InvalidThreadpool[] = { TAO_ENCAP_BYTE_ORDER, // byte order 48, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x52544f52), - ACE_NTOHL (0x422f496e), - ACE_NTOHL (0x76616c69), - ACE_NTOHL (0x64546872), - ACE_NTOHL (0x65616470), - ACE_NTOHL (0x6f6f6c3a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x52544f52), + ACE_NTOHL (0x422f496e), + ACE_NTOHL (0x76616c69), + ACE_NTOHL (0x64546872), + ACE_NTOHL (0x65616470), + ACE_NTOHL (0x6f6f6c3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/RTCORBA/RTORB/InvalidThreadpool:1.0 18, - ACE_NTOHL (0x496e7661), - ACE_NTOHL (0x6c696454), - ACE_NTOHL (0x68726561), - ACE_NTOHL (0x64706f6f), + ACE_NTOHL (0x496e7661), + ACE_NTOHL (0x6c696454), + ACE_NTOHL (0x68726561), + ACE_NTOHL (0x64706f6f), ACE_NTOHL (0x6c000000), // name = InvalidThreadpool 0, // member count }; @@ -3905,11 +3917,11 @@ RTCORBA::RTORB::RTORB (void) RTCORBA::RTORB::~RTORB (void) {} -void +void RTCORBA::RTORB::_tao_any_destructor (void *_tao_void_pointer) { RTORB *_tao_tmp_pointer = - static_cast<RTORB *> (_tao_void_pointer); + ACE_static_cast (RTORB *, _tao_void_pointer); CORBA::release (_tao_tmp_pointer); } @@ -3923,10 +3935,10 @@ RTCORBA::RTORB::_narrow ( { return RTORB::_nil (); } - + RTORB_ptr proxy = dynamic_cast<RTORB_ptr> (_tao_objref); - + return RTORB::_duplicate (proxy); } @@ -3940,10 +3952,10 @@ RTCORBA::RTORB::_unchecked_narrow ( { return RTORB::_nil (); } - + RTORB_ptr proxy = dynamic_cast<RTORB_ptr> (_tao_objref); - + return RTORB::_duplicate (proxy); } @@ -3954,7 +3966,7 @@ RTCORBA::RTORB::_duplicate (RTORB_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -4005,16 +4017,16 @@ static const CORBA::Long _oc_RTCORBA_RTORB[] = { TAO_ENCAP_BYTE_ORDER, // byte order 30, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x5254434f), - ACE_NTOHL (0x5242412f), - ACE_NTOHL (0x52544f52), - ACE_NTOHL (0x423a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x5254434f), + ACE_NTOHL (0x5242412f), + ACE_NTOHL (0x52544f52), + ACE_NTOHL (0x423a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/RTCORBA/RTORB:1.0 6, - ACE_NTOHL (0x52544f52), + ACE_NTOHL (0x52544f52), ACE_NTOHL (0x42000000), // name = RTORB }; @@ -4032,7 +4044,7 @@ namespace RTCORBA &_tc_TAO_tc_RTCORBA_RTORB; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -4069,8 +4081,8 @@ CORBA::Boolean operator>>= ( RTCORBA::ThreadpoolLane *&_tao_elem ) { - return _tao_any >>= const_cast< - const RTCORBA::ThreadpoolLane *&> ( + return _tao_any >>= ACE_const_cast ( + const RTCORBA::ThreadpoolLane *&, _tao_elem ); } @@ -4090,7 +4102,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. @@ -4127,8 +4139,8 @@ CORBA::Boolean operator>>= ( RTCORBA::ThreadpoolLanes *&_tao_elem ) { - return _tao_any >>= const_cast< - const RTCORBA::ThreadpoolLanes *&> ( + return _tao_any >>= ACE_const_cast ( + const RTCORBA::ThreadpoolLanes *&, _tao_elem ); } @@ -4172,7 +4184,7 @@ CORBA::Boolean operator>>= ( TAO::Any_Basic_Impl_T<RTCORBA::PriorityModel>::extract ( _tao_any, RTCORBA::_tc_PriorityModel, - _tao_elem + _tao_elem ); } @@ -4383,7 +4395,7 @@ operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/any_op_cs.cpp:54 @@ -4434,8 +4446,8 @@ CORBA::Boolean operator>>= ( RTCORBA::Protocol *&_tao_elem ) { - return _tao_any >>= const_cast< - const RTCORBA::Protocol *&> ( + return _tao_any >>= ACE_const_cast ( + const RTCORBA::Protocol *&, _tao_elem ); } @@ -4455,7 +4467,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/any_op_cs.cpp:54 @@ -4506,8 +4518,8 @@ CORBA::Boolean operator>>= ( RTCORBA::ProtocolList *&_tao_elem ) { - return _tao_any >>= const_cast< - const RTCORBA::ProtocolList *&> ( + return _tao_any >>= ACE_const_cast ( + const RTCORBA::ProtocolList *&, _tao_elem ); } @@ -5010,7 +5022,7 @@ operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -5047,8 +5059,8 @@ CORBA::Boolean operator>>= ( RTCORBA::PriorityBand *&_tao_elem ) { - return _tao_any >>= const_cast< - const RTCORBA::PriorityBand *&> ( + return _tao_any >>= ACE_const_cast ( + const RTCORBA::PriorityBand *&, _tao_elem ); } @@ -5068,7 +5080,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. @@ -5105,8 +5117,8 @@ CORBA::Boolean operator>>= ( RTCORBA::PriorityBands *&_tao_elem ) { - return _tao_any >>= const_cast< - const RTCORBA::PriorityBands *&> ( + return _tao_any >>= ACE_const_cast ( + const RTCORBA::PriorityBands *&, _tao_elem ); } @@ -5402,7 +5414,7 @@ operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/any_op_cs.cpp:50 ACE_TEMPLATE_SPECIALIZATION @@ -5453,8 +5465,8 @@ CORBA::Boolean operator>>= ( RTCORBA::RTORB::MutexNotFound *&_tao_elem ) { - return _tao_any >>= const_cast< - const RTCORBA::RTORB::MutexNotFound *&> ( + return _tao_any >>= ACE_const_cast ( + const RTCORBA::RTORB::MutexNotFound *&, _tao_elem ); } @@ -5474,7 +5486,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/any_op_cs.cpp:50 ACE_TEMPLATE_SPECIALIZATION @@ -5525,8 +5537,8 @@ CORBA::Boolean operator>>= ( RTCORBA::RTORB::InvalidThreadpool *&_tao_elem ) { - return _tao_any >>= const_cast< - const RTCORBA::RTORB::InvalidThreadpool *&> ( + return _tao_any >>= ACE_const_cast ( + const RTCORBA::RTORB::InvalidThreadpool *&, _tao_elem ); } @@ -5582,21 +5594,21 @@ CORBA::Boolean operator<< ( const RTCORBA::ThreadpoolLanes &_tao_sequence ) { - const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - + CORBA::ULong _tao_seq_len = _tao_sequence.length (); + if (strm << _tao_seq_len) { // Encode all elements. CORBA::Boolean _tao_marshal_flag = 1; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = (strm << _tao_sequence[i]); } - + return _tao_marshal_flag; } - + return 0; } @@ -5606,7 +5618,7 @@ CORBA::Boolean operator>> ( ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -5616,28 +5628,28 @@ 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. CORBA::Boolean _tao_marshal_flag = 1; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = (strm >> _tao_sequence[i]); } - + return _tao_marshal_flag; - + } - + return 0; } @@ -5656,12 +5668,12 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, RTCORBA::PriorityModel &_tao_enum { CORBA::ULong _tao_temp = 0; CORBA::Boolean _tao_result = strm >> _tao_temp; - + if (_tao_result == 1) { - _tao_enumval = static_cast<RTCORBA::PriorityModel> (_tao_temp); + _tao_enumval = ACE_static_cast (RTCORBA::PriorityModel, _tao_temp); } - + return _tao_result; } @@ -5699,21 +5711,21 @@ CORBA::Boolean operator<< ( const RTCORBA::PriorityBands &_tao_sequence ) { - const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - + CORBA::ULong _tao_seq_len = _tao_sequence.length (); + if (strm << _tao_seq_len) { // Encode all elements. CORBA::Boolean _tao_marshal_flag = 1; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = (strm << _tao_sequence[i]); } - + return _tao_marshal_flag; } - + return 0; } @@ -5723,7 +5735,7 @@ CORBA::Boolean operator>> ( ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -5733,35 +5745,35 @@ 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. CORBA::Boolean _tao_marshal_flag = 1; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = (strm >> _tao_sequence[i]); } - + return _tao_marshal_flag; - + } - + return 0; } #endif /* _TAO_CDR_OP_RTCORBA_PriorityBands_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1628 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) @@ -5828,7 +5840,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< RTCORBA::PriorityModelPolicy >; - + template class TAO_Objref_Out_T< RTCORBA::PriorityModelPolicy @@ -5848,7 +5860,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< RTCORBA::ThreadpoolPolicy >; - + template class TAO_Objref_Out_T< RTCORBA::ThreadpoolPolicy @@ -5868,7 +5880,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< RTCORBA::ProtocolProperties >; - + template class TAO_Objref_Out_T< RTCORBA::ProtocolProperties @@ -5943,7 +5955,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< RTCORBA::ServerProtocolPolicy >; - + template class TAO_Objref_Out_T< RTCORBA::ServerProtocolPolicy @@ -5963,7 +5975,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< RTCORBA::ClientProtocolPolicy >; - + template class TAO_Objref_Out_T< RTCORBA::ClientProtocolPolicy @@ -5983,7 +5995,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< RTCORBA::PrivateConnectionPolicy >; - + template class TAO_Objref_Out_T< RTCORBA::PrivateConnectionPolicy @@ -6003,7 +6015,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< RTCORBA::TCPProtocolProperties >; - + template class TAO_Objref_Out_T< RTCORBA::TCPProtocolProperties @@ -6023,7 +6035,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< RTCORBA::GIOPProtocolProperties >; - + template class TAO_Objref_Out_T< RTCORBA::GIOPProtocolProperties @@ -6043,7 +6055,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< RTCORBA::UnixDomainProtocolProperties >; - + template class TAO_Objref_Out_T< RTCORBA::UnixDomainProtocolProperties @@ -6063,7 +6075,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< RTCORBA::SharedMemoryProtocolProperties >; - + template class TAO_Objref_Out_T< RTCORBA::SharedMemoryProtocolProperties @@ -6132,7 +6144,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< RTCORBA::PriorityBandedConnectionPolicy >; - + template class TAO_Objref_Out_T< RTCORBA::PriorityBandedConnectionPolicy @@ -6152,7 +6164,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< RTCORBA::Current >; - + template class TAO_Objref_Out_T< RTCORBA::Current @@ -6172,7 +6184,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< RTCORBA::Mutex >; - + template class TAO_Objref_Out_T< RTCORBA::Mutex @@ -6202,7 +6214,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< RTCORBA::RTORB >; - + template class TAO_Objref_Out_T< RTCORBA::RTORB @@ -6278,7 +6290,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ RTCORBA::PriorityModelPolicy > - + # pragma instantiate \ TAO_Objref_Out_T< \ RTCORBA::PriorityModelPolicy @@ -6298,7 +6310,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ RTCORBA::ThreadpoolPolicy > - + # pragma instantiate \ TAO_Objref_Out_T< \ RTCORBA::ThreadpoolPolicy @@ -6318,7 +6330,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ RTCORBA::ProtocolProperties > - + # pragma instantiate \ TAO_Objref_Out_T< \ RTCORBA::ProtocolProperties @@ -6393,7 +6405,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ RTCORBA::ServerProtocolPolicy > - + # pragma instantiate \ TAO_Objref_Out_T< \ RTCORBA::ServerProtocolPolicy @@ -6413,7 +6425,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ RTCORBA::ClientProtocolPolicy > - + # pragma instantiate \ TAO_Objref_Out_T< \ RTCORBA::ClientProtocolPolicy @@ -6433,7 +6445,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ RTCORBA::PrivateConnectionPolicy > - + # pragma instantiate \ TAO_Objref_Out_T< \ RTCORBA::PrivateConnectionPolicy @@ -6453,7 +6465,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ RTCORBA::TCPProtocolProperties > - + # pragma instantiate \ TAO_Objref_Out_T< \ RTCORBA::TCPProtocolProperties @@ -6473,7 +6485,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ RTCORBA::GIOPProtocolProperties > - + # pragma instantiate \ TAO_Objref_Out_T< \ RTCORBA::GIOPProtocolProperties @@ -6493,7 +6505,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ RTCORBA::UnixDomainProtocolProperties > - + # pragma instantiate \ TAO_Objref_Out_T< \ RTCORBA::UnixDomainProtocolProperties @@ -6513,7 +6525,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ RTCORBA::SharedMemoryProtocolProperties > - + # pragma instantiate \ TAO_Objref_Out_T< \ RTCORBA::SharedMemoryProtocolProperties @@ -6582,7 +6594,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ RTCORBA::PriorityBandedConnectionPolicy > - + # pragma instantiate \ TAO_Objref_Out_T< \ RTCORBA::PriorityBandedConnectionPolicy @@ -6602,7 +6614,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ RTCORBA::Current > - + # pragma instantiate \ TAO_Objref_Out_T< \ RTCORBA::Current @@ -6622,7 +6634,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ RTCORBA::Mutex > - + # pragma instantiate \ TAO_Objref_Out_T< \ RTCORBA::Mutex @@ -6652,7 +6664,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ RTCORBA::RTORB > - + # pragma instantiate \ TAO_Objref_Out_T< \ RTCORBA::RTORB @@ -6663,4 +6675,5 @@ CORBA::Boolean operator>> ( RTCORBA::RTORB \ > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/RTCORBA/RTCORBAC.h b/TAO/tao/RTCORBA/RTCORBAC.h index 35d04be0554..0b618c573a2 100644 --- a/TAO/tao/RTCORBA/RTCORBAC.h +++ b/TAO/tao/RTCORBA/RTCORBAC.h @@ -26,15 +26,14 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:153 +// be\be_codegen.cpp:171 #ifndef _TAO_IDL_ORIG_RTCORBAC_H_ #define _TAO_IDL_ORIG_RTCORBAC_H_ #include /**/ "ace/pre.h" - -#include "ace/config-all.h" +#include "tao/ORB.h" #ifndef TAO_RTCORBA_SAFE_INCLUDE #error "You should not include RTCORBAC.h directly, use RTCORBA.h" @@ -46,9 +45,8 @@ #include "rtcorba_export.h" #include "rtcorba_typedefs.h" -#include "tao/ORB.h" +#include "tao/Encodable.h" #include "tao/TimeBaseC.h" -#include "tao/SystemException.h" #include "tao/Environment.h" #include "tao/Object.h" #include "tao/Sequence_T.h" @@ -56,8 +54,6 @@ #include "tao/Seq_Var_T.h" #include "tao/Seq_Out_T.h" #include "tao/VarOut_T.h" -#include "tao/Encodable.h" -#include "tao/PolicyC.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -82,13 +78,13 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// 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; } @@ -98,109 +94,109 @@ namespace TAO namespace RTCORBA { - + // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:342 - + typedef CORBA::Short NativePriority; typedef CORBA::Short_out NativePriority_out; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NativePriority; - + // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:342 - + typedef CORBA::Short Priority; typedef CORBA::Short_out Priority_out; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Priority; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const RTCORBA::Priority minPriority = 0; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const RTCORBA::Priority maxPriority = 32767; - + // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:342 - + typedef CORBA::Long NetworkPriority; typedef CORBA::Long_out NetworkPriority_out; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NetworkPriority; - + // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:342 - + typedef CORBA::ULong ThreadpoolId; typedef CORBA::ULong_out ThreadpoolId_out; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadpoolId; - + // TAO_IDL - Generated from // be\be_type.cpp:258 - + struct ThreadpoolLane; - + typedef TAO_Fixed_Var_T< ThreadpoolLane > ThreadpoolLane_var; - + typedef ThreadpoolLane & ThreadpoolLane_out; - + // TAO_IDL - Generated from // be\be_visitor_structure/structure_ch.cpp:52 - + struct TAO_RTCORBA_Export ThreadpoolLane { typedef ThreadpoolLane_var _var_type; - + static void _tao_any_destructor (void *); RTCORBA::Priority lane_priority; CORBA::ULong static_threads; CORBA::ULong dynamic_threads; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadpoolLane; - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_RTCORBA_THREADPOOLLANES_CH_) #define _RTCORBA_THREADPOOLLANES_CH_ - + class ThreadpoolLanes; - + typedef TAO_FixedSeq_Var_T< ThreadpoolLanes, ThreadpoolLane > ThreadpoolLanes_var; - + typedef TAO_Seq_Out_T< ThreadpoolLanes, @@ -208,7 +204,7 @@ namespace RTCORBA ThreadpoolLane > ThreadpoolLanes_out; - + class TAO_RTCORBA_Export ThreadpoolLanes : public TAO_Unbounded_Sequence< @@ -221,60 +217,60 @@ namespace RTCORBA ThreadpoolLanes ( CORBA::ULong max, CORBA::ULong length, - ThreadpoolLane* buffer, + ThreadpoolLane* buffer, CORBA::Boolean release = 0 ); ThreadpoolLanes (const ThreadpoolLanes &); ~ThreadpoolLanes (void); - + static void _tao_any_destructor (void *); - + typedef ThreadpoolLanes_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadpoolLanes; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const CORBA::PolicyType PRIORITY_MODEL_POLICY_TYPE = 40U; - + // TAO_IDL - Generated from // be\be_visitor_enum/enum_ch.cpp:57 - + enum PriorityModel { CLIENT_PROPAGATED, SERVER_DECLARED }; - + typedef PriorityModel &PriorityModel_out; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityModel; - + // TAO_IDL - Generated from - // be\be_interface.cpp:601 + // be\be_interface.cpp:611 #if !defined (_RTCORBA_PRIORITYMODELPOLICY__VAR_OUT_CH_) #define _RTCORBA_PRIORITYMODELPOLICY__VAR_OUT_CH_ - + class PriorityModelPolicy; typedef PriorityModelPolicy *PriorityModelPolicy_ptr; - + typedef TAO_Objref_Var_T< PriorityModelPolicy > PriorityModelPolicy_var; - + typedef TAO_Objref_Out_T< PriorityModelPolicy @@ -282,131 +278,131 @@ namespace RTCORBA PriorityModelPolicy_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_RTCORBA_PRIORITYMODELPOLICY_CH_) #define _RTCORBA_PRIORITYMODELPOLICY_CH_ - + class TAO_RTCORBA_Export PriorityModelPolicy - : public virtual ::CORBA::Policy + : public virtual CORBA::Policy { public: typedef PriorityModelPolicy_ptr _ptr_type; typedef PriorityModelPolicy_var _var_type; - + // The static operations. static PriorityModelPolicy_ptr _duplicate (PriorityModelPolicy_ptr obj); - + static PriorityModelPolicy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static PriorityModelPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static PriorityModelPolicy_ptr _nil (void) { return (PriorityModelPolicy_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::RTCORBA::PriorityModel priority_model ( 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 RTCORBA::Priority server_priority ( 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 copy ( 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. PriorityModelPolicy (void); - + virtual ~PriorityModelPolicy (void); - + private: // Private and unimplemented for concrete interfaces. PriorityModelPolicy (const PriorityModelPolicy &); - + void operator= (const PriorityModelPolicy &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityModelPolicy; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const CORBA::PolicyType THREADPOOL_POLICY_TYPE = 41U; - + // TAO_IDL - Generated from - // be\be_interface.cpp:601 + // be\be_interface.cpp:611 #if !defined (_RTCORBA_THREADPOOLPOLICY__VAR_OUT_CH_) #define _RTCORBA_THREADPOOLPOLICY__VAR_OUT_CH_ - + class ThreadpoolPolicy; typedef ThreadpoolPolicy *ThreadpoolPolicy_ptr; - + typedef TAO_Objref_Var_T< ThreadpoolPolicy > ThreadpoolPolicy_var; - + typedef TAO_Objref_Out_T< ThreadpoolPolicy @@ -414,116 +410,116 @@ namespace RTCORBA ThreadpoolPolicy_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_RTCORBA_THREADPOOLPOLICY_CH_) #define _RTCORBA_THREADPOOLPOLICY_CH_ - + class TAO_RTCORBA_Export ThreadpoolPolicy - : public virtual ::CORBA::Policy + : public virtual CORBA::Policy { public: typedef ThreadpoolPolicy_ptr _ptr_type; typedef ThreadpoolPolicy_var _var_type; - + // The static operations. static ThreadpoolPolicy_ptr _duplicate (ThreadpoolPolicy_ptr obj); - + static ThreadpoolPolicy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ThreadpoolPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ThreadpoolPolicy_ptr _nil (void) { return (ThreadpoolPolicy_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual RTCORBA::ThreadpoolId threadpool ( 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 copy ( 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. ThreadpoolPolicy (void); - + virtual ~ThreadpoolPolicy (void); - + private: // Private and unimplemented for concrete interfaces. ThreadpoolPolicy (const ThreadpoolPolicy &); - + void operator= (const ThreadpoolPolicy &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadpoolPolicy; - + // TAO_IDL - Generated from - // be\be_interface.cpp:601 + // be\be_interface.cpp:611 #if !defined (_RTCORBA_PROTOCOLPROPERTIES__VAR_OUT_CH_) #define _RTCORBA_PROTOCOLPROPERTIES__VAR_OUT_CH_ - + class ProtocolProperties; typedef ProtocolProperties *ProtocolProperties_ptr; - + typedef TAO_Objref_Var_T< ProtocolProperties > ProtocolProperties_var; - + typedef TAO_Objref_Out_T< ProtocolProperties @@ -531,13 +527,13 @@ namespace RTCORBA ProtocolProperties_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_RTCORBA_PROTOCOLPROPERTIES_CH_) #define _RTCORBA_PROTOCOLPROPERTIES_CH_ - + class TAO_RTCORBA_Export ProtocolProperties : public virtual CORBA::Object , public virtual TAO_Encodable @@ -545,112 +541,112 @@ namespace RTCORBA public: typedef ProtocolProperties_ptr _ptr_type; typedef ProtocolProperties_var _var_type; - + // The static operations. static ProtocolProperties_ptr _duplicate (ProtocolProperties_ptr obj); - + static ProtocolProperties_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ProtocolProperties_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ProtocolProperties_ptr _nil (void) { return (ProtocolProperties_ptr)0; } - + static void _tao_any_destructor (void *); - + // 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); - + // CDR Encoder/Decoder methods. (handcrafted) virtual CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr); virtual CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr); protected: // Abstract or local interface only. ProtocolProperties (void); - + virtual ~ProtocolProperties (void); - + private: // Private and unimplemented for concrete interfaces. ProtocolProperties (const ProtocolProperties &); - + void operator= (const ProtocolProperties &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ProtocolProperties; - + // TAO_IDL - Generated from // be\be_type.cpp:258 - + struct Protocol; - + typedef TAO_Var_Var_T< Protocol > Protocol_var; - + typedef TAO_Out_T< Protocol, Protocol_var > Protocol_out; - + // TAO_IDL - Generated from // be\be_visitor_structure/structure_ch.cpp:52 - + struct TAO_RTCORBA_Export Protocol { typedef Protocol_var _var_type; - + static void _tao_any_destructor (void *); IOP::ProfileId protocol_type; RTCORBA::ProtocolProperties_var orb_protocol_properties; RTCORBA::ProtocolProperties_var transport_protocol_properties; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Protocol; - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_RTCORBA_PROTOCOLLIST_CH_) #define _RTCORBA_PROTOCOLLIST_CH_ - + class ProtocolList; - + typedef TAO_VarSeq_Var_T< ProtocolList, Protocol > ProtocolList_var; - + typedef TAO_Seq_Out_T< ProtocolList, @@ -658,7 +654,7 @@ namespace RTCORBA Protocol > ProtocolList_out; - + class TAO_RTCORBA_Export ProtocolList : public TAO_Unbounded_Sequence< @@ -671,44 +667,44 @@ namespace RTCORBA ProtocolList ( CORBA::ULong max, CORBA::ULong length, - Protocol* buffer, + Protocol* buffer, CORBA::Boolean release = 0 ); ProtocolList (const ProtocolList &); ~ProtocolList (void); - + static void _tao_any_destructor (void *); - + typedef ProtocolList_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ProtocolList; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const CORBA::PolicyType SERVER_PROTOCOL_POLICY_TYPE = 42U; - + // TAO_IDL - Generated from - // be\be_interface.cpp:601 + // be\be_interface.cpp:611 #if !defined (_RTCORBA_SERVERPROTOCOLPOLICY__VAR_OUT_CH_) #define _RTCORBA_SERVERPROTOCOLPOLICY__VAR_OUT_CH_ - + class ServerProtocolPolicy; typedef ServerProtocolPolicy *ServerProtocolPolicy_ptr; - + typedef TAO_Objref_Var_T< ServerProtocolPolicy > ServerProtocolPolicy_var; - + typedef TAO_Objref_Out_T< ServerProtocolPolicy @@ -716,121 +712,121 @@ namespace RTCORBA ServerProtocolPolicy_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_RTCORBA_SERVERPROTOCOLPOLICY_CH_) #define _RTCORBA_SERVERPROTOCOLPOLICY_CH_ - + class TAO_RTCORBA_Export ServerProtocolPolicy - : public virtual ::CORBA::Policy + : public virtual CORBA::Policy { public: typedef ServerProtocolPolicy_ptr _ptr_type; typedef ServerProtocolPolicy_var _var_type; - + // The static operations. static ServerProtocolPolicy_ptr _duplicate (ServerProtocolPolicy_ptr obj); - + static ServerProtocolPolicy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ServerProtocolPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ServerProtocolPolicy_ptr _nil (void) { return (ServerProtocolPolicy_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::RTCORBA::ProtocolList * protocols ( 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 copy ( 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. ServerProtocolPolicy (void); - + virtual ~ServerProtocolPolicy (void); - + private: // Private and unimplemented for concrete interfaces. ServerProtocolPolicy (const ServerProtocolPolicy &); - + void operator= (const ServerProtocolPolicy &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerProtocolPolicy; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const CORBA::PolicyType CLIENT_PROTOCOL_POLICY_TYPE = 43U; - + // TAO_IDL - Generated from - // be\be_interface.cpp:601 + // be\be_interface.cpp:611 #if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY__VAR_OUT_CH_) #define _RTCORBA_CLIENTPROTOCOLPOLICY__VAR_OUT_CH_ - + class ClientProtocolPolicy; typedef ClientProtocolPolicy *ClientProtocolPolicy_ptr; - + typedef TAO_Objref_Var_T< ClientProtocolPolicy > ClientProtocolPolicy_var; - + typedef TAO_Objref_Out_T< ClientProtocolPolicy @@ -838,121 +834,121 @@ namespace RTCORBA ClientProtocolPolicy_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY_CH_) #define _RTCORBA_CLIENTPROTOCOLPOLICY_CH_ - + class TAO_RTCORBA_Export ClientProtocolPolicy - : public virtual ::CORBA::Policy + : public virtual CORBA::Policy { public: typedef ClientProtocolPolicy_ptr _ptr_type; typedef ClientProtocolPolicy_var _var_type; - + // The static operations. static ClientProtocolPolicy_ptr _duplicate (ClientProtocolPolicy_ptr obj); - + static ClientProtocolPolicy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ClientProtocolPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ClientProtocolPolicy_ptr _nil (void) { return (ClientProtocolPolicy_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::RTCORBA::ProtocolList * protocols ( 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 copy ( 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. ClientProtocolPolicy (void); - + virtual ~ClientProtocolPolicy (void); - + private: // Private and unimplemented for concrete interfaces. ClientProtocolPolicy (const ClientProtocolPolicy &); - + void operator= (const ClientProtocolPolicy &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ClientProtocolPolicy; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const CORBA::PolicyType PRIVATE_CONNECTION_POLICY_TYPE = 44U; - + // TAO_IDL - Generated from - // be\be_interface.cpp:601 + // be\be_interface.cpp:611 #if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY__VAR_OUT_CH_) #define _RTCORBA_PRIVATECONNECTIONPOLICY__VAR_OUT_CH_ - + class PrivateConnectionPolicy; typedef PrivateConnectionPolicy *PrivateConnectionPolicy_ptr; - + typedef TAO_Objref_Var_T< PrivateConnectionPolicy > PrivateConnectionPolicy_var; - + typedef TAO_Objref_Out_T< PrivateConnectionPolicy @@ -960,81 +956,81 @@ namespace RTCORBA PrivateConnectionPolicy_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY_CH_) #define _RTCORBA_PRIVATECONNECTIONPOLICY_CH_ - + class TAO_RTCORBA_Export PrivateConnectionPolicy - : public virtual ::CORBA::Policy + : public virtual CORBA::Policy { public: typedef PrivateConnectionPolicy_ptr _ptr_type; typedef PrivateConnectionPolicy_var _var_type; - + // The static operations. static PrivateConnectionPolicy_ptr _duplicate (PrivateConnectionPolicy_ptr obj); - + static PrivateConnectionPolicy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static PrivateConnectionPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static PrivateConnectionPolicy_ptr _nil (void) { return (PrivateConnectionPolicy_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::Policy_ptr copy ( 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. PrivateConnectionPolicy (void); - + virtual ~PrivateConnectionPolicy (void); - + private: // Private and unimplemented for concrete interfaces. PrivateConnectionPolicy (const PrivateConnectionPolicy &); - + void operator= (const PrivateConnectionPolicy &); }; @@ -1046,7 +1042,7 @@ namespace RTCORBA TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PrivateConnectionPolicy; // TAO_IDL - Generated from - // be\be_interface.cpp:601 + // be\be_interface.cpp:611 #if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES__VAR_OUT_CH_) #define _RTCORBA_TCPPROTOCOLPROPERTIES__VAR_OUT_CH_ @@ -1075,7 +1071,7 @@ namespace RTCORBA #define _RTCORBA_TCPPROTOCOLPROPERTIES_CH_ class TAO_RTCORBA_Export TCPProtocolProperties - : public virtual ::RTCORBA::ProtocolProperties + : public virtual RTCORBA::ProtocolProperties { public: typedef TCPProtocolProperties_ptr _ptr_type; @@ -1115,7 +1111,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual void send_buffer_size ( - ::CORBA::Long send_buffer_size + CORBA::Long send_buffer_size ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -1136,7 +1132,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual void recv_buffer_size ( - ::CORBA::Long recv_buffer_size + CORBA::Long recv_buffer_size ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -1157,7 +1153,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual void keep_alive ( - ::CORBA::Boolean keep_alive + CORBA::Boolean keep_alive ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -1178,7 +1174,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual void dont_route ( - ::CORBA::Boolean dont_route + CORBA::Boolean dont_route ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -1199,7 +1195,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual void no_delay ( - ::CORBA::Boolean no_delay + CORBA::Boolean no_delay ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -1220,7 +1216,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual void enable_network_priority ( - ::CORBA::Boolean enable_network_priority + CORBA::Boolean enable_network_priority ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -1259,7 +1255,7 @@ namespace RTCORBA TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TCPProtocolProperties; // TAO_IDL - Generated from - // be\be_interface.cpp:601 + // be\be_interface.cpp:611 #if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES__VAR_OUT_CH_) #define _RTCORBA_GIOPPROTOCOLPROPERTIES__VAR_OUT_CH_ @@ -1288,7 +1284,7 @@ namespace RTCORBA #define _RTCORBA_GIOPPROTOCOLPROPERTIES_CH_ class TAO_RTCORBA_Export GIOPProtocolProperties - : public virtual ::RTCORBA::ProtocolProperties + : public virtual RTCORBA::ProtocolProperties { public: typedef GIOPProtocolProperties_ptr _ptr_type; @@ -1346,7 +1342,7 @@ namespace RTCORBA TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_GIOPProtocolProperties; // TAO_IDL - Generated from - // be\be_interface.cpp:601 + // be\be_interface.cpp:611 #if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES__VAR_OUT_CH_) #define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES__VAR_OUT_CH_ @@ -1375,7 +1371,7 @@ namespace RTCORBA #define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES_CH_ class TAO_RTCORBA_Export UnixDomainProtocolProperties - : public virtual ::RTCORBA::ProtocolProperties + : public virtual RTCORBA::ProtocolProperties { public: typedef UnixDomainProtocolProperties_ptr _ptr_type; @@ -1415,7 +1411,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual void send_buffer_size ( - ::CORBA::Long send_buffer_size + CORBA::Long send_buffer_size ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -1436,7 +1432,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual void recv_buffer_size ( - ::CORBA::Long recv_buffer_size + CORBA::Long recv_buffer_size ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -1475,7 +1471,7 @@ namespace RTCORBA TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UnixDomainProtocolProperties; // TAO_IDL - Generated from - // be\be_interface.cpp:601 + // be\be_interface.cpp:611 #if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES__VAR_OUT_CH_) #define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES__VAR_OUT_CH_ @@ -1504,7 +1500,7 @@ namespace RTCORBA #define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES_CH_ class TAO_RTCORBA_Export SharedMemoryProtocolProperties - : public virtual ::RTCORBA::ProtocolProperties + : public virtual RTCORBA::ProtocolProperties { public: typedef SharedMemoryProtocolProperties_ptr _ptr_type; @@ -1544,7 +1540,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual void preallocate_buffer_size ( - ::CORBA::Long preallocate_buffer_size + CORBA::Long preallocate_buffer_size ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -1715,7 +1711,7 @@ namespace RTCORBA const CORBA::PolicyType PRIORITY_BANDED_CONNECTION_POLICY_TYPE = 45U; // TAO_IDL - Generated from - // be\be_interface.cpp:601 + // be\be_interface.cpp:611 #if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__VAR_OUT_CH_) #define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__VAR_OUT_CH_ @@ -1744,7 +1740,7 @@ namespace RTCORBA #define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY_CH_ class TAO_RTCORBA_Export PriorityBandedConnectionPolicy - : public virtual ::CORBA::Policy + : public virtual CORBA::Policy { public: typedef PriorityBandedConnectionPolicy_ptr _ptr_type; @@ -1832,7 +1828,7 @@ namespace RTCORBA TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityBandedConnectionPolicy; // TAO_IDL - Generated from - // be\be_interface.cpp:601 + // be\be_interface.cpp:611 #if !defined (_RTCORBA_CURRENT__VAR_OUT_CH_) #define _RTCORBA_CURRENT__VAR_OUT_CH_ @@ -1861,7 +1857,7 @@ namespace RTCORBA #define _RTCORBA_CURRENT_CH_ class TAO_RTCORBA_Export Current - : public virtual ::CORBA::Current + : public virtual CORBA::Current { public: typedef Current_ptr _ptr_type; @@ -1901,7 +1897,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual void the_priority ( - ::RTCORBA::Priority the_priority + RTCORBA::Priority the_priority ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -1940,7 +1936,7 @@ namespace RTCORBA TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current; // TAO_IDL - Generated from - // be\be_interface.cpp:601 + // be\be_interface.cpp:611 #if !defined (_RTCORBA_MUTEX__VAR_OUT_CH_) #define _RTCORBA_MUTEX__VAR_OUT_CH_ @@ -2019,7 +2015,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Boolean try_lock ( - ::TimeBase::TimeT max_wait + TimeBase::TimeT max_wait ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -2058,7 +2054,7 @@ namespace RTCORBA TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Mutex; // TAO_IDL - Generated from - // be\be_interface.cpp:601 + // be\be_interface.cpp:611 #if !defined (_RTCORBA_RTORB__VAR_OUT_CH_) #define _RTCORBA_RTORB__VAR_OUT_CH_ @@ -2127,7 +2123,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual void destroy_mutex ( - ::RTCORBA::Mutex_ptr the_mutex + RTCORBA::Mutex_ptr the_mutex ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -2187,7 +2183,7 @@ namespace RTCORBA virtual ::RTCORBA::Mutex_ptr create_named_mutex ( const char * name, - ::CORBA::Boolean_out created_flag + CORBA::Boolean_out created_flag ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -2202,20 +2198,20 @@ namespace RTCORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - ::RTCORBA::RTORB::MutexNotFound + CORBA::SystemException + , RTCORBA::RTORB::MutexNotFound )) = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 virtual ::RTCORBA::TCPProtocolProperties_ptr create_tcp_protocol_properties ( - ::CORBA::Long send_buffer_size, - ::CORBA::Long recv_buffer_size, - ::CORBA::Boolean keep_alive, - ::CORBA::Boolean dont_route, - ::CORBA::Boolean no_delay, - ::CORBA::Boolean enable_network_priority + CORBA::Long send_buffer_size, + CORBA::Long recv_buffer_size, + CORBA::Boolean keep_alive, + CORBA::Boolean dont_route, + CORBA::Boolean no_delay, + CORBA::Boolean enable_network_priority ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -2274,13 +2270,13 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual RTCORBA::ThreadpoolId create_threadpool ( - ::CORBA::ULong stacksize, - ::CORBA::ULong static_threads, - ::CORBA::ULong dynamic_threads, - ::RTCORBA::Priority default_priority, - ::CORBA::Boolean allow_request_buffering, - ::CORBA::ULong max_buffered_requests, - ::CORBA::ULong max_request_buffer_size + CORBA::ULong stacksize, + CORBA::ULong static_threads, + CORBA::ULong dynamic_threads, + RTCORBA::Priority default_priority, + CORBA::Boolean allow_request_buffering, + CORBA::ULong max_buffered_requests, + CORBA::ULong max_request_buffer_size ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -2291,12 +2287,12 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual RTCORBA::ThreadpoolId create_threadpool_with_lanes ( - ::CORBA::ULong stacksize, - const ::RTCORBA::ThreadpoolLanes & lanes, - ::CORBA::Boolean allow_borrowing, - ::CORBA::Boolean allow_request_buffering, - ::CORBA::ULong max_buffered_requests, - ::CORBA::ULong max_request_buffer_size + CORBA::ULong stacksize, + const RTCORBA::ThreadpoolLanes & lanes, + CORBA::Boolean allow_borrowing, + CORBA::Boolean allow_request_buffering, + CORBA::ULong max_buffered_requests, + CORBA::ULong max_request_buffer_size ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -2307,20 +2303,20 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual void destroy_threadpool ( - ::RTCORBA::ThreadpoolId threadpool + RTCORBA::ThreadpoolId threadpool ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - CORBA::SystemException, - ::RTCORBA::RTORB::InvalidThreadpool + CORBA::SystemException + , RTCORBA::RTORB::InvalidThreadpool )) = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 virtual ::RTCORBA::PriorityModelPolicy_ptr create_priority_model_policy ( - ::RTCORBA::PriorityModel priority_model, - ::RTCORBA::Priority server_priority + RTCORBA::PriorityModel priority_model, + RTCORBA::Priority server_priority ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -2331,7 +2327,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual ::RTCORBA::ThreadpoolPolicy_ptr create_threadpool_policy ( - ::RTCORBA::ThreadpoolId threadpool + RTCORBA::ThreadpoolId threadpool ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -2342,7 +2338,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual ::RTCORBA::PriorityBandedConnectionPolicy_ptr create_priority_banded_connection_policy ( - const ::RTCORBA::PriorityBands & priority_bands + const RTCORBA::PriorityBands & priority_bands ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -2353,7 +2349,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual ::RTCORBA::ServerProtocolPolicy_ptr create_server_protocol_policy ( - const ::RTCORBA::ProtocolList & protocols + const RTCORBA::ProtocolList & protocols ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -2364,7 +2360,7 @@ namespace RTCORBA // be\be_visitor_operation/operation_ch.cpp:46 virtual ::RTCORBA::ClientProtocolPolicy_ptr create_client_protocol_policy ( - const ::RTCORBA::ProtocolList & protocols + const RTCORBA::ProtocolList & protocols ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( @@ -2428,17 +2424,17 @@ namespace TAO #define _RTCORBA_PRIORITYMODELPOLICY__TRAITS_CH_ ACE_TEMPLATE_SPECIALIZATION - struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::PriorityModelPolicy> + struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::PriorityModelPolicy> { - static ::RTCORBA::PriorityModelPolicy_ptr duplicate ( - ::RTCORBA::PriorityModelPolicy_ptr + static RTCORBA::PriorityModelPolicy_ptr tao_duplicate ( + RTCORBA::PriorityModelPolicy_ptr ); - static void release ( - ::RTCORBA::PriorityModelPolicy_ptr + static void tao_release ( + RTCORBA::PriorityModelPolicy_ptr ); - static ::RTCORBA::PriorityModelPolicy_ptr nil (void); - static CORBA::Boolean marshal ( - ::RTCORBA::PriorityModelPolicy_ptr p, + static RTCORBA::PriorityModelPolicy_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( + RTCORBA::PriorityModelPolicy_ptr p, TAO_OutputCDR & cdr ); }; @@ -2449,17 +2445,17 @@ namespace TAO #define _RTCORBA_THREADPOOLPOLICY__TRAITS_CH_ ACE_TEMPLATE_SPECIALIZATION - struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::ThreadpoolPolicy> + struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::ThreadpoolPolicy> { - static ::RTCORBA::ThreadpoolPolicy_ptr duplicate ( - ::RTCORBA::ThreadpoolPolicy_ptr + static RTCORBA::ThreadpoolPolicy_ptr tao_duplicate ( + RTCORBA::ThreadpoolPolicy_ptr ); - static void release ( - ::RTCORBA::ThreadpoolPolicy_ptr + static void tao_release ( + RTCORBA::ThreadpoolPolicy_ptr ); - static ::RTCORBA::ThreadpoolPolicy_ptr nil (void); - static CORBA::Boolean marshal ( - ::RTCORBA::ThreadpoolPolicy_ptr p, + static RTCORBA::ThreadpoolPolicy_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( + RTCORBA::ThreadpoolPolicy_ptr p, TAO_OutputCDR & cdr ); }; @@ -2470,17 +2466,17 @@ namespace TAO #define _RTCORBA_PROTOCOLPROPERTIES__TRAITS_CH_ ACE_TEMPLATE_SPECIALIZATION - struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::ProtocolProperties> + struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::ProtocolProperties> { - static ::RTCORBA::ProtocolProperties_ptr duplicate ( - ::RTCORBA::ProtocolProperties_ptr + static RTCORBA::ProtocolProperties_ptr tao_duplicate ( + RTCORBA::ProtocolProperties_ptr ); - static void release ( - ::RTCORBA::ProtocolProperties_ptr + static void tao_release ( + RTCORBA::ProtocolProperties_ptr ); - static ::RTCORBA::ProtocolProperties_ptr nil (void); - static CORBA::Boolean marshal ( - ::RTCORBA::ProtocolProperties_ptr p, + static RTCORBA::ProtocolProperties_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( + RTCORBA::ProtocolProperties_ptr p, TAO_OutputCDR & cdr ); }; @@ -2491,17 +2487,17 @@ namespace TAO #define _RTCORBA_SERVERPROTOCOLPOLICY__TRAITS_CH_ ACE_TEMPLATE_SPECIALIZATION - struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::ServerProtocolPolicy> + struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::ServerProtocolPolicy> { - static ::RTCORBA::ServerProtocolPolicy_ptr duplicate ( - ::RTCORBA::ServerProtocolPolicy_ptr + static RTCORBA::ServerProtocolPolicy_ptr tao_duplicate ( + RTCORBA::ServerProtocolPolicy_ptr ); - static void release ( - ::RTCORBA::ServerProtocolPolicy_ptr + static void tao_release ( + RTCORBA::ServerProtocolPolicy_ptr ); - static ::RTCORBA::ServerProtocolPolicy_ptr nil (void); - static CORBA::Boolean marshal ( - ::RTCORBA::ServerProtocolPolicy_ptr p, + static RTCORBA::ServerProtocolPolicy_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( + RTCORBA::ServerProtocolPolicy_ptr p, TAO_OutputCDR & cdr ); }; @@ -2512,17 +2508,17 @@ namespace TAO #define _RTCORBA_CLIENTPROTOCOLPOLICY__TRAITS_CH_ ACE_TEMPLATE_SPECIALIZATION - struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::ClientProtocolPolicy> + struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::ClientProtocolPolicy> { - static ::RTCORBA::ClientProtocolPolicy_ptr duplicate ( - ::RTCORBA::ClientProtocolPolicy_ptr + static RTCORBA::ClientProtocolPolicy_ptr tao_duplicate ( + RTCORBA::ClientProtocolPolicy_ptr ); - static void release ( - ::RTCORBA::ClientProtocolPolicy_ptr + static void tao_release ( + RTCORBA::ClientProtocolPolicy_ptr ); - static ::RTCORBA::ClientProtocolPolicy_ptr nil (void); - static CORBA::Boolean marshal ( - ::RTCORBA::ClientProtocolPolicy_ptr p, + static RTCORBA::ClientProtocolPolicy_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( + RTCORBA::ClientProtocolPolicy_ptr p, TAO_OutputCDR & cdr ); }; @@ -2533,17 +2529,17 @@ namespace TAO #define _RTCORBA_PRIVATECONNECTIONPOLICY__TRAITS_CH_ ACE_TEMPLATE_SPECIALIZATION - struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::PrivateConnectionPolicy> + struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::PrivateConnectionPolicy> { - static ::RTCORBA::PrivateConnectionPolicy_ptr duplicate ( - ::RTCORBA::PrivateConnectionPolicy_ptr + static RTCORBA::PrivateConnectionPolicy_ptr tao_duplicate ( + RTCORBA::PrivateConnectionPolicy_ptr ); - static void release ( - ::RTCORBA::PrivateConnectionPolicy_ptr + static void tao_release ( + RTCORBA::PrivateConnectionPolicy_ptr ); - static ::RTCORBA::PrivateConnectionPolicy_ptr nil (void); - static CORBA::Boolean marshal ( - ::RTCORBA::PrivateConnectionPolicy_ptr p, + static RTCORBA::PrivateConnectionPolicy_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( + RTCORBA::PrivateConnectionPolicy_ptr p, TAO_OutputCDR & cdr ); }; @@ -2554,17 +2550,17 @@ namespace TAO #define _RTCORBA_TCPPROTOCOLPROPERTIES__TRAITS_CH_ ACE_TEMPLATE_SPECIALIZATION - struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::TCPProtocolProperties> + struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::TCPProtocolProperties> { - static ::RTCORBA::TCPProtocolProperties_ptr duplicate ( - ::RTCORBA::TCPProtocolProperties_ptr + static RTCORBA::TCPProtocolProperties_ptr tao_duplicate ( + RTCORBA::TCPProtocolProperties_ptr ); - static void release ( - ::RTCORBA::TCPProtocolProperties_ptr + static void tao_release ( + RTCORBA::TCPProtocolProperties_ptr ); - static ::RTCORBA::TCPProtocolProperties_ptr nil (void); - static CORBA::Boolean marshal ( - ::RTCORBA::TCPProtocolProperties_ptr p, + static RTCORBA::TCPProtocolProperties_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( + RTCORBA::TCPProtocolProperties_ptr p, TAO_OutputCDR & cdr ); }; @@ -2575,17 +2571,17 @@ namespace TAO #define _RTCORBA_GIOPPROTOCOLPROPERTIES__TRAITS_CH_ ACE_TEMPLATE_SPECIALIZATION - struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::GIOPProtocolProperties> + struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::GIOPProtocolProperties> { - static ::RTCORBA::GIOPProtocolProperties_ptr duplicate ( - ::RTCORBA::GIOPProtocolProperties_ptr + static RTCORBA::GIOPProtocolProperties_ptr tao_duplicate ( + RTCORBA::GIOPProtocolProperties_ptr ); - static void release ( - ::RTCORBA::GIOPProtocolProperties_ptr + static void tao_release ( + RTCORBA::GIOPProtocolProperties_ptr ); - static ::RTCORBA::GIOPProtocolProperties_ptr nil (void); - static CORBA::Boolean marshal ( - ::RTCORBA::GIOPProtocolProperties_ptr p, + static RTCORBA::GIOPProtocolProperties_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( + RTCORBA::GIOPProtocolProperties_ptr p, TAO_OutputCDR & cdr ); }; @@ -2596,17 +2592,17 @@ namespace TAO #define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES__TRAITS_CH_ ACE_TEMPLATE_SPECIALIZATION - struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::UnixDomainProtocolProperties> + struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::UnixDomainProtocolProperties> { - static ::RTCORBA::UnixDomainProtocolProperties_ptr duplicate ( - ::RTCORBA::UnixDomainProtocolProperties_ptr + static RTCORBA::UnixDomainProtocolProperties_ptr tao_duplicate ( + RTCORBA::UnixDomainProtocolProperties_ptr ); - static void release ( - ::RTCORBA::UnixDomainProtocolProperties_ptr + static void tao_release ( + RTCORBA::UnixDomainProtocolProperties_ptr ); - static ::RTCORBA::UnixDomainProtocolProperties_ptr nil (void); - static CORBA::Boolean marshal ( - ::RTCORBA::UnixDomainProtocolProperties_ptr p, + static RTCORBA::UnixDomainProtocolProperties_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( + RTCORBA::UnixDomainProtocolProperties_ptr p, TAO_OutputCDR & cdr ); }; @@ -2617,17 +2613,17 @@ namespace TAO #define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES__TRAITS_CH_ ACE_TEMPLATE_SPECIALIZATION - struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::SharedMemoryProtocolProperties> + struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::SharedMemoryProtocolProperties> { - static ::RTCORBA::SharedMemoryProtocolProperties_ptr duplicate ( - ::RTCORBA::SharedMemoryProtocolProperties_ptr + static RTCORBA::SharedMemoryProtocolProperties_ptr tao_duplicate ( + RTCORBA::SharedMemoryProtocolProperties_ptr ); - static void release ( - ::RTCORBA::SharedMemoryProtocolProperties_ptr + static void tao_release ( + RTCORBA::SharedMemoryProtocolProperties_ptr ); - static ::RTCORBA::SharedMemoryProtocolProperties_ptr nil (void); - static CORBA::Boolean marshal ( - ::RTCORBA::SharedMemoryProtocolProperties_ptr p, + static RTCORBA::SharedMemoryProtocolProperties_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( + RTCORBA::SharedMemoryProtocolProperties_ptr p, TAO_OutputCDR & cdr ); }; @@ -2638,17 +2634,17 @@ namespace TAO #define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__TRAITS_CH_ ACE_TEMPLATE_SPECIALIZATION - struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::PriorityBandedConnectionPolicy> + struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy> { - static ::RTCORBA::PriorityBandedConnectionPolicy_ptr duplicate ( - ::RTCORBA::PriorityBandedConnectionPolicy_ptr + static RTCORBA::PriorityBandedConnectionPolicy_ptr tao_duplicate ( + RTCORBA::PriorityBandedConnectionPolicy_ptr ); - static void release ( - ::RTCORBA::PriorityBandedConnectionPolicy_ptr + static void tao_release ( + RTCORBA::PriorityBandedConnectionPolicy_ptr ); - static ::RTCORBA::PriorityBandedConnectionPolicy_ptr nil (void); - static CORBA::Boolean marshal ( - ::RTCORBA::PriorityBandedConnectionPolicy_ptr p, + static RTCORBA::PriorityBandedConnectionPolicy_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( + RTCORBA::PriorityBandedConnectionPolicy_ptr p, TAO_OutputCDR & cdr ); }; @@ -2659,17 +2655,17 @@ namespace TAO #define _RTCORBA_CURRENT__TRAITS_CH_ ACE_TEMPLATE_SPECIALIZATION - struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::Current> + struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::Current> { - static ::RTCORBA::Current_ptr duplicate ( - ::RTCORBA::Current_ptr + static RTCORBA::Current_ptr tao_duplicate ( + RTCORBA::Current_ptr ); - static void release ( - ::RTCORBA::Current_ptr + static void tao_release ( + RTCORBA::Current_ptr ); - static ::RTCORBA::Current_ptr nil (void); - static CORBA::Boolean marshal ( - ::RTCORBA::Current_ptr p, + static RTCORBA::Current_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( + RTCORBA::Current_ptr p, TAO_OutputCDR & cdr ); }; @@ -2680,17 +2676,17 @@ namespace TAO #define _RTCORBA_MUTEX__TRAITS_CH_ ACE_TEMPLATE_SPECIALIZATION - struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::Mutex> + struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::Mutex> { - static ::RTCORBA::Mutex_ptr duplicate ( - ::RTCORBA::Mutex_ptr + static RTCORBA::Mutex_ptr tao_duplicate ( + RTCORBA::Mutex_ptr ); - static void release ( - ::RTCORBA::Mutex_ptr + static void tao_release ( + RTCORBA::Mutex_ptr ); - static ::RTCORBA::Mutex_ptr nil (void); - static CORBA::Boolean marshal ( - ::RTCORBA::Mutex_ptr p, + static RTCORBA::Mutex_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( + RTCORBA::Mutex_ptr p, TAO_OutputCDR & cdr ); }; @@ -2701,17 +2697,17 @@ namespace TAO #define _RTCORBA_RTORB__TRAITS_CH_ ACE_TEMPLATE_SPECIALIZATION - struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::RTORB> + struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::RTORB> { - static ::RTCORBA::RTORB_ptr duplicate ( - ::RTCORBA::RTORB_ptr + static RTCORBA::RTORB_ptr tao_duplicate ( + RTCORBA::RTORB_ptr ); - static void release ( - ::RTCORBA::RTORB_ptr + static void tao_release ( + RTCORBA::RTORB_ptr ); - static ::RTCORBA::RTORB_ptr nil (void); - static CORBA::Boolean marshal ( - ::RTCORBA::RTORB_ptr p, + static RTCORBA::RTORB_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( + RTCORBA::RTORB_ptr p, TAO_OutputCDR & cdr ); }; @@ -2940,10 +2936,10 @@ TAO_RTCORBA_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_RTCORBA_PriorityBands_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:964 +// be\be_codegen.cpp:978 #if defined (__ACE_INLINE__) -#include "RTCORBAC.inl" +#include "RTCORBAC.i" #endif /* defined INLINE */ #if defined(_MSC_VER) && (_MSC_VER >= 1200) @@ -2958,4 +2954,3 @@ TAO_RTCORBA_Export CORBA::Boolean operator>> ( #endif /* ifndef */ - diff --git a/TAO/tao/RTCORBA/RTCORBAC.i b/TAO/tao/RTCORBA/RTCORBAC.i new file mode 100644 index 00000000000..38aa32569ba --- /dev/null +++ b/TAO/tao/RTCORBA/RTCORBAC.i @@ -0,0 +1,28 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + + diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp index 83e195b4b99..2f7547f5c8b 100644 --- a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp +++ b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp @@ -7,7 +7,6 @@ #include "tao/debug.h" #include "tao/ORB_Constants.h" #include "tao/ORBInitializer_Registry.h" -#include "tao/SystemException.h" #include "ace/OS_NS_strings.h" ACE_RCSID (RTCORBA, diff --git a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp index dd75f7ba1bd..3ee8de165b4 100644 --- a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp +++ b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp @@ -6,7 +6,6 @@ #include "RT_Stub.h" #include "tao/ORB_Constants.h" -#include "tao/SystemException.h" #include "ace/Log_Msg.h" diff --git a/TAO/tao/RTCORBA/diffs/RTCORBA.diff b/TAO/tao/RTCORBA/diffs/RTCORBA.diff index 489856dc1ca..e4810dd618a 100644 --- a/TAO/tao/RTCORBA/diffs/RTCORBA.diff +++ b/TAO/tao/RTCORBA/diffs/RTCORBA.diff @@ -1,76 +1,94 @@ ---- orig/RTCORBAC.h 2004-09-16 12:52:02.885009600 +0200 -+++ RTCORBAC.h 2004-09-16 12:36:01.362408000 +0200 -@@ -36,12 +36,18 @@ - - #include "ace/config-all.h" - -+#ifndef TAO_RTCORBA_SAFE_INCLUDE -+#error "You should not include RTCORBAC.h directly, use RTCORBA.h" -+#endif /* !TAO_RTCORBA_SAFE_INCLUDE */ -+ +--- orig/RTCORBAC.h Wed Feb 6 13:37:48 2002 ++++ RTCORBAC.h Wed Feb 6 13:44:01 2002 +@@ -23,15 +23,26 @@ + #define _TAO_IDL_ORIG_RTCORBAC_H_ + + #include "ace/pre.h" +-#include "tao/corba.h" ++#include "tao/orbconf.h" + #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - + #include "rtcorba_export.h" -+#include "rtcorba_typedefs.h" - #include "tao/ORB.h" +-#include "IOPC.h" +-#include "TimeBaseC.h" ++#include "tao/IOPC.h" +#include "tao/TimeBaseC.h" - #include "tao/SystemException.h" - #include "tao/Environment.h" - #include "tao/Object.h" -@@ -50,6 +56,8 @@ - #include "tao/Seq_Var_T.h" - #include "tao/Seq_Out_T.h" - #include "tao/VarOut_T.h" -+#include "tao/Encodable.h" +#include "tao/PolicyC.h" - ++ ++// Forward references. ++class TAO_Priority_Mapping_Manager; ++class TAO_Priority_Mapping_Manager_var; ++class TAO_Priority_Mapping_Manager_out; ++class TAO_Priority_Mapping; ++ ++#ifndef TAO_RTCORBA_SAFE_INCLUDE ++#error "You should not include RTCORBAC.h directly, use RTCORBA.h" ++#endif /* !TAO_RTCORBA_SAFE_INCLUDE */ + #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO -@@ -532,6 +540,7 @@ - +@@ -58,6 +69,15 @@ + + TAO_NAMESPACE RTCORBA + { ++ // TAO-specific ++ typedef TAO_Priority_Mapping_Manager PriorityMappingManager; ++ typedef TAO_Priority_Mapping_Manager *PriorityMappingManager_ptr; ++ typedef TAO_Priority_Mapping_Manager_var PriorityMappingManager_var; ++ typedef TAO_Priority_Mapping_Manager_out PriorityMappingManager_out; ++ ++ typedef TAO_Priority_Mapping PriorityMapping; ++ // End TAO-specific ++ + typedef CORBA::Short NativePriority; + typedef CORBA::Short_out NativePriority_out; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NativePriority; +@@ -674,6 +694,7 @@ + class TAO_RTCORBA_Export ProtocolProperties - : public virtual CORBA::Object + : public virtual CORBA_Object + , public virtual TAO_Encodable { public: - typedef ProtocolProperties_ptr _ptr_type; -@@ -568,6 +577,9 @@ + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) +@@ -705,6 +726,11 @@ + virtual const char* _interface_repository_id (void) const; - virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - -+ // CDR Encoder/Decoder methods. (handcrafted) + ++ // CDR Encoder/Decoder methods. ++ + virtual CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr); + virtual CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr); ++ protected: - // Abstract or local interface only. ProtocolProperties (void); ---- orig/RTCORBAC.cpp 2004-09-16 12:52:02.885009600 +0200 -+++ RTCORBAC.cpp 2004-09-16 12:36:36.643139200 +0200 -@@ -29,7 +29,7 @@ - // be\be_codegen.cpp:303 - - + +--- orig/RTCORBAC.cpp Wed Feb 6 13:37:48 2002 ++++ RTCORBAC.cpp Wed Feb 6 13:41:48 2002 +@@ -19,7 +19,7 @@ + // Information about TAO is available at: + // http://www.cs.wustl.edu/~schmidt/TAO.html + -#include "RTCORBAC.h" +#include "RTCORBA.h" - #include "tao/CDR.h" - #include "tao/Typecode.h" - #include "tao/Any_Impl_T.h" -@@ -57,7 +57,23 @@ - } - - + + #include "tao/Stub.h" + #include "tao/Invocation.h" +@@ -39,6 +39,21 @@ + #include "RTCORBAC.i" + #endif /* !defined INLINE */ + +////////////////////////////////////////////////////// -+// CDR Encoding Support hand crafted ++// CDR Encoding Support + +CORBA::Boolean +RTCORBA::ProtocolProperties::_tao_encode (TAO_OutputCDR &) +{ + return 1; +} - // TAO_IDL - Generated from -+// be/be_visitor_arg_traits.cpp:60 + +CORBA::Boolean +RTCORBA::ProtocolProperties::_tao_decode (TAO_InputCDR &) @@ -78,6 +96,6 @@ + return 1; +} + - // be\be_visitor_typecode/typecode_defn.cpp:290 - static const CORBA::Long _oc_RTCORBA_NativePriority[] = + { + TAO_ENCAP_BYTE_ORDER, // byte order diff --git a/TAO/tao/RTPortableServer.mpc b/TAO/tao/RTPortableServer.mpc index f3386bb07e8..6909d85ddef 100644 --- a/TAO/tao/RTPortableServer.mpc +++ b/TAO/tao/RTPortableServer.mpc @@ -22,8 +22,4 @@ project : taolib, core, rtcorba, portableserver { Resource_Files { RTPortableServer } - - PIDL_Files { - RTPortableServer - } } diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.cpp b/TAO/tao/RTPortableServer/RTPortableServerC.cpp index 69a012e8ad5..9bdb59d615f 100644 --- a/TAO/tao/RTPortableServer/RTPortableServerC.cpp +++ b/TAO/tao/RTPortableServer/RTPortableServerC.cpp @@ -58,7 +58,7 @@ namespace TAO ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTPortableServer::POA_ptr -TAO::Objref_Traits<RTPortableServer::POA>::duplicate ( +TAO::Objref_Traits<RTPortableServer::POA>::tao_duplicate ( RTPortableServer::POA_ptr p ) { @@ -67,7 +67,7 @@ TAO::Objref_Traits<RTPortableServer::POA>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTPortableServer::POA>::release ( +TAO::Objref_Traits<RTPortableServer::POA>::tao_release ( RTPortableServer::POA_ptr p ) { @@ -76,14 +76,14 @@ TAO::Objref_Traits<RTPortableServer::POA>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTPortableServer::POA_ptr -TAO::Objref_Traits<RTPortableServer::POA>::nil (void) +TAO::Objref_Traits<RTPortableServer::POA>::tao_nil (void) { return RTPortableServer::POA::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTPortableServer::POA>::marshal ( +TAO::Objref_Traits<RTPortableServer::POA>::tao_marshal ( RTPortableServer::POA_ptr p, TAO_OutputCDR & cdr ) @@ -92,7 +92,7 @@ TAO::Objref_Traits<RTPortableServer::POA>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*RTPortableServer__TAO_POA_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -103,7 +103,7 @@ RTPortableServer::POA::POA (void) RTPortableServer::POA::~POA (void) {} -void +void RTPortableServer::POA::_tao_any_destructor (void *_tao_void_pointer) { POA *_tao_tmp_pointer = @@ -121,10 +121,10 @@ RTPortableServer::POA::_narrow ( { return POA::_nil (); } - + POA_ptr proxy = dynamic_cast<POA_ptr> (_tao_objref); - + return POA::_duplicate (proxy); } @@ -138,10 +138,10 @@ RTPortableServer::POA::_unchecked_narrow ( { return POA::_nil (); } - + POA_ptr proxy = dynamic_cast<POA_ptr> (_tao_objref); - + return POA::_duplicate (proxy); } @@ -152,7 +152,7 @@ RTPortableServer::POA::_duplicate (POA_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -214,7 +214,7 @@ RTPortableServer::POA::marshal (TAO_OutputCDR &) TAO_Objref_Var_T< RTPortableServer::POA >; - + template class TAO_Objref_Out_T< RTPortableServer::POA @@ -231,10 +231,11 @@ RTPortableServer::POA::marshal (TAO_OutputCDR &) TAO_Objref_Var_T< \ RTPortableServer::POA > - + # pragma instantiate \ TAO_Objref_Out_T< \ RTPortableServer::POA > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.h b/TAO/tao/RTPortableServer/RTPortableServerC.h index bd290881d44..ab6ce108fe9 100644 --- a/TAO/tao/RTPortableServer/RTPortableServerC.h +++ b/TAO/tao/RTPortableServer/RTPortableServerC.h @@ -70,13 +70,13 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// 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; } @@ -86,22 +86,22 @@ namespace TAO namespace RTPortableServer { - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_RTPORTABLESERVER_POA__VAR_OUT_CH_) #define _RTPORTABLESERVER_POA__VAR_OUT_CH_ - + class POA; typedef POA *POA_ptr; - + typedef TAO_Objref_Var_T< POA > POA_var; - + typedef TAO_Objref_Out_T< POA @@ -109,43 +109,43 @@ namespace RTPortableServer POA_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_RTPORTABLESERVER_POA_CH_) #define _RTPORTABLESERVER_POA_CH_ - + class TAO_RTPortableServer_Export POA : public virtual PortableServer::POA { public: typedef POA_ptr _ptr_type; typedef POA_var _var_type; - + // The static operations. static POA_ptr _duplicate (POA_ptr obj); - + static POA_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static POA_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static POA_ptr _nil (void) { return (POA_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Object_ptr create_reference_with_priority ( const char * intf, RTCORBA::Priority priority @@ -155,10 +155,10 @@ namespace RTPortableServer CORBA::SystemException , PortableServer::POA::WrongPolicy )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Object_ptr create_reference_with_id_and_priority ( const PortableServer::ObjectId & oid, const char * intf, @@ -169,10 +169,10 @@ namespace RTPortableServer CORBA::SystemException , PortableServer::POA::WrongPolicy )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::PortableServer::ObjectId * activate_object_with_priority ( PortableServer::Servant p_servant, RTCORBA::Priority priority @@ -183,10 +183,10 @@ namespace RTPortableServer , PortableServer::POA::ServantAlreadyActive , PortableServer::POA::WrongPolicy )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void activate_object_with_id_and_priority ( const PortableServer::ObjectId & oid, PortableServer::Servant p_servant, @@ -199,36 +199,36 @@ namespace RTPortableServer , PortableServer::POA::ObjectAlreadyActive , PortableServer::POA::WrongPolicy )) = 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. POA (void); - + virtual ~POA (void); - + private: // Private and unimplemented for concrete interfaces. POA (const POA &); - + void operator= (const POA &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_POA; // TAO_IDL - Generated from @@ -245,18 +245,18 @@ namespace TAO #if !defined (_RTPORTABLESERVER_POA__TRAITS_CH_) #define _RTPORTABLESERVER_POA__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_RTPortableServer_Export Objref_Traits<RTPortableServer::POA> { - static RTPortableServer::POA_ptr duplicate ( + static RTPortableServer::POA_ptr tao_duplicate ( RTPortableServer::POA_ptr ); - static void release ( + static void tao_release ( RTPortableServer::POA_ptr ); - static RTPortableServer::POA_ptr nil (void); - static CORBA::Boolean marshal ( + static RTPortableServer::POA_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( RTPortableServer::POA_ptr p, TAO_OutputCDR & cdr ); @@ -290,3 +290,4 @@ TAO_RTPortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTPo #include /**/ "ace/post.h" #endif /* ifndef */ + diff --git a/TAO/tao/RTScheduler.mpc b/TAO/tao/RTScheduler.mpc index f8f7ef78a37..3eeca32721c 100644 --- a/TAO/tao/RTScheduler.mpc +++ b/TAO/tao/RTScheduler.mpc @@ -22,8 +22,4 @@ project : taolib, rtcorba, portableserver, core, corba_messaging { Resource_Files { RTScheduling } - - PIDL_Files { - RTScheduling - } } diff --git a/TAO/tao/RTScheduling/RTSchedulerC.cpp b/TAO/tao/RTScheduling/RTSchedulerC.cpp index c6c7627011c..eaf3576ee46 100644 --- a/TAO/tao/RTScheduling/RTSchedulerC.cpp +++ b/TAO/tao/RTScheduling/RTSchedulerC.cpp @@ -79,7 +79,7 @@ namespace TAO ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTScheduling::ThreadAction_ptr -TAO::Objref_Traits<RTScheduling::ThreadAction>::duplicate ( +TAO::Objref_Traits<RTScheduling::ThreadAction>::tao_duplicate ( RTScheduling::ThreadAction_ptr p ) { @@ -88,7 +88,7 @@ TAO::Objref_Traits<RTScheduling::ThreadAction>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTScheduling::ThreadAction>::release ( +TAO::Objref_Traits<RTScheduling::ThreadAction>::tao_release ( RTScheduling::ThreadAction_ptr p ) { @@ -97,14 +97,14 @@ TAO::Objref_Traits<RTScheduling::ThreadAction>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTScheduling::ThreadAction_ptr -TAO::Objref_Traits<RTScheduling::ThreadAction>::nil (void) +TAO::Objref_Traits<RTScheduling::ThreadAction>::tao_nil (void) { return RTScheduling::ThreadAction::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTScheduling::ThreadAction>::marshal ( +TAO::Objref_Traits<RTScheduling::ThreadAction>::tao_marshal ( RTScheduling::ThreadAction_ptr p, TAO_OutputCDR & cdr ) @@ -253,7 +253,7 @@ namespace RTScheduling ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTScheduling::DistributableThread_ptr -TAO::Objref_Traits<RTScheduling::DistributableThread>::duplicate ( +TAO::Objref_Traits<RTScheduling::DistributableThread>::tao_duplicate ( RTScheduling::DistributableThread_ptr p ) { @@ -262,7 +262,7 @@ TAO::Objref_Traits<RTScheduling::DistributableThread>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTScheduling::DistributableThread>::release ( +TAO::Objref_Traits<RTScheduling::DistributableThread>::tao_release ( RTScheduling::DistributableThread_ptr p ) { @@ -271,14 +271,14 @@ TAO::Objref_Traits<RTScheduling::DistributableThread>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTScheduling::DistributableThread_ptr -TAO::Objref_Traits<RTScheduling::DistributableThread>::nil (void) +TAO::Objref_Traits<RTScheduling::DistributableThread>::tao_nil (void) { return RTScheduling::DistributableThread::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTScheduling::DistributableThread>::marshal ( +TAO::Objref_Traits<RTScheduling::DistributableThread>::tao_marshal ( RTScheduling::DistributableThread_ptr p, TAO_OutputCDR & cdr ) @@ -475,7 +475,7 @@ namespace RTScheduling ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTScheduling::Current_ptr -TAO::Objref_Traits<RTScheduling::Current>::duplicate ( +TAO::Objref_Traits<RTScheduling::Current>::tao_duplicate ( RTScheduling::Current_ptr p ) { @@ -484,7 +484,7 @@ TAO::Objref_Traits<RTScheduling::Current>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTScheduling::Current>::release ( +TAO::Objref_Traits<RTScheduling::Current>::tao_release ( RTScheduling::Current_ptr p ) { @@ -493,14 +493,14 @@ TAO::Objref_Traits<RTScheduling::Current>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTScheduling::Current_ptr -TAO::Objref_Traits<RTScheduling::Current>::nil (void) +TAO::Objref_Traits<RTScheduling::Current>::tao_nil (void) { return RTScheduling::Current::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTScheduling::Current>::marshal ( +TAO::Objref_Traits<RTScheduling::Current>::tao_marshal ( RTScheduling::Current_ptr p, TAO_OutputCDR & cdr ) @@ -957,7 +957,7 @@ namespace RTScheduling ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTScheduling::ResourceManager_ptr -TAO::Objref_Traits<RTScheduling::ResourceManager>::duplicate ( +TAO::Objref_Traits<RTScheduling::ResourceManager>::tao_duplicate ( RTScheduling::ResourceManager_ptr p ) { @@ -966,7 +966,7 @@ TAO::Objref_Traits<RTScheduling::ResourceManager>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTScheduling::ResourceManager>::release ( +TAO::Objref_Traits<RTScheduling::ResourceManager>::tao_release ( RTScheduling::ResourceManager_ptr p ) { @@ -975,14 +975,14 @@ TAO::Objref_Traits<RTScheduling::ResourceManager>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTScheduling::ResourceManager_ptr -TAO::Objref_Traits<RTScheduling::ResourceManager>::nil (void) +TAO::Objref_Traits<RTScheduling::ResourceManager>::tao_nil (void) { return RTScheduling::ResourceManager::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTScheduling::ResourceManager>::marshal ( +TAO::Objref_Traits<RTScheduling::ResourceManager>::tao_marshal ( RTScheduling::ResourceManager_ptr p, TAO_OutputCDR & cdr ) @@ -1136,7 +1136,7 @@ namespace RTScheduling ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTScheduling::Scheduler_ptr -TAO::Objref_Traits<RTScheduling::Scheduler>::duplicate ( +TAO::Objref_Traits<RTScheduling::Scheduler>::tao_duplicate ( RTScheduling::Scheduler_ptr p ) { @@ -1145,7 +1145,7 @@ TAO::Objref_Traits<RTScheduling::Scheduler>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTScheduling::Scheduler>::release ( +TAO::Objref_Traits<RTScheduling::Scheduler>::tao_release ( RTScheduling::Scheduler_ptr p ) { @@ -1154,14 +1154,14 @@ TAO::Objref_Traits<RTScheduling::Scheduler>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTScheduling::Scheduler_ptr -TAO::Objref_Traits<RTScheduling::Scheduler>::nil (void) +TAO::Objref_Traits<RTScheduling::Scheduler>::tao_nil (void) { return RTScheduling::Scheduler::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTScheduling::Scheduler>::marshal ( +TAO::Objref_Traits<RTScheduling::Scheduler>::tao_marshal ( RTScheduling::Scheduler_ptr p, TAO_OutputCDR & cdr ) diff --git a/TAO/tao/RTScheduling/RTSchedulerC.h b/TAO/tao/RTScheduling/RTSchedulerC.h index f695f3cb712..04d83d3528b 100644 --- a/TAO/tao/RTScheduling/RTSchedulerC.h +++ b/TAO/tao/RTScheduling/RTSchedulerC.h @@ -1172,14 +1172,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_RTScheduler_Export Objref_Traits<RTScheduling::ThreadAction> { - static RTScheduling::ThreadAction_ptr duplicate ( + static RTScheduling::ThreadAction_ptr tao_duplicate ( RTScheduling::ThreadAction_ptr ); - static void release ( + static void tao_release ( RTScheduling::ThreadAction_ptr ); - static RTScheduling::ThreadAction_ptr nil (void); - static CORBA::Boolean marshal ( + static RTScheduling::ThreadAction_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( RTScheduling::ThreadAction_ptr p, TAO_OutputCDR & cdr ); @@ -1193,14 +1193,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_RTScheduler_Export Objref_Traits<RTScheduling::DistributableThread> { - static RTScheduling::DistributableThread_ptr duplicate ( + static RTScheduling::DistributableThread_ptr tao_duplicate ( RTScheduling::DistributableThread_ptr ); - static void release ( + static void tao_release ( RTScheduling::DistributableThread_ptr ); - static RTScheduling::DistributableThread_ptr nil (void); - static CORBA::Boolean marshal ( + static RTScheduling::DistributableThread_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( RTScheduling::DistributableThread_ptr p, TAO_OutputCDR & cdr ); @@ -1214,14 +1214,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_RTScheduler_Export Objref_Traits<RTScheduling::Current> { - static RTScheduling::Current_ptr duplicate ( + static RTScheduling::Current_ptr tao_duplicate ( RTScheduling::Current_ptr ); - static void release ( + static void tao_release ( RTScheduling::Current_ptr ); - static RTScheduling::Current_ptr nil (void); - static CORBA::Boolean marshal ( + static RTScheduling::Current_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( RTScheduling::Current_ptr p, TAO_OutputCDR & cdr ); @@ -1235,14 +1235,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_RTScheduler_Export Objref_Traits<RTScheduling::ResourceManager> { - static RTScheduling::ResourceManager_ptr duplicate ( + static RTScheduling::ResourceManager_ptr tao_duplicate ( RTScheduling::ResourceManager_ptr ); - static void release ( + static void tao_release ( RTScheduling::ResourceManager_ptr ); - static RTScheduling::ResourceManager_ptr nil (void); - static CORBA::Boolean marshal ( + static RTScheduling::ResourceManager_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( RTScheduling::ResourceManager_ptr p, TAO_OutputCDR & cdr ); @@ -1256,14 +1256,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_RTScheduler_Export Objref_Traits<RTScheduling::Scheduler> { - static RTScheduling::Scheduler_ptr duplicate ( + static RTScheduling::Scheduler_ptr tao_duplicate ( RTScheduling::Scheduler_ptr ); - static void release ( + static void tao_release ( RTScheduling::Scheduler_ptr ); - static RTScheduling::Scheduler_ptr nil (void); - static CORBA::Boolean marshal ( + static RTScheduling::Scheduler_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( RTScheduling::Scheduler_ptr p, TAO_OutputCDR & cdr ); diff --git a/TAO/tao/Reactive_Connect_Strategy.cpp b/TAO/tao/Reactive_Connect_Strategy.cpp index 74bddc34ee6..2d0fa7d7da9 100644 --- a/TAO/tao/Reactive_Connect_Strategy.cpp +++ b/TAO/tao/Reactive_Connect_Strategy.cpp @@ -2,7 +2,6 @@ #include "Connection_Handler.h" #include "ORB_Core.h" #include "debug.h" -#include "Transport.h" #include "ace/Synch_Options.h" @@ -88,15 +87,3 @@ TAO_Reactive_Connect_Strategy::wait (TAO_Connection_Handler *ch, return result; } - - -int -TAO_Reactive_Connect_Strategy::wait (TAO_Transport *t, - ACE_Time_Value *val) -{ - if (t == 0) - return -1; - - return this->wait (t->connection_handler (), - val); -} diff --git a/TAO/tao/Reactive_Connect_Strategy.h b/TAO/tao/Reactive_Connect_Strategy.h index 5550e00380d..fc377a5d596 100644 --- a/TAO/tao/Reactive_Connect_Strategy.h +++ b/TAO/tao/Reactive_Connect_Strategy.h @@ -49,11 +49,7 @@ public: ACE_Synch_Options &opt); virtual int wait (TAO_Connection_Handler *ch, - ACE_Time_Value *val); - - - virtual int wait (TAO_Transport *t, - ACE_Time_Value *val); + ACE_Time_Value *val); }; diff --git a/TAO/tao/Remote_Object_Proxy_Broker.cpp b/TAO/tao/Remote_Object_Proxy_Broker.cpp index 0cb98e0f718..8f357a28467 100644 --- a/TAO/tao/Remote_Object_Proxy_Broker.cpp +++ b/TAO/tao/Remote_Object_Proxy_Broker.cpp @@ -4,12 +4,11 @@ #include "Invocation_Adapter.h" #include "IFR_Client_Adapter.h" #include "ORB_Core.h" -#include "SystemException.h" #include "ace/Dynamic_Service.h" ACE_RCSID (tao, - Remote_Object_Proxy_Broker, + TAO_Object_Remote_Proxy_Broker, "$Id$") namespace TAO diff --git a/TAO/tao/RequestInfo_Util.cpp b/TAO/tao/RequestInfo_Util.cpp index 7db5fe67980..c9f7eb4bc3f 100644 --- a/TAO/tao/RequestInfo_Util.cpp +++ b/TAO/tao/RequestInfo_Util.cpp @@ -7,14 +7,11 @@ #include "ORB_Constants.h" #include "StringSeqC.h" #include "DynamicC.h" -#include "SystemException.h" - -ACE_RCSID (tao, - RequestInfo_Util, +ACE_RCSID (tao, + RequestInfo_Util, "$Id$") - Dynamic::ParameterList * TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_DECL) { @@ -23,7 +20,7 @@ TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_DECL) Dynamic::ParameterList, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOMEM), CORBA::COMPLETED_NO)); @@ -40,7 +37,7 @@ TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_DECL) Dynamic::ExceptionList, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOMEM), CORBA::COMPLETED_NO)); @@ -57,7 +54,7 @@ TAO_RequestInfo_Util::make_context_list (ACE_ENV_SINGLE_ARG_DECL) Dynamic::ContextList, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOMEM), CORBA::COMPLETED_NO)); @@ -74,7 +71,7 @@ TAO_RequestInfo_Util::make_request_context (ACE_ENV_SINGLE_ARG_DECL) Dynamic::RequestContext, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOMEM), CORBA::COMPLETED_NO)); @@ -92,7 +89,7 @@ TAO_RequestInfo_Util::make_any (CORBA::Boolean tk_void_any CORBA::Any, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOMEM), CORBA::COMPLETED_NO)); diff --git a/TAO/tao/Request_Dispatcher.h b/TAO/tao/Request_Dispatcher.h index e63dafa4be0..0c16e373345 100644 --- a/TAO/tao/Request_Dispatcher.h +++ b/TAO/tao/Request_Dispatcher.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "tao/SystemException.h" +#include "tao/Exception.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/Sequence.cpp b/TAO/tao/Sequence.cpp index dc753c2fb34..9410f8000dc 100644 --- a/TAO/tao/Sequence.cpp +++ b/TAO/tao/Sequence.cpp @@ -6,7 +6,7 @@ #include "tao/Sequence.i" #endif /* __ACE_INLINE__ */ -#include "SystemException.h" +#include "Exception.h" #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) # include "ace/Message_Block.h" diff --git a/TAO/tao/Sequence_T.cpp b/TAO/tao/Sequence_T.cpp index 9f538db1292..1290e27a70c 100644 --- a/TAO/tao/Sequence_T.cpp +++ b/TAO/tao/Sequence_T.cpp @@ -409,8 +409,8 @@ TAO_Object_Manager<T,T_var>::operator= ( if (this->release_) { - TAO::Objref_Traits<T>::release (*this->ptr_); - *this->ptr_ = TAO::Objref_Traits<T>::duplicate (*rhs.ptr_); + TAO::Objref_Traits<T>::tao_release (*this->ptr_); + *this->ptr_ = TAO::Objref_Traits<T>::tao_duplicate (*rhs.ptr_); } else { @@ -430,7 +430,7 @@ TAO_Object_Manager<T,T_var>::operator= (T * p) // that of a var variable. Therefore we will not duplicate the // user provided pointer before assigning it to the internal // variable. - TAO::Objref_Traits<T>::release (*this->ptr_); + TAO::Objref_Traits<T>::tao_release (*this->ptr_); *this->ptr_ = p; } else @@ -451,8 +451,8 @@ TAO_Object_Manager<T,T_var>::operator= (const T_var & p) // that of a var variable. Therefore we duplicate p's // pointer before assigning it to the internal // variable. - TAO::Objref_Traits<T>::release (*this->ptr_); - *this->ptr_ = TAO::Objref_Traits<T>::duplicate (p.in ()); + TAO::Objref_Traits<T>::tao_release (*this->ptr_); + *this->ptr_ = TAO::Objref_Traits<T>::tao_duplicate (p.in ()); } else { @@ -466,8 +466,8 @@ template <typename T, typename T_var> T *& TAO_Object_Manager<T,T_var>::out (void) { - TAO::Objref_Traits<T>::release (*this->ptr_); - *this->ptr_ = TAO::Objref_Traits<T>::nil (); + TAO::Objref_Traits<T>::tao_release (*this->ptr_); + *this->ptr_ = TAO::Objref_Traits<T>::tao_nil (); return *this->ptr_; } @@ -476,7 +476,7 @@ T * TAO_Object_Manager<T,T_var>::_retn (void) { T *temp = *this->ptr_; - *this->ptr_ = TAO::Objref_Traits<T>::nil (); + *this->ptr_ = TAO::Objref_Traits<T>::tao_nil (); return temp; } @@ -585,7 +585,7 @@ TAO_Unbounded_Object_Sequence<T,T_var>::TAO_Unbounded_Object_Sequence ( for (CORBA::ULong i = 0; i < rhs.length_; ++i) { - tmp1[i] = TAO::Objref_Traits<T>::duplicate (tmp2[i]); + tmp1[i] = TAO::Objref_Traits<T>::tao_duplicate (tmp2[i]); } this->buffer_ = tmp1; @@ -621,8 +621,8 @@ TAO_Unbounded_Object_Sequence<T,T_var>::operator= ( for (CORBA::ULong i = 0; i < this->length_; ++i) { - TAO::Objref_Traits<T>::release (tmp[i]); - tmp[i] = TAO::Objref_Traits<T>::nil (); + TAO::Objref_Traits<T>::tao_release (tmp[i]); + tmp[i] = TAO::Objref_Traits<T>::tao_nil (); } if (this->maximum_ < rhs.maximum_) @@ -656,7 +656,7 @@ TAO_Unbounded_Object_Sequence<T,T_var>::operator= ( for (CORBA::ULong i = 0; i < rhs.length_; ++i) { - tmp1[i] = TAO::Objref_Traits<T>::duplicate (tmp2[i]); + tmp1[i] = TAO::Objref_Traits<T>::tao_duplicate (tmp2[i]); } return *this; @@ -675,7 +675,7 @@ TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf ( for (CORBA::ULong i = 0; i < nelems; ++i) { - buf[i] = TAO::Objref_Traits<T>::nil (); + buf[i] = TAO::Objref_Traits<T>::tao_nil (); } return buf; @@ -727,7 +727,7 @@ TAO_Unbounded_Object_Sequence<T,T_var>::_allocate_buffer ( // the old instances. if (!this->release_) { - tmp[i] = TAO::Objref_Traits<T>::duplicate (old[i]); + tmp[i] = TAO::Objref_Traits<T>::tao_duplicate (old[i]); } else { @@ -759,8 +759,8 @@ TAO_Unbounded_Object_Sequence<T,T_var>::_deallocate_buffer ( for (CORBA::ULong i = 0; i < this->length_; ++i) { - TAO::Objref_Traits<T>::release (tmp[i]); - tmp[i] = TAO::Objref_Traits<T>::nil (); + TAO::Objref_Traits<T>::tao_release (tmp[i]); + tmp[i] = TAO::Objref_Traits<T>::tao_nil (); } TAO_Unbounded_Object_Sequence<T,T_var>::freebuf (tmp); @@ -782,8 +782,8 @@ TAO_Unbounded_Object_Sequence<T,T_var>::_shrink_buffer ( for (CORBA::ULong i = nl; i < ol; ++i) { - TAO::Objref_Traits<T>::release (tmp[i]); - tmp[i] = TAO::Objref_Traits<T>::nil (); + TAO::Objref_Traits<T>::tao_release (tmp[i]); + tmp[i] = TAO::Objref_Traits<T>::tao_nil (); } } @@ -817,7 +817,7 @@ TAO_Bounded_Object_Sequence<T,T_var,MAX>::TAO_Bounded_Object_Sequence ( for (CORBA::ULong i = 0; i < rhs.length_; ++i) { - tmp1[i] = TAO::Objref_Traits<T>::duplicate (tmp2[i]); + tmp1[i] = TAO::Objref_Traits<T>::tao_duplicate (tmp2[i]); } this->buffer_ = tmp1; @@ -846,8 +846,8 @@ TAO_Bounded_Object_Sequence<T,T_var,MAX>::operator= ( for (CORBA::ULong i = 0; i < this->length_; ++i) { - TAO::Objref_Traits<T>::release (tmp[i]); - tmp[i] = TAO::Objref_Traits<T>::nil (); + TAO::Objref_Traits<T>::tao_release (tmp[i]); + tmp[i] = TAO::Objref_Traits<T>::tao_nil (); } // No need to reallocate the buffer since it is always of size // MAX @@ -876,7 +876,7 @@ TAO_Bounded_Object_Sequence<T,T_var,MAX>::operator= ( for (CORBA::ULong i=0; i < rhs.length_; ++i) { - tmp1[i] = TAO::Objref_Traits<T>::duplicate (tmp2[i]); + tmp1[i] = TAO::Objref_Traits<T>::tao_duplicate (tmp2[i]); } return *this; @@ -895,7 +895,7 @@ TAO_Bounded_Object_Sequence<T,T_var,MAX>::allocbuf ( for (CORBA::ULong i = 0; i < MAX; ++i) { - buf[i] = TAO::Objref_Traits<T>::nil (); + buf[i] = TAO::Objref_Traits<T>::tao_nil (); } return buf; @@ -910,10 +910,10 @@ TAO_Bounded_Object_Sequence<T,T_var,MAX>::freebuf (T ** buffer) // complaint and call CORBA::release() on each one. for (CORBA::ULong i = 0; i < MAX; ++i) { - if (buffer[i] != TAO::Objref_Traits<T>::nil ()) + if (buffer[i] != TAO::Objref_Traits<T>::tao_nil ()) { - TAO::Objref_Traits<T>::release (buffer[i]); - buffer[i] = TAO::Objref_Traits<T>::nil (); + TAO::Objref_Traits<T>::tao_release (buffer[i]); + buffer[i] = TAO::Objref_Traits<T>::tao_nil (); } } @@ -962,8 +962,8 @@ TAO_Bounded_Object_Sequence<T,T_var,MAX>::_shrink_buffer ( for (CORBA::ULong i = nl; i < ol; ++i) { - TAO::Objref_Traits<T>::release (tmp[i]); - tmp[i] = TAO::Objref_Traits<T>::nil (); + TAO::Objref_Traits<T>::tao_release (tmp[i]); + tmp[i] = TAO::Objref_Traits<T>::tao_nil (); } } @@ -1395,7 +1395,7 @@ TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::TAO_Unbounded_Array_Sequence ( rhs.buffer_); for (CORBA::ULong i = 0; i < rhs.length_; ++i) { - TAO::Array_Traits<T,T_slice,TAG>::copy (tmp1[i], tmp2[i]); + TAO::Array_Traits<T,T_slice,TAG>::tao_copy (tmp1[i], tmp2[i]); } this->buffer_ = tmp1; @@ -1466,7 +1466,7 @@ TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::operator= ( for (CORBA::ULong i = 0; i < rhs.length_; ++i) { - TAO::Array_Traits<T,T_slice,TAG>::copy ( + TAO::Array_Traits<T,T_slice,TAG>::tao_copy ( ACE_reinterpret_cast (T *, this->buffer_)[i], ACE_reinterpret_cast (const T *, @@ -1544,7 +1544,7 @@ TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::_allocate_buffer ( T* old = (T *) this->buffer_; for (CORBA::ULong i = 0; i < this->length_; ++i) { - TAO::Array_Traits<T,T_slice,TAG>::copy (tmp[i], old[i]); + TAO::Array_Traits<T,T_slice,TAG>::tao_copy (tmp[i], old[i]); } if (this->release_) @@ -1631,7 +1631,7 @@ TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::TAO_Bounded_Array_Sequence ( for (CORBA::ULong i = 0; i < rhs.length_; ++i) { - TAO::Array_Traits<T,T_slice,TAG>::copy (tmp1[i], tmp2[i]); + TAO::Array_Traits<T,T_slice,TAG>::tao_copy (tmp1[i], tmp2[i]); } this->buffer_ = tmp1; @@ -1683,7 +1683,7 @@ TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::operator= ( for (CORBA::ULong i = 0; i < rhs.length_; ++i) { - TAO::Array_Traits<T,T_slice,TAG>::copy ( + TAO::Array_Traits<T,T_slice,TAG>::tao_copy ( ((T *) this->buffer_)[i], ((const T *) rhs.buffer_)[i] ); diff --git a/TAO/tao/Sequence_T.i b/TAO/tao/Sequence_T.i index c1ecd508680..1575fbf085a 100644 --- a/TAO/tao/Sequence_T.i +++ b/TAO/tao/Sequence_T.i @@ -159,7 +159,7 @@ template <typename T, typename T_var> ACE_INLINE TAO_Object_Manager<T,T_var>::operator const T_var () const { - return TAO::Objref_Traits<T>::duplicate (*this->ptr_); + return TAO::Objref_Traits<T>::tao_duplicate (*this->ptr_); } template <typename T, typename T_var> diff --git a/TAO/tao/Service_Callbacks.cpp b/TAO/tao/Service_Callbacks.cpp index c5d69c476e3..80f905477e9 100644 --- a/TAO/tao/Service_Callbacks.cpp +++ b/TAO/tao/Service_Callbacks.cpp @@ -1,6 +1,6 @@ #include "Service_Callbacks.h" #include "ORB_Constants.h" -#include "SystemException.h" +#include "Exception.h" #include "Environment.h" #include "Invocation_Utils.h" diff --git a/TAO/tao/Services_Activate.h b/TAO/tao/Services_Activate.h index 582d6d3b94a..7e75c1aac4c 100644 --- a/TAO/tao/Services_Activate.h +++ b/TAO/tao/Services_Activate.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/SystemException.h" +#include "tao/Exception.h" class TAO_ORB_Core; class TAO_Service_Callbacks; diff --git a/TAO/tao/SmartProxies.mpc b/TAO/tao/SmartProxies.mpc index 60db5a9c004..031c5e01e63 100644 --- a/TAO/tao/SmartProxies.mpc +++ b/TAO/tao/SmartProxies.mpc @@ -22,7 +22,4 @@ project : taolib, core { Resource_Files { SmartProxies } - - PIDL_Files { - } } diff --git a/TAO/tao/Special_Basic_Argument_T.cpp b/TAO/tao/Special_Basic_Argument_T.cpp index 3fe67efa366..0fb3ae66072 100644 --- a/TAO/tao/Special_Basic_Argument_T.cpp +++ b/TAO/tao/Special_Basic_Argument_T.cpp @@ -21,8 +21,6 @@ TAO::In_Special_Basic_Argument_T<S,to_S,from_S>::marshal (TAO_OutputCDR & cdr) return cdr << from_S (this->x_); } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename to_S, typename from_S> void TAO::In_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_param ( @@ -33,8 +31,6 @@ TAO::In_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_param ( p.mode = CORBA::PARAM_IN; } -#endif /* TAO_HAS_INTERCEPTORS */ - // =========================================================== template<typename S, typename to_S, typename from_S> @@ -55,8 +51,6 @@ TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S>::demarshal ( return cdr >> to_S (this->x_); } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename to_S, typename from_S> void TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_param ( @@ -67,8 +61,6 @@ TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_param ( p.mode = CORBA::PARAM_INOUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================== template<typename S, typename to_S, typename from_S> @@ -80,8 +72,6 @@ TAO::Out_Special_Basic_Argument_T<S,to_S,from_S>::demarshal ( return cdr >> to_S (this->x_); } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename to_S, typename from_S> void TAO::Out_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_param ( @@ -92,8 +82,6 @@ TAO::Out_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_param ( p.mode = CORBA::PARAM_OUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================ template<typename S, typename to_S, typename from_S> @@ -105,8 +93,6 @@ TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S>::demarshal ( return cdr >> to_S (this->x_); } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename to_S, typename from_S> void TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_result ( @@ -116,7 +102,5 @@ TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_result ( (*any) <<= from_S (this->x_); } -#endif /* TAO_HAS_INTERCEPTORS */ - #endif /* TAO_SPECIAL_BASIC_ARGUMENT_T_C */ diff --git a/TAO/tao/Special_Basic_Argument_T.h b/TAO/tao/Special_Basic_Argument_T.h index 6d405e4bbaa..19c368ec6e9 100644 --- a/TAO/tao/Special_Basic_Argument_T.h +++ b/TAO/tao/Special_Basic_Argument_T.h @@ -38,9 +38,9 @@ namespace TAO In_Special_Basic_Argument_T (S const &); virtual CORBA::Boolean marshal (TAO_OutputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S const & arg (void); private: @@ -61,9 +61,9 @@ namespace TAO virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S & arg (void); private: @@ -83,9 +83,9 @@ namespace TAO Out_Special_Basic_Argument_T (S & x); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S & arg (void); private: @@ -105,9 +105,9 @@ namespace TAO Ret_Special_Basic_Argument_T (void); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_result (CORBA::Any *); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S & arg (void); S excp (void); diff --git a/TAO/tao/Special_Basic_SArgument_T.cpp b/TAO/tao/Special_Basic_SArgument_T.cpp index c997f057d98..7b49823f9a5 100644 --- a/TAO/tao/Special_Basic_SArgument_T.cpp +++ b/TAO/tao/Special_Basic_SArgument_T.cpp @@ -25,8 +25,6 @@ TAO::In_Special_Basic_SArgument_T<S,to_S,from_S>::demarshal ( return cdr >> to_S (this->x_); } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename to_S, typename from_S> void TAO::In_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_param ( @@ -37,8 +35,6 @@ TAO::In_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_param ( p.mode = CORBA::PARAM_IN; } -#endif /* TAO_HAS_INTERCEPTORS */ - // =========================================================== template<typename S, typename to_S, typename from_S> @@ -59,8 +55,6 @@ TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S>::demarshal ( return cdr >> to_S (this->x_); } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename to_S, typename from_S> void TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_param ( @@ -71,8 +65,6 @@ TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_param ( p.mode = CORBA::PARAM_INOUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================== template<typename S, typename to_S, typename from_S> @@ -84,8 +76,6 @@ TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S>::marshal ( return cdr << from_S (this->x_); } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename to_S, typename from_S> void TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_param ( @@ -96,8 +86,6 @@ TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_param ( p.mode = CORBA::PARAM_OUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================== template<typename S, typename to_S, typename from_S> @@ -109,8 +97,6 @@ TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S>::marshal ( return cdr << from_S (this->x_); } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename to_S, typename from_S> void TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_result ( @@ -120,7 +106,5 @@ TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_result ( (*any) <<= this->x_; } -#endif /* TAO_HAS_INTERCEPTORS */ - #endif /* TAO_SPECIAL_BASIC_SARGUMENT_T_C */ diff --git a/TAO/tao/Special_Basic_SArgument_T.h b/TAO/tao/Special_Basic_SArgument_T.h index fcd4254358c..1399221066d 100644 --- a/TAO/tao/Special_Basic_SArgument_T.h +++ b/TAO/tao/Special_Basic_SArgument_T.h @@ -37,9 +37,9 @@ namespace TAO In_Special_Basic_SArgument_T (void); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S arg (void) const; private: @@ -60,9 +60,9 @@ namespace TAO virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S & arg (void); private: @@ -82,9 +82,9 @@ namespace TAO Out_Special_Basic_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S & arg (void); private: @@ -104,9 +104,9 @@ namespace TAO Ret_Special_Basic_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_result (CORBA::Any *); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S & arg (void); private: diff --git a/TAO/tao/Strategies.mpc b/TAO/tao/Strategies.mpc index a3e381bacd1..5ef081ef846 100644 --- a/TAO/tao/Strategies.mpc +++ b/TAO/tao/Strategies.mpc @@ -22,8 +22,4 @@ project : taolib, core { Resource_Files { Strategies } - - PIDL_Files { - Strategies - } } diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp index 8854b94696e..bba8297505f 100644 --- a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp @@ -124,11 +124,8 @@ TAO_DIOP_Connection_Handler::open (void*) this->local_addr_.get_port_number ())); } - // Set that the transport is now connected, if fails we return -1 - // Use C-style cast b/c otherwise we get warnings on lots of - // compilers - if (!this->transport ()->post_open ((size_t) this->get_handle ())) - return -1; + // Set the id in the transport now that we're active. + this->transport ()->id ((size_t) this->get_handle ()); this->state_changed (TAO_LF_Event::LFS_SUCCESS); @@ -169,7 +166,16 @@ TAO_DIOP_Connection_Handler::close_connection (void) int TAO_DIOP_Connection_Handler::handle_input (ACE_HANDLE h) { - return this->handle_input_eh (h, this); + int result = + this->handle_input_eh (h, this); + + if (result == -1) + { + this->close_connection (); + return 0; + } + + return result; } int @@ -212,7 +218,9 @@ TAO_DIOP_Connection_Handler::handle_close (ACE_HANDLE, int TAO_DIOP_Connection_Handler::close (u_long) { - return this->close_handler (); + this->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED); + this->transport ()->remove_reference (); + return 0; } int diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp index a082ce439ed..918e70d6d7f 100644 --- a/TAO/tao/Strategies/DIOP_Connector.cpp +++ b/TAO/tao/Strategies/DIOP_Connector.cpp @@ -258,16 +258,6 @@ TAO_DIOP_Connector::remote_endpoint (TAO_Endpoint *endpoint) return diop_endpoint; } -int -TAO_DIOP_Connector::cancel_svc_handler ( - TAO_Connection_Handler * svc_handler) -{ - ACE_UNUSED_ARG(svc_handler); - - // Noop - return 0; -} - // **************************************************************** diff --git a/TAO/tao/Strategies/DIOP_Connector.h b/TAO/tao/Strategies/DIOP_Connector.h index 389875fa03a..4fe4ba07c0d 100644 --- a/TAO/tao/Strategies/DIOP_Connector.h +++ b/TAO/tao/Strategies/DIOP_Connector.h @@ -89,9 +89,6 @@ protected: /// initialize <tcp_properties_>. int init_tcp_properties (void); - /// Cancel the passed cvs handler from the connector - int cancel_svc_handler (TAO_Connection_Handler * svc_handler); - protected: /// TCP configuration properties to be used for all diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp index 60d586cef75..39d4a1125a6 100644 --- a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp @@ -154,16 +154,14 @@ TAO_SCIOP_Connection_Handler::open (void*) return -1; ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - SCIOP_Connection_Handler::open, SCIOP ") + ACE_TEXT ("TAO (%P|%t) - Connection_Handler::open, SCIOP ") ACE_TEXT ("connection to peer <%s> on %d\n"), client, this->peer ().get_handle ())); } - // Set that the transport is now connected, if fails we return -1 - // Use C-style cast b/c otherwise we get warnings on lots of - // compilers - if (!this->transport ()->post_open ((size_t) this->get_handle ())) - return -1; + // Set the id in the transport now that we're active. + // Use C-style cast b/c otherwise we get warnings on lots of compilers + this->transport ()->id ((size_t) this->get_handle ()); this->state_changed (TAO_LF_Event::LFS_SUCCESS); @@ -185,7 +183,16 @@ TAO_SCIOP_Connection_Handler::close_connection (void) int TAO_SCIOP_Connection_Handler::handle_input (ACE_HANDLE h) { - return this->handle_input_eh (h, this); + int result = + this->handle_input_eh (h, this); + + if (result == -1) + { + this->close_connection (); + return 0; + } + + return result; } int @@ -224,7 +231,9 @@ TAO_SCIOP_Connection_Handler::handle_close (ACE_HANDLE, int TAO_SCIOP_Connection_Handler::close (u_long) { - return this->close_handler (); + this->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED); + this->transport ()->remove_reference (); + return 0; } int diff --git a/TAO/tao/Strategies/SCIOP_Connector.cpp b/TAO/tao/Strategies/SCIOP_Connector.cpp index 2911873f0cd..e387d532ca2 100644 --- a/TAO/tao/Strategies/SCIOP_Connector.cpp +++ b/TAO/tao/Strategies/SCIOP_Connector.cpp @@ -14,7 +14,6 @@ #include "tao/Thread_Lane_Resources.h" #include "tao/Transport.h" #include "tao/Wait_Strategy.h" -#include "tao/Profile_Transport_Resolver.h" #include "ace/OS_NS_strings.h" #include "ace/Strategies_T.h" @@ -153,9 +152,9 @@ TAO_SCIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint) } TAO_Transport * -TAO_SCIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r, +TAO_SCIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, TAO_Transport_Descriptor_Interface &desc, - ACE_Time_Value *timeout) + ACE_Time_Value *max_wait_time) { TAO_Endpoint *tao_endpoint = desc.endpoint (); @@ -164,7 +163,7 @@ TAO_SCIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r, while (tao_endpoint != 0) { TAO_SCIOP_Endpoint *sciop_endpoint = this->remote_endpoint (tao_endpoint); if (sciop_endpoint != 0) { - transport = make_connection_i (r, desc, timeout, sciop_endpoint); + transport = make_connection_i (desc, max_wait_time, sciop_endpoint); if (transport) { break; } @@ -177,37 +176,26 @@ TAO_SCIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r, TAO_Transport * -TAO_SCIOP_Connector::make_connection_i (TAO::Profile_Transport_Resolver *r, - TAO_Transport_Descriptor_Interface &desc, - ACE_Time_Value *timeout, +TAO_SCIOP_Connector::make_connection_i (TAO_Transport_Descriptor_Interface &desc, + ACE_Time_Value *max_wait_time, TAO_SCIOP_Endpoint *sciop_endpoint) { const ACE_INET_Addr &remote_address = sciop_endpoint->object_addr (); - if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - SCIOP_Connector::make_connection_i, " - "to <%s:%d> which should %s\n", - ACE_TEXT_CHAR_TO_TCHAR(sciop_endpoint->host()), - sciop_endpoint->port(), - r->blocked () ? ACE_TEXT("block") : ACE_TEXT("nonblock"))); + if (TAO_debug_level > 2) { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - SCIOP_Connector::make_connection_i, " + "to <%s:%d>\n", + sciop_endpoint->host(), sciop_endpoint->port())); + } // Get the right synch options ACE_Synch_Options synch_options; - this->active_connect_strategy_->synch_options (timeout, + this->active_connect_strategy_->synch_options (max_wait_time, synch_options); - // If we don't need to block for a transport just set the timeout to - // be zero. - ACE_Time_Value tmp_zero (ACE_Time_Value::zero); - if (!r->blocked ()) - { - synch_options.timeout (ACE_Time_Value::zero); - timeout = &tmp_zero; - } - TAO_SCIOP_Connection_Handler *svc_handler = 0; // Connect. @@ -237,45 +225,93 @@ TAO_SCIOP_Connector::make_connection_i (TAO::Profile_Transport_Resolver *r, // another thread pick up the completion and potentially deletes the // handler before we get a chance to increment the reference count. - // Make sure that we always do a remove_reference - ACE_Event_Handler_var svc_handler_auto_ptr (svc_handler); + // No immediate result. Wait for completion. + if (result == -1 && errno == EWOULDBLOCK) + { + if (TAO_debug_level > 2) + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - SCIOP_Connector::make_connection, " + "going to wait for connection completion on local" + "handle [%d]\n", + svc_handler->get_handle ())); + + // Wait for connection completion. + result = + this->active_connect_strategy_->wait (svc_handler, + max_wait_time); + + if (TAO_debug_level > 2) + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - SCIOP_Connector::make_connection" + "wait done for handle[%d], result = %d\n", + svc_handler->get_handle (), result)); + } - TAO_Transport *transport = - svc_handler->transport (); + // There are three possibilities when wait() returns: (a) + // connection succeeded; (b) connection failed; (c) wait() + // failed because of some other error. It is easy to deal with + // (a) and (b). (c) is tricky since the connection is still + // pending and may get completed by some other thread. The + // following code deals with (c). - if (result == -1) - { - // No immediate result, wait for completion - if (errno == EWOULDBLOCK) + // Check if the handler has been closed. + int closed = + svc_handler->is_closed (); + + // In case of failures and close() has not be called. + if (result == -1 && + !closed) { - // Try to wait until connection completion. Incase we block, then we - // get a connected transport or not. In case of non block we get - // a connected or not connected transport - if (!this->wait_for_connection_completion (r, - transport, - timeout)) + // First, cancel from connector. + this->base_connector_.cancel (svc_handler); + + // Double check to make sure the handler has not been closed + // yet. This double check is required to ensure that the + // connection handler was not closed yet by some other + // thread since it was still registered with the connector. + // Once connector.cancel() has been processed, we are + // assured that the connector will no longer open/close this + // handler. + closed = + svc_handler->is_closed (); + + // If closed, there is nothing to do here. If not closed, + // it was either opened or is still pending. + if (!closed) { - if (TAO_debug_level > 2) - ACE_ERROR ((LM_ERROR, "TAO (%P|%t) - SCIOP_Connector::" - "make_connection_i, " - "wait for completion failed\n")); + // Check if the handler has been opened. + int open = + svc_handler->is_open (); + + // Some other thread was able to open the handler even + // though wait failed for this thread. + if (open) + // Overwrite <result>. + result = 0; + else + { + // Assert that it is still connecting. + ACE_ASSERT (svc_handler->is_connecting ()); + + // Force close the handler now. + svc_handler->close (); + } } - } - else - { - // Transport is not usable - transport = 0; - } + } } - // In case of errors transport is zero - if (transport == 0) + // Irrespective of success or failure, remove the extra #REFCOUNT#. + svc_handler->remove_reference (); + + // In case of errors. + if (result == -1) { // Give users a clue to the problem. if (TAO_debug_level) { ACE_DEBUG ((LM_ERROR, - "TAO (%P|%t) - SCIOP_Connector::make_connection_i, " + "TAO (%P|%t) - SCIOP_Connector::make_connection, " "connection to <%s:%d> failed (%p)\n", sciop_endpoint->host (), sciop_endpoint->port (), "errno")); @@ -288,12 +324,14 @@ TAO_SCIOP_Connector::make_connection_i (TAO::Profile_Transport_Resolver *r, // #REFCOUNT# is one. if (TAO_debug_level > 2) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - SCIOP_Connector::make_connection_i, " - "new %s connection to <%s:%d> on Transport[%d]\n", - transport->is_connected() ? "connected" : "not connected", + "TAO (%P|%t) - SCIOP_Connector::make_connection, " + "new connection to <%s:%d> on Transport[%d]\n", sciop_endpoint->host (), sciop_endpoint->port (), svc_handler->peer ().get_handle ())); + TAO_Transport *transport = + svc_handler->transport (); + // Add the handler to Cache int retval = this->orb_core ()->lane_resources ().transport_cache ().cache_transport (&desc, @@ -308,31 +346,28 @@ TAO_SCIOP_Connector::make_connection_i (TAO::Profile_Transport_Resolver *r, if (TAO_debug_level > 0) { ACE_ERROR ((LM_ERROR, - "TAO (%P|%t) - SCIOP_Connector::make_connection_i, " + "TAO (%P|%t) - SCIOP_Connector::make_connection, " "could not add the new connection to cache\n")); } return 0; } - if (transport->is_connected () && - transport->wait_strategy ()->register_handler () != 0) + // Registration failures. + if (retval != 0) { - // Registration failures. - - // Purge from the connection cache, if we are not in the cache, this - // just does nothing. - (void) transport->purge_entry (); + // Purge from the connection cache. + transport->purge_entry (); // Close the handler. - (void) transport->close_connection (); + svc_handler->close (); if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, - "TAO (%P|%t) - SCIOP_Connector [%d]::make_connection_i, " - "could not register the transport " - "in the reactor.\n", - transport->id ())); + { + ACE_ERROR ((LM_ERROR, + "TAO (%P|%t) - SCIOP_Connector::make_connection, " + "could not register the new connection in the reactor\n")); + } return 0; } @@ -483,25 +518,4 @@ TAO_SCIOP_Connector::remote_endpoint (TAO_Endpoint *endpoint) return sciop_endpoint; } -int -TAO_SCIOP_Connector::cancel_svc_handler ( - TAO_Connection_Handler * svc_handler) -{ - TAO_SCIOP_Connection_Handler* handler= - dynamic_cast<TAO_SCIOP_Connection_Handler*>(svc_handler); - - if (handler) - { - // Cancel from the connector - this->base_connector_.cancel (handler); - - return 0; - } - else - { - return -1; - } -} - - #endif /* TAO_HAS_SCIOP == 1 */ diff --git a/TAO/tao/Strategies/SCIOP_Connector.h b/TAO/tao/Strategies/SCIOP_Connector.h index f307f27bc00..40f304f6085 100644 --- a/TAO/tao/Strategies/SCIOP_Connector.h +++ b/TAO/tao/Strategies/SCIOP_Connector.h @@ -100,9 +100,6 @@ protected: /// initialize <tcp_properties_>. int init_tcp_properties (void); - /// Cancel the passed cvs handler from the connector - int cancel_svc_handler (TAO_Connection_Handler * svc_handler); - protected: /// TCP configuration properties to be used for all @@ -119,8 +116,7 @@ private: TAO_SCIOP_Endpoint *remote_endpoint (TAO_Endpoint *ep); /// Try to make a connection to the next endpoint in the list. - TAO_Transport *make_connection_i (TAO::Profile_Transport_Resolver *r, - TAO_Transport_Descriptor_Interface &desc, + TAO_Transport *make_connection_i (TAO_Transport_Descriptor_Interface &desc, ACE_Time_Value *timeout, TAO_SCIOP_Endpoint *sciop_endpoint); diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp index cc3a4ae8b9d..298adc9ade2 100644 --- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp @@ -115,11 +115,8 @@ TAO_SHMIOP_Connection_Handler::open (void*) client, this->peer ().get_handle ())); } - // Set that the transport is now connected, if fails we return -1 - // Use C-style cast b/c otherwise we get warnings on lots of - // compilers - if (!this->transport ()->post_open ((size_t) this->get_handle ())) - return -1; + // Set the id in the transport now that we're active. + this->transport ()->id ((size_t) this->get_handle ()); // Not needed, anyway this->state_changed (TAO_LF_Event::LFS_SUCCESS); @@ -142,7 +139,16 @@ TAO_SHMIOP_Connection_Handler::close_connection (void) int TAO_SHMIOP_Connection_Handler::handle_input (ACE_HANDLE h) { - return this->handle_input_eh (h, this); + int result = + this->handle_input_eh (h, this); + + if (result == -1) + { + this->close_connection (); + return 0; + } + + return result; } int @@ -181,7 +187,9 @@ TAO_SHMIOP_Connection_Handler::handle_close (ACE_HANDLE, int TAO_SHMIOP_Connection_Handler::close (u_long) { - return this->close_handler (); + this->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED); + this->transport ()->remove_reference (); + return 0; } int diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp index eb1c042934b..1a674e31b71 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp @@ -155,7 +155,7 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) SHMIOP_Connector::make_connection - ") + ACE_TEXT ("TAO (%P|%t) Connector::connect - ") ACE_TEXT ("looking for SHMIOP connection.\n"))); TAO_SHMIOP_Endpoint *shmiop_endpoint = @@ -169,7 +169,7 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, if (TAO_debug_level > 2) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) SHMIOP_Connector::connect ") + ACE_TEXT ("(%P|%t) SHMIOP_Connector::connect ") ACE_TEXT ("making a new connection \n"))); // Get the right synch options @@ -193,8 +193,8 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, // We always use a blocking connection so the connection is never // pending. - // Make sure that we always do a remove_reference - ACE_Event_Handler_var svc_handler_auto_ptr (svc_handler); + // Irrespective of success or failure, remove the extra #REFCOUNT#. + svc_handler->remove_reference (); // In case of errors. if (result == -1) @@ -203,8 +203,8 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, if (TAO_debug_level > 0) { ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) SHMIOP_Connector::make_connection, ") - ACE_TEXT ("connection to <%s:%u> failed (%p)\n"), + ACE_TEXT ("(%P|%t) %N:%l, connection to ") + ACE_TEXT ("<%s:%u> failed (%p)\n"), ACE_TEXT_CHAR_TO_TCHAR (shmiop_endpoint->host ()), shmiop_endpoint->port (), ACE_TEXT ("errno"))); @@ -247,24 +247,26 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, return 0; } - if (transport->is_connected () && - transport->wait_strategy ()->register_handler () != 0) - { - // Registration failures. + // If the wait strategy wants us to be registered with the reactor + // then we do so. If registeration is required and it succeeds, + // #REFCOUNT# becomes two. + retval = transport->wait_strategy ()->register_handler (); - // Purge from the connection cache, if we are not in the cache, this - // just does nothing. - (void) transport->purge_entry (); + // Registration failures. + if (retval != 0) + { + // Purge from the connection cache. + transport->purge_entry (); // Close the handler. - (void) transport->close_connection (); + svc_handler->close (); if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, - "TAO (%P|%t) - SHMIOP_Connector [%d]::make_connection, " - "could not register the transport " - "in the reactor.\n", - transport->id ())); + { + ACE_ERROR ((LM_ERROR, + "TAO (%P|%t) - SHMIOP_Connector::make_connection, " + "could not register the new connection in the reactor\n")); + } return 0; } @@ -360,25 +362,4 @@ TAO_SHMIOP_Connector::remote_endpoint (TAO_Endpoint *endpoint) return shmiop_endpoint; } -int -TAO_SHMIOP_Connector::cancel_svc_handler ( - TAO_Connection_Handler * svc_handler) -{ - TAO_SHMIOP_Connection_Handler* handler= - dynamic_cast<TAO_SHMIOP_Connection_Handler*>(svc_handler); - - if (handler) - { - // Cancel from the connector - this->base_connector_.cancel (handler); - - return 0; - } - else - { - return -1; - } -} - - #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */ diff --git a/TAO/tao/Strategies/SHMIOP_Connector.h b/TAO/tao/Strategies/SHMIOP_Connector.h index d4b41468c55..fd29eca271d 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.h +++ b/TAO/tao/Strategies/SHMIOP_Connector.h @@ -102,9 +102,6 @@ protected: ACE_Time_Value *timeout = 0); virtual TAO_Profile *make_profile (ACE_ENV_SINGLE_ARG_DECL); - - /// Cancel the passed cvs handler from the connector - int cancel_svc_handler (TAO_Connection_Handler * svc_handler); //@} private: diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp index f3ad70d0fcd..7aa645abde1 100644 --- a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp @@ -97,11 +97,8 @@ TAO_UIOP_Connection_Handler::open (void*) ACE_TEXT ("<%s> on %d\n"), addr.get_path_name (), this->peer ().get_handle ())); - // Set that the transport is now connected, if fails we return -1 - // Use C-style cast b/c otherwise we get warnings on lots of - // compilers - if (!this->transport ()->post_open ((size_t) this->get_handle ())) - return -1; + // Set the id in the transport now that we're active. + this->transport ()->id ((size_t) this->get_handle ()); this->state_changed (TAO_LF_Event::LFS_SUCCESS); @@ -123,7 +120,16 @@ TAO_UIOP_Connection_Handler::close_connection (void) int TAO_UIOP_Connection_Handler::handle_input (ACE_HANDLE h) { - return this->handle_input_eh (h, this); + const int result = + this->handle_input_eh (h, this); + + if (result == -1) + { + this->close_connection (); + return 0; + } + + return result; } int @@ -162,7 +168,9 @@ TAO_UIOP_Connection_Handler::handle_close (ACE_HANDLE, int TAO_UIOP_Connection_Handler::close (u_long) { - return this->close_handler (); + this->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED); + this->transport ()->remove_reference (); + return 0; } int diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp index 9d1b9692ad9..d87dd885654 100644 --- a/TAO/tao/Strategies/UIOP_Connector.cpp +++ b/TAO/tao/Strategies/UIOP_Connector.cpp @@ -11,7 +11,6 @@ #include "tao/Transport_Cache_Manager.h" #include "tao/Thread_Lane_Resources.h" #include "tao/Connect_Strategy.h" -#include "tao/Profile_Transport_Resolver.h" #include "ace/OS_NS_strings.h" #include "ace/OS_NS_string.h" @@ -138,13 +137,13 @@ TAO_UIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint) } TAO_Transport * -TAO_UIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r, +TAO_UIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, TAO_Transport_Descriptor_Interface &desc, ACE_Time_Value *max_wait_time) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) UIUP_Connector::make_connection, ") + ACE_TEXT ("TAO (%P|%t) Connector::connect - ") ACE_TEXT ("looking for UIOP connection.\n"))); TAO_UIOP_Endpoint *uiop_endpoint = @@ -158,7 +157,7 @@ TAO_UIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r, if (TAO_debug_level > 2) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) UIUP_Connector::make_connection, ") + ACE_TEXT ("(%P|%t) UIOP_Connector::connect ") ACE_TEXT ("making a new connection \n"))); // Get the right synch options @@ -167,15 +166,6 @@ TAO_UIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r, this->active_connect_strategy_->synch_options (max_wait_time, synch_options); - // If we don't need to block for a transport just set the timeout to - // be zero. - ACE_Time_Value tmp_zero (ACE_Time_Value::zero); - if (!r->blocked ()) - { - synch_options.timeout (ACE_Time_Value::zero); - max_wait_time = &tmp_zero; - } - TAO_UIOP_Connection_Handler *svc_handler = 0; // Connect. @@ -201,61 +191,103 @@ TAO_UIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r, // another thread pick up the completion and potentially deletes the // handler before we get a chance to increment the reference count. - // Make sure that we always do a remove_reference - ACE_Event_Handler_var svc_handler_auto_ptr (svc_handler); - - TAO_Transport *transport = - svc_handler->transport (); - - if (result == -1) + // No immediate result. Wait for completion. + if (result == -1 && errno == EWOULDBLOCK) { - // No immediate result, wait for completion - if (errno == EWOULDBLOCK) + if (TAO_debug_level > 2) + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - UIOP_Connector::make_connection, " + "going to wait for connection completion on local" + "handle [%d]\n", + svc_handler->get_handle ())); + + result = + this->active_connect_strategy_->wait (svc_handler, + max_wait_time); + + if (TAO_debug_level > 2) { - // Try to wait until connection completion. Incase we block, then we - // get a connected transport or not. In case of non block we get - // a connected or not connected transport - if (!this->wait_for_connection_completion (r, - transport, - max_wait_time)) - { - if (TAO_debug_level > 2) - ACE_ERROR ((LM_ERROR, "TAO (%P|%t) - UIOP_Connector::" - "make_connection, " - "wait for completion failed\n")); - } - } - else - { - // Transport is not usable - transport = 0; + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - UIOP_Connector::make_connection" + "wait done for handle[%d], result = %d\n", + svc_handler->get_handle (), + result)); } + + // There are three possibilities when wait() returns: (a) + // connection succeeded; (b) connection failed; (c) wait() + // failed because of some other error. It is easy to deal with + // (a) and (b). (c) is tricky since the connection is still + // pending and may get completed by some other thread. The + // following code deals with (c). + + // Check if the handler has been closed. + int closed = svc_handler->is_closed (); + + // In case of failures and close() has not be called. + if (result == -1 && !closed) + { + // First, cancel from connector. + this->base_connector_.cancel (svc_handler); + + // Double check to make sure the handler has not been + // closed yet. This double check is required to ensure + // that the connection handler was not closed yet by some + // other thread since it was still registered with the + // connector. Once connector.cancel() has been processed, + // we are assured that the connector will no longer + // open/close this handler. + closed = svc_handler->is_closed (); + + // If closed, there is nothing to do here. If not closed, + // it was either opened or is still pending. + if (!closed) + { + // Check if the handler has been opened. + const int open = + svc_handler->is_open (); + + // Some other thread was able to open the handler even + // though wait failed for this thread. + if (open) + // Overwrite <result>. + result = 0; + else + { + // Assert that it is still connecting. + ACE_ASSERT (svc_handler->is_connecting ()); + + // Force close the handler now. + svc_handler->close (); + } + } + } } - // In case of errors transport is zero - if (transport == 0) + // Irrespective of success or failure, remove the extra #REFCOUNT#. + svc_handler->remove_reference (); + + // In case of errors. + if (result == -1) { // Give users a clue to the problem. - if (TAO_debug_level > 3) + if (TAO_debug_level) + { ACE_DEBUG ((LM_ERROR, - "TAO (%P|%t) - UIOP_Connector::make_connection, " - "connection to <%s> failed (%p)\n", + ACE_TEXT ("(%P|%t) %N:%l, connection to ") + ACE_TEXT ("%s failed (%p)\n"), uiop_endpoint->rendezvous_point (), - ACE_TEXT("errno"))); + ACE_TEXT ("errno"))); + } return 0; } + // At this point, the connection has be successfully connected. + // #REFCOUNT# is one. - // At this point, the connection has be successfully created - // connected or not connected, but we have a connection. - if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - UIOP_Connector::make_connection, " - "new %s connection to <%s> on Transport[%d]\n", - transport->is_connected() ? "connected" : "not connected", - uiop_endpoint->rendezvous_point (), - svc_handler->peer ().get_handle ())); + TAO_Transport *transport = + svc_handler->transport (); // Add the handler to Cache int retval = @@ -270,31 +302,33 @@ TAO_UIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r, if (TAO_debug_level > 0) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) UIOP_Connector::make_connection, ") + ACE_TEXT ("(%P|%t) UIOP_Connector::connect ") ACE_TEXT ("could not add the new connection to Cache \n"))); } return 0; } - if (transport->is_connected () && - transport->wait_strategy ()->register_handler () != 0) - { - // Registration failures. + // If the wait strategy wants us to be registered with the reactor + // then we do so. If registeration is required and it succeeds, + // #REFCOUNT# becomes two. + retval = transport->wait_strategy ()->register_handler (); - // Purge from the connection cache, if we are not in the cache, this - // just does nothing. - (void) transport->purge_entry (); + // Registration failures. + if (retval != 0) + { + // Purge from the connection cache. + transport->purge_entry (); // Close the handler. - (void) transport->close_connection (); + svc_handler->close (); if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, - "TAO (%P|%t) - UIOP_Connector [%d]::make_connection, " - "could not register the transport " - "in the reactor.\n", - transport->id ())); + { + ACE_ERROR ((LM_ERROR, + "TAO (%P|%t) - UIOP_Connector::make_connection, " + "could not register the new connection in the reactor\n")); + } return 0; } @@ -435,24 +469,4 @@ TAO_UIOP_Connector::remote_endpoint (TAO_Endpoint *endpoint) return uiop_endpoint; } -int -TAO_UIOP_Connector::cancel_svc_handler ( - TAO_Connection_Handler * svc_handler) -{ - TAO_UIOP_Connection_Handler* handler= - dynamic_cast<TAO_UIOP_Connection_Handler*>(svc_handler); - - if (handler) - { - // Cancel from the connector - this->base_connector_.cancel (handler); - - return 0; - } - else - { - return -1; - } -} - #endif /* TAO_HAS_UIOP == 1 */ diff --git a/TAO/tao/Strategies/UIOP_Connector.h b/TAO/tao/Strategies/UIOP_Connector.h index ba23060bd9d..d3297c8b3a8 100644 --- a/TAO/tao/Strategies/UIOP_Connector.h +++ b/TAO/tao/Strategies/UIOP_Connector.h @@ -73,9 +73,6 @@ public: virtual int check_prefix (const char *endpoint); virtual char object_key_delimiter (void) const; - - /// Cancel the passed cvs handler from the connector - virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler); //@} public: diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp index eedc383446b..39c2430adce 100644 --- a/TAO/tao/Stub.cpp +++ b/TAO/tao/Stub.cpp @@ -15,7 +15,6 @@ #include "Sync_Strategies.h" #include "debug.h" #include "Policy_Manager.h" -#include "SystemException.h" #if !defined (__ACE_INLINE__) # include "Stub.i" @@ -168,6 +167,7 @@ int TAO_Stub::create_ior_info (IOP::IOR *&ior_info, CORBA::ULong &index ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)) { // We are creating the IOR info. Let us not be disturbed. So grab a // lock. @@ -259,6 +259,7 @@ int TAO_Stub::get_profile_ior_info (TAO_MProfile &profiles, IOP::IOR *&ior_info ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h index 45fb155b548..289e3c84751 100644 --- a/TAO/tao/Stub.h +++ b/TAO/tao/Stub.h @@ -47,11 +47,6 @@ namespace TAO class ObjectKey; } -namespace IOP -{ - struct IOR; -} - /** * @class TAO_Stub * @@ -270,7 +265,8 @@ public: */ int create_ior_info (IOP::IOR *&ior_info, CORBA::ULong &index - ACE_ENV_ARG_DECL); + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)); /// Return a reference to the reference count lock. /** @@ -330,7 +326,8 @@ private: /// THREAD-SAFE Create the IOR info int get_profile_ior_info (TAO_MProfile &profile, IOP::IOR *&ior_info - ACE_ENV_ARG_DECL); + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp index b6e08c6d4eb..ad0a2947525 100644 --- a/TAO/tao/Synch_Invocation.cpp +++ b/TAO/tao/Synch_Invocation.cpp @@ -8,6 +8,7 @@ #include "Stub.h" #include "Bind_Dispatcher_Guard.h" #include "operation_details.h" +#include "Pluggable_Messaging.h" #include "Wait_Strategy.h" #include "debug.h" #include "ORB_Constants.h" @@ -52,31 +53,12 @@ namespace TAO TAO_Synch_Reply_Dispatcher rd (this->resolver_.stub ()->orb_core (), this->details_.reply_service_info ()); - TAO_Target_Specification tspec; - this->init_target_spec (tspec ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); - - TAO_OutputCDR &cdr = - this->resolver_.transport ()->out_stream (); - - Invocation_Status s = TAO_INVOKE_FAILURE; - - this->write_header (tspec, - cdr - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (s); - - this->marshal_data (cdr - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (s); - - // Register a reply dispatcher for this invocation. Use the // preallocated reply dispatcher. TAO_Bind_Dispatcher_Guard dispatch_guard ( - this->details_.request_id (), - &rd, - this->resolver_.transport ()->tms ()); + this->details_.request_id (), + &rd, + this->resolver_.transport ()->tms ()); if (dispatch_guard.status () != 0) { @@ -84,13 +66,16 @@ namespace TAO // we close the connection? this->resolver_.transport ()->close_connection (); - ACE_THROW_RETURN ( - CORBA::INTERNAL ( - 0, - CORBA::COMPLETED_NO), - s); + ACE_THROW_RETURN (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, + CORBA::COMPLETED_NO), + TAO_INVOKE_FAILURE); } + TAO_Target_Specification tspec; + this->init_target_spec (tspec ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); + + Invocation_Status s = TAO_INVOKE_FAILURE; #if TAO_HAS_INTERCEPTORS == 1 // Start the interception point here.. @@ -102,13 +87,26 @@ namespace TAO return s; #endif /*TAO_HAS_INTERCEPTORS */ - countdown.update (); + TAO_OutputCDR &cdr = + this->resolver_.transport ()->messaging_object ()->out_stream (); // We have started the interception flow. We need to call the // ending interception flow if things go wrong. The purpose of the // try block is to do just this. ACE_TRY { + this->write_header (tspec, + cdr + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + this->marshal_data (cdr + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + + countdown.update (); + s = this->send_message (cdr, TAO_Transport::TAO_TWOWAY_REQUEST, max_wait_time @@ -293,7 +291,7 @@ namespace TAO if (TAO_debug_level > 3) { ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - Synch_Twoway_Invocation::wait_for_reply, " + "TAO (%P|%t) - Synch_Twoway_Invocation::wait_for_reply , " "recovering after an error \n")); } @@ -408,7 +406,7 @@ namespace TAO { // Could not demarshal the addressing disposition, raise an local // CORBA::MARSHAL - ACE_THROW_RETURN (CORBA::MARSHAL (0, + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO_INVOKE_FAILURE); } @@ -482,7 +480,7 @@ namespace TAO { // Could not demarshal the exception id, raise an local // CORBA::MARSHAL - ACE_THROW_RETURN (CORBA::MARSHAL (0, + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO_INVOKE_FAILURE); } @@ -541,7 +539,7 @@ namespace TAO { // Could not demarshal the exception id, raise an local // CORBA::MARSHAL - ACE_THROW_RETURN (CORBA::MARSHAL (0, + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO_INVOKE_FAILURE); } @@ -552,7 +550,7 @@ namespace TAO if ((cdr >> minor) == 0 || (cdr >> completion) == 0) { - ACE_THROW_RETURN (CORBA::MARSHAL (0, + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO_INVOKE_FAILURE); } @@ -631,7 +629,7 @@ namespace TAO if (TAO_debug_level > 4) ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Synch_Twoway_Invocation::" - "handle_system_exception, about to raise\n")); + "handle_system_exception about to raise\n")); mon.set_status (TAO_INVOKE_SYSTEM_EXCEPTION); @@ -661,22 +659,17 @@ namespace TAO const CORBA::Octet response_flags = this->details_.response_flags (); - Invocation_Status s = TAO_INVOKE_FAILURE; - if (response_flags == CORBA::Octet (Messaging::SYNC_WITH_SERVER) || response_flags == CORBA::Octet (Messaging::SYNC_WITH_TARGET)) - { - s = Synch_Twoway_Invocation::remote_twoway (max_wait_time - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); - - return s; - } + return Synch_Twoway_Invocation::remote_twoway (max_wait_time + ACE_ENV_ARG_PARAMETER); TAO_Target_Specification tspec; this->init_target_spec (tspec ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); + Invocation_Status s = TAO_INVOKE_FAILURE; + #if TAO_HAS_INTERCEPTORS == 1 s = this->send_request_interception (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); @@ -685,11 +678,8 @@ namespace TAO return s; #endif /*TAO_HAS_INTERCEPTORS */ - TAO_Transport* transport = - this->resolver_.transport (); - TAO_OutputCDR &cdr = - transport->out_stream (); + this->resolver_.transport ()->messaging_object ()->out_stream (); ACE_TRY { @@ -704,24 +694,21 @@ namespace TAO countdown.update (); - if (transport->is_connected()) + if (response_flags == CORBA::Octet (Messaging::SYNC_WITH_TRANSPORT)) { - // We have a connected transport so we can send the message s = this->send_message (cdr, - TAO_Transport::TAO_ONEWAY_REQUEST, + TAO_Transport::TAO_TWOWAY_REQUEST, max_wait_time ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else { - if (TAO_debug_level > 4) - ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - Synch_Oneway_Invocation::" - "remote_oneway, queueing message\n")); - - if (transport->format_queue_message (cdr) != 0) - s = TAO_INVOKE_FAILURE; + s = this->send_message (cdr, + TAO_Transport::TAO_ONEWAY_REQUEST, + max_wait_time + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; } #if TAO_HAS_INTERCEPTORS == 1 diff --git a/TAO/tao/Synch_Invocation.h b/TAO/tao/Synch_Invocation.h index 4f47a01e192..6e73aed1f36 100644 --- a/TAO/tao/Synch_Invocation.h +++ b/TAO/tao/Synch_Invocation.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/SystemException.h" +#include "tao/Exception.h" class TAO_Operation_Details; class TAO_Synch_Reply_Dispatcher; @@ -28,6 +28,11 @@ class TAO_InputCDR; class ACE_Time_Value; class TAO_Bind_Dispatcher_Guard; +namespace CORBA +{ + class SystemException; +} + namespace TAO { class Profile_Transport_Resolver; diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp index 317c0fafc71..7dc1757e108 100644 --- a/TAO/tao/TAOC.cpp +++ b/TAO/tao/TAOC.cpp @@ -51,10 +51,10 @@ namespace TAO } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/structure_cs.cpp:66 -void +void TAO::BufferingConstraint::_tao_any_destructor ( void *_tao_void_pointer ) @@ -71,7 +71,7 @@ TAO::BufferingConstraint::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION TAO::BufferingConstraintPolicy_ptr -TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::duplicate ( +TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::tao_duplicate ( TAO::BufferingConstraintPolicy_ptr p ) { @@ -80,7 +80,7 @@ TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::release ( +TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::tao_release ( TAO::BufferingConstraintPolicy_ptr p ) { @@ -89,14 +89,14 @@ TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION TAO::BufferingConstraintPolicy_ptr -TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::nil (void) +TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::tao_nil (void) { return TAO::BufferingConstraintPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::marshal ( +TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::tao_marshal ( TAO::BufferingConstraintPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -105,7 +105,7 @@ TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*TAO__TAO_BufferingConstraintPolicy_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -116,7 +116,7 @@ TAO::BufferingConstraintPolicy::BufferingConstraintPolicy (void) TAO::BufferingConstraintPolicy::~BufferingConstraintPolicy (void) {} -void +void TAO::BufferingConstraintPolicy::_tao_any_destructor (void *_tao_void_pointer) { BufferingConstraintPolicy *_tao_tmp_pointer = @@ -134,10 +134,10 @@ TAO::BufferingConstraintPolicy::_narrow ( { return BufferingConstraintPolicy::_nil (); } - + BufferingConstraintPolicy_ptr proxy = dynamic_cast<BufferingConstraintPolicy_ptr> (_tao_objref); - + return BufferingConstraintPolicy::_duplicate (proxy); } @@ -151,10 +151,10 @@ TAO::BufferingConstraintPolicy::_unchecked_narrow ( { return BufferingConstraintPolicy::_nil (); } - + BufferingConstraintPolicy_ptr proxy = dynamic_cast<BufferingConstraintPolicy_ptr> (_tao_objref); - + return BufferingConstraintPolicy::_duplicate (proxy); } @@ -165,7 +165,7 @@ TAO::BufferingConstraintPolicy::_duplicate (BufferingConstraintPolicy_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -264,7 +264,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< TAO::BufferingConstraintPolicy >; - + template class TAO_Objref_Out_T< TAO::BufferingConstraintPolicy @@ -291,10 +291,11 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ TAO::BufferingConstraintPolicy > - + # pragma instantiate \ TAO_Objref_Out_T< \ TAO::BufferingConstraintPolicy > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/TAOC.h b/TAO/tao/TAOC.h index 8b6258bfd93..392e48e7301 100644 --- a/TAO/tao/TAOC.h +++ b/TAO/tao/TAOC.h @@ -71,13 +71,13 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// 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; } @@ -87,92 +87,92 @@ namespace TAO namespace TAO { - + // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:342 - + typedef CORBA::UShort BufferingConstraintMode; typedef CORBA::UShort_out BufferingConstraintMode_out; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BufferingConstraintMode; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const TAO::BufferingConstraintMode BUFFER_FLUSH = 0U; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const TAO::BufferingConstraintMode BUFFER_TIMEOUT = 1U; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const TAO::BufferingConstraintMode BUFFER_MESSAGE_COUNT = 2U; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const TAO::BufferingConstraintMode BUFFER_MESSAGE_BYTES = 4U; - + // TAO_IDL - Generated from // be\be_type.cpp:258 - + struct BufferingConstraint; - + typedef TAO_Fixed_Var_T< BufferingConstraint > BufferingConstraint_var; - + typedef BufferingConstraint & BufferingConstraint_out; - + // TAO_IDL - Generated from // be\be_visitor_structure/structure_ch.cpp:52 - + struct TAO_Export BufferingConstraint { typedef BufferingConstraint_var _var_type; - + static void _tao_any_destructor (void *); TAO::BufferingConstraintMode mode; TimeBase::TimeT timeout; CORBA::ULong message_count; CORBA::ULong message_bytes; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BufferingConstraint; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const CORBA::PolicyType BUFFERING_CONSTRAINT_POLICY_TYPE = 1413545985U; - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY__VAR_OUT_CH_) #define _TAO_BUFFERINGCONSTRAINTPOLICY__VAR_OUT_CH_ - + class BufferingConstraintPolicy; typedef BufferingConstraintPolicy *BufferingConstraintPolicy_ptr; - + typedef TAO_Objref_Var_T< BufferingConstraintPolicy > BufferingConstraintPolicy_var; - + typedef TAO_Objref_Out_T< BufferingConstraintPolicy @@ -180,109 +180,109 @@ namespace TAO BufferingConstraintPolicy_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY_CH_) #define _TAO_BUFFERINGCONSTRAINTPOLICY_CH_ - + class TAO_Export BufferingConstraintPolicy : public virtual CORBA::Policy { public: typedef BufferingConstraintPolicy_ptr _ptr_type; typedef BufferingConstraintPolicy_var _var_type; - + // The static operations. static BufferingConstraintPolicy_ptr _duplicate (BufferingConstraintPolicy_ptr obj); - + static BufferingConstraintPolicy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static BufferingConstraintPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static BufferingConstraintPolicy_ptr _nil (void) { return (BufferingConstraintPolicy_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::TAO::BufferingConstraint buffering_constraint ( 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 copy ( 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. BufferingConstraintPolicy (void); - + virtual ~BufferingConstraintPolicy (void); - + private: // Private and unimplemented for concrete interfaces. BufferingConstraintPolicy (const BufferingConstraintPolicy &); - + void operator= (const BufferingConstraintPolicy &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BufferingConstraintPolicy; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const Messaging::SyncScope SYNC_EAGER_BUFFERING = 0; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const Messaging::SyncScope SYNC_DELAYED_BUFFERING = -2; // TAO_IDL - Generated from @@ -299,18 +299,18 @@ namespace TAO #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY__TRAITS_CH_) #define _TAO_BUFFERINGCONSTRAINTPOLICY__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<TAO::BufferingConstraintPolicy> { - static TAO::BufferingConstraintPolicy_ptr duplicate ( + static TAO::BufferingConstraintPolicy_ptr tao_duplicate ( TAO::BufferingConstraintPolicy_ptr ); - static void release ( + static void tao_release ( TAO::BufferingConstraintPolicy_ptr ); - static TAO::BufferingConstraintPolicy_ptr nil (void); - static CORBA::Boolean marshal ( + static TAO::BufferingConstraintPolicy_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( TAO::BufferingConstraintPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -358,3 +358,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::BufferingConstraint & #include /**/ "ace/post.h" #endif /* ifndef */ + diff --git a/TAO/tao/TAO_Server_Request.cpp b/TAO/tao/TAO_Server_Request.cpp index 879a332ccfc..a9820608a3b 100644 --- a/TAO/tao/TAO_Server_Request.cpp +++ b/TAO/tao/TAO_Server_Request.cpp @@ -8,7 +8,6 @@ #include "GIOP_Utils.h" #include "Transport.h" #include "CDR.h" -#include "SystemException.h" #if !defined (__ACE_INLINE__) # include "TAO_Server_Request.i" @@ -175,9 +174,8 @@ TAO_ServerRequest::init_reply (void) if ((*this->outgoing_ << object_ptr) == 0) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - ServerRequest::init_reply, ") ACE_TEXT ("TAO_GIOP_ServerRequest::marshal - ") - ACE_TEXT ("marshal encoding forwarded objref failed\n"))); + ACE_TEXT ("encoding forwarded objref failed\n"))); } } this->transport_->assign_translators (0,this->outgoing_); @@ -221,8 +219,8 @@ TAO_ServerRequest::send_no_exception_reply (void) // is required. ACE_ERROR (( LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - ServerRequest::send_no_exception_reply, ") - ACE_TEXT ("cannot send NO_EXCEPTION reply\n") + ACE_TEXT ("TAO: (%P|%t) %p: cannot send NO_EXCEPTION reply\n"), + ACE_TEXT ("TAO_GIOP_ServerRequest::send_no_exception_reply") )); } } @@ -241,8 +239,9 @@ TAO_ServerRequest::tao_send_reply (void) // No exception but some kind of error, yet a response // is required. ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - ServerRequest::tao_send_reply, ") - ACE_TEXT ("cannot send reply\n"))); + ACE_TEXT ("TAO: (%P|%t) %p: cannot send reply\n"), + ACE_TEXT ("TAO_ServerRequest::tao_send_reply"))); + } } } @@ -301,7 +300,7 @@ TAO_ServerRequest::tao_send_reply_exception (CORBA::Exception &ex) ex) == -1) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - ServerRequest::tao_send_reply_exception, ") + ACE_TEXT ("TAO: (%P|%t|%N|%l): ") ACE_TEXT ("could not make exception reply\n"))); } @@ -312,7 +311,7 @@ TAO_ServerRequest::tao_send_reply_exception (CORBA::Exception &ex) TAO_Transport::TAO_REPLY) == -1) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - ServerRequest::tao_send_reply_exception, ") + ACE_TEXT ("TAO: (%P|%t|%N|%l): ") ACE_TEXT ("could not send exception reply\n"))); } } @@ -325,8 +324,7 @@ TAO_ServerRequest::tao_send_reply_exception (CORBA::Exception &ex) // down, since it really isn't the client's fault. ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - ServerRequest::tao_send_reply_exception, ") - ACE_TEXT ("exception thrown ") + ACE_TEXT ("(%P|%t) exception thrown ") ACE_TEXT ("but client is not waiting a response\n"))); } } @@ -378,7 +376,7 @@ TAO_ServerRequest::send_cached_reply (CORBA::OctetSeq &s) reply_params) == -1) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - ServerRequest::send_cached_reply, ") + ACE_TEXT ("TAO: (%P|%t|%N|%l): ") ACE_TEXT ("could not make cached reply\n"))); } @@ -390,7 +388,7 @@ TAO_ServerRequest::send_cached_reply (CORBA::OctetSeq &s) if (!this->outgoing_->good_bit ()) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - ServerRequest::send_cached_reply, ") + ACE_TEXT ("TAO: (%P|%t|%N|%l): ") ACE_TEXT ("could not marshal reply\n"))); // Send the message @@ -399,7 +397,7 @@ TAO_ServerRequest::send_cached_reply (CORBA::OctetSeq &s) TAO_Transport::TAO_REPLY) == -1) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - ServerRequest::send_cached_reply, ") + ACE_TEXT ("TAO: (%P|%t|%N|%l): ") ACE_TEXT ("could not send cached reply\n"))); } } diff --git a/TAO/tao/TC_Constants_Forward.h b/TAO/tao/TC_Constants_Forward.h index bb23cb8331a..a3c14d685dd 100644 --- a/TAO/tao/TC_Constants_Forward.h +++ b/TAO/tao/TC_Constants_Forward.h @@ -17,8 +17,6 @@ #include /**/ "ace/pre.h" -#include "tao/TAO_Export.h" - namespace CORBA { /** diff --git a/TAO/tao/Thread_Lane_Resources.cpp b/TAO/tao/Thread_Lane_Resources.cpp index 1ca22a258e7..ed85271751c 100644 --- a/TAO/tao/Thread_Lane_Resources.cpp +++ b/TAO/tao/Thread_Lane_Resources.cpp @@ -12,7 +12,6 @@ ACE_RCSID (tao, #include "tao/Connection_Handler.h" #include "tao/Transport.h" #include "tao/Connector_Registry.h" -#include "tao/SystemException.h" #include "ace/Reactor.h" diff --git a/TAO/tao/Thread_Per_Connection_Handler.cpp b/TAO/tao/Thread_Per_Connection_Handler.cpp index 6cd522c8298..f51f17c51e8 100644 --- a/TAO/tao/Thread_Per_Connection_Handler.cpp +++ b/TAO/tao/Thread_Per_Connection_Handler.cpp @@ -40,7 +40,7 @@ TAO_Thread_Per_Connection_Handler::activate (long flags, if (TAO_debug_level) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Thread_Per_Connection_Handler::") + ACE_TEXT ("TAO (%P|%t) - IIOP_Connection_Handler::") ACE_TEXT ("activate %d threads, flags = %d\n"), n_threads, flags)); @@ -61,8 +61,9 @@ TAO_Thread_Per_Connection_Handler::activate (long flags, int TAO_Thread_Per_Connection_Handler::svc (void) { - ACE::clr_flags (this->ch_->transport ()->event_handler_i ()->get_handle (), - ACE_NONBLOCK); + ACE_Flag_Manip::clr_flags ( + this->ch_->transport ()->event_handler_i ()->get_handle (), + ACE_NONBLOCK); // Call the implementation here return this->ch_->svc_i (); diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp index df1e0ffcfe9..ba4c262a11f 100644 --- a/TAO/tao/Transport.cpp +++ b/TAO/tao/Transport.cpp @@ -111,7 +111,6 @@ TAO_Transport::TAO_Transport (CORBA::ULong tag, , orb_core_ (orb_core) , cache_map_entry_ (0) , bidirectional_flag_ (-1) - , opening_connection_role_ (TAO::TAO_UNSPECIFIED_ROLE) , head_ (0) , tail_ (0) , incoming_message_queue_ (orb_core) @@ -123,7 +122,6 @@ TAO_Transport::TAO_Transport (CORBA::ULong tag, , purging_order_ (0) , recv_buffer_size_ (0) , sent_byte_count_ (0) - , is_connected_ (false) , char_translator_ (0) , wchar_translator_ (0) , tcs_set_ (0) @@ -147,18 +145,8 @@ TAO_Transport::~TAO_Transport (void) delete this->handler_lock_; - if (!this->is_connected_) - { - // When we have a not connected transport we could have buffered - // messages on this transport which we have to cleanup now. - this->cleanup_queue_i(); - - // Cleanup our cache entry - this->purge_entry(); - } - - // By the time the destructor is reached here all the connection stuff - // *must* have been cleaned up. + // By the time the destructor is reached all the connection stuff + // *must* have been cleaned up ACE_ASSERT (this->head_ == 0); ACE_ASSERT (this->cache_map_entry_ == 0); } @@ -206,13 +194,6 @@ TAO_Transport::register_handler (void) ACE_Reactor *r = this->orb_core_->reactor (); - // @@note: This should be okay since the register handler call will - // not make a nested call into the transport. - ACE_GUARD_RETURN (ACE_Lock, - ace_mon, - *this->handler_lock_, - false); - if (r == this->event_handler_i ()->reactor ()) { return 0; @@ -288,22 +269,21 @@ TAO_Transport::generate_request_header ( } /// @todo Ideally the following should be inline. -/// @todo purge_entry has a return value, use it int TAO_Transport::recache_transport (TAO_Transport_Descriptor_Interface *desc) { // First purge our entry - this->purge_entry (); + this->transport_cache_manager ().purge_entry (this->cache_map_entry_); // Then add ourselves to the cache return this->transport_cache_manager ().cache_transport (desc, this); } -int +void TAO_Transport::purge_entry (void) { - return this->transport_cache_manager ().purge_entry (this->cache_map_entry_); + this->transport_cache_manager ().purge_entry (this->cache_map_entry_); } int @@ -359,15 +339,6 @@ TAO_Transport::handle_output (void) } int -TAO_Transport::format_queue_message (TAO_OutputCDR &stream) -{ - if (this->messaging_object ()->format_message (stream) != 0) - return -1; - - return this->queue_message_i (stream.begin()); -} - -int TAO_Transport::send_message_block_chain (const ACE_Message_Block *mb, size_t &bytes_transferred, ACE_Time_Value *max_wait_time) @@ -874,32 +845,6 @@ TAO_Transport::drain_queue_i (void) } void -TAO_Transport::cleanup_queue_i () -{ - if (TAO_debug_level > 4) - { - ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - Transport[%d]::cleanup_queue_i, " - "cleaning up complete queue\n", - this->id ())); - } - - // Cleanup all messages - while (this->head_ != 0) - { - TAO_Queued_Message *i = this->head_; - - // @@ This is a good point to insert a flag to indicate that a - // CloseConnection message was successfully received. - i->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED); - - i->remove_from_list (this->head_, this->tail_); - - i->destroy (); - } -} - -void TAO_Transport::cleanup_queue (size_t byte_count) { while (this->head_ != 0 && byte_count > 0) @@ -1012,7 +957,18 @@ TAO_Transport::send_connection_closed_notifications (void) void TAO_Transport::send_connection_closed_notifications_i (void) { - this->cleanup_queue_i (); + while (this->head_ != 0) + { + TAO_Queued_Message *i = this->head_; + + // @@ This is a good point to insert a flag to indicate that a + // CloseConnection message was successfully received. + i->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED); + + i->remove_from_list (this->head_, this->tail_); + + i->destroy (); + } this->messaging_object ()->reset (); } @@ -1023,9 +979,6 @@ TAO_Transport::send_message_shared_i (TAO_Stub *stub, const ACE_Message_Block *message_block, ACE_Time_Value *max_wait_time) { - -// @todo Bala mentioned that this has to go out here -// { if (message_semantics == TAO_Transport::TAO_TWOWAY_REQUEST) { return this->send_synchronous_message_i (message_block, @@ -1036,7 +989,6 @@ TAO_Transport::send_message_shared_i (TAO_Stub *stub, return this->send_reply_message_i (message_block, max_wait_time); } - // } // Let's figure out if the message should be queued without trying // to send first: @@ -1091,7 +1043,7 @@ TAO_Transport::send_message_shared_i (TAO_Stub *stub, { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Transport[%d]::send_message_shared_i, " "fatal error in " "send_message_block_chain_i - %m\n", @@ -1143,15 +1095,13 @@ TAO_Transport::send_message_shared_i (TAO_Stub *stub, this->id ())); } - if (this->queue_message_i(message_block) == -1) - { - ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - Transport[%d]::send_message_shared_i, " - "cannot queue message for " - " - %m\n", - this->id ())); - return -1; - } + TAO_Queued_Message *queued_message = 0; + ACE_NEW_RETURN (queued_message, + TAO_Asynch_Queued_Message (message_block, + 0, + 1), + -1); + queued_message->push_back (this->head_, this->tail_); // ... if the queue is full we need to activate the output on the // queue ... @@ -1181,20 +1131,6 @@ TAO_Transport::send_message_shared_i (TAO_Stub *stub, return 0; } -int -TAO_Transport::queue_message_i(const ACE_Message_Block *message_block) -{ - TAO_Queued_Message *queued_message = 0; - ACE_NEW_RETURN (queued_message, - TAO_Asynch_Queued_Message (message_block, - 0, - 1), - -1); - queued_message->push_back (this->head_, this->tail_); - - return 0; -} - /* * * All the methods relevant to the incoming data path of the ORB are @@ -2121,64 +2057,6 @@ TAO_Transport::remove_reference (void) return this->event_handler_i ()->remove_reference (); } -TAO_OutputCDR & -TAO_Transport::out_stream (void) -{ - return this->messaging_object ()->out_stream (); -} - -bool -TAO_Transport::post_open (size_t id) -{ - this->id_ = id; - - { - ACE_GUARD_RETURN (ACE_Lock, - ace_mon, - *this->handler_lock_, - false); - - this->is_connected_ = true; - } - - // When we have data in our outgoing queue schedule ourselves - // for output - if (this->queue_is_empty_i ()) - return true; - - // If the wait strategy wants us to be registered with the reactor - // then we do so. If registeration is required and it succeeds, - // #REFCOUNT# becomes two. - if (this->wait_strategy ()->register_handler () == 0) - { - TAO_Flushing_Strategy *flushing_strategy = - this->orb_core ()->flushing_strategy (); - (void) flushing_strategy->schedule_output (this); - } - else - { - // Registration failures. - - // Purge from the connection cache, if we are not in the cache, this - // just does nothing. - (void) this->purge_entry (); - - // Close the handler. - (void) this->close_connection (); - - if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, - "TAO (%P|%t) - Transport[%d]::post_connect , " - "could not register the transport " - "in the reactor.\n", - this->id ())); - - return false; - } - - return true; -} - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Reverse_Lock<ACE_Lock>; diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h index e02f53e25ea..b15c8bf9340 100644 --- a/TAO/tao/Transport.h +++ b/TAO/tao/Transport.h @@ -43,20 +43,6 @@ class TAO_Resume_Handle; class TAO_Stub; struct iovec; -namespace TAO -{ - /** - * @NOTE: Should this be in TAO namespace. Seems like a candidate - * that should be in the transport - */ - enum Connection_Role - { - TAO_UNSPECIFIED_ROLE = 0, - TAO_SERVER_ROLE = 1, - TAO_CLIENT_ROLE = 2 - }; -} - /** * @class TAO_Transport * @@ -219,7 +205,7 @@ namespace TAO * * <B>See Also:</B> * - * http://cvs.doc.wustl.edu/ace-latest.cgi/ACE_wrappers/TAO/docs/pluggable_protocols/index.html + * http://deuce.doc.wustl.edu/cvsweb/ace-latest.cgi/ACE_wrappers/TAO/docs/pluggable_protocols/index.html * */ class TAO_Export TAO_Transport @@ -291,23 +277,6 @@ public: size_t id (void) const; void id (size_t id); - /** - * Methods dealing with the role of the connection, e.g., CLIENT or SERVER. - * See CORBA 2.6 Specification, Section 15.5.1 for origin of definitions. - */ - TAO::Connection_Role opened_as (void) const; - void opened_as (TAO::Connection_Role); - - /** - * Predicate that returns true if it is valid for this transport to act in a server - * role. This would, for example, be true if opened_as() == TAO_SERVER_ROLE - * or bidirectional_flag() == 1. - * - * \return 0 cannot act in server role - * \return 1 can acts in server role - */ - bool acts_as_server (void) const; - /// Get and Set the purging order. The purging strategy uses the set /// version to set the purging order. unsigned long purging_order (void) const; @@ -328,6 +297,13 @@ public: */ void provide_handler (TAO_Connection_Handler_Set &handlers); + + /// Remove all messages from the outgoing queue. + /** + * @todo shouldn't this be automated? + */ + // void dequeue_all (void); + /// Register the handler with the reactor. /** * Register the handler with the reactor. This method is used by the @@ -472,23 +448,9 @@ public: * adapter class (TAO_Transport_Event_Handler or something), this * will reduce footprint and simplify the process of implementing a * pluggable protocol. - * - * @todo This method has to be renamed to event_handler() */ virtual ACE_Event_Handler * event_handler_i (void) = 0; - /// Is this transport really connected - bool is_connected (void) const; - - /// Perform all the actions when this transport get opened - bool post_open (size_t id); - - /// Get the connection handler for this transport - TAO_Connection_Handler * connection_handler (void); - - /// Accessor for the output CDR stream - TAO_OutputCDR &out_stream (void); - protected: virtual TAO_Connection_Handler * connection_handler_i (void) = 0; @@ -672,12 +634,7 @@ protected: const ACE_Message_Block *message_block, ACE_Time_Value *max_wait_time); - /// Queue a message for @a message_block - int queue_message_i (const ACE_Message_Block *message_block); - public: - /// Format and queue a message for @a stream - int format_queue_message (TAO_OutputCDR &stream); /// Send a message block chain, int send_message_block_chain (const ACE_Message_Block *message_block, @@ -689,7 +646,7 @@ public: size_t &bytes_transferred, ACE_Time_Value *max_wait_time); /// Cache management - int purge_entry (void); + void purge_entry (void); /// Cache management int make_idle (void); @@ -809,8 +766,8 @@ private: */ void cleanup_queue (size_t byte_count); - /// Cleanup the complete queue - void cleanup_queue_i (); + /// Copy the contents of a message block into a Queued_Message + /// TAO_Queued_Message *copy_message_block (const ACE_Message_Block *mb); /// Check if the buffering constraints have been reached int check_buffering_constraints_i (TAO_Stub *stub, int &must_flush); @@ -901,8 +858,6 @@ protected: */ int bidirectional_flag_; - TAO::Connection_Role opening_connection_role_; - /// Implement the outgoing data queue TAO_Queued_Message *head_; TAO_Queued_Message *tail_; @@ -929,7 +884,7 @@ protected: * a null lock for single-threaded systems, and a real lock for * multi-threaded systems. */ - mutable ACE_Lock *handler_lock_; + ACE_Lock *handler_lock_; /// A unique identifier for the transport. /** @@ -950,11 +905,6 @@ protected: /// Number of bytes sent. size_t sent_byte_count_; - /// Is this transport really connected or not. In case of oneways with - /// SYNC_NONE Policy we don't wait until the connection is ready and we - /// buffer the requests in this transport until the connection is ready - bool is_connected_; - private: /// @@Phil, I think it would be nice if we could think of a way to @@ -988,7 +938,7 @@ private: /** * @class TAO_Transport_Refcount_Guard * - * @brief Helper class that increments the refcount on construction + * @brief Helper class that increments the refount on construction * and decrements the refcount on destruction. */ class TAO_Export TAO_Transport_Refcount_Guard diff --git a/TAO/tao/Transport.inl b/TAO/tao/Transport.inl index be8b82bdac1..ab9770b43f4 100644 --- a/TAO/tao/Transport.inl +++ b/TAO/tao/Transport.inl @@ -38,25 +38,6 @@ TAO_Transport::bidirectional_flag (int flag) this->bidirectional_flag_ = flag; } -ACE_INLINE TAO::Connection_Role -TAO_Transport::opened_as () const -{ - return this->opening_connection_role_; -} - -ACE_INLINE void -TAO_Transport::opened_as (TAO::Connection_Role role) -{ - this->opening_connection_role_ = role; -} - -ACE_INLINE bool -TAO_Transport::acts_as_server (void) const -{ - return (this->opened_as () == TAO::TAO_SERVER_ROLE || - this->bidirectional_flag_ == 1) ? true : false; -} - ACE_INLINE TAO_Transport_Cache_Manager::HASH_MAP_ENTRY * TAO_Transport::cache_map_entry (void) { @@ -164,23 +145,6 @@ TAO_Transport::first_request_sent (void) this->first_request_ = 0; } -ACE_INLINE bool -TAO_Transport::is_connected (void) const -{ - ACE_GUARD_RETURN (ACE_Lock, - ace_mon, - *this->handler_lock_, - false); - - return this->is_connected_; -} - -ACE_INLINE TAO_Connection_Handler * -TAO_Transport::connection_handler (void) -{ - return this->connection_handler_i(); -} - /*****************************************************/ ACE_INLINE diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp index 7ef578dfd72..00783bcd224 100644 --- a/TAO/tao/Transport_Connector.cpp +++ b/TAO/tao/Transport_Connector.cpp @@ -8,10 +8,6 @@ #include "debug.h" #include "Connect_Strategy.h" #include "Client_Strategy_Factory.h" -#include "Connection_Handler.h" -#include "Profile_Transport_Resolver.h" -#include "Wait_Strategy.h" -#include "SystemException.h" #include "ace/OS_NS_string.h" @@ -54,7 +50,7 @@ TAO_Connector::make_mprofile (const char *string, { ACE_THROW_RETURN (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, EINVAL), CORBA::COMPLETED_NO), -1); @@ -220,182 +216,44 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r, ACE_Time_Value *timeout ACE_ENV_ARG_DECL_NOT_USED) { - if (desc == 0 || - (this->set_validate_endpoint (desc->endpoint ()) == -1)) - return 0; + if ((this->set_validate_endpoint (desc->endpoint ()) == -1) || desc == 0) + { + return 0; + } TAO_Transport *base_transport = 0; - TAO_Transport_Cache_Manager &tcm = - this->orb_core ()->lane_resources ().transport_cache (); - // Check the Cache first for connections // If transport found, reference count is incremented on assignment // @@todo: We need to send the timeout value to the cache registry // too. That should be the next step! - if (tcm.find_transport (desc, - base_transport) != 0) - { - // @@TODO: This is not the right place for this! - // Purge connections (if necessary) - tcm.purge (); - - TAO_Transport* t = this->make_connection (r, - *desc, - timeout); - - if (t == 0) - return t; - - t->opened_as (TAO::TAO_CLIENT_ROLE); - - if (TAO_debug_level > 4) - ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - Transport_Connector::connect, " - "opening Transport[%d] in TAO_CLIENT_ROLE\n", - t->id ())); - - return t; - } - - if (TAO_debug_level > 4) - { - TAO::Connection_Role cr = - base_transport->opened_as (); - - ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - Transport_Connector::connect, " - "got an existing %s Transport[%d] in role %s\n", - base_transport->is_connected () ? "connected" : "unconnected", - base_transport->id (), - cr == TAO::TAO_SERVER_ROLE ? "TAO_SERVER_ROLE" : - cr == TAO::TAO_CLIENT_ROLE ? "TAO_CLIENT_ROLE" : - "TAO_UNSPECIFIED_ROLE" )); - } - - // If connected return.. - if (base_transport->is_connected ()) - return base_transport; - - if (!this->wait_for_connection_completion (r, - base_transport, - timeout)) + if (this->orb_core ()->lane_resources ().transport_cache ().find_transport ( + desc, + base_transport) == 0) { if (TAO_debug_level > 2) - ACE_ERROR ((LM_ERROR, - "TAO (%P|%t) - Transport_Connector::" - "connect, " - "wait for completion failed\n")); - return 0; - } - - if (base_transport->is_connected () && - base_transport->wait_strategy ()->register_handler () != 0) - { - // Registration failures. - - // Purge from the connection cache, if we are not in the cache, this - // just does nothing. - (void) base_transport->purge_entry (); - - // Close the handler. - (void) base_transport->close_connection (); - - if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, - "TAO (%P|%t) - Transport_Connector [%d]::connect, " - "could not register the transport " - "in the reactor.\n", - base_transport->id ())); - - return 0; - } - - return base_transport; -} - -bool -TAO_Connector::wait_for_connection_completion ( - TAO::Profile_Transport_Resolver *r, - TAO_Transport *&transport, - ACE_Time_Value *timeout) -{ - if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - Transport_Connector::wait_for_connection_completion, " - "going to wait for connection completion on transport" - "[%d]\n", - transport->id ())); - - // If we don't need to block for a transport just set the timeout to - // be zero. - ACE_Time_Value tmp_zero (ACE_Time_Value::zero); - if (!r->blocked ()) - { - timeout = &tmp_zero; - } - - // Wait until the connection is ready, when non-blocking we just do a wait - // with zero time - int result = - this->active_connect_strategy_->wait ( - transport, - timeout); - - if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - Transport_Connector::wait_for_connection_completion, " - "transport [%d], wait done result = %d\n", - transport->id (), result)); - - // There are three possibilities when wait() returns: (a) - // connection succeeded; (b) connection failed; (c) wait() - // failed because of some other error. It is easy to deal with - // (a) and (b). (c) is tricky since the connection is still - // pending and may get completed by some other thread. The - // following method deals with (c). - - if (result == -1) - { - if (!r->blocked () && errno == ETIME) { - // If we did a non blocking connect, just ignore - // any timeout errors - result = 0; - } - else - { - // When we need to get a connected transport - result = - this->check_connection_closure ( - transport->connection_handler ()); + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - Transport_Connector::connect, " + "got an existing Transport[%d]\n", + base_transport->id ())); } - // In case of errors. - if (result == -1) - { - // Report that making the connection failed, don't print errno - // because we touched the reactor and errno could be changed - if (TAO_debug_level > 2) - ACE_ERROR ((LM_ERROR, - "TAO (%P|%t) - Transport_Connector::" - "wait_for_connection_completion, " - "transport [%d], wait for completion failed\n", - transport->id())); - - // Set transport to zero, it is not usable - transport = 0; - - return false; - } + // No need to _duplicate since things are taken care within the + // cache manager. + return base_transport; } - // Connection not ready yet but we can use this transport, if - // we need a connected one we will block later to make sure - // it is connected - return true; + // @@TODO: This is not the right place for this! + // Purge connections (if necessary) + this->orb_core_->lane_resources ().transport_cache ().purge (); + + return this->make_connection (r, + *desc, + timeout); } + int TAO_Connector::create_connect_strategy (void) { @@ -413,57 +271,3 @@ TAO_Connector::create_connect_strategy (void) return 0; } - -int -TAO_Connector::check_connection_closure ( - TAO_Connection_Handler *connection_handler) -{ - int result = -1; - - // Check if the handler has been closed. - int closed = - connection_handler->is_closed (); - - // In case of failures and close() has not be called. - if (!closed) - { - // First, cancel from connector. - if (this->cancel_svc_handler (connection_handler) == -1) - return -1; - - // Double check to make sure the handler has not been closed - // yet. This double check is required to ensure that the - // connection handler was not closed yet by some other - // thread since it was still registered with the connector. - // Once connector.cancel() has been processed, we are - // assured that the connector will no longer open/close this - // handler. - closed = connection_handler->is_closed (); - - // If closed, there is nothing to do here. If not closed, - // it was either opened or is still pending. - if (!closed) - { - // Check if the handler has been opened. - const int open = connection_handler->is_open (); - - // Some other thread was able to open the handler even - // though wait failed for this thread. - if (open) - { - // Set the result to 0, we have an open connection - result = 0; - } - else - { - // Assert that it is still connecting. - ACE_ASSERT (connection_handler->is_connecting ()); - - // Force close the handler now. - connection_handler->close_handler (); - } - } - } - - return result; -} diff --git a/TAO/tao/Transport_Connector.h b/TAO/tao/Transport_Connector.h index 73347185874..b142cf90b9e 100644 --- a/TAO/tao/Transport_Connector.h +++ b/TAO/tao/Transport_Connector.h @@ -35,7 +35,6 @@ class TAO_MProfile; class TAO_ORB_Core; class TAO_Connect_Strategy; class TAO_Transport; -class TAO_Connection_Handler; namespace TAO { @@ -59,10 +58,10 @@ class TAO_Export TAO_Connector { public: - /// Default constructor. + /// default constructor. TAO_Connector (CORBA::ULong tag); - /// The destructor. + /// the destructor. virtual ~TAO_Connector (void); /** @@ -76,14 +75,12 @@ public: /// Parse a string containing a URL style IOR and return an /// MProfile. - int make_mprofile ( - const char *ior, - TAO_MProfile &mprofile - ACE_ENV_ARG_DECL); + int make_mprofile (const char *ior, + TAO_MProfile &mprofile + ACE_ENV_ARG_DECL); /// Initialize object and register with reactor. - virtual int open ( - TAO_ORB_Core *orb_core) = 0; + virtual int open (TAO_ORB_Core *orb_core) = 0; /// Shutdown Connector bridge and concrete Connector. virtual int close (void) = 0; @@ -93,21 +90,18 @@ public: * connect () method so it can be called from the invocation code * independent of the actual transport protocol in use. */ - virtual TAO_Transport* connect ( - TAO::Profile_Transport_Resolver *r, - TAO_Transport_Descriptor_Interface *desc, - ACE_Time_Value *timeout - ACE_ENV_ARG_DECL); + virtual TAO_Transport* connect (TAO::Profile_Transport_Resolver *r, + TAO_Transport_Descriptor_Interface *desc, + ACE_Time_Value *timeout + ACE_ENV_ARG_DECL); /// Create a profile for this protocol and initialize it based on the /// encapsulation in @a cdr - virtual TAO_Profile *create_profile ( - TAO_InputCDR& cdr) = 0; + virtual TAO_Profile *create_profile (TAO_InputCDR& cdr) = 0; /// Check that the prefix of the provided endpoint is valid for use /// with a given pluggable protocol. - virtual int check_prefix ( - const char *endpoint) = 0; + virtual int check_prefix (const char *endpoint) = 0; /// Return the object key delimiter to use or expect. virtual char object_key_delimiter (void) const = 0; @@ -121,35 +115,9 @@ protected: /// remote *_Addr's which have not been done during IOR decode. virtual int set_validate_endpoint (TAO_Endpoint *endpoint) = 0; - /// Make a connection - virtual TAO_Transport* make_connection ( - TAO::Profile_Transport_Resolver *r, - TAO_Transport_Descriptor_Interface &desc, - ACE_Time_Value *timeout) = 0; - - /// Cancel the passed cvs handler from the connector - virtual int cancel_svc_handler ( - TAO_Connection_Handler *svc_handler) = 0; - - /// Check whether the connection is not closed - /** - * @retval 0 The connection happens to be not closed, but is now open - * because an other thread managed to open the handler - * @retval -1 The connection is closed - */ - virtual int check_connection_closure ( - TAO_Connection_Handler *connection_handler); - - /** - * Wait for connection completion. We have a transport that is not - * connected yet, wait until it is connected. - * @retval true When we could use @a transport - * @return false When we can't use the @a transport - */ - virtual bool wait_for_connection_completion( - TAO::Profile_Transport_Resolver *r, - TAO_Transport *&transport, - ACE_Time_Value *timeout); + virtual TAO_Transport* make_connection (TAO::Profile_Transport_Resolver *r, + TAO_Transport_Descriptor_Interface &desc, + ACE_Time_Value *timeout) = 0; /// Set the ORB Core pointer void orb_core (TAO_ORB_Core *orb_core); diff --git a/TAO/tao/TypeCodeFactory.mpc b/TAO/tao/TypeCodeFactory.mpc index 031535adc89..d5fed83a8db 100644 --- a/TAO/tao/TypeCodeFactory.mpc +++ b/TAO/tao/TypeCodeFactory.mpc @@ -22,8 +22,4 @@ project : taolib, core, ifr_client { Resource_Files { TypeCodeFactory } - - PIDL_Files { - TypeCodeFactory - } } diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp index c6700c8118b..403daf58673 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp @@ -53,13 +53,13 @@ // Arg traits specializations. namespace TAO { - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:582 #if !defined (_CORBA_ANY__ARG_TRAITS_CS_) #define _CORBA_ANY__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::Any> : public @@ -72,13 +72,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:537 #if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_CS_) #define _CORBA_DEFINITIONKIND__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::DefinitionKind> : public @@ -92,7 +92,7 @@ namespace TAO #if !defined (_CORBA_CONTAINER__ARG_TRAITS_CS_) #define _CORBA_CONTAINER__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::Container> : public @@ -109,7 +109,7 @@ namespace TAO #if !defined (_CORBA_IDLTYPE__ARG_TRAITS_CS_) #define _CORBA_IDLTYPE__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::IDLType> : public @@ -123,13 +123,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:379 #if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_) #define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::InterfaceDefSeq> : public @@ -145,7 +145,7 @@ namespace TAO #if !defined (_CORBA_VALUEDEF__ARG_TRAITS_CS_) #define _CORBA_VALUEDEF__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::ValueDef> : public @@ -159,13 +159,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:379 #if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_) #define _CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::ValueDefSeq> : public @@ -178,13 +178,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:379 #if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_CS_) #define _CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::AbstractInterfaceDefSeq> : public @@ -197,13 +197,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:379 #if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_CS_) #define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::StructMemberSeq> : public @@ -216,13 +216,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:379 #if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_CS_) #define _CORBA_INITIALIZERSEQ__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::InitializerSeq> : public @@ -235,13 +235,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:379 #if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_) #define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::ExtInitializerSeq> : public @@ -254,13 +254,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:379 #if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_CS_) #define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::UnionMemberSeq> : public @@ -273,13 +273,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:379 #if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_CS_) #define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::EnumMemberSeq> : public @@ -292,13 +292,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:537 #if !defined (_CORBA_PRIMITIVEKIND__ARG_TRAITS_CS_) #define _CORBA_PRIMITIVEKIND__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::PrimitiveKind> : public @@ -309,13 +309,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:379 #if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_CS_) #define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::ExceptionDefSeq> : public @@ -328,13 +328,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:537 #if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_CS_) #define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::AttributeMode> : public @@ -345,13 +345,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:537 #if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_CS_) #define _CORBA_OPERATIONMODE__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::OperationMode> : public @@ -362,13 +362,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:379 #if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_CS_) #define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::ParDescriptionSeq> : public @@ -381,13 +381,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:379 #if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_CS_) #define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::ContextIdSeq> : public @@ -410,7 +410,7 @@ namespace TAO ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::TypeCodeFactory_ptr -TAO::Objref_Traits<CORBA::TypeCodeFactory>::duplicate ( +TAO::Objref_Traits<CORBA::TypeCodeFactory>::tao_duplicate ( CORBA::TypeCodeFactory_ptr p ) { @@ -419,7 +419,7 @@ TAO::Objref_Traits<CORBA::TypeCodeFactory>::duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::TypeCodeFactory>::release ( +TAO::Objref_Traits<CORBA::TypeCodeFactory>::tao_release ( CORBA::TypeCodeFactory_ptr p ) { @@ -428,14 +428,14 @@ TAO::Objref_Traits<CORBA::TypeCodeFactory>::release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::TypeCodeFactory_ptr -TAO::Objref_Traits<CORBA::TypeCodeFactory>::nil (void) +TAO::Objref_Traits<CORBA::TypeCodeFactory>::tao_nil (void) { return CORBA::TypeCodeFactory::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::TypeCodeFactory>::marshal ( +TAO::Objref_Traits<CORBA::TypeCodeFactory>::tao_marshal ( CORBA::TypeCodeFactory_ptr p, TAO_OutputCDR & cdr ) @@ -444,7 +444,7 @@ TAO::Objref_Traits<CORBA::TypeCodeFactory>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_TypeCodeFactory_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -455,7 +455,7 @@ CORBA::TypeCodeFactory::TypeCodeFactory (void) CORBA::TypeCodeFactory::~TypeCodeFactory (void) {} -void +void CORBA::TypeCodeFactory::_tao_any_destructor (void *_tao_void_pointer) { TypeCodeFactory *_tao_tmp_pointer = @@ -473,10 +473,10 @@ CORBA::TypeCodeFactory::_narrow ( { return TypeCodeFactory::_nil (); } - + TypeCodeFactory_ptr proxy = dynamic_cast<TypeCodeFactory_ptr> (_tao_objref); - + return TypeCodeFactory::_duplicate (proxy); } @@ -490,10 +490,10 @@ CORBA::TypeCodeFactory::_unchecked_narrow ( { return TypeCodeFactory::_nil (); } - + TypeCodeFactory_ptr proxy = dynamic_cast<TypeCodeFactory_ptr> (_tao_objref); - + return TypeCodeFactory::_duplicate (proxy); } @@ -504,7 +504,7 @@ CORBA::TypeCodeFactory::_duplicate (TypeCodeFactory_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -555,20 +555,20 @@ static const CORBA::Long _oc_CORBA_TypeCodeFactory[] = { TAO_ENCAP_BYTE_ORDER, // byte order 38, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5479), - ACE_NTOHL (0x7065436f), - ACE_NTOHL (0x64654661), - ACE_NTOHL (0x63746f72), - ACE_NTOHL (0x793a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f5479), + ACE_NTOHL (0x7065436f), + ACE_NTOHL (0x64654661), + ACE_NTOHL (0x63746f72), + ACE_NTOHL (0x793a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CORBA/TypeCodeFactory:1.0 16, - ACE_NTOHL (0x54797065), - ACE_NTOHL (0x436f6465), - ACE_NTOHL (0x46616374), + ACE_NTOHL (0x54797065), + ACE_NTOHL (0x436f6465), + ACE_NTOHL (0x46616374), ACE_NTOHL (0x6f727900), // name = TypeCodeFactory }; @@ -913,7 +913,7 @@ operator>>= ( TAO_Objref_Var_T< CORBA::TypeCodeFactory >; - + template class TAO_Objref_Out_T< CORBA::TypeCodeFactory @@ -1179,7 +1179,7 @@ operator>>= ( TAO_Objref_Var_T< \ CORBA::TypeCodeFactory > - + # pragma instantiate \ TAO_Objref_Out_T< \ CORBA::TypeCodeFactory @@ -1190,4 +1190,5 @@ operator>>= ( CORBA::TypeCodeFactory \ > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h index 9c179ba0312..c180b0952d6 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h @@ -70,13 +70,13 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// 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; } @@ -86,22 +86,22 @@ namespace TAO namespace CORBA { - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_TYPECODEFACTORY__VAR_OUT_CH_) #define _CORBA_TYPECODEFACTORY__VAR_OUT_CH_ - + class TypeCodeFactory; typedef TypeCodeFactory *TypeCodeFactory_ptr; - + typedef TAO_Objref_Var_T< TypeCodeFactory > TypeCodeFactory_var; - + typedef TAO_Objref_Out_T< TypeCodeFactory @@ -109,43 +109,43 @@ namespace CORBA TypeCodeFactory_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_TYPECODEFACTORY_CH_) #define _CORBA_TYPECODEFACTORY_CH_ - + class TAO_TypeCodeFactory_Export TypeCodeFactory : public virtual CORBA::Object { public: typedef TypeCodeFactory_ptr _ptr_type; typedef TypeCodeFactory_var _var_type; - + // The static operations. static TypeCodeFactory_ptr _duplicate (TypeCodeFactory_ptr obj); - + static TypeCodeFactory_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static TypeCodeFactory_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static TypeCodeFactory_ptr _nil (void) { return (TypeCodeFactory_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::TypeCode_ptr create_struct_tc ( const char * id, const char * name, @@ -155,10 +155,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::TypeCode_ptr create_union_tc ( const char * id, const char * name, @@ -169,10 +169,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::TypeCode_ptr create_enum_tc ( const char * id, const char * name, @@ -182,10 +182,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::TypeCode_ptr create_alias_tc ( const char * id, const char * name, @@ -195,10 +195,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::TypeCode_ptr create_exception_tc ( const char * id, const char * name, @@ -208,10 +208,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::TypeCode_ptr create_interface_tc ( const char * id, const char * name @@ -220,10 +220,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::TypeCode_ptr create_string_tc ( CORBA::ULong bound ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -231,10 +231,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::TypeCode_ptr create_wstring_tc ( CORBA::ULong bound ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -242,10 +242,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::TypeCode_ptr create_fixed_tc ( CORBA::UShort digits, CORBA::UShort scale @@ -254,10 +254,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::TypeCode_ptr create_sequence_tc ( CORBA::ULong bound, CORBA::TypeCode_ptr element_type @@ -266,10 +266,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::TypeCode_ptr create_array_tc ( CORBA::ULong length, CORBA::TypeCode_ptr element_type @@ -278,10 +278,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::TypeCode_ptr create_value_tc ( const char * id, const char * name, @@ -293,10 +293,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::TypeCode_ptr create_value_box_tc ( const char * id, const char * name, @@ -306,10 +306,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::TypeCode_ptr create_native_tc ( const char * id, const char * name @@ -318,10 +318,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::TypeCode_ptr create_recursive_tc ( const char * id ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -329,10 +329,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::TypeCode_ptr create_abstract_interface_tc ( const char * id, const char * name @@ -341,10 +341,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::TypeCode_ptr create_local_interface_tc ( const char * id, const char * name @@ -353,10 +353,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::TypeCode_ptr create_component_tc ( const char * id, const char * name @@ -365,10 +365,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::TypeCode_ptr create_home_tc ( const char * id, const char * name @@ -377,10 +377,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::TypeCode_ptr create_event_tc ( const char * id, const char * name, @@ -392,36 +392,36 @@ namespace CORBA 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. TypeCodeFactory (void); - + virtual ~TypeCodeFactory (void); - + private: // Private and unimplemented for concrete interfaces. TypeCodeFactory (const TypeCodeFactory &); - + void operator= (const TypeCodeFactory &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TypeCodeFactory; // TAO_IDL - Generated from @@ -438,18 +438,18 @@ namespace TAO #if !defined (_CORBA_TYPECODEFACTORY__TRAITS_CH_) #define _CORBA_TYPECODEFACTORY__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_TypeCodeFactory_Export Objref_Traits<CORBA::TypeCodeFactory> { - static CORBA::TypeCodeFactory_ptr duplicate ( + static CORBA::TypeCodeFactory_ptr tao_duplicate ( CORBA::TypeCodeFactory_ptr ); - static void release ( + static void tao_release ( CORBA::TypeCodeFactory_ptr ); - static CORBA::TypeCodeFactory_ptr nil (void); - static CORBA::Boolean marshal ( + static CORBA::TypeCodeFactory_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( CORBA::TypeCodeFactory_ptr p, TAO_OutputCDR & cdr ); @@ -483,3 +483,4 @@ TAO_TypeCodeFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA #include /**/ "ace/post.h" #endif /* ifndef */ + diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp index c186db28aa4..93167098bf1 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp @@ -7,7 +7,6 @@ #include "tao/ORB_Constants.h" #include "tao/CDR.h" #include "tao/Any_Impl.h" -#include "tao/SystemException.h" #include "ace/Containers_T.h" #include "ace/Hash_Map_Manager_T.h" @@ -66,7 +65,7 @@ TAO_TypeCodeFactory_i::create_union_tc ( ) ACE_THROW_SPEC ((CORBA::SystemException)) { - + if (name == 0 || !this->valid_name (name)) { ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 15, @@ -175,7 +174,7 @@ TAO_TypeCodeFactory_i::create_union_tc ( if (!valid_member) { - ACE_THROW_RETURN (CORBA::BAD_TYPECODE (CORBA::OMGVMCID | 2, + ACE_THROW_RETURN (CORBA::BAD_TYPECODE (2, CORBA::COMPLETED_NO), CORBA::TypeCode::_nil ()); } @@ -1229,7 +1228,7 @@ TAO_TypeCodeFactory_i::valid_name (const char *name) { return 1; } - + if (!isalpha (*name)) { return 0; @@ -1486,7 +1485,7 @@ TAO_TypeCodeFactory_i::assemble_tc (TAO_OutputCDR &cdr, CORBA::TypeCode (kind, consolidated_block.length (), consolidated_block.rd_ptr (), - true, + 0, 0), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); diff --git a/TAO/tao/TypeCodeFactory_Adapter.h b/TAO/tao/TypeCodeFactory_Adapter.h index f7732120b18..649caf3267b 100644 --- a/TAO/tao/TypeCodeFactory_Adapter.h +++ b/TAO/tao/TypeCodeFactory_Adapter.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/SystemException.h" +#include "tao/Exception.h" #include "tao/OBV_Constants.h" #include "tao/default_environment.h" diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp index 22f40bb19f0..b9e3e261989 100644 --- a/TAO/tao/Typecode.cpp +++ b/TAO/tao/Typecode.cpp @@ -20,7 +20,6 @@ #include "debug.h" #include "Any_Unknown_IDL_Type.h" #include "ORB_Constants.h" -#include "SystemException.h" #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \ || defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) @@ -3642,7 +3641,7 @@ CORBA::Any_ptr CORBA::TypeCode::parameter (const CORBA::Long /* slot */ ACE_ENV_ARG_DECL) { - ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (0, + ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), 0); } @@ -3652,60 +3651,31 @@ CORBA::TypeCode::parameter (const CORBA::Long /* slot */ namespace TAO { CORBA::TypeCode_ptr - Objref_Traits<CORBA::TypeCode>::duplicate (CORBA::TypeCode_ptr p) + Objref_Traits<CORBA::TypeCode>::tao_duplicate (CORBA::TypeCode_ptr p) { return CORBA::TypeCode::_duplicate (p); } void - Objref_Traits<CORBA::TypeCode>::release (CORBA::TypeCode_ptr p) + Objref_Traits<CORBA::TypeCode>::tao_release (CORBA::TypeCode_ptr p) { CORBA::release (p); } CORBA::TypeCode_ptr - Objref_Traits<CORBA::TypeCode>::nil (void) + Objref_Traits<CORBA::TypeCode>::tao_nil (void) { return CORBA::TypeCode::_nil (); } CORBA::Boolean - Objref_Traits<CORBA::TypeCode>::marshal (CORBA::TypeCode_ptr p, - TAO_OutputCDR & cdr) + Objref_Traits<CORBA::TypeCode>::tao_marshal (CORBA::TypeCode_ptr p, + TAO_OutputCDR & cdr) { return cdr << p; } } -/*static*/ CORBA::TypeCode_ptr -CORBA::TypeCode::_duplicate (CORBA::TypeCode_ptr tc) -{ - if (tc) - { - if (tc->orb_owns_) - { - tc->_incr_refcnt (); - return tc; - } - else - { - CORBA::TypeCode_ptr tmp = 0; - ACE_NEW_RETURN (tmp, - CORBA::TypeCode (static_cast<CORBA::TCKind> (tc->kind_), - tc->length_, - tc->buffer_, - true, - 0, - tc->parent_), - 0); - - return tmp; - } - } - - return 0; -} - // **************************************************************** CORBA::Boolean @@ -3714,7 +3684,7 @@ operator<< (TAO_OutputCDR& cdr, const CORBA::TypeCode *x) if (x == 0) { ACE_DECLARE_NEW_CORBA_ENV; - ACE_THROW_RETURN (CORBA::MARSHAL (0, + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), 0); } diff --git a/TAO/tao/Typecode.h b/TAO/tao/Typecode.h index a853dd4a39d..6020c59e98d 100644 --- a/TAO/tao/Typecode.h +++ b/TAO/tao/Typecode.h @@ -27,7 +27,7 @@ #include "ace/Hash_Map_Manager_T.h" #include "ace/Unbounded_Queue.h" -#include "tao/UserException.h" +#include "tao/Exception.h" #include "tao/Environment.h" #include "tao/Pseudo_VarOut_T.h" #include "tao/Objref_VarOut_T.h" @@ -190,7 +190,6 @@ namespace CORBA /// Duplicates i.e., increments ref count. static CORBA::TypeCode_ptr _duplicate (CORBA::TypeCode_ptr tc); - static void _release (CORBA::TypeCode_ptr tc); /// Returns a NULL typecode. static CORBA::TypeCode_ptr _nil (void); @@ -291,16 +290,19 @@ namespace CORBA * parent */ TypeCode (CORBA::TCKind kind, - size_t length, - const char *buffer, - CORBA::Boolean orb_owns_tc, - CORBA::ULong size, - CORBA::TypeCode_ptr parent = 0); + size_t length, + const char *buffer, + CORBA::Boolean orb_owns_tc, + CORBA::ULong size, + CORBA::TypeCode_ptr parent = 0); /// destructor ~TypeCode (void); - + /// These are used to indicate the status of marshaling. + // Reference counting operations. + CORBA::ULong _incr_refcnt (void); + CORBA::ULong _decr_refcnt (void); // = Following three are deprecated @@ -402,12 +404,8 @@ namespace CORBA // Useful for template programming. private: - // = All the private/helper methods - /// These are used to indicate the status of marshaling. - // Reference counting operations. - CORBA::ULong _incr_refcnt (void); - CORBA::ULong _decr_refcnt (void); + /** * equal() and equivalent() must both recurse, but their * behavior is somewhat different (as defined in CORBA 2.3). @@ -624,11 +622,11 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<CORBA::TypeCode> { - static CORBA::TypeCode_ptr duplicate (CORBA::TypeCode_ptr); - static void release (CORBA::TypeCode_ptr); - static CORBA::TypeCode_ptr nil (void); - static CORBA::Boolean marshal (CORBA::TypeCode_ptr p, - TAO_OutputCDR & cdr); + static CORBA::TypeCode_ptr tao_duplicate (CORBA::TypeCode_ptr); + static void tao_release (CORBA::TypeCode_ptr); + static CORBA::TypeCode_ptr tao_nil (void); + static CORBA::Boolean tao_marshal (CORBA::TypeCode_ptr p, + TAO_OutputCDR & cdr); }; /** diff --git a/TAO/tao/Typecode.i b/TAO/tao/Typecode.i index 7b49dd5c5ad..6c6f85e2fd2 100644 --- a/TAO/tao/Typecode.i +++ b/TAO/tao/Typecode.i @@ -9,7 +9,6 @@ CORBA::TypeCode::_incr_refcnt (void) return this->refcount_++; } - ACE_INLINE CORBA::ULong CORBA::TypeCode::_decr_refcnt (void) { @@ -23,16 +22,12 @@ CORBA::TypeCode::_decr_refcnt (void) return 0; } -/*static*/ ACE_INLINE void -CORBA::TypeCode::_release (CORBA::TypeCode_ptr tc) +ACE_INLINE CORBA::TypeCode_ptr +CORBA::TypeCode::_duplicate (CORBA::TypeCode_ptr tc) { if (tc) - { - if (tc->orb_owns_ == false) - return; - - tc->_decr_refcnt (); - } + tc->_incr_refcnt (); + return tc; } ACE_INLINE CORBA::TypeCode_ptr @@ -132,5 +127,7 @@ CORBA::is_nil (CORBA::TypeCode_ptr obj) ACE_INLINE void CORBA::release (CORBA::TypeCode_ptr obj) { - CORBA::TypeCode::_release (obj); + if (obj) + obj->_decr_refcnt (); } + diff --git a/TAO/tao/Typecode_Constants.cpp b/TAO/tao/Typecode_Constants.cpp index d842c153221..34e87120ffa 100644 --- a/TAO/tao/Typecode_Constants.cpp +++ b/TAO/tao/Typecode_Constants.cpp @@ -29,9 +29,8 @@ #include "tao/Typecode_Constants.h" #include "tao/Typecode.h" #include "tao/NVList.h" -#include "tao/ORB.h" +#include "ORB.h" #include "tao/Object.h" -#include "tao/SystemException.h" #if defined (TAO_HAS_AMI_POLLER) && (TAO_HAS_AMI_POLLER == 1) #include "tao/PollableC.h" diff --git a/TAO/tao/UB_String_Argument_T.cpp b/TAO/tao/UB_String_Argument_T.cpp index a22d029b64c..034badc8d9d 100644 --- a/TAO/tao/UB_String_Argument_T.cpp +++ b/TAO/tao/UB_String_Argument_T.cpp @@ -24,8 +24,6 @@ TAO::In_UB_String_Argument_T<S>::marshal (TAO_OutputCDR & cdr) return cdr << this->x_; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S> void TAO::In_UB_String_Argument_T<S>::interceptor_param (Dynamic::Parameter & p) @@ -34,8 +32,6 @@ TAO::In_UB_String_Argument_T<S>::interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_IN; } -#endif /* TAO_HAS_INTERCEPTORS */ - // =========================================================== template<typename S> @@ -53,8 +49,6 @@ TAO::Inout_UB_String_Argument_T<S>::demarshal (TAO_InputCDR & cdr) return cdr >> this->x_; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S> void TAO::Inout_UB_String_Argument_T<S>::interceptor_param (Dynamic::Parameter & p) @@ -63,8 +57,6 @@ TAO::Inout_UB_String_Argument_T<S>::interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_INOUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================== template<typename S, typename S_out> @@ -74,8 +66,6 @@ TAO::Out_UB_String_Argument_T<S,S_out>::demarshal (TAO_InputCDR & cdr) return cdr >> this->x_; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename S_out> void TAO::Out_UB_String_Argument_T<S,S_out>::interceptor_param ( @@ -86,8 +76,6 @@ TAO::Out_UB_String_Argument_T<S,S_out>::interceptor_param ( p.mode = CORBA::PARAM_OUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================ template<typename S, typename S_var> @@ -97,8 +85,6 @@ TAO::Ret_UB_String_Argument_T<S,S_var>::demarshal (TAO_InputCDR & cdr) return cdr >> this->x_.out (); } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename S_var> void TAO::Ret_UB_String_Argument_T<S,S_var>::interceptor_result (CORBA::Any * any) @@ -106,6 +92,4 @@ TAO::Ret_UB_String_Argument_T<S,S_var>::interceptor_result (CORBA::Any * any) (*any) <<= this->x_.in (); } -#endif /* TAO_HAS_INTERCEPTORS */ - #endif /* TAO_UB_STRING_ARGUMENT_T_C */ diff --git a/TAO/tao/UB_String_Argument_T.h b/TAO/tao/UB_String_Argument_T.h index 4553e79a9e2..a5d14c67e47 100644 --- a/TAO/tao/UB_String_Argument_T.h +++ b/TAO/tao/UB_String_Argument_T.h @@ -35,9 +35,9 @@ namespace TAO In_UB_String_Argument_T (const S * x); virtual CORBA::Boolean marshal (TAO_OutputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + const S * arg (void) const; private: @@ -58,9 +58,9 @@ namespace TAO virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S *& arg (void); private: @@ -80,9 +80,9 @@ namespace TAO Out_UB_String_Argument_T (S_out & x); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S *& arg (void); private: @@ -102,9 +102,9 @@ namespace TAO Ret_UB_String_Argument_T (void); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_result (CORBA::Any *); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S *& arg (void); S * excp (void); diff --git a/TAO/tao/UB_String_SArgument_T.cpp b/TAO/tao/UB_String_SArgument_T.cpp index 04844f9fea0..da3a42de777 100644 --- a/TAO/tao/UB_String_SArgument_T.cpp +++ b/TAO/tao/UB_String_SArgument_T.cpp @@ -21,8 +21,6 @@ TAO::In_UB_String_SArgument_T<S,S_var>::demarshal (TAO_InputCDR &cdr) return cdr >> this->x_.out (); } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename S_var> void TAO::In_UB_String_SArgument_T<S,S_var>::interceptor_param ( @@ -33,8 +31,6 @@ TAO::In_UB_String_SArgument_T<S,S_var>::interceptor_param ( p.mode = CORBA::PARAM_IN; } -#endif /* TAO_HAS_INTERCEPTORS */ - // =========================================================== template<typename S, typename S_var> @@ -51,8 +47,6 @@ TAO::Inout_UB_String_SArgument_T<S,S_var>::demarshal (TAO_InputCDR & cdr) return cdr >> this->x_.out (); } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename S_var> void TAO::Inout_UB_String_SArgument_T<S,S_var>::interceptor_param ( @@ -63,8 +57,6 @@ TAO::Inout_UB_String_SArgument_T<S,S_var>::interceptor_param ( p.mode = CORBA::PARAM_INOUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================== template<typename S, typename S_var> @@ -74,8 +66,6 @@ TAO::Out_UB_String_SArgument_T<S,S_var>::marshal (TAO_OutputCDR &cdr) return cdr << this->x_.in (); } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename S_var> void TAO::Out_UB_String_SArgument_T<S,S_var>::interceptor_param ( @@ -86,8 +76,6 @@ TAO::Out_UB_String_SArgument_T<S,S_var>::interceptor_param ( p.mode = CORBA::PARAM_OUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================ template<typename S, typename S_var> @@ -97,8 +85,6 @@ TAO::Ret_UB_String_SArgument_T<S,S_var>::marshal (TAO_OutputCDR & cdr) return cdr << this->x_.in (); } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename S_var> void TAO::Ret_UB_String_SArgument_T<S,S_var>::interceptor_result (CORBA::Any * any) @@ -106,6 +92,4 @@ TAO::Ret_UB_String_SArgument_T<S,S_var>::interceptor_result (CORBA::Any * any) (*any) <<= this->x_.in (); } -#endif /* TAO_HAS_INTERCEPTORS */ - #endif /* TAO_UB_STRING_SARGUMENT_T_C */ diff --git a/TAO/tao/UB_String_SArgument_T.h b/TAO/tao/UB_String_SArgument_T.h index f6e2d0f6297..4094f57b2ab 100644 --- a/TAO/tao/UB_String_SArgument_T.h +++ b/TAO/tao/UB_String_SArgument_T.h @@ -35,9 +35,9 @@ namespace TAO In_UB_String_SArgument_T (void); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + const S * arg (void) const; private: @@ -58,9 +58,9 @@ namespace TAO virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S *& arg (void); private: @@ -80,9 +80,9 @@ namespace TAO Out_UB_String_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S *& arg (void); private: @@ -102,9 +102,9 @@ namespace TAO Ret_UB_String_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_result (CORBA::Any *); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S *& arg (void); private: diff --git a/TAO/tao/UShortSeqC.h b/TAO/tao/UShortSeqC.h index 0a7cf275a8b..1ba78ecea0e 100644 --- a/TAO/tao/UShortSeqC.h +++ b/TAO/tao/UShortSeqC.h @@ -72,22 +72,22 @@ namespace CORBA { - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_USHORTSEQ_CH_) #define _CORBA_USHORTSEQ_CH_ - + class UShortSeq; - + typedef TAO_FixedSeq_Var_T< UShortSeq, CORBA::UShort > UShortSeq_var; - + typedef TAO_Seq_Out_T< UShortSeq, @@ -95,7 +95,7 @@ namespace CORBA CORBA::UShort > UShortSeq_out; - + class TAO_Export UShortSeq : public TAO_Unbounded_Sequence< @@ -108,22 +108,22 @@ namespace CORBA UShortSeq ( CORBA::ULong max, CORBA::ULong length, - CORBA::UShort* buffer, + CORBA::UShort* buffer, CORBA::Boolean release = 0 ); UShortSeq (const UShortSeq &); ~UShortSeq (void); - + static void _tao_any_destructor (void *); - + typedef UShortSeq_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UShortSeq; // TAO_IDL - Generated from @@ -139,18 +139,6 @@ namespace TAO { } -// Workaround for a Visual Studio .NET bug where this class is not -// properly imported by an application if typedef'd or subclassed, -// resulting in 'multiply defined' link errors. The export macro -// here forces an explicit import by the application. Please see -// http://support.microsoft.com/default.aspx?scid=kb;en-us;309801 -// The problem stems from use of the type below in DsLogAdmin, -// but we put the instantiation here because the application will -// need to see it in *C.h to avoid the error. -#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT - template class TAO_Export TAO_Unbounded_Sequence<CORBA::UShortSeq>; -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ - // TAO_IDL - Generated from // be\be_visitor_sequence/any_op_ch.cpp:52 diff --git a/TAO/tao/Utils.mpc b/TAO/tao/Utils.mpc index b57ba25bc19..88223e6007b 100644 --- a/TAO/tao/Utils.mpc +++ b/TAO/tao/Utils.mpc @@ -26,8 +26,4 @@ project : taolib, core, portableserver { Resource_Files { Utils } - - PIDL_Files { - } - } diff --git a/TAO/tao/Utils/RIR_Narrow.cpp b/TAO/tao/Utils/RIR_Narrow.cpp index 6c340121e4e..057ba51c9c8 100644 --- a/TAO/tao/Utils/RIR_Narrow.cpp +++ b/TAO/tao/Utils/RIR_Narrow.cpp @@ -2,7 +2,6 @@ #define TAO_UTILS_RIR_NARROW_CPP #include "RIR_Narrow.h" -#include "tao/SystemException.h" #include <stdexcept> ACE_RCSID (Utils, diff --git a/TAO/tao/Utils/Servant_Var.inl b/TAO/tao/Utils/Servant_Var.inl index 8716ed46cdf..426484ca1c3 100644 --- a/TAO/tao/Utils/Servant_Var.inl +++ b/TAO/tao/Utils/Servant_Var.inl @@ -1,16 +1,12 @@ -// -*- C++ -*- -// // $Id$ -#include "tao/Exception.h" #include "ace/Swap.h" template <class T> -ACE_INLINE T * -TAO::Utils::Servant_Var<T>::_duplicate (T * p) +ACE_INLINE T * TAO::Utils::Servant_Var<T>:: +_duplicate(T * p) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + ACE_TRY_NEW_ENV { if (p != 0) { @@ -23,52 +19,53 @@ TAO::Utils::Servant_Var<T>::_duplicate (T * p) ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK_RETURN (0); return p; } template <class T> ACE_INLINE void -TAO::Utils::Servant_Var<T>::swap (Servant_Var<T> & rhs) ACE_THROW_SPEC(()) +TAO::Utils::Servant_Var<T>::swap(Servant_Var<T> & rhs) ACE_THROW_SPEC(()) { - ACE_Swap<T*>::swap (this->ptr_, rhs.ptr_); + ACE_Swap<T*>::swap(this->ptr_, rhs.ptr_); } template <class T> -ACE_INLINE TAO::Utils::Servant_Var<T>::Servant_Var (T * p) - : ptr_ (p) +ACE_INLINE TAO::Utils::Servant_Var<T>:: +Servant_Var(T * p) + : ptr_(p) { } // If _add_ref throws, this object will not be completely constructed // so the destructor will not be called. template <class T> -ACE_INLINE TAO::Utils::Servant_Var<T>::Servant_Var (Servant_Var<T> const & rhs) - : ptr_ (Servant_Var<T>::_duplicate(rhs.ptr_)) +ACE_INLINE TAO::Utils::Servant_Var<T>:: +Servant_Var(Servant_Var<T> const & rhs) + : ptr_(Servant_Var<T>::_duplicate(rhs.ptr_)) { } template <class T> -ACE_INLINE TAO::Utils::Servant_Var<T> & -TAO::Utils::Servant_Var<T>::operator= (Servant_Var<T> const & rhs) +ACE_INLINE TAO::Utils::Servant_Var<T> & TAO::Utils::Servant_Var<T>:: +operator=(Servant_Var<T> const & rhs) { - TAO::Utils::Servant_Var<T> tmp (rhs); - this->swap (tmp); + TAO::Utils::Servant_Var<T> tmp(rhs); + this->swap(tmp); return *this; } template <class T> -ACE_INLINE typename TAO::Utils::Servant_Var<T> & -TAO::Utils::Servant_Var<T>::operator= (T * p) +ACE_INLINE ACE_TYPENAME TAO::Utils::Servant_Var<T> & TAO::Utils::Servant_Var<T>:: +operator=(T * p) { - TAO::Utils::Servant_Var<T> tmp (p); - this->swap (tmp); + TAO::Utils::Servant_Var<T> tmp(p); + this->swap(tmp); return *this; } template <class T> ACE_INLINE -TAO::Utils::Servant_Var<T>::~Servant_Var (void) +TAO::Utils::Servant_Var<T>::~Servant_Var () ACE_THROW_SPEC (()) { // Unfortunately, there is no throw spec on _remove_ref, so we @@ -92,95 +89,99 @@ TAO::Utils::Servant_Var<T>::~Servant_Var (void) #if !defined(ACE_LACKS_MEMBER_TEMPLATES) template <class T> template <class Y> -ACE_INLINE TAO::Utils::Servant_Var<T>::Servant_Var (Y * p) - : ptr_ (p) +ACE_INLINE TAO::Utils::Servant_Var<T>:: +Servant_Var(Y * p) + : ptr_(p) { } template <class T> template <class Y> -ACE_INLINE TAO::Utils::Servant_Var<T>::Servant_Var (Servant_Var<Y> const & rhs) - : ptr_ (Servant_Var<T>::_duplicate (rhs.in ())) +ACE_INLINE TAO::Utils::Servant_Var<T>:: +Servant_Var(Servant_Var<Y> const & rhs) + : ptr_(Servant_Var<T>::_duplicate(rhs.in())) { } template <class T> template <class Y> -ACE_INLINE typename TAO::Utils::Servant_Var<T> & -TAO::Utils::Servant_Var<T>:: +ACE_INLINE ACE_TYPENAME TAO::Utils::Servant_Var<T> & TAO::Utils::Servant_Var<T>:: operator=(Servant_Var<Y> const & rhs) { - TAO::Utils::Servant_Var<T> tmp (rhs); - this->swap (tmp); + TAO::Utils::Servant_Var<T> tmp(rhs); + this->swap(tmp); return *this; } template <class T> template <class Y> -ACE_INLINE typename TAO::Utils::Servant_Var<T> & -TAO::Utils::Servant_Var<T>::operator= (Y * p) +ACE_INLINE ACE_TYPENAME TAO::Utils::Servant_Var<T> & TAO::Utils::Servant_Var<T>:: +operator=(Y * p) { - TAO::Utils::Servant_Var<T> tmp (p); - this->swap (tmp); + TAO::Utils::Servant_Var<T> tmp(p); + this->swap(tmp); return *this; } #endif /* ACE_LACKS_MEMBER_TEMPLATES */ template <class T> -ACE_INLINE T const * -TAO::Utils::Servant_Var<T>::operator->() const +ACE_INLINE T const * TAO::Utils::Servant_Var<T>:: +operator->() const { return ptr_; } template <class T> -ACE_INLINE T * -TAO::Utils::Servant_Var<T>::operator->() +ACE_INLINE T * TAO::Utils::Servant_Var<T>:: +operator->() { return ptr_; } template <class T> -ACE_INLINE T const & TAO::Utils::Servant_Var<T>::operator*() const +ACE_INLINE T const & TAO::Utils::Servant_Var<T>:: +operator*() const { return *ptr_; } template <class T> -ACE_INLINE T & TAO::Utils::Servant_Var<T>::operator*() +ACE_INLINE T & TAO::Utils::Servant_Var<T>:: +operator*() { return *ptr_; } template <class T> -ACE_INLINE TAO::Utils::Servant_Var<T>::operator void const * () const +ACE_INLINE TAO::Utils::Servant_Var<T>:: +operator void const * () const { return ptr_; } template <class T> -ACE_INLINE T * -TAO::Utils::Servant_Var<T>::in (void) const +ACE_INLINE T * TAO::Utils::Servant_Var<T>:: +in() const { return ptr_; } template <class T> -ACE_INLINE T *& -TAO::Utils::Servant_Var<T>::inout (void) +ACE_INLINE T *& TAO::Utils::Servant_Var<T>:: +inout() { return ptr_; } template <class T> -ACE_INLINE T *& -TAO::Utils::Servant_Var<T>::out (void) +ACE_INLINE T *& TAO::Utils::Servant_Var<T>:: +out() { TAO::Utils::Servant_Var<T> tmp; - this->swap (tmp); + this->swap(tmp); return ptr_; } template <class T> -ACE_INLINE T * -TAO::Utils::Servant_Var<T>::_retn (void) +ACE_INLINE T * TAO::Utils::Servant_Var<T>:: +_retn() { T * rval = ptr_; ptr_ = 0; @@ -189,16 +190,18 @@ TAO::Utils::Servant_Var<T>::_retn (void) template <class X, class Y> ACE_INLINE bool -operator== (typename TAO::Utils::Servant_Var<X> const & x, - typename TAO::Utils::Servant_Var<Y> const & y) +operator==(ACE_TYPENAME TAO::Utils::Servant_Var<X> const & x, + ACE_TYPENAME TAO::Utils::Servant_Var<Y> const & y) { - return x.in () == y.in (); + return x.in() == y.in(); } +// -*- C++ -*- +// $Id$ template <class X, class Y> ACE_INLINE bool -operator!= (typename TAO::Utils::Servant_Var<X> const & x, - typename TAO::Utils::Servant_Var<Y> const & y) +operator!=(ACE_TYPENAME TAO::Utils::Servant_Var<X> const & x, + ACE_TYPENAME TAO::Utils::Servant_Var<Y> const & y) { - return x.in () != y.in (); + return x.in() != y.in(); } diff --git a/TAO/tao/Utils/Server_Main.cpp b/TAO/tao/Utils/Server_Main.cpp index bdbc1f0ad8c..3cd07cc85f7 100644 --- a/TAO/tao/Utils/Server_Main.cpp +++ b/TAO/tao/Utils/Server_Main.cpp @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file Server_Main.cpp @@ -11,7 +10,7 @@ * @author Dale Wilson <wilson_d@ociweb.com> */ //============================================================================= - +// #ifndef TAO_UTILS_SERVER_MAIN_T_CPP #define TAO_UTILS_SERVER_MAIN_T_CPP @@ -20,49 +19,39 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - -ACE_RCSID (Utils, - Server_Main, - "$Id$") - - -#include "tao/ORB.h" +ACE_RCSID(Utils, Server_Main, "$Id$") #include "ace/Argv_Type_Converter.h" #include "ace/Log_Msg.h" -#include "ace/Time_Value.h" - +#include "tao/ORB.h" template <typename SERVANT> -TAO::Utils::Server_Main<SERVANT>::Server_Main (const char * name) +TAO::Utils::Server_Main<SERVANT>::Server_Main(const char * name) : name_(name) { } template <typename SERVANT> -TAO::Utils::Server_Main<SERVANT>::~Server_Main () +TAO::Utils::Server_Main<SERVANT>::~Server_Main() { } template <typename SERVANT> -int -TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[]) +int TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[]) { int result = 0; // hide unicode if necessary. - ACE_Argv_Type_Converter command_line (argc, argv); + ACE_Argv_Type_Converter command_line(argc, argv); - char ** asciiArgv = command_line.get_ASCII_argv (); + char ** asciiArgv = command_line.get_ASCII_argv(); ACE_TRY_NEW_ENV { // Initialize the orb - CORBA::ORB_var orb = - CORBA::ORB_init (argc, asciiArgv, name_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (! CORBA::is_nil(orb.in ())) + CORBA::ORB_var orb = CORBA::ORB_init(argc, asciiArgv, name_ ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (-1); + if(! CORBA::is_nil(orb.in ())) { // create an instance of the servant object and give it a // chance at the arguments. @@ -72,19 +61,19 @@ TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[]) { ////////////////////////////////// // let the servant register itself - result = servant.init (orb.in () ACE_ENV_ARG_PARAMETER); + result = servant.init(orb.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == 0) { ACE_ERROR ((LM_INFO, - "%T %s (%P|%t) Ready %s\n", name_, servant.identity () + "%T %s (%P|%t) Ready %s\n", name_, servant.identity() )); ////////////////////////////////// // Run the event loop for the ORB. // Initial run to initialize the orb - ACE_Time_Value tv (1,0); + ACE_Time_Value tv(1,0); orb->run (tv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -92,22 +81,20 @@ TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[]) int quit = 0; while (result == 0 && ! quit ) { - ACE_Time_Value work_tv (1,0); + ACE_Time_Value work_tv(1,0); orb->perform_work(work_tv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; quit = servant.idle (result ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ACE_TRY_CHECK; } - servant.fini (ACE_ENV_SINGLE_ARG_PARAMETER); + servant.fini(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->shutdown (1 ACE_ENV_ARG_PARAMETER); + orb->shutdown(1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_ERROR ((LM_INFO, - "%T %s (%P|%t) Terminated normally. %s\n", - name_, - servant.identity () + "%T %s (%P|%t) Terminated normally. %s\n", name_, servant.identity() )); } else diff --git a/TAO/tao/Valuetype.mpc b/TAO/tao/Valuetype.mpc index 4cecf92a5f3..9da388eba2d 100644 --- a/TAO/tao/Valuetype.mpc +++ b/TAO/tao/Valuetype.mpc @@ -22,7 +22,4 @@ project : taolib, core { Resource_Files { Valuetype } - - PIDL_Files { - } } diff --git a/TAO/tao/Valuetype/Sequence_T.cpp b/TAO/tao/Valuetype/Sequence_T.cpp index 08f1571b21e..4d518d638e7 100644 --- a/TAO/tao/Valuetype/Sequence_T.cpp +++ b/TAO/tao/Valuetype/Sequence_T.cpp @@ -9,15 +9,15 @@ #include "Sequence_T.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (Valuetype, - Sequence_T, +ACE_RCSID (Valuetype, + Sequence_T, "$Id$") // ************************************************************* // class TAO_Valuetype_Manager // ************************************************************* -template <typename T, typename T_var> +template <typename T, typename T_var> TAO_Valuetype_Manager<T,T_var> & TAO_Valuetype_Manager<T,T_var>::operator= ( const TAO_Valuetype_Manager<T,T_var> & rhs @@ -30,9 +30,9 @@ TAO_Valuetype_Manager<T,T_var>::operator= ( if (this->release_) { - TAO::Value_Traits<T>::remove_ref (*this->ptr_); + TAO::Value_Traits<T>::tao_remove_ref (*this->ptr_); *this->ptr_ = *rhs.ptr_; - TAO::Value_Traits<T>::add_ref (*this->ptr_); + TAO::Value_Traits<T>::tao_add_ref (*this->ptr_); } else { @@ -42,7 +42,7 @@ TAO_Valuetype_Manager<T,T_var>::operator= ( return *this; } -template <typename T, typename T_var> +template <typename T, typename T_var> TAO_Valuetype_Manager<T,T_var> & TAO_Valuetype_Manager<T,T_var>::operator= (T * p) { @@ -52,7 +52,7 @@ TAO_Valuetype_Manager<T,T_var>::operator= (T * p) // that of a var variable. Therefore we will not duplicate the // user provided pointer before assigning it to the internal // variable. - TAO::Value_Traits<T>::remove_ref (*this->ptr_); + TAO::Value_Traits<T>::tao_remove_ref (*this->ptr_); *this->ptr_ = p; } else @@ -63,7 +63,7 @@ TAO_Valuetype_Manager<T,T_var>::operator= (T * p) return *this; } -template <typename T, typename T_var> +template <typename T, typename T_var> TAO_Valuetype_Manager<T,T_var> & TAO_Valuetype_Manager<T,T_var>::operator= (const T_var & p) { @@ -78,9 +78,9 @@ TAO_Valuetype_Manager<T,T_var>::operator= (const T_var & p) (*this->ptr_)->_remove_ref (); } - TAO::Value_Traits<T>::remove_ref (*this->ptr_); + TAO::Value_Traits<T>::tao_remove_ref (*this->ptr_); *this->ptr_ = p.in (); - TAO::Value_Traits<T>::add_ref (*this->ptr_); + TAO::Value_Traits<T>::tao_add_ref (*this->ptr_); } else { @@ -94,7 +94,7 @@ TAO_Valuetype_Manager<T,T_var>::operator= (const T_var & p) // Operations for class TAO_Unbounded_Valuetype_Sequence // ************************************************************* -template <typename T, typename T_var> +template <typename T, typename T_var> TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence ( CORBA::ULong maximum ) @@ -105,7 +105,7 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence ( { } -template <typename T, typename T_var> +template <typename T, typename T_var> TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence ( const TAO_Unbounded_Valuetype_Sequence<T,T_var> & rhs ) @@ -118,11 +118,12 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence ( this->maximum_ ); T ** const tmp2 = - reinterpret_cast<T ** ACE_CAST_CONST> (rhs.buffer_); + ACE_reinterpret_cast (T ** ACE_CAST_CONST, + rhs.buffer_); for (CORBA::ULong i = 0; i < rhs.length_; ++i) { - TAO::Value_Traits<T>::add_ref (tmp2[i]); + TAO::Value_Traits<T>::tao_add_ref (tmp2[i]); tmp1[i] = tmp2[i]; } @@ -134,7 +135,7 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence ( } } -template <typename T, typename T_var> +template <typename T, typename T_var> TAO_Unbounded_Valuetype_Sequence<T,T_var>::~TAO_Unbounded_Valuetype_Sequence ( void ) @@ -142,7 +143,7 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::~TAO_Unbounded_Valuetype_Sequence ( this->_deallocate_buffer (); } -template <typename T, typename T_var> +template <typename T, typename T_var> TAO_Unbounded_Valuetype_Sequence<T,T_var> & TAO_Unbounded_Valuetype_Sequence<T,T_var>::operator= ( const TAO_Unbounded_Valuetype_Sequence<T,T_var> & rhs @@ -155,11 +156,12 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::operator= ( if (this->release_) { - T ** tmp = reinterpret_cast<T **> (this->buffer_); + T ** tmp = ACE_reinterpret_cast (T **, + this->buffer_); for (CORBA::ULong i = 0; i < this->length_; ++i) { - TAO::Value_Traits<T>::remove_ref (tmp[i]); + TAO::Value_Traits<T>::tao_remove_ref (tmp[i]); tmp[i] = 0; } @@ -187,25 +189,27 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::operator= ( TAO_Unbounded_Base_Sequence::operator= (rhs); - T ** tmp1 = reinterpret_cast<T **> (this->buffer_); - T ** const tmp2 = reinterpret_cast<T **ACE_CAST_CONST> (rhs.buffer_); + T ** tmp1 = ACE_reinterpret_cast (T **, + this->buffer_); + T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, + rhs.buffer_); for (CORBA::ULong i = 0; i < rhs.length_; ++i) { - TAO::Value_Traits<T>::add_ref (tmp2[i]); + TAO::Value_Traits<T>::tao_add_ref (tmp2[i]); tmp1[i] = tmp2[i]; } return *this; } -template <typename T, typename T_var> +template <typename T, typename T_var> T ** TAO_Unbounded_Valuetype_Sequence<T,T_var>::allocbuf (CORBA::ULong nelems) { T ** buf = 0; - ACE_NEW_RETURN (buf, - T * [nelems], + ACE_NEW_RETURN (buf, + T * [nelems], 0); for (CORBA::ULong i = 0; i < nelems; ++i) @@ -216,7 +220,7 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::allocbuf (CORBA::ULong nelems) return buf; } -template <typename T, typename T_var> +template <typename T, typename T_var> void TAO_Unbounded_Valuetype_Sequence<T,T_var>::freebuf (T ** buffer) { @@ -240,18 +244,19 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::freebuf (T ** buffer) delete [] buffer; } -template <typename T, typename T_var> +template <typename T, typename T_var> void TAO_Unbounded_Valuetype_Sequence<T,T_var>::_allocate_buffer ( CORBA::ULong length ) { - T ** tmp = + T ** tmp = TAO_Unbounded_Valuetype_Sequence<T,T_var>::allocbuf (length); if (this->buffer_ != 0) { - T ** old = reinterpret_cast<T **> (this->buffer_); + T ** old = ACE_reinterpret_cast (T **, + this->buffer_); for (CORBA::ULong i = 0; i < this->length_; ++i) // Only call duplicate when we did not own the previous @@ -261,7 +266,7 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::_allocate_buffer ( // the old instances. if (!this->release_) { - TAO::Value_Traits<T>::add_ref (tmp[i]); + TAO::Value_Traits<T>::tao_add_ref (tmp[i]); tmp[i] = old[i]; } else @@ -278,7 +283,7 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::_allocate_buffer ( this->buffer_ = tmp; } -template <typename T, typename T_var> +template <typename T, typename T_var> void TAO_Unbounded_Valuetype_Sequence<T,T_var>::_deallocate_buffer (void) { @@ -287,11 +292,12 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::_deallocate_buffer (void) return; } - T ** tmp = reinterpret_cast<T **> (this->buffer_); + T ** tmp = ACE_reinterpret_cast (T **, + this->buffer_); for (CORBA::ULong i = 0; i < this->length_; ++i) { - TAO::Value_Traits<T>::remove_ref (tmp[i]); + TAO::Value_Traits<T>::tao_remove_ref (tmp[i]); tmp[i] = 0; } @@ -299,18 +305,19 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::_deallocate_buffer (void) this->buffer_ = 0; } -template <typename T, typename T_var> +template <typename T, typename T_var> void TAO_Unbounded_Valuetype_Sequence<T,T_var>::_shrink_buffer ( CORBA::ULong nl, CORBA::ULong ol ) { - T ** tmp = static_cast<T **> (this->buffer_); + T ** tmp = ACE_static_cast (T **, + this->buffer_); for (CORBA::ULong i = nl; i < ol; ++i) { - TAO::Value_Traits<T>::remove_ref (tmp[i]); + TAO::Value_Traits<T>::tao_remove_ref (tmp[i]); tmp[i] = 0; } } @@ -342,11 +349,11 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::TAO_Bounded_Valuetype_Sequence ( TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::allocbuf (MAX); T ** const tmp2 = - reinterpret_cast<T ** ACE_CAST_CONST> (rhs.buffer_); + ACE_reinterpret_cast (T ** ACE_CAST_CONST, rhs.buffer_); for (CORBA::ULong i = 0; i < rhs.length_; ++i) { - TAO::Value_Traits<T>::add_ref (tmp2[i]); + TAO::Value_Traits<T>::tao_add_ref (tmp2[i]); tmp1[i] = tmp2[i]; } @@ -371,11 +378,12 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::operator= ( if (this->release_) { - T ** tmp = reinterpret_cast<T **> (this->buffer_); + T ** tmp = ACE_reinterpret_cast (T **, + this->buffer_); for (CORBA::ULong i = 0; i < this->length_; ++i) { - TAO::Value_Traits<T>::remove_ref (tmp[i]); + TAO::Value_Traits<T>::tao_remove_ref (tmp[i]); tmp[i] = 0; } // No need to reallocate the buffer since it is always of size @@ -398,12 +406,14 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::operator= ( TAO_Bounded_Base_Sequence::operator= (rhs); - T ** tmp1 = reinterpret_cast<T **> (this->buffer_); - T ** const tmp2 = reinterpret_cast<T ** ACE_CAST_CONST> (rhs.buffer_); + T ** tmp1 = ACE_reinterpret_cast (T **, + this->buffer_); + T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, + rhs.buffer_); for (CORBA::ULong i = 0; i < rhs.length_; ++i) { - TAO::Value_Traits<T>::add_ref (tmp2[i]); + TAO::Value_Traits<T>::tao_add_ref (tmp2[i]); tmp1[i] = tmp2[i]; } @@ -415,8 +425,8 @@ T ** TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::allocbuf (CORBA::ULong) { T ** buf = 0; - ACE_NEW_RETURN (buf, - T * [MAX], + ACE_NEW_RETURN (buf, + T * [MAX], 0); for (CORBA::ULong i = 0; i < MAX; ++i) @@ -438,7 +448,7 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::freebuf (T ** buffer) { if (buffer[i] != 0) { - TAO::Value_Traits<T>::remove_ref (buffer[i]); + TAO::Value_Traits<T>::tao_remove_ref (buffer[i]); buffer[i] = 0; } } @@ -467,7 +477,8 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::_deallocate_buffer (void) return; } - T ** tmp = reinterpret_cast<T **> (this->buffer_); + T ** tmp = ACE_reinterpret_cast (T **, + this->buffer_); TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::freebuf (tmp); this->buffer_ = 0; } @@ -479,11 +490,12 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::_shrink_buffer ( CORBA::ULong ol ) { - T ** tmp = reinterpret_cast<T **> (this->buffer_); + T ** tmp = ACE_reinterpret_cast (T **, + this->buffer_); for (CORBA::ULong i = nl; i < ol; ++i) { - TAO::Value_Traits<T>::remove_ref (tmp[i]); + TAO::Value_Traits<T>::tao_remove_ref (tmp[i]); tmp[i] = 0; } } diff --git a/TAO/tao/Valuetype/Sequence_T.inl b/TAO/tao/Valuetype/Sequence_T.inl index 3468c13718a..98776b01bb5 100644 --- a/TAO/tao/Valuetype/Sequence_T.inl +++ b/TAO/tao/Valuetype/Sequence_T.inl @@ -7,13 +7,13 @@ // Inline operations for class TAO_Valuetype_Manager // ************************************************************* -template <typename T, typename T_var> +template <typename T, typename T_var> ACE_INLINE TAO_Valuetype_Manager<T,T_var>::~TAO_Valuetype_Manager (void) { } -template <typename T, typename T_var> +template <typename T, typename T_var> ACE_INLINE TAO_Valuetype_Manager<T,T_var>::TAO_Valuetype_Manager ( const TAO_Valuetype_Manager<T,T_var> & rhs @@ -23,10 +23,10 @@ TAO_Valuetype_Manager<T,T_var>::TAO_Valuetype_Manager ( { } -template <typename T, typename T_var> +template <typename T, typename T_var> ACE_INLINE TAO_Valuetype_Manager<T,T_var>::TAO_Valuetype_Manager( - T ** buffer, + T ** buffer, CORBA::Boolean release ) : ptr_ (buffer), @@ -34,64 +34,64 @@ TAO_Valuetype_Manager<T,T_var>::TAO_Valuetype_Manager( { } -template <typename T, typename T_var> -ACE_INLINE +template <typename T, typename T_var> +ACE_INLINE T * TAO_Valuetype_Manager<T,T_var>::operator-> (void) const { return *this->ptr_; } -template <typename T, typename T_var> +template <typename T, typename T_var> ACE_INLINE TAO_Valuetype_Manager<T,T_var>::operator const T_var () const { - TAO::Value_Traits<T>::add_ref (*this->ptr_); + TAO::Value_Traits<T>::tao_add_ref (*this->ptr_); return *this->ptr_; } -template <typename T, typename T_var> +template <typename T, typename T_var> ACE_INLINE TAO_Valuetype_Manager<T,T_var>::operator const T * () const { return *this->ptr_; } -template <typename T, typename T_var> +template <typename T, typename T_var> ACE_INLINE TAO_Valuetype_Manager<T,T_var>::operator T *& () { return *this->ptr_; } -template <typename T, typename T_var> -ACE_INLINE +template <typename T, typename T_var> +ACE_INLINE T * TAO_Valuetype_Manager<T,T_var>::in (void) const { return *this->ptr_; } -template <typename T, typename T_var> -ACE_INLINE +template <typename T, typename T_var> +ACE_INLINE T *& TAO_Valuetype_Manager<T,T_var>::inout (void) { return *this->ptr_; } -template <typename T, typename T_var> -ACE_INLINE +template <typename T, typename T_var> +ACE_INLINE T *& TAO_Valuetype_Manager<T,T_var>::out (void) { - TAO::Value_Traits<T>::remove_ref (*this->ptr_); + TAO::Value_Traits<T>::tao_remove_ref (*this->ptr_); *this->ptr_ = 0; return *this->ptr_; } -template <typename T, typename T_var> -ACE_INLINE +template <typename T, typename T_var> +ACE_INLINE T * TAO_Valuetype_Manager<T,T_var>::_retn (void) { @@ -104,7 +104,7 @@ TAO_Valuetype_Manager<T,T_var>::_retn (void) // class TAO_Unbounded_Valuetype_Sequence // ************************************************************* -template <typename T, typename T_var> +template <typename T, typename T_var> ACE_INLINE TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence ( void @@ -112,7 +112,7 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence ( { } -template <typename T, typename T_var> +template <typename T, typename T_var> ACE_INLINE TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence ( CORBA::ULong maximum, @@ -124,8 +124,8 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence ( { } -template <typename T, typename T_var> -ACE_INLINE +template <typename T, typename T_var> +ACE_INLINE TAO_Valuetype_Manager<T,T_var> TAO_Unbounded_Valuetype_Sequence<T,T_var>::operator[] ( CORBA::ULong slot @@ -140,7 +140,7 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::operator[] ( // class TAO_Bounded_Valuetype_Sequence // ************************************************************* -template<typename T, typename T_var, size_t MAX> +template<typename T, typename T_var, size_t MAX> ACE_INLINE TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::~TAO_Bounded_Valuetype_Sequence ( void @@ -149,7 +149,7 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::~TAO_Bounded_Valuetype_Sequence ( this->_deallocate_buffer (); } -template<typename T, typename T_var, size_t MAX> +template<typename T, typename T_var, size_t MAX> ACE_INLINE TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::TAO_Bounded_Valuetype_Sequence ( CORBA::ULong length, @@ -160,8 +160,8 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::TAO_Bounded_Valuetype_Sequence ( { } -template<typename T, typename T_var, size_t MAX> -ACE_INLINE +template<typename T, typename T_var, size_t MAX> +ACE_INLINE TAO_Valuetype_Manager<T,T_var> TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::operator[] ( CORBA::ULong slot @@ -171,3 +171,4 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::operator[] ( T ** const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST, this->buffer_); return TAO_Valuetype_Manager<T,T_var> (tmp + slot, this->release_); } + diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp index eb0524252fe..2a740b7b815 100644 --- a/TAO/tao/Valuetype/ValueBase.cpp +++ b/TAO/tao/Valuetype/ValueBase.cpp @@ -517,21 +517,21 @@ operator>> (TAO_InputCDR &strm, namespace TAO { void - Value_Traits<CORBA::ValueBase>::add_ref ( + Value_Traits<CORBA::ValueBase>::tao_add_ref ( CORBA::ValueBase *p) { CORBA::add_ref (p); } void - Value_Traits<CORBA::ValueBase>::remove_ref ( + Value_Traits<CORBA::ValueBase>::tao_remove_ref ( CORBA::ValueBase * p) { CORBA::remove_ref (p); } void - Value_Traits<CORBA::ValueBase>::release ( + Value_Traits<CORBA::ValueBase>::tao_release ( CORBA::ValueBase * p) { CORBA::remove_ref (p); diff --git a/TAO/tao/Valuetype/ValueBase.h b/TAO/tao/Valuetype/ValueBase.h index ff35debdefc..d75f136558d 100644 --- a/TAO/tao/Valuetype/ValueBase.h +++ b/TAO/tao/Valuetype/ValueBase.h @@ -224,12 +224,12 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Valuetype_Export Value_Traits<CORBA::ValueBase> { - static void add_ref (CORBA::ValueBase *); - static void remove_ref (CORBA::ValueBase *); + static void tao_add_ref (CORBA::ValueBase *); + static void tao_remove_ref (CORBA::ValueBase *); // For INOUT value type arguments, so they can use the same set // of arg classes as interfaces. - static void release (CORBA::ValueBase *); + static void tao_release (CORBA::ValueBase *); }; } diff --git a/TAO/tao/Valuetype/ValueFactory.cpp b/TAO/tao/Valuetype/ValueFactory.cpp index cf0f39e5e55..df331883ffe 100644 --- a/TAO/tao/Valuetype/ValueFactory.cpp +++ b/TAO/tao/Valuetype/ValueFactory.cpp @@ -83,19 +83,19 @@ namespace TAO using namespace CORBA; void - Value_Traits<ValueFactoryBase>::add_ref (ValueFactoryBase *p) + Value_Traits<ValueFactoryBase>::tao_add_ref (ValueFactoryBase *p) { CORBA::add_ref (p); } void - Value_Traits<ValueFactoryBase>::remove_ref (ValueFactoryBase * p) + Value_Traits<ValueFactoryBase>::tao_remove_ref (ValueFactoryBase * p) { CORBA::remove_ref (p); } void - Value_Traits<ValueFactoryBase>::release (ValueFactoryBase * p) + Value_Traits<ValueFactoryBase>::tao_release (ValueFactoryBase * p) { CORBA::remove_ref (p); } diff --git a/TAO/tao/Valuetype/ValueFactory.h b/TAO/tao/Valuetype/ValueFactory.h index 68c209c634d..af8fbe0d5d7 100644 --- a/TAO/tao/Valuetype/ValueFactory.h +++ b/TAO/tao/Valuetype/ValueFactory.h @@ -84,12 +84,15 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Valuetype_Export Value_Traits<CORBA::ValueFactoryBase> { - static void add_ref (CORBA::ValueFactoryBase *); - static void remove_ref (CORBA::ValueFactoryBase *); + static void tao_add_ref ( + CORBA::ValueFactoryBase *); + static void tao_remove_ref ( + CORBA::ValueFactoryBase *); // For INOUT value type arguments, so they can use the same set // of arg classes as interfaces. - static void release (CORBA::ValueFactoryBase *); + static void tao_release ( + CORBA::ValueFactoryBase *); }; } // Use this macro for writing code that is independend from diff --git a/TAO/tao/Valuetype/Value_VarOut_T.cpp b/TAO/tao/Valuetype/Value_VarOut_T.cpp index a235bf8fee3..ddcfe18c1f3 100644 --- a/TAO/tao/Valuetype/Value_VarOut_T.cpp +++ b/TAO/tao/Valuetype/Value_VarOut_T.cpp @@ -14,21 +14,21 @@ ACE_RCSID (Valuetype, template<typename T> void -TAO::Value_Traits<T>::add_ref (T * p) +TAO::Value_Traits<T>::tao_add_ref (T * p) { CORBA::add_ref (p); } template<typename T> void -TAO::Value_Traits<T>::remove_ref (T * p) +TAO::Value_Traits<T>::tao_remove_ref (T * p) { CORBA::remove_ref (p); } template<typename T> void -TAO::Value_Traits<T>::release (T * p) +TAO::Value_Traits<T>::tao_release (T * p) { CORBA::remove_ref (p); } @@ -47,7 +47,7 @@ TAO_Value_Var_T<T>::TAO_Value_Var_T (T * p) template <typename T> TAO_Value_Var_T<T>::TAO_Value_Var_T (const T * p) - : ptr_ (const_cast<T *> (p)) + : ptr_ (ACE_const_cast (T *, p)) {} template <typename T> @@ -62,21 +62,21 @@ TAO_Value_Var_T<T>::TAO_Value_Var_T ( const TAO_Value_Var_T<T> & p ) { - TAO::Value_Traits<T>::add_ref (p.ptr ()); + TAO::Value_Traits<T>::tao_add_ref (p.ptr ()); this->ptr_ = p.ptr (); } template <typename T> TAO_Value_Var_T<T>::~TAO_Value_Var_T (void) { - TAO::Value_Traits<T>::remove_ref (this->ptr_); + TAO::Value_Traits<T>::tao_remove_ref (this->ptr_); } template <typename T> TAO_Value_Var_T<T> & TAO_Value_Var_T<T>::operator= (T * p) { - TAO::Value_Traits<T>::remove_ref (this->ptr_); + TAO::Value_Traits<T>::tao_remove_ref (this->ptr_); this->ptr_ = p; return *this; } @@ -87,9 +87,9 @@ TAO_Value_Var_T<T>::operator= (const TAO_Value_Var_T & p) { if (this != &p) { - TAO::Value_Traits<T>::remove_ref (this->ptr_); + TAO::Value_Traits<T>::tao_remove_ref (this->ptr_); T * tmp = p.ptr (); - TAO::Value_Traits<T>::add_ref (tmp); + TAO::Value_Traits<T>::tao_add_ref (tmp); this->ptr_ = tmp; } @@ -133,7 +133,7 @@ template <typename T> T *& TAO_Value_Var_T<T>::out (void) { - TAO::Value_Traits<T>::remove_ref (this->ptr_); + TAO::Value_Traits<T>::tao_remove_ref (this->ptr_); this->ptr_ = 0; return this->ptr_; } @@ -160,7 +160,7 @@ template <typename T> TAO_Value_Out_T<T>::TAO_Value_Out_T (TAO_Value_Var_T<T> & p) : ptr_ (p.out ()) { - TAO::Value_Traits<T>::remove_ref (this->ptr_); + TAO::Value_Traits<T>::tao_remove_ref (this->ptr_); this->ptr_ = 0; } @@ -182,7 +182,7 @@ TAO_Value_Out_T<T> & TAO_Value_Out_T<T>::operator= (const TAO_Value_Var_T<T> & p) { T * tmp = p.ptr (); - TAO::Value_Traits<T>::add_ref (tmp); + TAO::Value_Traits<T>::tao_add_ref (tmp); this->ptr_ = tmp; return *this; } diff --git a/TAO/tao/Valuetype/Value_VarOut_T.h b/TAO/tao/Valuetype/Value_VarOut_T.h index 25e2af286dd..d6e94700362 100644 --- a/TAO/tao/Valuetype/Value_VarOut_T.h +++ b/TAO/tao/Valuetype/Value_VarOut_T.h @@ -30,12 +30,12 @@ namespace TAO template<typename T> struct Value_Traits { - static void add_ref (T *); - static void remove_ref (T *); + static void tao_add_ref (T *); + static void tao_remove_ref (T *); // For INOUT value type arguments, so they can use the same set // of arg classes as interfaces. - static void release (T *); + static void tao_release (T *); }; } diff --git a/TAO/tao/Var_Array_Argument_T.cpp b/TAO/tao/Var_Array_Argument_T.cpp index 591995eb163..c7f04620b0a 100644 --- a/TAO/tao/Var_Array_Argument_T.cpp +++ b/TAO/tao/Var_Array_Argument_T.cpp @@ -23,8 +23,6 @@ TAO::In_Var_Array_Argument_T<S,S_slice,S_forany>::marshal ( return cdr << this->x_; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename S_slice, typename S_forany> void TAO::In_Var_Array_Argument_T<S,S_slice,S_forany>::interceptor_param ( @@ -35,8 +33,6 @@ TAO::In_Var_Array_Argument_T<S,S_slice,S_forany>::interceptor_param ( p.mode = CORBA::PARAM_IN; } -#endif /* TAO_HAS_INTERCEPTORS */ - // =========================================================== template<typename S, typename S_slice, typename S_forany> @@ -57,8 +53,6 @@ TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany>::demarshal ( return cdr >> this->x_; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename S_slice, typename S_forany> void TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany>::interceptor_param ( @@ -69,8 +63,6 @@ TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany>::interceptor_param ( p.mode = CORBA::PARAM_INOUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================== template<typename S, @@ -86,14 +78,12 @@ TAO::Out_Var_Array_Argument_T<S,S_slice,S_var,S_out,S_forany,S_tag>::demarshal ( { typedef TAO::Array_Traits<S,S_slice,S_tag> ARRAY_TRAITS; ACE_ALLOCATOR_RETURN (this->x_, - ARRAY_TRAITS::alloc (), + ARRAY_TRAITS::tao_alloc (), 0); S_forany tmp (this->x_); return cdr >> tmp; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename S_slice, typename S_var, @@ -108,8 +98,6 @@ interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_OUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================ template<typename S, @@ -125,15 +113,13 @@ TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::demarshal ( typedef TAO::Array_Traits<S,S_slice,S_tag> ARRAY_TRAITS; S_slice * tmp_ptr = 0; ACE_ALLOCATOR_RETURN (tmp_ptr, - ARRAY_TRAITS::alloc (), + ARRAY_TRAITS::tao_alloc (), 0); this->x_ = tmp_ptr; S_forany tmp (this->x_.ptr ()); return cdr >> tmp; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename S_slice, typename S_var, @@ -146,6 +132,4 @@ interceptor_result (CORBA::Any * any) (*any) <<= S_forany (this->x_.ptr ()); } -#endif /* TAO_HAS_INTERCEPTORS */ - #endif /* TAO_VAR_ARRAY_ARGUMENT_T_C */ diff --git a/TAO/tao/Var_Array_Argument_T.h b/TAO/tao/Var_Array_Argument_T.h index 342acbc5311..d489b0af7e4 100644 --- a/TAO/tao/Var_Array_Argument_T.h +++ b/TAO/tao/Var_Array_Argument_T.h @@ -35,9 +35,9 @@ namespace TAO In_Var_Array_Argument_T (const S_slice * x); virtual CORBA::Boolean marshal (TAO_OutputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + const S_slice * arg (void) const; private: @@ -58,9 +58,9 @@ namespace TAO virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S_slice * arg (void); private: @@ -85,9 +85,9 @@ namespace TAO Out_Var_Array_Argument_T (S_out x); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S_slice *& arg (void); private: @@ -111,9 +111,9 @@ namespace TAO Ret_Var_Array_Argument_T (void); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_result (CORBA::Any *); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S_slice *& arg (void); S_slice * excp (void); diff --git a/TAO/tao/Var_Array_SArgument_T.cpp b/TAO/tao/Var_Array_SArgument_T.cpp index 216b9071d74..371d35cbe72 100644 --- a/TAO/tao/Var_Array_SArgument_T.cpp +++ b/TAO/tao/Var_Array_SArgument_T.cpp @@ -22,8 +22,6 @@ TAO::In_Var_Array_SArgument_T<S,S_forany>::demarshal (TAO_InputCDR &cdr) return cdr >> tmp; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename S_forany> void TAO::In_Var_Array_SArgument_T<S,S_forany>::interceptor_param ( @@ -34,8 +32,6 @@ TAO::In_Var_Array_SArgument_T<S,S_forany>::interceptor_param ( p.mode = CORBA::PARAM_IN; } -#endif /* TAO_HAS_INTERCEPTORS */ - // =========================================================== template<typename S, typename S_forany> @@ -53,8 +49,6 @@ TAO::Inout_Var_Array_SArgument_T<S,S_forany>::demarshal (TAO_InputCDR & cdr) return cdr >> tmp; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename S_forany> void TAO::Inout_Var_Array_SArgument_T<S,S_forany>::interceptor_param ( @@ -65,8 +59,6 @@ TAO::Inout_Var_Array_SArgument_T<S,S_forany>::interceptor_param ( p.mode = CORBA::PARAM_INOUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================== template<typename S_slice, typename S_var, typename S_forany> @@ -78,8 +70,6 @@ TAO::Out_Var_Array_SArgument_T<S_slice,S_var,S_forany>::marshal ( return cdr << S_forany (this->x_.ptr ()); } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S_slice, typename S_var, typename S_forany> void TAO::Out_Var_Array_SArgument_T<S_slice,S_var,S_forany>::interceptor_param ( @@ -90,8 +80,6 @@ TAO::Out_Var_Array_SArgument_T<S_slice,S_var,S_forany>::interceptor_param ( p.mode = CORBA::PARAM_OUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================ template<typename S_slice, typename S_var, typename S_forany> @@ -103,8 +91,6 @@ TAO::Ret_Var_Array_SArgument_T<S_slice,S_var,S_forany>::marshal ( return cdr << S_forany (this->x_.ptr ()); } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S_slice, typename S_var, typename S_forany> void TAO::Ret_Var_Array_SArgument_T<S_slice,S_var,S_forany>::interceptor_result ( @@ -114,6 +100,4 @@ TAO::Ret_Var_Array_SArgument_T<S_slice,S_var,S_forany>::interceptor_result ( (*any) <<= S_forany (this->x_.ptr ()); } -#endif /* TAO_HAS_INTERCEPTORS */ - #endif /* TAO_VAR_ARRAY_SARGUMENT_T_C */ diff --git a/TAO/tao/Var_Array_SArgument_T.h b/TAO/tao/Var_Array_SArgument_T.h index 70f5caad9fa..1c0e5a95752 100644 --- a/TAO/tao/Var_Array_SArgument_T.h +++ b/TAO/tao/Var_Array_SArgument_T.h @@ -35,9 +35,9 @@ namespace TAO In_Var_Array_SArgument_T (void); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + const S & arg (void) const; private: @@ -58,9 +58,9 @@ namespace TAO virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S & arg (void); private: @@ -80,9 +80,9 @@ namespace TAO Out_Var_Array_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S_slice *& arg (void); private: @@ -102,9 +102,9 @@ namespace TAO Ret_Var_Array_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_result (CORBA::Any *); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S_slice *& arg (void); private: diff --git a/TAO/tao/Var_Size_Argument_T.cpp b/TAO/tao/Var_Size_Argument_T.cpp index 5d28dae9742..0445fa652f3 100644 --- a/TAO/tao/Var_Size_Argument_T.cpp +++ b/TAO/tao/Var_Size_Argument_T.cpp @@ -21,8 +21,6 @@ TAO::In_Var_Size_Argument_T<S>::marshal (TAO_OutputCDR & cdr) return cdr << *this->x_; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S> void TAO::In_Var_Size_Argument_T<S>::interceptor_param (Dynamic::Parameter & p) @@ -31,8 +29,6 @@ TAO::In_Var_Size_Argument_T<S>::interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_IN; } -#endif /* TAO_HAS_INTERCEPTORS */ - // =========================================================== template<typename S> @@ -49,8 +45,6 @@ TAO::Inout_Var_Size_Argument_T<S>::demarshal (TAO_InputCDR & cdr) return cdr >> *this->x_; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S> void TAO::Inout_Var_Size_Argument_T<S>::interceptor_param (Dynamic::Parameter & p) @@ -59,8 +53,6 @@ TAO::Inout_Var_Size_Argument_T<S>::interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_INOUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================== template<typename S, typename S_out> @@ -68,11 +60,13 @@ CORBA::Boolean TAO::Out_Var_Size_Argument_T<S,S_out>::demarshal (TAO_InputCDR & cdr) { this->x_ = new S; + + /*ACE_NEW_RETURN (this->x_, + S, + 0); */ return cdr >> *this->x_; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename S_out> void TAO::Out_Var_Size_Argument_T<S,S_out>::interceptor_param ( @@ -83,8 +77,6 @@ TAO::Out_Var_Size_Argument_T<S,S_out>::interceptor_param ( p.mode = CORBA::PARAM_OUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================ template<typename S, typename S_var> @@ -99,8 +91,6 @@ TAO::Ret_Var_Size_Argument_T<S,S_var>::demarshal (TAO_InputCDR & cdr) return cdr >> this->x_.inout (); } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename S_var> void TAO::Ret_Var_Size_Argument_T<S,S_var>::interceptor_result (CORBA::Any * any) @@ -108,6 +98,4 @@ TAO::Ret_Var_Size_Argument_T<S,S_var>::interceptor_result (CORBA::Any * any) (*any) <<= this->x_.in (); } -#endif /* TAO_HAS_INTERCEPTORS */ - #endif /* TAO_VAR_SIZE_ARGUMENT_T_C */ diff --git a/TAO/tao/Var_Size_Argument_T.h b/TAO/tao/Var_Size_Argument_T.h index 88b81297218..c7c0ccf3400 100644 --- a/TAO/tao/Var_Size_Argument_T.h +++ b/TAO/tao/Var_Size_Argument_T.h @@ -35,9 +35,9 @@ namespace TAO In_Var_Size_Argument_T (S const & x); virtual CORBA::Boolean marshal (TAO_OutputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + const S & arg (void) const; private: @@ -58,9 +58,9 @@ namespace TAO virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S & arg (void); private: @@ -80,9 +80,9 @@ namespace TAO Out_Var_Size_Argument_T (S_out x); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S *& arg (void); private: @@ -102,9 +102,9 @@ namespace TAO Ret_Var_Size_Argument_T (void); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_result (CORBA::Any *); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S *& arg (void); S * excp (void); diff --git a/TAO/tao/Var_Size_SArgument_T.cpp b/TAO/tao/Var_Size_SArgument_T.cpp index 682b18ac6a3..bfca13434f6 100644 --- a/TAO/tao/Var_Size_SArgument_T.cpp +++ b/TAO/tao/Var_Size_SArgument_T.cpp @@ -21,8 +21,6 @@ TAO::In_Var_Size_SArgument_T<S>::demarshal (TAO_InputCDR &cdr) return cdr >> *this->x_; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S> void TAO::In_Var_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p) @@ -31,8 +29,6 @@ TAO::In_Var_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_IN; } -#endif /* TAO_HAS_INTERCEPTORS */ - // =========================================================== template<typename S> @@ -49,8 +45,6 @@ TAO::Inout_Var_Size_SArgument_T<S>::demarshal (TAO_InputCDR & cdr) return cdr >> *this->x_; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S> void TAO::Inout_Var_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p) @@ -59,8 +53,6 @@ TAO::Inout_Var_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_INOUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================== template<typename S, typename S_var> @@ -70,8 +62,6 @@ TAO::Out_Var_Size_SArgument_T<S,S_var>::marshal (TAO_OutputCDR &cdr) return cdr << this->x_.in (); } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename S_var> void TAO::Out_Var_Size_SArgument_T<S,S_var>::interceptor_param ( @@ -82,8 +72,6 @@ TAO::Out_Var_Size_SArgument_T<S,S_var>::interceptor_param ( p.mode = CORBA::PARAM_OUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================ template<typename S, typename S_var> @@ -92,8 +80,6 @@ TAO::Ret_Var_Size_SArgument_T<S,S_var>::marshal (TAO_OutputCDR & cdr) { return cdr << this->x_.in (); } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S, typename S_var> void @@ -102,6 +88,4 @@ TAO::Ret_Var_Size_SArgument_T<S,S_var>::interceptor_result (CORBA::Any * any) (*any) <<= this->x_.in (); } -#endif /* TAO_HAS_INTERCEPTORS */ - #endif /* TAO_VAR_SIZE_SARGUMENT_T_C */ diff --git a/TAO/tao/Var_Size_SArgument_T.h b/TAO/tao/Var_Size_SArgument_T.h index 5f1cb0a7a3e..6ab8fcd6e4a 100644 --- a/TAO/tao/Var_Size_SArgument_T.h +++ b/TAO/tao/Var_Size_SArgument_T.h @@ -35,9 +35,9 @@ namespace TAO In_Var_Size_SArgument_T (void); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + const S & arg (void) const; private: @@ -58,9 +58,9 @@ namespace TAO virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S & arg (void); private: @@ -80,9 +80,9 @@ namespace TAO Out_Var_Size_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_param (Dynamic::Parameter &); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S *& arg (void); private: @@ -102,9 +102,9 @@ namespace TAO Ret_Var_Size_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); -#if TAO_HAS_INTERCEPTORS == 1 + virtual void interceptor_result (CORBA::Any *); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ + S *& arg (void); private: diff --git a/TAO/tao/WrongTransactionA.cpp b/TAO/tao/WrongTransactionA.cpp index acec61525a9..2357c5fc611 100644 --- a/TAO/tao/WrongTransactionA.cpp +++ b/TAO/tao/WrongTransactionA.cpp @@ -27,7 +27,6 @@ #include "WrongTransactionC.h" #include "tao/Typecode.h" -#include "tao/SystemException.h" #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from @@ -172,3 +171,4 @@ CORBA::Boolean operator>>= ( > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp index d6b3f067135..3196a475d79 100644 --- a/TAO/tao/WrongTransactionC.cpp +++ b/TAO/tao/WrongTransactionC.cpp @@ -32,7 +32,6 @@ #include "WrongTransactionC.h" #include "tao/CDR.h" #include "tao/Typecode.h" -#include "tao/SystemException.h" #include "ace/OS_NS_string.h" #if defined (__BORLANDC__) @@ -198,3 +197,4 @@ CORBA::Boolean operator>> ( #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp index 3111bc36f50..609ad113229 100644 --- a/TAO/tao/append.cpp +++ b/TAO/tao/append.cpp @@ -27,8 +27,6 @@ #include "tao/Marshal.h" #include "tao/Any_Impl.h" #include "tao/CDR.h" -#include "tao/SystemException.h" - #include "ace/Dynamic_Service.h" ACE_RCSID (tao, @@ -99,7 +97,7 @@ TAO_Marshal_Primitive::append (CORBA::TypeCode_ptr tc, ACE_TEXT ("TAO_Marshal_Primitive::append detected error\n") )); - ACE_THROW_RETURN (CORBA::MARSHAL (0, + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } @@ -114,12 +112,12 @@ TAO_Marshal_Any::append (CORBA::TypeCode_ptr, CORBA::TypeCode_var elem_tc; if (!(*src >> elem_tc.inout ())) - ACE_THROW_RETURN (CORBA::MARSHAL (0, + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); if (!(*dest << elem_tc.in ())) - ACE_THROW_RETURN (CORBA::MARSHAL (0, + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); @@ -137,7 +135,7 @@ TAO_Marshal_Any::append (CORBA::TypeCode_ptr, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Any::append detected error\n"))); - ACE_THROW_RETURN (CORBA::MARSHAL (0, + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } @@ -258,7 +256,7 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr, ACE_TEXT ("TAO_Marshal_TypeCode::append detected error\n"))); } - ACE_THROW_RETURN (CORBA::MARSHAL (0, + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } @@ -344,7 +342,7 @@ TAO_Marshal_ObjRef::append (CORBA::TypeCode_ptr, ACE_TEXT ("TAO_Marshal_ObjRef::append detected error\n") )); - ACE_THROW_RETURN (CORBA::MARSHAL (0, + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } @@ -387,7 +385,7 @@ TAO_Marshal_Struct::append (CORBA::TypeCode_ptr tc, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Struct::append detected error\n"))); - ACE_THROW_RETURN (CORBA::MARSHAL (0, + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } @@ -678,7 +676,7 @@ TAO_Marshal_String::append (CORBA::TypeCode_ptr, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_TypeCode::append detected error\n"))); - ACE_THROW_RETURN (CORBA::MARSHAL (0, + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } @@ -1122,7 +1120,7 @@ TAO_Marshal_Alias::append (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Alias::append detected error\n"))); - ACE_THROW_RETURN (CORBA::MARSHAL (0, + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } @@ -1176,7 +1174,7 @@ TAO_Marshal_Except::append (CORBA::TypeCode_ptr tc, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Except::append detected error\n"))); - ACE_THROW_RETURN (CORBA::MARSHAL (0, + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } @@ -1206,7 +1204,7 @@ TAO_Marshal_WString::append (CORBA::TypeCode_ptr, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_WString::append detected error\n"))); - ACE_THROW_RETURN (CORBA::MARSHAL (0, + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } @@ -1312,7 +1310,7 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr tc, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Value::append detected error\n"))); - ACE_THROW_RETURN (CORBA::MARSHAL (0, + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h index 822d5499ad2..f38e43d31b7 100644 --- a/TAO/tao/corba.h +++ b/TAO/tao/corba.h @@ -37,8 +37,7 @@ #include "tao/Typecode.h" #include "tao/Environment.h" -#include "tao/SystemException.h" -#include "tao/UserException.h" +#include "tao/Exception.h" #include "tao/NVList.h" diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp index ef6ab5c28fb..1dd4d84c1a7 100644 --- a/TAO/tao/default_client.cpp +++ b/TAO/tao/default_client.cpp @@ -4,7 +4,6 @@ #include "Wait_On_Read.h" #include "Wait_On_Reactor.h" #include "Wait_On_Leader_Follower.h" -#include "Wait_On_LF_No_Upcall.h" #include "Exclusive_TMS.h" #include "Muxed_TMS.h" #include "Blocked_Connect_Strategy.h" @@ -109,10 +108,7 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[]) } else if (ACE_OS::strcasecmp (argv[curarg], - ACE_TEXT("-ORBClientConnectionHandler")) == 0 - || - ACE_OS::strcasecmp (argv[curarg], - ACE_TEXT("-ORBWaitStrategy")) == 0) + ACE_TEXT("-ORBClientConnectionHandler")) == 0) { curarg++; if (curarg < argc) @@ -128,9 +124,6 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (name, ACE_TEXT("RW")) == 0) this->wait_strategy_ = TAO_WAIT_ON_READ; - else if (ACE_OS::strcasecmp (name, - ACE_TEXT("MT_NOUPCALL")) == 0) - this->wait_strategy_ = TAO_WAIT_ON_LF_NO_UPCALL; else this->report_option_value_error (ACE_TEXT("-ORBClientConnectionHandler"), name); } @@ -294,10 +287,6 @@ TAO_Default_Client_Strategy_Factory::create_wait_strategy (TAO_Transport *transp ACE_NEW_RETURN (ws, TAO_Wait_On_Reactor (transport), 0); - else if (this->wait_strategy_ == TAO_WAIT_ON_LF_NO_UPCALL) - ACE_NEW_RETURN (ws, - TAO::Wait_On_LF_No_Upcall (transport), - 0); else { // = Leader follower model. diff --git a/TAO/tao/default_client.h b/TAO/tao/default_client.h index 6dd566dd682..d1958ff4aeb 100644 --- a/TAO/tao/default_client.h +++ b/TAO/tao/default_client.h @@ -87,8 +87,7 @@ private: { TAO_WAIT_ON_LEADER_FOLLOWER, TAO_WAIT_ON_REACTOR, - TAO_WAIT_ON_READ, - TAO_WAIT_ON_LF_NO_UPCALL + TAO_WAIT_ON_READ }; /// The wait-for-reply strategy. diff --git a/TAO/tao/diffs/ObjectReferenceTemplate.diff b/TAO/tao/diffs/ObjectReferenceTemplate.diff new file mode 100644 index 00000000000..318dd1a4816 --- /dev/null +++ b/TAO/tao/diffs/ObjectReferenceTemplate.diff @@ -0,0 +1,30 @@ +--- orig/ObjectReferenceTemplateC.h Thu Feb 7 15:04:56 2002 ++++ ObjectReferenceTemplateC.h Fri Feb 8 11:23:31 2002 +@@ -23,7 +23,7 @@ + #define _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATEC_H_ + + #include "ace/pre.h" +-#include "tao/corba.h" ++#include "tao/corbafwd.h" + + #if !defined (ACE_LACKS_PRAGMA_ONCE) + # pragma once +@@ -32,6 +32,8 @@ + #include "TAO_Export.h" + #include "OctetSeqC.h" + #include "StringSeqC.h" ++#include "ValueBase.h" ++#include "Exception.h" + + #if defined (TAO_EXPORT_MACRO) + #undef TAO_EXPORT_MACRO +--- orig/ObjectReferenceTemplateC.cpp Thu Feb 7 15:04:56 2002 ++++ ObjectReferenceTemplateC.cpp Fri Feb 8 11:23:01 2002 +@@ -24,6 +24,7 @@ + #include "tao/Stub.h" + #include "tao/Invocation.h" + #include "tao/PortableInterceptor.h" ++#include "tao/ValueFactory.h" + + #if TAO_HAS_INTERCEPTORS == 1 + #include "tao/RequestInfo_Util.h" diff --git a/TAO/tao/operation_details.cpp b/TAO/tao/operation_details.cpp index d8d2e27a3e3..6aa3fab038f 100644 --- a/TAO/tao/operation_details.cpp +++ b/TAO/tao/operation_details.cpp @@ -5,21 +5,16 @@ #include "ORB_Constants.h" #include "DynamicC.h" #include "Exception_Data.h" -#include "SystemException.h" - #include "ace/OS_NS_string.h" - #if !defined (__ACE_INLINE__) # include "tao/operation_details.i" #endif /* ! __ACE_INLINE__ */ - ACE_RCSID (tao, operation_details, "$Id$") - CORBA::Exception * TAO_Operation_Details::corba_exception (const char *id ACE_ENV_ARG_DECL) @@ -39,7 +34,7 @@ TAO_Operation_Details::corba_exception (const char *id if (exception == 0) { - ACE_THROW_RETURN (CORBA::NO_MEMORY (0, + ACE_THROW_RETURN (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0); } @@ -49,7 +44,7 @@ TAO_Operation_Details::corba_exception (const char *id } // If there are no matches return an unknown exception. - ACE_THROW_RETURN (CORBA::UNKNOWN (0, + ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0); } @@ -78,8 +73,6 @@ TAO_Operation_Details::demarshal_args (TAO_InputCDR &cdr) return true; } -#if TAO_HAS_INTERCEPTORS == 1 - bool TAO_Operation_Details::parameter_list (Dynamic::ParameterList ¶m_list) { @@ -92,7 +85,6 @@ TAO_Operation_Details::parameter_list (Dynamic::ParameterList ¶m_list) return true; } -#endif /* TAO_HAS_INTERCEPTORS == 1 */ bool TAO_Operation_Details::exception_list (Dynamic::ExceptionList &exception_list) @@ -114,8 +106,6 @@ TAO_Operation_Details::exception_list (Dynamic::ExceptionList &exception_list) } -#if TAO_HAS_INTERCEPTORS == 1 - bool TAO_Operation_Details::result (CORBA::Any *any) { @@ -124,5 +114,3 @@ TAO_Operation_Details::result (CORBA::Any *any) return true; } - -#endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/operation_details.h b/TAO/tao/operation_details.h index 5950a8b3235..7f217584581 100644 --- a/TAO/tao/operation_details.h +++ b/TAO/tao/operation_details.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "SystemException.h" +#include "Exception.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -141,11 +141,9 @@ public: * the list of parameters passed by the operation, exceptions * declared for the operation, and the result when available. */ - bool exception_list (Dynamic::ExceptionList &); -#if TAO_HAS_INTERCEPTORS == 1 bool parameter_list (Dynamic::ParameterList &); + bool exception_list (Dynamic::ExceptionList &); bool result (CORBA::Any *); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ //@} /// Accessors for the argumet list diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp index 15108839291..00e613ea836 100644 --- a/TAO/tao/skip.cpp +++ b/TAO/tao/skip.cpp @@ -26,8 +26,6 @@ #include "Typecode.h" #include "Any_Impl.h" #include "tao/CDR.h" -#include "SystemException.h" - #include "ace/Dynamic_Service.h" ACE_RCSID (tao, @@ -91,7 +89,7 @@ TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr tc, LM_DEBUG, ACE_TEXT ("TAO_Marshal_Primitive::skip detected error\n") )); - ACE_THROW_RETURN (CORBA::MARSHAL (0, + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } @@ -209,7 +207,7 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr, LM_DEBUG, ACE_TEXT ("TAO_Marshal_TypeCode::skip detected error\n") )); - ACE_THROW_RETURN (CORBA::MARSHAL (0, + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } @@ -240,7 +238,7 @@ TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr, LM_DEBUG, ACE_TEXT ("TAO_Marshal_Principal::skip detected error\n") )); - ACE_THROW_RETURN (CORBA::MARSHAL (0, + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } @@ -303,7 +301,7 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr, LM_DEBUG, ACE_TEXT ("TAO_Marshal_ObjRef::skip detected error\n") )); - ACE_THROW_RETURN (CORBA::MARSHAL (0, + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } @@ -342,7 +340,7 @@ TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr tc, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Struct::skip detected error\n"))); - ACE_THROW_RETURN (CORBA::MARSHAL (0, + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } @@ -620,7 +618,7 @@ TAO_Marshal_String::skip (CORBA::TypeCode_ptr, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_TypeCode::skip detected error\n"))); - ACE_THROW_RETURN (CORBA::MARSHAL (0, + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } @@ -857,7 +855,7 @@ TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr tc, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Alias::skip detected error\n"))); - ACE_THROW_RETURN (CORBA::MARSHAL (0, + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } @@ -907,7 +905,7 @@ TAO_Marshal_Except::skip (CORBA::TypeCode_ptr tc, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Except::skip detected error\n"))); - ACE_THROW_RETURN (CORBA::MARSHAL (0, + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } @@ -938,7 +936,7 @@ TAO_Marshal_WString::skip (CORBA::TypeCode_ptr, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_WString::skip detected error\n"))); - ACE_THROW_RETURN (CORBA::MARSHAL (0, + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } @@ -1035,7 +1033,7 @@ TAO_Marshal_Value::skip (CORBA::TypeCode_ptr tc, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Value::skip detected error\n"))); - ACE_THROW_RETURN (CORBA::MARSHAL (0, + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc index 34819bd2bfd..e4b9a2108b9 100644 --- a/TAO/tao/tao.mpc +++ b/TAO/tao/tao.mpc @@ -1,5 +1,5 @@ //$Id$ -project(TAO) : acelib, taoversion, core, tao_output, taodefaults, pidl, extra_core { +project(TAO) : acelib, taoversion, core, tao_output, taodefaults, extra_core { sharedname = TAO dynamicflags = TAO_BUILD_DLL @@ -77,8 +77,6 @@ project(TAO) : acelib, taoversion, core, tao_output, taodefaults, pidl, extra_co CurrentC.cpp CurrentA.cpp Exception.cpp - SystemException.cpp - UserException.cpp WrongTransactionC.cpp WrongTransactionA.cpp Environment.cpp @@ -204,7 +202,6 @@ project(TAO) : acelib, taoversion, core, tao_output, taodefaults, pidl, extra_co Wait_On_Read.cpp Wait_On_Reactor.cpp Wait_On_Leader_Follower.cpp - Wait_On_LF_No_Upcall.cpp Transport_Mux_Strategy.cpp Exclusive_TMS.cpp Muxed_TMS.cpp @@ -230,6 +227,7 @@ project(TAO) : acelib, taoversion, core, tao_output, taodefaults, pidl, extra_co TAOA.cpp Object_Loader.cpp TAO_Singleton_Manager.cpp + DLL_ORB.cpp Adapter.cpp Services_Activate.cpp Service_Callbacks.cpp |