diff options
56 files changed, 10777 insertions, 15179 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 924a80cfa39..6ecb3cdbcd6 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,107 @@ +Fri Apr 28 20:09:34 2000 Carlos O'Ryan <coryan@uci.edu> + + * Modified Messaging.pidl, Pollable.pidl and TAO.pidl to use local + interfaces, then re-generated the code using the local + interfaces, made whatever modifications where required and + stored the modifications as a patch file for future reference. + The change is good because it is a step to resolve [BUGID:322], + the memory management of local interfaces is well defined. + And because the change reduces the code size, for example, on + Linux the sizes before the change are: + text data bss dec hex filename + 39074 11832 264 51170 c7e2 .shobj/PollableC.o + 17353 5812 60 23225 5ab9 .shobj/PollableS.o + 109438 32556 2536 144530 23492 .shobj/MessagingC.o + 53514 18712 88 72314 11a7a .shobj/MessagingS.o + 27061 7516 584 35161 8959 .shobj/TAOC.o + 6739 2048 32 8819 2273 .shobj/TAOS.o + Once the files are generated using local interfaces the numbers + change to: + text data bss dec hex filename + 8647 2684 64 11395 2c83 .shobj/PollableC.o + 990 84 28 1102 44e .shobj/PollableS.o + 50581 16344 1192 68117 10a15 .shobj/MessagingC.o + 10532 2488 84 13104 3330 .shobj/MessagingS.o + 11928 3136 488 15552 3cc0 .shobj/TAOC.o + 990 84 28 1102 44e .shobj/TAOS.o + + * tao/Buffering_Constraint_Policy.h: + * tao/Buffering_Constraint_Policy.i: + * tao/Buffering_Constraint_Policy.cpp: + * tao/Client_Priority_Policy.h: + * tao/Client_Priority_Policy.cpp: + * tao/Messaging_Policy_i.h: + * tao/Messaging_Policy_i.cpp: + Reimplement the policies using the semantics for local + interfaces. We inherit from the stub instead of the skeleton + class, and there is no need to activate the object with the + POA. Interestingly destroy() becomes a no-op, when the last + references goes away the object is destroyed without any other + intervention. + + * tao/ORB.cpp: + * tao/Policy_Manager.cpp: + * tao/Stub.cpp: + Changed to use the new local interfaces, no more references to + the POA or activation. + + * tao/corbafwd.h: + * tao/Exception.cpp: + New minor code to indicate problems while manipulating + policies. + + * tao/Messaging.pidl: + * tao/MessagingC.h: + * tao/MessagingC.i: + * tao/MessagingC.cpp: + * tao/MessagingS.h: + * tao/MessagingS.i: + * tao/MessagingS.cpp: + * tao/MessagingS_T.h: + * tao/MessagingS_T.i: + * tao/MessagingS_T.cpp: + * tao/diffs/MessagingC.h.diff: + * tao/diffs/MessagingC.i.diff: + * tao/diffs/MessagingC.cpp.diff: + * tao/diffs/MessagingS.h.diff: + * tao/diffs/MessagingS.i.diff: + * tao/diffs/MessagingS.cpp.diff: + * tao/diffs/MessagingS_T.h.diff: + * tao/diffs/MessagingS_T.i.diff: + * tao/diffs/MessagingS_T.cpp.diff: + The new files for Messaging.pidl + + * tao/Pollable.pidl: + * tao/PollableC.h: + * tao/PollableC.i: + * tao/PollableC.cpp: + * tao/PollableS.h: + * tao/PollableS.i: + * tao/PollableS.cpp: + * tao/PollableS_T.h: + * tao/PollableS_T.i: + * tao/PollableS_T.cpp: + * tao/diffs/PollableC.h.diff: + * tao/diffs/PollableC.i.diff: + * tao/diffs/PollableC.cpp.diff: + The new files for Pollable.pidl + + * tao/TAO.pidl: + * tao/TAOC.h: + * tao/TAOC.i: + * tao/TAOC.cpp: + * tao/TAOS.h: + * tao/TAOS.i: + * tao/TAOS.cpp: + * tao/TAOS_T.h: + * tao/TAOS_T.i: + * tao/TAOS_T.cpp: + * tao/diffs/TAOC.h.diff: + * tao/diffs/TAOC.i.diff: + * tao/diffs/TAOC.cpp.diff: + The new files for TAO.pidl + + Fri Apr 28 21:22:44 2000 Balachandran Natarajan <bala@cs.wustl.edu> * tao/Invocation.cpp (create_ior_info): diff --git a/TAO/tao/Buffering_Constraint_Policy.cpp b/TAO/tao/Buffering_Constraint_Policy.cpp index 1e83634bc86..251687ea267 100644 --- a/TAO/tao/Buffering_Constraint_Policy.cpp +++ b/TAO/tao/Buffering_Constraint_Policy.cpp @@ -11,18 +11,14 @@ ACE_RCSID(TAO, Buffering_Constraint_Policy, "$Id$") #include "tao/Buffering_Constraint_Policy.i" #endif /* __ACE_INLINE__ */ -TAO_Buffering_Constraint_Policy::TAO_Buffering_Constraint_Policy (const TAO::BufferingConstraint &buffering_constraint, - PortableServer::POA_ptr poa) - : buffering_constraint_ (buffering_constraint), - poa_ (PortableServer::POA::_duplicate (poa)) +TAO_Buffering_Constraint_Policy::TAO_Buffering_Constraint_Policy (const TAO::BufferingConstraint &buffering_constraint) + : buffering_constraint_ (buffering_constraint) { } TAO_Buffering_Constraint_Policy::TAO_Buffering_Constraint_Policy (const TAO_Buffering_Constraint_Policy &rhs) - : TAO_RefCountServantBase (rhs), - POA_TAO::BufferingConstraintPolicy (rhs), - buffering_constraint_ (rhs.buffering_constraint_), - poa_ (rhs.poa_) + : TAO::BufferingConstraintPolicy (), + buffering_constraint_ (rhs.buffering_constraint_) { } @@ -33,8 +29,7 @@ TAO_Buffering_Constraint_Policy::policy_type (CORBA_Environment &) } CORBA::Policy_ptr -TAO_Buffering_Constraint_Policy::create (PortableServer::POA_ptr poa, - const CORBA::Any& val, +TAO_Buffering_Constraint_Policy::create (const CORBA::Any& val, CORBA::Environment &ACE_TRY_ENV) { TAO::BufferingConstraint *buffering_constraint; @@ -44,17 +39,11 @@ TAO_Buffering_Constraint_Policy::create (PortableServer::POA_ptr poa, TAO_Buffering_Constraint_Policy *servant = 0; ACE_NEW_THROW_EX (servant, - TAO_Buffering_Constraint_Policy (*buffering_constraint, - poa), + TAO_Buffering_Constraint_Policy (*buffering_constraint), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); - PortableServer::ServantBase_var smart_servant (servant); - - CORBA::Policy_var result = servant->_this (ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); - - return result._retn (); + return servant; } TAO_Buffering_Constraint_Policy * @@ -76,31 +65,12 @@ TAO_Buffering_Constraint_Policy::copy (CORBA_Environment &ACE_TRY_ENV) CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); - PortableServer::ServantBase_var smart_servant (servant); - - CORBA::Policy_var result = servant->_this (ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); - - return result._retn (); + return servant; } void -TAO_Buffering_Constraint_Policy::destroy (CORBA_Environment &ACE_TRY_ENV) -{ - PortableServer::ObjectId_var id = - this->poa_->servant_to_id (this, - ACE_TRY_ENV); - ACE_CHECK; - - this->poa_->deactivate_object (id.in (), - ACE_TRY_ENV); - ACE_CHECK; -} - -PortableServer::POA_ptr -TAO_Buffering_Constraint_Policy::_default_POA (CORBA_Environment &) +TAO_Buffering_Constraint_Policy::destroy (CORBA_Environment &) { - return PortableServer::POA::_duplicate (this->poa_.in ()); } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/Buffering_Constraint_Policy.h b/TAO/tao/Buffering_Constraint_Policy.h index 4a46e879de9..9d4187f2f6d 100644 --- a/TAO/tao/Buffering_Constraint_Policy.h +++ b/TAO/tao/Buffering_Constraint_Policy.h @@ -29,7 +29,7 @@ #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) -#include "tao/TAOS.h" +#include "tao/TAOC.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) @@ -38,8 +38,7 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -class TAO_Export TAO_Buffering_Constraint_Policy : public TAO_RefCountServantBase, - public POA_TAO::BufferingConstraintPolicy +class TAO_Export TAO_Buffering_Constraint_Policy : public TAO::BufferingConstraintPolicy { // = TITLE // Implementation class for TAO-specific Buffering Constraint @@ -50,15 +49,13 @@ class TAO_Export TAO_Buffering_Constraint_Policy : public TAO_RefCountServantBas // the ORB. // public: - TAO_Buffering_Constraint_Policy (const TAO::BufferingConstraint &buffering_constraint, - PortableServer::POA_ptr poa); + TAO_Buffering_Constraint_Policy (const TAO::BufferingConstraint &buffering_constraint); // Constructor. TAO_Buffering_Constraint_Policy (const TAO_Buffering_Constraint_Policy &rhs); // Copy constructor. - static CORBA::Policy_ptr create (PortableServer::POA_ptr poa, - const CORBA::Any& val, + static CORBA::Policy_ptr create (const CORBA::Any& val, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); // Helper method for the implementation of CORBA::ORB::create_policy. @@ -76,14 +73,9 @@ public: virtual void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - private: TAO::BufferingConstraint buffering_constraint_; // The attribute - - PortableServer::POA_var poa_; - // The default poa }; #if defined(_MSC_VER) && (_MSC_VER >= 1200) diff --git a/TAO/tao/Buffering_Constraint_Policy.i b/TAO/tao/Buffering_Constraint_Policy.i index 92b7a9af7ba..6a7f3a8df4e 100644 --- a/TAO/tao/Buffering_Constraint_Policy.i +++ b/TAO/tao/Buffering_Constraint_Policy.i @@ -11,4 +11,3 @@ TAO_Buffering_Constraint_Policy::buffering_constraint (void) { return this->buffering_constraint_; } - diff --git a/TAO/tao/Client_Priority_Policy.cpp b/TAO/tao/Client_Priority_Policy.cpp index d9742e8c143..6707aca5d48 100644 --- a/TAO/tao/Client_Priority_Policy.cpp +++ b/TAO/tao/Client_Priority_Policy.cpp @@ -12,17 +12,13 @@ ACE_RCSID(TAO, Client_Priority_Policy, "$Id$") TAO_Client_Priority_Policy::TAO_Client_Priority_Policy ( - PortableServer::POA_ptr poa, const TAO::PrioritySpecification &priority_spec) - : poa_ (PortableServer::POA::_duplicate (poa)), - priority_spec_ (priority_spec) + : priority_spec_ (priority_spec) { } TAO_Client_Priority_Policy::TAO_Client_Priority_Policy (const TAO_Client_Priority_Policy &rhs) - : TAO_RefCountServantBase (rhs), - POA_TAO::ClientPriorityPolicy (rhs), - poa_ (rhs.poa_), + : TAO::ClientPriorityPolicy (), priority_spec_ (rhs.priority_spec_) { } @@ -40,8 +36,7 @@ TAO_Client_Priority_Policy::policy_type (CORBA_Environment &) } CORBA::Policy_ptr -TAO_Client_Priority_Policy::create (PortableServer::POA_ptr poa, - const CORBA::Any& val, +TAO_Client_Priority_Policy::create (const CORBA::Any& val, CORBA::Environment &ACE_TRY_ENV) { // Future policy implementors: notice how the following code is @@ -54,16 +49,11 @@ TAO_Client_Priority_Policy::create (PortableServer::POA_ptr poa, TAO_Client_Priority_Policy *tmp; ACE_NEW_THROW_EX (tmp, - TAO_Client_Priority_Policy (poa, *priority_spec), + TAO_Client_Priority_Policy (*priority_spec), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); - PortableServer::ServantBase_var clone (tmp); - - CORBA::Policy_var result = tmp->_this (ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); - - return result._retn (); + return tmp; } TAO_Client_Priority_Policy * @@ -88,28 +78,12 @@ TAO_Client_Priority_Policy::copy (CORBA_Environment &ACE_TRY_ENV) CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); - PortableServer::ServantBase_var clone (tmp); - - CORBA::Policy_var result = tmp->_this (ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); - - return result._retn (); + return tmp; } void -TAO_Client_Priority_Policy::destroy (CORBA_Environment &ACE_TRY_ENV) -{ - PortableServer::ObjectId_var id = - this->poa_->servant_to_id (this, ACE_TRY_ENV); - ACE_CHECK; - this->poa_->deactivate_object (id.in (), ACE_TRY_ENV); - ACE_CHECK; -} - -PortableServer::POA_ptr -TAO_Client_Priority_Policy::_default_POA (CORBA_Environment &) +TAO_Client_Priority_Policy::destroy (CORBA_Environment &) { - return PortableServer::POA::_duplicate (this->poa_.in ()); } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/Client_Priority_Policy.h b/TAO/tao/Client_Priority_Policy.h index 6c09136f670..94238a33109 100644 --- a/TAO/tao/Client_Priority_Policy.h +++ b/TAO/tao/Client_Priority_Policy.h @@ -31,7 +31,7 @@ #if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1) -#include "tao/TAOS.h" +#include "tao/TAOC.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) @@ -40,8 +40,7 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -class TAO_Export TAO_Client_Priority_Policy : public TAO_RefCountServantBase, - public POA_TAO::ClientPriorityPolicy +class TAO_Export TAO_Client_Priority_Policy : public TAO::ClientPriorityPolicy { // = TITLE // @@ -50,15 +49,13 @@ class TAO_Export TAO_Client_Priority_Policy : public TAO_RefCountServantBase, // // public: - TAO_Client_Priority_Policy (PortableServer::POA_ptr poa, - const TAO::PrioritySpecification &priority_spec); + TAO_Client_Priority_Policy (const TAO::PrioritySpecification &priority_spec); // Constructor. TAO_Client_Priority_Policy (const TAO_Client_Priority_Policy &rhs); // Copy constructor. static CORBA::Policy_ptr create ( - PortableServer::POA_ptr poa, const CORBA::Any& val, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () @@ -82,14 +79,8 @@ public: virtual void destroy ( CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); - virtual PortableServer::POA_ptr _default_POA ( - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () - ); private: - PortableServer::POA_var poa_; - // The default poa - TAO::PrioritySpecification priority_spec_; // The attribute }; diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp index 01adcbeabab..86992111f17 100644 --- a/TAO/tao/Exception.cpp +++ b/TAO/tao/Exception.cpp @@ -436,6 +436,9 @@ CORBA_SystemException::_info (void) const 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; default: location = "unknown location"; } diff --git a/TAO/tao/Messaging.pidl b/TAO/tao/Messaging.pidl index e636869e3f5..f8d5dbf82a1 100644 --- a/TAO/tao/Messaging.pidl +++ b/TAO/tao/Messaging.pidl @@ -11,19 +11,30 @@ // // = DESCRIPTION // This file was used to generate the code in Messaging{C,S,S_T}.{h,i,cpp} -// The code is then hand-crafted to compile it inside the ORB, avoid -// cyclic dependencies and enforce the locality constraints on -// certain objects. +// +// The command used to generate code from this file is: +// +// tao_idl -o orig -Gp -Gd -Ge 1 -Gv \ +// -Wb,export_macro=TAO_Export \ +// -Wb,export_include="tao/corbafwd.h" Messaging.pidl +// +// after the file is generated a patch must be applied. The patch +// fixes the interface repository IDs, disables the code under +// certain configurations, and eliminates cycles in the include +// dependencies. Those changes are required because the generated +// code is part of the TAO library, it hardly makes any sense to +// change the IDL compiler to support changes that are very +// occasional. // // ================================================================ -#pragma prefix "omg.org" - #include "TimeBase.pidl" #include "IOP.pidl" #include "Policy.pidl" #include "Pollable.pidl" +#pragma prefix "omg.org" + module Messaging { // @@ -66,13 +77,13 @@ module Messaging // Rebind Policy (default = TRANSPARENT) const CORBA::PolicyType REBIND_POLICY_TYPE = 23; - interface RebindPolicy : CORBA::Policy { + local interface RebindPolicy : CORBA::Policy { readonly attribute RebindMode rebind_mode; }; // Synchronization Policy (default = WITH_TRANSPORT) const CORBA::PolicyType SYNC_SCOPE_POLICY_TYPE = 24; - interface SyncScopePolicy : CORBA::Policy { + local interface SyncScopePolicy : CORBA::Policy { readonly attribute SyncScope synchronization; }; @@ -82,40 +93,40 @@ module Messaging Priority min; Priority max; }; - interface RequestPriorityPolicy : CORBA::Policy { + local interface RequestPriorityPolicy : CORBA::Policy { readonly attribute PriorityRange priority_range; }; const CORBA::PolicyType REPLY_PRIORITY_POLICY_TYPE = 26; - interface ReplyPriorityPolicy : CORBA::Policy { + local interface ReplyPriorityPolicy : CORBA::Policy { readonly attribute PriorityRange priority_range; }; // Timeout Policies const CORBA::PolicyType REQUEST_START_TIME_POLICY_TYPE = 27; - interface RequestStartTimePolicy : CORBA::Policy { + local interface RequestStartTimePolicy : CORBA::Policy { readonly attribute TimeBase::UtcT start_time; }; const CORBA::PolicyType REQUEST_END_TIME_POLICY_TYPE = 28; - interface RequestEndTimePolicy : CORBA::Policy { + local interface RequestEndTimePolicy : CORBA::Policy { readonly attribute TimeBase::UtcT end_time; }; const CORBA::PolicyType REPLY_START_TIME_POLICY_TYPE = 29; - interface ReplyStartTimePolicy : CORBA::Policy { + local interface ReplyStartTimePolicy : CORBA::Policy { readonly attribute TimeBase::UtcT start_time; }; const CORBA::PolicyType REPLY_END_TIME_POLICY_TYPE = 30; - interface ReplyEndTimePolicy : CORBA::Policy { + local interface ReplyEndTimePolicy : CORBA::Policy { readonly attribute TimeBase::UtcT end_time; }; const CORBA::PolicyType RELATIVE_REQ_TIMEOUT_POLICY_TYPE = 31; - interface RelativeRequestTimeoutPolicy : CORBA::Policy { + local interface RelativeRequestTimeoutPolicy : CORBA::Policy { readonly attribute TimeBase::TimeT relative_expiry; }; const CORBA::PolicyType RELATIVE_RT_TIMEOUT_POLICY_TYPE = 32; - interface RelativeRoundtripTimeoutPolicy : CORBA::Policy { + local interface RelativeRoundtripTimeoutPolicy : CORBA::Policy { readonly attribute TimeBase::TimeT relative_expiry; }; @@ -124,18 +135,18 @@ module Messaging RoutingType min; RoutingType max; }; - interface RoutingPolicy : CORBA::Policy { + local interface RoutingPolicy : CORBA::Policy { readonly attribute RoutingTypeRange routing_range; }; const CORBA::PolicyType MAX_HOPS_POLICY_TYPE = 34; - interface MaxHopsPolicy : CORBA::Policy { + local interface MaxHopsPolicy : CORBA::Policy { readonly attribute unsigned short max_hops; }; // Router Delivery-ordering Policy (default = ORDER_TEMPORAL) const CORBA::PolicyType QUEUE_ORDER_POLICY_TYPE = 35; - interface QueueOrderPolicy : CORBA::Policy { + local interface QueueOrderPolicy : CORBA::Policy { readonly attribute Ordering allowed_orders; }; @@ -180,7 +191,7 @@ module Messaging // #if defined(NO_VALUE) - interface Poller : CORBA::Pollable { + local interface Poller : CORBA_Pollable { readonly attribute Object operation_target; readonly attribute string operation_name; @@ -191,7 +202,7 @@ module Messaging readonly attribute string op_name; }; #else - valuetype Poller supports CORBA::Pollable { + valuetype Poller supports CORBA_Pollable { readonly attribute Object operation_target; readonly attribute string operation_name; diff --git a/TAO/tao/MessagingC.cpp b/TAO/tao/MessagingC.cpp index e00afc73750..2dfc9939969 100644 --- a/TAO/tao/MessagingC.cpp +++ b/TAO/tao/MessagingC.cpp @@ -1,5 +1,4 @@ -/* -*- C++ -*- */ -// $Id$ +/* -*- C++ -*- $Id$ */ // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* // TAO and the TAO IDL Compiler have been developed by the Center for @@ -8,7 +7,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/MessagingC.h" +#include "MessagingC.h" #if (TAO_HAS_CORBA_MESSAGING == 1) @@ -18,7 +17,7 @@ #include "tao/Invocation.h" #if !defined (__ACE_INLINE__) -#include "tao/MessagingC.i" +#include "MessagingC.i" #endif /* !defined INLINE */ ACE_RCSID(tao, MessagingC, "$Id$") @@ -26,7 +25,7 @@ ACE_RCSID(tao, MessagingC, "$Id$") static const CORBA::Long _oc_Messaging_RebindMode[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x62696e64), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:Messaging/RebindMode:1.0 + 37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x62696e64), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/Messaging/RebindMode:1.0 11, ACE_NTOHL (0x52656269), ACE_NTOHL (0x6e644d6f), ACE_NTOHL (0x64650000), // name = RebindMode CORBA::tk_short, @@ -51,7 +50,7 @@ TAO_NAMESPACE_END static const CORBA::Long _oc_Messaging_SyncScope[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 28, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5379), ACE_NTOHL (0x6e635363), ACE_NTOHL (0x6f70653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:Messaging/SyncScope:1.0 + 36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5379), ACE_NTOHL (0x6e635363), ACE_NTOHL (0x6f70653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/Messaging/SyncScope:1.0 10, ACE_NTOHL (0x53796e63), ACE_NTOHL (0x53636f70), ACE_NTOHL (0x65000000), // name = SyncScope CORBA::tk_short, @@ -88,7 +87,7 @@ TAO_NAMESPACE_END static const CORBA::Long _oc_Messaging_RoutingType[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f526f), ACE_NTOHL (0x7574696e), ACE_NTOHL (0x67547970), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:Messaging/RoutingType:1.0 + 38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f526f), ACE_NTOHL (0x7574696e), ACE_NTOHL (0x67547970), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/Messaging/RoutingType:1.0 12, ACE_NTOHL (0x526f7574), ACE_NTOHL (0x696e6754), ACE_NTOHL (0x79706500), // name = RoutingType CORBA::tk_short, @@ -113,7 +112,7 @@ TAO_NAMESPACE_END static const CORBA::Long _oc_Messaging_Timeout[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 26, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5469), ACE_NTOHL (0x6d656f75), ACE_NTOHL (0x743a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:Messaging/Timeout:1.0 + 34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5469), ACE_NTOHL (0x6d656f75), ACE_NTOHL (0x743a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/Messaging/Timeout:1.0 8, ACE_NTOHL (0x54696d65), ACE_NTOHL (0x6f757400), // name = Timeout CORBA::tk_alias, // typecode kind for typedefs 56, // encapsulation length @@ -122,6 +121,7 @@ static const CORBA::Long _oc_Messaging_Timeout[] = 6, ACE_NTOHL (0x54696d65), ACE_NTOHL (0x54000000), // name = TimeT CORBA::tk_ulonglong, + }; static CORBA::TypeCode _tc_TAO_tc_Messaging_Timeout (CORBA::tk_alias, sizeof (_oc_Messaging_Timeout), (char *) &_oc_Messaging_Timeout, 0, sizeof (Messaging::Timeout)); TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) @@ -131,7 +131,7 @@ TAO_NAMESPACE_END static const CORBA::Long _oc_Messaging_Priority[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5072), ACE_NTOHL (0x696f7269), ACE_NTOHL (0x74793a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:Messaging/Priority:1.0 + 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5072), ACE_NTOHL (0x696f7269), ACE_NTOHL (0x74793a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/Messaging/Priority:1.0 9, ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x0), // name = Priority CORBA::tk_short, @@ -144,7 +144,7 @@ TAO_NAMESPACE_END static const CORBA::Long _oc_Messaging_Ordering[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f4f72), ACE_NTOHL (0x64657269), ACE_NTOHL (0x6e673a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:Messaging/Ordering:1.0 + 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f4f72), ACE_NTOHL (0x64657269), ACE_NTOHL (0x6e673a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/Messaging/Ordering:1.0 9, ACE_NTOHL (0x4f726465), ACE_NTOHL (0x72696e67), ACE_NTOHL (0x0), // name = Ordering CORBA::tk_ushort, @@ -156,215 +156,208 @@ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Ordering, &_tc_TAO_tc_Messaging_O TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::UShort) TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE (const CORBA::UShort, ORDER_ANY, 1) +TAO_NAMESPACE_DEFINE (const CORBA::UShort, ORDER_ANY, 1U) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::UShort) TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE (const CORBA::UShort, ORDER_TEMPORAL, 2) +TAO_NAMESPACE_DEFINE (const CORBA::UShort, ORDER_TEMPORAL, 2U) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::UShort) TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE (const CORBA::UShort, ORDER_PRIORITY, 4) +TAO_NAMESPACE_DEFINE (const CORBA::UShort, ORDER_PRIORITY, 4U) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::UShort) TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE (const CORBA::UShort, ORDER_DEADLINE, 8) +TAO_NAMESPACE_DEFINE (const CORBA::UShort, ORDER_DEADLINE, 8U) TAO_NAMESPACE_END #if (TAO_HAS_REBIND_POLICY == 1) TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, REBIND_POLICY_TYPE, - TAO_MESSAGING_REBIND_POLICY_TYPE) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, REBIND_POLICY_TYPE, 23U) TAO_NAMESPACE_END Messaging::RebindPolicy_ptr Messaging::RebindPolicy::_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV ) { - if (CORBA::is_nil (obj)) - return Messaging::RebindPolicy::_nil (); - CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/RebindPolicy:1.0", ACE_TRY_ENV); - ACE_CHECK_RETURN (Messaging::RebindPolicy::_nil ()); - if (is_a == 0) - return Messaging::RebindPolicy::_nil (); - return Messaging::RebindPolicy::_unchecked_narrow (obj, ACE_TRY_ENV); + return RebindPolicy::_unchecked_narrow (obj, ACE_TRY_ENV); } Messaging::RebindPolicy_ptr Messaging::RebindPolicy::_unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV + CORBA::Environment & ) { - ACE_UNUSED_ARG (ACE_TRY_ENV); if (CORBA::is_nil (obj)) - return Messaging::RebindPolicy::_nil (); - TAO_Stub* stub = obj->_stubobj (); - stub->_incr_refcnt (); - void* servant = 0; - if (obj->_is_collocated () && obj->_servant() != 0) - servant = obj->_servant()->_downcast ("IDL:Messaging/RebindPolicy:1.0"); - if (servant == 0) - ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::RebindPolicy::_nil ()); - - Messaging::RebindPolicy_ptr retval = - Messaging::RebindPolicy::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_Messaging::_tao_collocated_RebindPolicy ( - ACE_reinterpret_cast (POA_Messaging::RebindPolicy_ptr, - servant), - stub - ), - Messaging::RebindPolicy::_nil () - ); - - return retval; + return RebindPolicy::_nil (); + return + ACE_reinterpret_cast + ( + RebindPolicy_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &RebindPolicy::_narrow + ) + ) + ); } -CORBA::Boolean Messaging::RebindPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RebindPolicy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) - return 1; // success using local knowledge - else - return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call +Messaging::RebindPolicy_ptr +Messaging::RebindPolicy::_duplicate (RebindPolicy_ptr obj) +{ + if (!CORBA::is_nil (obj)) + obj->_add_ref (); + return obj; +} + +void *Messaging::RebindPolicy::_tao_QueryInterface (ptr_arith_t type) +{ + void *retv = 0; + if (type == ACE_reinterpret_cast + (ptr_arith_t, + &RebindPolicy::_narrow)) + retv = ACE_reinterpret_cast (void*, this); + else if (type == ACE_reinterpret_cast + (ptr_arith_t, + &CORBA::Policy::_narrow)) + retv = ACE_reinterpret_cast + ( + void *, + ACE_static_cast + ( + CORBA::Policy_ptr, + this + ) + ); + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); + + if (retv) + this->_add_ref (); + return retv; } const char* Messaging::RebindPolicy::_interface_repository_id (void) const { - return "IDL:Messaging/RebindPolicy:1.0"; + return "IDL:omg.org/Messaging/RebindPolicy:1.0"; } -static const CORBA::Long _oc_Messaging_RebindPolicy[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x62696e64), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63793a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:Messaging/RebindPolicy:1.0 - 13, ACE_NTOHL (0x52656269), ACE_NTOHL (0x6e64506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x0), // name = RebindPolicy, -}; -static CORBA::TypeCode _tc_TAO_tc_Messaging_RebindPolicy (CORBA::tk_objref, sizeof (_oc_Messaging_RebindPolicy), (char *) &_oc_Messaging_RebindPolicy, 0, sizeof (Messaging::RebindPolicy)); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RebindPolicy, &_tc_TAO_tc_Messaging_RebindPolicy) -TAO_NAMESPACE_END - #endif /* TAO_HAS_REBIND_POLICY == 1 */ #if (TAO_HAS_SYNC_SCOPE_POLICY == 1) TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, SYNC_SCOPE_POLICY_TYPE, - TAO_MESSAGING_SYNC_SCOPE_POLICY_TYPE) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, SYNC_SCOPE_POLICY_TYPE, 24U) TAO_NAMESPACE_END Messaging::SyncScopePolicy_ptr Messaging::SyncScopePolicy::_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV ) { - if (CORBA::is_nil (obj)) - return Messaging::SyncScopePolicy::_nil (); - CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/SyncScopePolicy:1.0", ACE_TRY_ENV); - ACE_CHECK_RETURN (Messaging::SyncScopePolicy::_nil ()); - if (is_a == 0) - return Messaging::SyncScopePolicy::_nil (); - return Messaging::SyncScopePolicy::_unchecked_narrow (obj, ACE_TRY_ENV); + return SyncScopePolicy::_unchecked_narrow (obj, ACE_TRY_ENV); } Messaging::SyncScopePolicy_ptr Messaging::SyncScopePolicy::_unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV + CORBA::Environment & ) { - ACE_UNUSED_ARG (ACE_TRY_ENV); if (CORBA::is_nil (obj)) - return Messaging::SyncScopePolicy::_nil (); - TAO_Stub* stub = obj->_stubobj (); - stub->_incr_refcnt (); - void* servant = 0; - if (obj->_is_collocated () && obj->_servant() != 0) - servant = obj->_servant()->_downcast ("IDL:Messaging/SyncScopePolicy:1.0"); - if (servant == 0) - ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::SyncScopePolicy::_nil ()); - - Messaging::SyncScopePolicy_ptr retval = - Messaging::SyncScopePolicy::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_Messaging::_tao_collocated_SyncScopePolicy ( - ACE_reinterpret_cast (POA_Messaging::SyncScopePolicy_ptr, - servant), - stub - ), - Messaging::SyncScopePolicy::_nil () - ); - - return retval; + return SyncScopePolicy::_nil (); + return + ACE_reinterpret_cast + ( + SyncScopePolicy_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &SyncScopePolicy::_narrow + ) + ) + ); } -CORBA::Boolean Messaging::SyncScopePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/SyncScopePolicy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) - return 1; // success using local knowledge - else - return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call +Messaging::SyncScopePolicy_ptr +Messaging::SyncScopePolicy::_duplicate (SyncScopePolicy_ptr obj) +{ + if (!CORBA::is_nil (obj)) + obj->_add_ref (); + return obj; +} + +void *Messaging::SyncScopePolicy::_tao_QueryInterface (ptr_arith_t type) +{ + void *retv = 0; + if (type == ACE_reinterpret_cast + (ptr_arith_t, + &SyncScopePolicy::_narrow)) + retv = ACE_reinterpret_cast (void*, this); + else if (type == ACE_reinterpret_cast + (ptr_arith_t, + &CORBA::Policy::_narrow)) + retv = ACE_reinterpret_cast + ( + void *, + ACE_static_cast + ( + CORBA::Policy_ptr, + this + ) + ); + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); + + if (retv) + this->_add_ref (); + return retv; } const char* Messaging::SyncScopePolicy::_interface_repository_id (void) const { - return "IDL:Messaging/SyncScopePolicy:1.0"; + return "IDL:omg.org/Messaging/SyncScopePolicy:1.0"; } -static const CORBA::Long _oc_Messaging_SyncScopePolicy[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5379), ACE_NTOHL (0x6e635363), ACE_NTOHL (0x6f706550), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x793a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:Messaging/SyncScopePolicy:1.0 - 16, ACE_NTOHL (0x53796e63), ACE_NTOHL (0x53636f70), ACE_NTOHL (0x65506f6c), ACE_NTOHL (0x69637900), // name = SyncScopePolicy, -}; -static CORBA::TypeCode _tc_TAO_tc_Messaging_SyncScopePolicy (CORBA::tk_objref, sizeof (_oc_Messaging_SyncScopePolicy), (char *) &_oc_Messaging_SyncScopePolicy, 0, sizeof (Messaging::SyncScopePolicy)); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_SyncScopePolicy, &_tc_TAO_tc_Messaging_SyncScopePolicy) -TAO_NAMESPACE_END - #endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ #if (TAO_HAS_PRIORITY_POLICIES == 1) TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, REQUEST_PRIORITY_POLICY_TYPE, - TAO_MESSAGING_REQUEST_PRIORITY_POLICY_TYPE) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, REQUEST_PRIORITY_POLICY_TYPE, 25U) TAO_NAMESPACE_END static const CORBA::Long _oc_Messaging_PriorityRange[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5072), ACE_NTOHL (0x696f7269), ACE_NTOHL (0x74795261), ACE_NTOHL (0x6e67653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:Messaging/PriorityRange:1.0 + 40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5072), ACE_NTOHL (0x696f7269), ACE_NTOHL (0x74795261), ACE_NTOHL (0x6e67653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/Messaging/PriorityRange:1.0 14, ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x52616e67), ACE_NTOHL (0x65000000), // name = PriorityRange 2, // member count - 4, ACE_NTOHL (0x6d696e00), // name = min - CORBA::tk_alias, // typecode kind for typedefs - 56, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - 27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5072), ACE_NTOHL (0x696f7269), ACE_NTOHL (0x74793a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:Messaging/Priority:1.0 - 9, ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x0), // name = Priority - CORBA::tk_short, + 4, ACE_NTOHL (0x6d696e00), // name = min + CORBA::tk_alias, // typecode kind for typedefs + 64, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5072), ACE_NTOHL (0x696f7269), ACE_NTOHL (0x74793a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/Messaging/Priority:1.0 + 9, ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x0), // name = Priority + CORBA::tk_short, + + + 4, ACE_NTOHL (0x6d617800), // name = max + CORBA::tk_alias, // typecode kind for typedefs + 64, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5072), ACE_NTOHL (0x696f7269), ACE_NTOHL (0x74793a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/Messaging/Priority:1.0 + 9, ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x0), // name = Priority + CORBA::tk_short, - 4, ACE_NTOHL (0x6d617800), // name = max - CORBA::tk_alias, // typecode kind for typedefs - 56, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - 27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5072), ACE_NTOHL (0x696f7269), ACE_NTOHL (0x74793a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:Messaging/Priority:1.0 - 9, ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x0), // name = Priority - CORBA::tk_short, }; static CORBA::TypeCode _tc_TAO_tc_Messaging_PriorityRange (CORBA::tk_struct, sizeof (_oc_Messaging_PriorityRange), (char *) &_oc_Messaging_PriorityRange, 0, sizeof (Messaging::PriorityRange)); @@ -372,687 +365,667 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (Messaging) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PriorityRange, &_tc_TAO_tc_Messaging_PriorityRange) TAO_NAMESPACE_END +void Messaging::PriorityRange::_tao_any_destructor (void *x) +{ + PriorityRange *tmp = ACE_static_cast (PriorityRange*,x); + delete tmp; +} + Messaging::RequestPriorityPolicy_ptr Messaging::RequestPriorityPolicy::_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV ) { - if (CORBA::is_nil (obj)) - return Messaging::RequestPriorityPolicy::_nil (); - CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/RequestPriorityPolicy:1.0", ACE_TRY_ENV); - ACE_CHECK_RETURN (Messaging::RequestPriorityPolicy::_nil ()); - if (is_a == 0) - return Messaging::RequestPriorityPolicy::_nil (); - return Messaging::RequestPriorityPolicy::_unchecked_narrow (obj, ACE_TRY_ENV); + return RequestPriorityPolicy::_unchecked_narrow (obj, ACE_TRY_ENV); } Messaging::RequestPriorityPolicy_ptr Messaging::RequestPriorityPolicy::_unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV + CORBA::Environment & ) { - ACE_UNUSED_ARG (ACE_TRY_ENV); if (CORBA::is_nil (obj)) - return Messaging::RequestPriorityPolicy::_nil (); - TAO_Stub* stub = obj->_stubobj (); - stub->_incr_refcnt (); - void* servant = 0; - if (obj->_is_collocated () && obj->_servant() != 0) - servant = obj->_servant()->_downcast ("IDL:Messaging/RequestPriorityPolicy:1.0"); - if (servant == 0) - ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::RequestPriorityPolicy::_nil ()); - - Messaging::RequestPriorityPolicy_ptr retval = - Messaging::RequestPriorityPolicy::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_Messaging::_tao_collocated_RequestPriorityPolicy ( - ACE_reinterpret_cast (POA_Messaging::RequestPriorityPolicy_ptr, - servant), - stub - ), - Messaging::RequestPriorityPolicy::_nil () - ); - - return retval; + return RequestPriorityPolicy::_nil (); + return + ACE_reinterpret_cast + ( + RequestPriorityPolicy_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &RequestPriorityPolicy::_narrow + ) + ) + ); } -CORBA::Boolean Messaging::RequestPriorityPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RequestPriorityPolicy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) - return 1; // success using local knowledge - else - return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call +Messaging::RequestPriorityPolicy_ptr +Messaging::RequestPriorityPolicy::_duplicate (RequestPriorityPolicy_ptr obj) +{ + if (!CORBA::is_nil (obj)) + obj->_add_ref (); + return obj; +} + +void *Messaging::RequestPriorityPolicy::_tao_QueryInterface (ptr_arith_t type) +{ + void *retv = 0; + if (type == ACE_reinterpret_cast + (ptr_arith_t, + &RequestPriorityPolicy::_narrow)) + retv = ACE_reinterpret_cast (void*, this); + else if (type == ACE_reinterpret_cast + (ptr_arith_t, + &CORBA::Policy::_narrow)) + retv = ACE_reinterpret_cast + ( + void *, + ACE_static_cast + ( + CORBA::Policy_ptr, + this + ) + ); + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); + + if (retv) + this->_add_ref (); + return retv; } const char* Messaging::RequestPriorityPolicy::_interface_repository_id (void) const { - return "IDL:Messaging/RequestPriorityPolicy:1.0"; + return "IDL:omg.org/Messaging/RequestPriorityPolicy:1.0"; } -static const CORBA::Long _oc_Messaging_RequestPriorityPolicy[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x71756573), ACE_NTOHL (0x74507269), ACE_NTOHL (0x6f726974), ACE_NTOHL (0x79506f6c), ACE_NTOHL (0x6963793a), ACE_NTOHL (0x312e3000), // repository ID = IDL:Messaging/RequestPriorityPolicy:1.0 - 22, ACE_NTOHL (0x52657175), ACE_NTOHL (0x65737450), ACE_NTOHL (0x72696f72), ACE_NTOHL (0x69747950), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x79000000), // name = RequestPriorityPolicy, -}; -static CORBA::TypeCode _tc_TAO_tc_Messaging_RequestPriorityPolicy (CORBA::tk_objref, sizeof (_oc_Messaging_RequestPriorityPolicy), (char *) &_oc_Messaging_RequestPriorityPolicy, 0, sizeof (Messaging::RequestPriorityPolicy)); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RequestPriorityPolicy, &_tc_TAO_tc_Messaging_RequestPriorityPolicy) -TAO_NAMESPACE_END +#endif /* TAO_HAS_PRIORITY_POLICIES == 1 */ + +#if (TAO_HAS_REQUEST_START_TIME_POLICY == 1) + TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, REPLY_PRIORITY_POLICY_TYPE, - TAO_MESSAGING_REPLY_PRIORITY_POLICY_TYPE) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, REPLY_PRIORITY_POLICY_TYPE, 26U) TAO_NAMESPACE_END Messaging::ReplyPriorityPolicy_ptr Messaging::ReplyPriorityPolicy::_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV ) { - if (CORBA::is_nil (obj)) - return Messaging::ReplyPriorityPolicy::_nil (); - CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/ReplyPriorityPolicy:1.0", ACE_TRY_ENV); - ACE_CHECK_RETURN (Messaging::ReplyPriorityPolicy::_nil ()); - if (is_a == 0) - return Messaging::ReplyPriorityPolicy::_nil (); - return Messaging::ReplyPriorityPolicy::_unchecked_narrow (obj, ACE_TRY_ENV); + return ReplyPriorityPolicy::_unchecked_narrow (obj, ACE_TRY_ENV); } Messaging::ReplyPriorityPolicy_ptr Messaging::ReplyPriorityPolicy::_unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV + CORBA::Environment & ) { - ACE_UNUSED_ARG (ACE_TRY_ENV); if (CORBA::is_nil (obj)) - return Messaging::ReplyPriorityPolicy::_nil (); - TAO_Stub* stub = obj->_stubobj (); - stub->_incr_refcnt (); - void* servant = 0; - if (obj->_is_collocated () && obj->_servant() != 0) - servant = obj->_servant()->_downcast ("IDL:Messaging/ReplyPriorityPolicy:1.0"); - if (servant == 0) - ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::ReplyPriorityPolicy::_nil ()); - - Messaging::ReplyPriorityPolicy_ptr retval = - Messaging::ReplyPriorityPolicy::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_Messaging::_tao_collocated_ReplyPriorityPolicy ( - ACE_reinterpret_cast (POA_Messaging::ReplyPriorityPolicy_ptr, - servant), - stub - ), - Messaging::ReplyPriorityPolicy::_nil () - ); - - return retval; + return ReplyPriorityPolicy::_nil (); + return + ACE_reinterpret_cast + ( + ReplyPriorityPolicy_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &ReplyPriorityPolicy::_narrow + ) + ) + ); } -CORBA::Boolean Messaging::ReplyPriorityPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/ReplyPriorityPolicy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) - return 1; // success using local knowledge - else - return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call +Messaging::ReplyPriorityPolicy_ptr +Messaging::ReplyPriorityPolicy::_duplicate (ReplyPriorityPolicy_ptr obj) +{ + if (!CORBA::is_nil (obj)) + obj->_add_ref (); + return obj; +} + +void *Messaging::ReplyPriorityPolicy::_tao_QueryInterface (ptr_arith_t type) +{ + void *retv = 0; + if (type == ACE_reinterpret_cast + (ptr_arith_t, + &ReplyPriorityPolicy::_narrow)) + retv = ACE_reinterpret_cast (void*, this); + else if (type == ACE_reinterpret_cast + (ptr_arith_t, + &CORBA::Policy::_narrow)) + retv = ACE_reinterpret_cast + ( + void *, + ACE_static_cast + ( + CORBA::Policy_ptr, + this + ) + ); + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); + + if (retv) + this->_add_ref (); + return retv; } const char* Messaging::ReplyPriorityPolicy::_interface_repository_id (void) const { - return "IDL:Messaging/ReplyPriorityPolicy:1.0"; + return "IDL:omg.org/Messaging/ReplyPriorityPolicy:1.0"; } -static const CORBA::Long _oc_Messaging_ReplyPriorityPolicy[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x706c7950), ACE_NTOHL (0x72696f72), ACE_NTOHL (0x69747950), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x793a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:Messaging/ReplyPriorityPolicy:1.0 - 20, ACE_NTOHL (0x5265706c), ACE_NTOHL (0x79507269), ACE_NTOHL (0x6f726974), ACE_NTOHL (0x79506f6c), ACE_NTOHL (0x69637900), // name = ReplyPriorityPolicy, -}; -static CORBA::TypeCode _tc_TAO_tc_Messaging_ReplyPriorityPolicy (CORBA::tk_objref, sizeof (_oc_Messaging_ReplyPriorityPolicy), (char *) &_oc_Messaging_ReplyPriorityPolicy, 0, sizeof (Messaging::ReplyPriorityPolicy)); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ReplyPriorityPolicy, &_tc_TAO_tc_Messaging_ReplyPriorityPolicy) -TAO_NAMESPACE_END - #endif /* TAO_HAS_PRIORITY_POLICIES == 1 */ #if (TAO_HAS_REQUEST_START_TIME_POLICY == 1) TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, REQUEST_START_TIME_POLICY_TYPE, - TAO_MESSAGING_REQUEST_START_TIME_POLICY_TYPE) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, REQUEST_START_TIME_POLICY_TYPE, 27U) TAO_NAMESPACE_END Messaging::RequestStartTimePolicy_ptr Messaging::RequestStartTimePolicy::_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV ) { - if (CORBA::is_nil (obj)) - return Messaging::RequestStartTimePolicy::_nil (); - CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/RequestStartTimePolicy:1.0", ACE_TRY_ENV); - ACE_CHECK_RETURN (Messaging::RequestStartTimePolicy::_nil ()); - if (is_a == 0) - return Messaging::RequestStartTimePolicy::_nil (); - return Messaging::RequestStartTimePolicy::_unchecked_narrow (obj, ACE_TRY_ENV); + return RequestStartTimePolicy::_unchecked_narrow (obj, ACE_TRY_ENV); } Messaging::RequestStartTimePolicy_ptr Messaging::RequestStartTimePolicy::_unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV + CORBA::Environment & ) { - ACE_UNUSED_ARG (ACE_TRY_ENV); if (CORBA::is_nil (obj)) - return Messaging::RequestStartTimePolicy::_nil (); - TAO_Stub* stub = obj->_stubobj (); - stub->_incr_refcnt (); - void* servant = 0; - if (obj->_is_collocated () && obj->_servant() != 0) - servant = obj->_servant()->_downcast ("IDL:Messaging/RequestStartTimePolicy:1.0"); - if (servant == 0) - ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::RequestStartTimePolicy::_nil ()); - - Messaging::RequestStartTimePolicy_ptr retval = - Messaging::RequestStartTimePolicy::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_Messaging::_tao_collocated_RequestStartTimePolicy ( - ACE_reinterpret_cast (POA_Messaging::RequestStartTimePolicy_ptr, - servant), - stub - ), - Messaging::RequestStartTimePolicy::_nil () - ); - - return retval; + return RequestStartTimePolicy::_nil (); + return + ACE_reinterpret_cast + ( + RequestStartTimePolicy_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &RequestStartTimePolicy::_narrow + ) + ) + ); } -CORBA::Boolean Messaging::RequestStartTimePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RequestStartTimePolicy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) - return 1; // success using local knowledge - else - return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call +Messaging::RequestStartTimePolicy_ptr +Messaging::RequestStartTimePolicy::_duplicate (RequestStartTimePolicy_ptr obj) +{ + if (!CORBA::is_nil (obj)) + obj->_add_ref (); + return obj; +} + +void *Messaging::RequestStartTimePolicy::_tao_QueryInterface (ptr_arith_t type) +{ + void *retv = 0; + if (type == ACE_reinterpret_cast + (ptr_arith_t, + &RequestStartTimePolicy::_narrow)) + retv = ACE_reinterpret_cast (void*, this); + else if (type == ACE_reinterpret_cast + (ptr_arith_t, + &CORBA::Policy::_narrow)) + retv = ACE_reinterpret_cast + ( + void *, + ACE_static_cast + ( + CORBA::Policy_ptr, + this + ) + ); + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); + + if (retv) + this->_add_ref (); + return retv; } const char* Messaging::RequestStartTimePolicy::_interface_repository_id (void) const { - return "IDL:Messaging/RequestStartTimePolicy:1.0"; + return "IDL:omg.org/Messaging/RequestStartTimePolicy:1.0"; } -static const CORBA::Long _oc_Messaging_RequestStartTimePolicy[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 41, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x71756573), ACE_NTOHL (0x74537461), ACE_NTOHL (0x72745469), ACE_NTOHL (0x6d65506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:Messaging/RequestStartTimePolicy:1.0 - 23, ACE_NTOHL (0x52657175), ACE_NTOHL (0x65737453), ACE_NTOHL (0x74617274), ACE_NTOHL (0x54696d65), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63790000), // name = RequestStartTimePolicy, -}; -static CORBA::TypeCode _tc_TAO_tc_Messaging_RequestStartTimePolicy (CORBA::tk_objref, sizeof (_oc_Messaging_RequestStartTimePolicy), (char *) &_oc_Messaging_RequestStartTimePolicy, 0, sizeof (Messaging::RequestStartTimePolicy)); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RequestStartTimePolicy, &_tc_TAO_tc_Messaging_RequestStartTimePolicy) -TAO_NAMESPACE_END - #endif /* TAO_HAS_REQUEST_START_TIME_POLICY == 1 */ #if (TAO_HAS_REQUEST_END_TIME_POLICY == 1) TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, REQUEST_END_TIME_POLICY_TYPE, - TAO_MESSAGING_REQUEST_END_TIME_POLICY_TYPE) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, REQUEST_END_TIME_POLICY_TYPE, 28U) TAO_NAMESPACE_END Messaging::RequestEndTimePolicy_ptr Messaging::RequestEndTimePolicy::_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV ) { - if (CORBA::is_nil (obj)) - return Messaging::RequestEndTimePolicy::_nil (); - CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/RequestEndTimePolicy:1.0", ACE_TRY_ENV); - ACE_CHECK_RETURN (Messaging::RequestEndTimePolicy::_nil ()); - if (is_a == 0) - return Messaging::RequestEndTimePolicy::_nil (); - return Messaging::RequestEndTimePolicy::_unchecked_narrow (obj, ACE_TRY_ENV); + return RequestEndTimePolicy::_unchecked_narrow (obj, ACE_TRY_ENV); } Messaging::RequestEndTimePolicy_ptr Messaging::RequestEndTimePolicy::_unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV + CORBA::Environment & ) { - ACE_UNUSED_ARG (ACE_TRY_ENV); if (CORBA::is_nil (obj)) - return Messaging::RequestEndTimePolicy::_nil (); - TAO_Stub* stub = obj->_stubobj (); - stub->_incr_refcnt (); - void* servant = 0; - if (obj->_is_collocated () && obj->_servant() != 0) - servant = obj->_servant()->_downcast ("IDL:Messaging/RequestEndTimePolicy:1.0"); - if (servant == 0) - ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::RequestEndTimePolicy::_nil ()); - - Messaging::RequestEndTimePolicy_ptr retval = - Messaging::RequestEndTimePolicy::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_Messaging::_tao_collocated_RequestEndTimePolicy ( - ACE_reinterpret_cast (POA_Messaging::RequestEndTimePolicy_ptr, - servant), - stub - ), - Messaging::RequestEndTimePolicy::_nil () - ); - - return retval; + return RequestEndTimePolicy::_nil (); + return + ACE_reinterpret_cast + ( + RequestEndTimePolicy_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &RequestEndTimePolicy::_narrow + ) + ) + ); } -CORBA::Boolean Messaging::RequestEndTimePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RequestEndTimePolicy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) - return 1; // success using local knowledge - else - return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call +Messaging::RequestEndTimePolicy_ptr +Messaging::RequestEndTimePolicy::_duplicate (RequestEndTimePolicy_ptr obj) +{ + if (!CORBA::is_nil (obj)) + obj->_add_ref (); + return obj; +} + +void *Messaging::RequestEndTimePolicy::_tao_QueryInterface (ptr_arith_t type) +{ + void *retv = 0; + if (type == ACE_reinterpret_cast + (ptr_arith_t, + &RequestEndTimePolicy::_narrow)) + retv = ACE_reinterpret_cast (void*, this); + else if (type == ACE_reinterpret_cast + (ptr_arith_t, + &CORBA::Policy::_narrow)) + retv = ACE_reinterpret_cast + ( + void *, + ACE_static_cast + ( + CORBA::Policy_ptr, + this + ) + ); + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); + + if (retv) + this->_add_ref (); + return retv; } const char* Messaging::RequestEndTimePolicy::_interface_repository_id (void) const { - return "IDL:Messaging/RequestEndTimePolicy:1.0"; + return "IDL:omg.org/Messaging/RequestEndTimePolicy:1.0"; } -static const CORBA::Long _oc_Messaging_RequestEndTimePolicy[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 39, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x71756573), ACE_NTOHL (0x74456e64), ACE_NTOHL (0x54696d65), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63793a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:Messaging/RequestEndTimePolicy:1.0 - 21, ACE_NTOHL (0x52657175), ACE_NTOHL (0x65737445), ACE_NTOHL (0x6e645469), ACE_NTOHL (0x6d65506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x0), // name = RequestEndTimePolicy, -}; -static CORBA::TypeCode _tc_TAO_tc_Messaging_RequestEndTimePolicy (CORBA::tk_objref, sizeof (_oc_Messaging_RequestEndTimePolicy), (char *) &_oc_Messaging_RequestEndTimePolicy, 0, sizeof (Messaging::RequestEndTimePolicy)); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RequestEndTimePolicy, &_tc_TAO_tc_Messaging_RequestEndTimePolicy) -TAO_NAMESPACE_END - #endif /* TAO_HAS_REQUEST_END_TIME_POLICY == 1 */ #if (TAO_HAS_REPLY_START_TIME_POLICY == 1) TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, REPLY_START_TIME_POLICY_TYPE, - TAO_MESSAGING_REPLY_START_TIME_POLICY_TYPE) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, REPLY_START_TIME_POLICY_TYPE, 29U) TAO_NAMESPACE_END Messaging::ReplyStartTimePolicy_ptr Messaging::ReplyStartTimePolicy::_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV ) { - if (CORBA::is_nil (obj)) - return Messaging::ReplyStartTimePolicy::_nil (); - CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/ReplyStartTimePolicy:1.0", ACE_TRY_ENV); - ACE_CHECK_RETURN (Messaging::ReplyStartTimePolicy::_nil ()); - if (is_a == 0) - return Messaging::ReplyStartTimePolicy::_nil (); - return Messaging::ReplyStartTimePolicy::_unchecked_narrow (obj, ACE_TRY_ENV); + return ReplyStartTimePolicy::_unchecked_narrow (obj, ACE_TRY_ENV); } Messaging::ReplyStartTimePolicy_ptr Messaging::ReplyStartTimePolicy::_unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV + CORBA::Environment & ) { - ACE_UNUSED_ARG (ACE_TRY_ENV); if (CORBA::is_nil (obj)) - return Messaging::ReplyStartTimePolicy::_nil (); - TAO_Stub* stub = obj->_stubobj (); - stub->_incr_refcnt (); - void* servant = 0; - if (obj->_is_collocated () && obj->_servant() != 0) - servant = obj->_servant()->_downcast ("IDL:Messaging/ReplyStartTimePolicy:1.0"); - if (servant == 0) - ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::ReplyStartTimePolicy::_nil ()); - - Messaging::ReplyStartTimePolicy_ptr retval = - Messaging::ReplyStartTimePolicy::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_Messaging::_tao_collocated_ReplyStartTimePolicy ( - ACE_reinterpret_cast (POA_Messaging::ReplyStartTimePolicy_ptr, - servant), - stub - ), - Messaging::ReplyStartTimePolicy::_nil () - ); - - return retval; + return ReplyStartTimePolicy::_nil (); + return + ACE_reinterpret_cast + ( + ReplyStartTimePolicy_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &ReplyStartTimePolicy::_narrow + ) + ) + ); } -CORBA::Boolean Messaging::ReplyStartTimePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/ReplyStartTimePolicy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) - return 1; // success using local knowledge - else - return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call +Messaging::ReplyStartTimePolicy_ptr +Messaging::ReplyStartTimePolicy::_duplicate (ReplyStartTimePolicy_ptr obj) +{ + if (!CORBA::is_nil (obj)) + obj->_add_ref (); + return obj; +} + +void *Messaging::ReplyStartTimePolicy::_tao_QueryInterface (ptr_arith_t type) +{ + void *retv = 0; + if (type == ACE_reinterpret_cast + (ptr_arith_t, + &ReplyStartTimePolicy::_narrow)) + retv = ACE_reinterpret_cast (void*, this); + else if (type == ACE_reinterpret_cast + (ptr_arith_t, + &CORBA::Policy::_narrow)) + retv = ACE_reinterpret_cast + ( + void *, + ACE_static_cast + ( + CORBA::Policy_ptr, + this + ) + ); + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); + + if (retv) + this->_add_ref (); + return retv; } const char* Messaging::ReplyStartTimePolicy::_interface_repository_id (void) const { - return "IDL:Messaging/ReplyStartTimePolicy:1.0"; + return "IDL:omg.org/Messaging/ReplyStartTimePolicy:1.0"; } -static const CORBA::Long _oc_Messaging_ReplyStartTimePolicy[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 39, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x706c7953), ACE_NTOHL (0x74617274), ACE_NTOHL (0x54696d65), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63793a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:Messaging/ReplyStartTimePolicy:1.0 - 21, ACE_NTOHL (0x5265706c), ACE_NTOHL (0x79537461), ACE_NTOHL (0x72745469), ACE_NTOHL (0x6d65506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x0), // name = ReplyStartTimePolicy, -}; -static CORBA::TypeCode _tc_TAO_tc_Messaging_ReplyStartTimePolicy (CORBA::tk_objref, sizeof (_oc_Messaging_ReplyStartTimePolicy), (char *) &_oc_Messaging_ReplyStartTimePolicy, 0, sizeof (Messaging::ReplyStartTimePolicy)); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ReplyStartTimePolicy, &_tc_TAO_tc_Messaging_ReplyStartTimePolicy) -TAO_NAMESPACE_END - #endif /* TAO_HAS_REPLY_START_TIME_POLICY == 1 */ #if (TAO_HAS_REPLY_END_TIME_POLICY == 1) TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, REPLY_END_TIME_POLICY_TYPE, - TAO_MESSAGING_REPLY_END_TIME_POLICY_TYPE) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, REPLY_END_TIME_POLICY_TYPE, 30U) TAO_NAMESPACE_END Messaging::ReplyEndTimePolicy_ptr Messaging::ReplyEndTimePolicy::_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV ) { - if (CORBA::is_nil (obj)) - return Messaging::ReplyEndTimePolicy::_nil (); - CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/ReplyEndTimePolicy:1.0", ACE_TRY_ENV); - ACE_CHECK_RETURN (Messaging::ReplyEndTimePolicy::_nil ()); - if (is_a == 0) - return Messaging::ReplyEndTimePolicy::_nil (); - return Messaging::ReplyEndTimePolicy::_unchecked_narrow (obj, ACE_TRY_ENV); + return ReplyEndTimePolicy::_unchecked_narrow (obj, ACE_TRY_ENV); } Messaging::ReplyEndTimePolicy_ptr Messaging::ReplyEndTimePolicy::_unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV + CORBA::Environment & ) { - ACE_UNUSED_ARG (ACE_TRY_ENV); if (CORBA::is_nil (obj)) - return Messaging::ReplyEndTimePolicy::_nil (); - TAO_Stub* stub = obj->_stubobj (); - stub->_incr_refcnt (); - void* servant = 0; - if (obj->_is_collocated () && obj->_servant() != 0) - servant = obj->_servant()->_downcast ("IDL:Messaging/ReplyEndTimePolicy:1.0"); - if (servant == 0) - ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::ReplyEndTimePolicy::_nil ()); - - Messaging::ReplyEndTimePolicy_ptr retval = - Messaging::ReplyEndTimePolicy::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_Messaging::_tao_collocated_ReplyEndTimePolicy ( - ACE_reinterpret_cast (POA_Messaging::ReplyEndTimePolicy_ptr, - servant), - stub - ), - Messaging::ReplyEndTimePolicy::_nil () - ); - - return retval; + return ReplyEndTimePolicy::_nil (); + return + ACE_reinterpret_cast + ( + ReplyEndTimePolicy_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &ReplyEndTimePolicy::_narrow + ) + ) + ); } -CORBA::Boolean Messaging::ReplyEndTimePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/ReplyEndTimePolicy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) - return 1; // success using local knowledge - else - return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call +Messaging::ReplyEndTimePolicy_ptr +Messaging::ReplyEndTimePolicy::_duplicate (ReplyEndTimePolicy_ptr obj) +{ + if (!CORBA::is_nil (obj)) + obj->_add_ref (); + return obj; +} + +void *Messaging::ReplyEndTimePolicy::_tao_QueryInterface (ptr_arith_t type) +{ + void *retv = 0; + if (type == ACE_reinterpret_cast + (ptr_arith_t, + &ReplyEndTimePolicy::_narrow)) + retv = ACE_reinterpret_cast (void*, this); + else if (type == ACE_reinterpret_cast + (ptr_arith_t, + &CORBA::Policy::_narrow)) + retv = ACE_reinterpret_cast + ( + void *, + ACE_static_cast + ( + CORBA::Policy_ptr, + this + ) + ); + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); + + if (retv) + this->_add_ref (); + return retv; } const char* Messaging::ReplyEndTimePolicy::_interface_repository_id (void) const { - return "IDL:Messaging/ReplyEndTimePolicy:1.0"; + return "IDL:omg.org/Messaging/ReplyEndTimePolicy:1.0"; } -static const CORBA::Long _oc_Messaging_ReplyEndTimePolicy[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x706c7945), ACE_NTOHL (0x6e645469), ACE_NTOHL (0x6d65506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:Messaging/ReplyEndTimePolicy:1.0 - 19, ACE_NTOHL (0x5265706c), ACE_NTOHL (0x79456e64), ACE_NTOHL (0x54696d65), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63790000), // name = ReplyEndTimePolicy, -}; -static CORBA::TypeCode _tc_TAO_tc_Messaging_ReplyEndTimePolicy (CORBA::tk_objref, sizeof (_oc_Messaging_ReplyEndTimePolicy), (char *) &_oc_Messaging_ReplyEndTimePolicy, 0, sizeof (Messaging::ReplyEndTimePolicy)); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ReplyEndTimePolicy, &_tc_TAO_tc_Messaging_ReplyEndTimePolicy) -TAO_NAMESPACE_END - #endif /* TAO_HAS_REPLY_END_TIME_POLICY == 1 */ #if (TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1) TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, RELATIVE_REQ_TIMEOUT_POLICY_TYPE, - TAO_MESSAGING_RELATIVE_REQ_TIMEOUT_POLICY_TYPE) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, RELATIVE_REQ_TIMEOUT_POLICY_TYPE, 31U) TAO_NAMESPACE_END Messaging::RelativeRequestTimeoutPolicy_ptr Messaging::RelativeRequestTimeoutPolicy::_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV ) { - if (CORBA::is_nil (obj)) - return Messaging::RelativeRequestTimeoutPolicy::_nil (); - CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/RelativeRequestTimeoutPolicy:1.0", ACE_TRY_ENV); - ACE_CHECK_RETURN (Messaging::RelativeRequestTimeoutPolicy::_nil ()); - if (is_a == 0) - return Messaging::RelativeRequestTimeoutPolicy::_nil (); - return Messaging::RelativeRequestTimeoutPolicy::_unchecked_narrow (obj, ACE_TRY_ENV); + return RelativeRequestTimeoutPolicy::_unchecked_narrow (obj, ACE_TRY_ENV); } Messaging::RelativeRequestTimeoutPolicy_ptr Messaging::RelativeRequestTimeoutPolicy::_unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV + CORBA::Environment & ) { - ACE_UNUSED_ARG (ACE_TRY_ENV); if (CORBA::is_nil (obj)) - return Messaging::RelativeRequestTimeoutPolicy::_nil (); - TAO_Stub* stub = obj->_stubobj (); - stub->_incr_refcnt (); - void* servant = 0; - if (obj->_is_collocated () && obj->_servant() != 0) - servant = obj->_servant()->_downcast ("IDL:Messaging/RelativeRequestTimeoutPolicy:1.0"); - if (servant == 0) - ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::RelativeRequestTimeoutPolicy::_nil ()); - - Messaging::RelativeRequestTimeoutPolicy_ptr retval = - Messaging::RelativeRequestTimeoutPolicy::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_Messaging::_tao_collocated_RelativeRequestTimeoutPolicy ( - ACE_reinterpret_cast (POA_Messaging::RelativeRequestTimeoutPolicy_ptr, - servant), - stub - ), - Messaging::RelativeRequestTimeoutPolicy::_nil () - ); - - return retval; + return RelativeRequestTimeoutPolicy::_nil (); + return + ACE_reinterpret_cast + ( + RelativeRequestTimeoutPolicy_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &RelativeRequestTimeoutPolicy::_narrow + ) + ) + ); } -CORBA::Boolean Messaging::RelativeRequestTimeoutPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RelativeRequestTimeoutPolicy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) - return 1; // success using local knowledge - else - return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call +Messaging::RelativeRequestTimeoutPolicy_ptr +Messaging::RelativeRequestTimeoutPolicy::_duplicate (RelativeRequestTimeoutPolicy_ptr obj) +{ + if (!CORBA::is_nil (obj)) + obj->_add_ref (); + return obj; +} + +void *Messaging::RelativeRequestTimeoutPolicy::_tao_QueryInterface (ptr_arith_t type) +{ + void *retv = 0; + if (type == ACE_reinterpret_cast + (ptr_arith_t, + &RelativeRequestTimeoutPolicy::_narrow)) + retv = ACE_reinterpret_cast (void*, this); + else if (type == ACE_reinterpret_cast + (ptr_arith_t, + &CORBA::Policy::_narrow)) + retv = ACE_reinterpret_cast + ( + void *, + ACE_static_cast + ( + CORBA::Policy_ptr, + this + ) + ); + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); + + if (retv) + this->_add_ref (); + return retv; } const char* Messaging::RelativeRequestTimeoutPolicy::_interface_repository_id (void) const { - return "IDL:Messaging/RelativeRequestTimeoutPolicy:1.0"; + return "IDL:omg.org/Messaging/RelativeRequestTimeoutPolicy:1.0"; } -static const CORBA::Long _oc_Messaging_RelativeRequestTimeoutPolicy[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 47, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x6c617469), ACE_NTOHL (0x76655265), ACE_NTOHL (0x71756573), ACE_NTOHL (0x7454696d), ACE_NTOHL (0x656f7574), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63793a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:Messaging/RelativeRequestTimeoutPolicy:1.0 - 29, ACE_NTOHL (0x52656c61), ACE_NTOHL (0x74697665), ACE_NTOHL (0x52657175), ACE_NTOHL (0x65737454), ACE_NTOHL (0x696d656f), ACE_NTOHL (0x7574506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x0), // name = RelativeRequestTimeoutPolicy, -}; -static CORBA::TypeCode _tc_TAO_tc_Messaging_RelativeRequestTimeoutPolicy (CORBA::tk_objref, sizeof (_oc_Messaging_RelativeRequestTimeoutPolicy), (char *) &_oc_Messaging_RelativeRequestTimeoutPolicy, 0, sizeof (Messaging::RelativeRequestTimeoutPolicy)); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RelativeRequestTimeoutPolicy, &_tc_TAO_tc_Messaging_RelativeRequestTimeoutPolicy) -TAO_NAMESPACE_END - #endif /* TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1 */ #if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, RELATIVE_RT_TIMEOUT_POLICY_TYPE, - TAO_MESSAGING_RELATIVE_RT_TIMEOUT_POLICY_TYPE) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, RELATIVE_RT_TIMEOUT_POLICY_TYPE, 32U) TAO_NAMESPACE_END Messaging::RelativeRoundtripTimeoutPolicy_ptr Messaging::RelativeRoundtripTimeoutPolicy::_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV ) { - if (CORBA::is_nil (obj)) - return Messaging::RelativeRoundtripTimeoutPolicy::_nil (); - CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/RelativeRoundtripTimeoutPolicy:1.0", ACE_TRY_ENV); - ACE_CHECK_RETURN (Messaging::RelativeRoundtripTimeoutPolicy::_nil - ()); - if (is_a == 0) - return Messaging::RelativeRoundtripTimeoutPolicy::_nil (); - return Messaging::RelativeRoundtripTimeoutPolicy::_unchecked_narrow (obj, ACE_TRY_ENV); + return RelativeRoundtripTimeoutPolicy::_unchecked_narrow (obj, ACE_TRY_ENV); } Messaging::RelativeRoundtripTimeoutPolicy_ptr Messaging::RelativeRoundtripTimeoutPolicy::_unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV + CORBA::Environment & ) { - ACE_UNUSED_ARG (ACE_TRY_ENV); if (CORBA::is_nil (obj)) - return Messaging::RelativeRoundtripTimeoutPolicy::_nil (); - TAO_Stub* stub = obj->_stubobj (); - stub->_incr_refcnt (); - void* servant = 0; - if (obj->_is_collocated () && obj->_servant() != 0) - servant = obj->_servant()->_downcast ("IDL:Messaging/RelativeRoundtripTimeoutPolicy:1.0"); - if (servant == 0) - ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::RelativeRoundtripTimeoutPolicy::_nil ()); - - Messaging::RelativeRoundtripTimeoutPolicy_ptr retval = - Messaging::RelativeRoundtripTimeoutPolicy::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_Messaging::_tao_collocated_RelativeRoundtripTimeoutPolicy ( - ACE_reinterpret_cast (POA_Messaging::RelativeRoundtripTimeoutPolicy_ptr, - servant), - stub - ), - Messaging::RelativeRoundtripTimeoutPolicy::_nil () - ); - - return retval; + return RelativeRoundtripTimeoutPolicy::_nil (); + return + ACE_reinterpret_cast + ( + RelativeRoundtripTimeoutPolicy_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &RelativeRoundtripTimeoutPolicy::_narrow + ) + ) + ); } -CORBA::Boolean Messaging::RelativeRoundtripTimeoutPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RelativeRoundtripTimeoutPolicy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) - return 1; // success using local knowledge - else - return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call +Messaging::RelativeRoundtripTimeoutPolicy_ptr +Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (RelativeRoundtripTimeoutPolicy_ptr obj) +{ + if (!CORBA::is_nil (obj)) + obj->_add_ref (); + return obj; +} + +void *Messaging::RelativeRoundtripTimeoutPolicy::_tao_QueryInterface (ptr_arith_t type) +{ + void *retv = 0; + if (type == ACE_reinterpret_cast + (ptr_arith_t, + &RelativeRoundtripTimeoutPolicy::_narrow)) + retv = ACE_reinterpret_cast (void*, this); + else if (type == ACE_reinterpret_cast + (ptr_arith_t, + &CORBA::Policy::_narrow)) + retv = ACE_reinterpret_cast + ( + void *, + ACE_static_cast + ( + CORBA::Policy_ptr, + this + ) + ); + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); + + if (retv) + this->_add_ref (); + return retv; } const char* Messaging::RelativeRoundtripTimeoutPolicy::_interface_repository_id (void) const { - return "IDL:Messaging/RelativeRoundtripTimeoutPolicy:1.0"; + return "IDL:omg.org/Messaging/RelativeRoundtripTimeoutPolicy:1.0"; } -static const CORBA::Long _oc_Messaging_RelativeRoundtripTimeoutPolicy[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 49, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x6c617469), ACE_NTOHL (0x7665526f), ACE_NTOHL (0x756e6474), ACE_NTOHL (0x72697054), ACE_NTOHL (0x696d656f), ACE_NTOHL (0x7574506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:Messaging/RelativeRoundtripTimeoutPolicy:1.0 - 31, ACE_NTOHL (0x52656c61), ACE_NTOHL (0x74697665), ACE_NTOHL (0x526f756e), ACE_NTOHL (0x64747269), ACE_NTOHL (0x7054696d), ACE_NTOHL (0x656f7574), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63790000), // name = RelativeRoundtripTimeoutPolicy, -}; -static CORBA::TypeCode _tc_TAO_tc_Messaging_RelativeRoundtripTimeoutPolicy (CORBA::tk_objref, sizeof (_oc_Messaging_RelativeRoundtripTimeoutPolicy), (char *) &_oc_Messaging_RelativeRoundtripTimeoutPolicy, 0, sizeof (Messaging::RelativeRoundtripTimeoutPolicy)); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RelativeRoundtripTimeoutPolicy, &_tc_TAO_tc_Messaging_RelativeRoundtripTimeoutPolicy) -TAO_NAMESPACE_END - #endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ #if (TAO_HAS_ROUTING_POLICY == 1) TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, ROUTING_POLICY_TYPE, - TAO_MESSAGING_ROUTING_POLICY_TYPE) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, ROUTING_POLICY_TYPE, 33U) TAO_NAMESPACE_END static const CORBA::Long _oc_Messaging_RoutingTypeRange[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f526f), ACE_NTOHL (0x7574696e), ACE_NTOHL (0x67547970), ACE_NTOHL (0x6552616e), ACE_NTOHL (0x67653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:Messaging/RoutingTypeRange:1.0 + 43, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f526f), ACE_NTOHL (0x7574696e), ACE_NTOHL (0x67547970), ACE_NTOHL (0x6552616e), ACE_NTOHL (0x67653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/Messaging/RoutingTypeRange:1.0 17, ACE_NTOHL (0x526f7574), ACE_NTOHL (0x696e6754), ACE_NTOHL (0x79706552), ACE_NTOHL (0x616e6765), ACE_NTOHL (0x0), // name = RoutingTypeRange 2, // member count - 4, ACE_NTOHL (0x6d696e00), // name = min - CORBA::tk_alias, // typecode kind for typedefs - 60, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - 30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f526f), ACE_NTOHL (0x7574696e), ACE_NTOHL (0x67547970), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:Messaging/RoutingType:1.0 - 12, ACE_NTOHL (0x526f7574), ACE_NTOHL (0x696e6754), ACE_NTOHL (0x79706500), // name = RoutingType - CORBA::tk_short, + 4, ACE_NTOHL (0x6d696e00), // name = min + CORBA::tk_alias, // typecode kind for typedefs + 68, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + 38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f526f), ACE_NTOHL (0x7574696e), ACE_NTOHL (0x67547970), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/Messaging/RoutingType:1.0 + 12, ACE_NTOHL (0x526f7574), ACE_NTOHL (0x696e6754), ACE_NTOHL (0x79706500), // name = RoutingType + CORBA::tk_short, + + + 4, ACE_NTOHL (0x6d617800), // name = max + CORBA::tk_alias, // typecode kind for typedefs + 68, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + 38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f526f), ACE_NTOHL (0x7574696e), ACE_NTOHL (0x67547970), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/Messaging/RoutingType:1.0 + 12, ACE_NTOHL (0x526f7574), ACE_NTOHL (0x696e6754), ACE_NTOHL (0x79706500), // name = RoutingType + CORBA::tk_short, - 4, ACE_NTOHL (0x6d617800), // name = max - CORBA::tk_alias, // typecode kind for typedefs - 60, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - 30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f526f), ACE_NTOHL (0x7574696e), ACE_NTOHL (0x67547970), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:Messaging/RoutingType:1.0 - 12, ACE_NTOHL (0x526f7574), ACE_NTOHL (0x696e6754), ACE_NTOHL (0x79706500), // name = RoutingType - CORBA::tk_short, }; static CORBA::TypeCode _tc_TAO_tc_Messaging_RoutingTypeRange (CORBA::tk_struct, sizeof (_oc_Messaging_RoutingTypeRange), (char *) &_oc_Messaging_RoutingTypeRange, 0, sizeof (Messaging::RoutingTypeRange)); @@ -1060,275 +1033,278 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (Messaging) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RoutingTypeRange, &_tc_TAO_tc_Messaging_RoutingTypeRange) TAO_NAMESPACE_END +void Messaging::RoutingTypeRange::_tao_any_destructor (void *x) +{ + RoutingTypeRange *tmp = ACE_static_cast (RoutingTypeRange*,x); + delete tmp; +} + Messaging::RoutingPolicy_ptr Messaging::RoutingPolicy::_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV ) { - if (CORBA::is_nil (obj)) - return Messaging::RoutingPolicy::_nil (); - CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/RoutingPolicy:1.0", ACE_TRY_ENV); - ACE_CHECK_RETURN (Messaging::RoutingPolicy::_nil ()); - if (is_a == 0) - return Messaging::RoutingPolicy::_nil (); - return Messaging::RoutingPolicy::_unchecked_narrow (obj, ACE_TRY_ENV); + return RoutingPolicy::_unchecked_narrow (obj, ACE_TRY_ENV); } Messaging::RoutingPolicy_ptr Messaging::RoutingPolicy::_unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV + CORBA::Environment & ) { - ACE_UNUSED_ARG (ACE_TRY_ENV); if (CORBA::is_nil (obj)) - return Messaging::RoutingPolicy::_nil (); - TAO_Stub* stub = obj->_stubobj (); - stub->_incr_refcnt (); - void* servant = 0; - if (obj->_is_collocated () && obj->_servant() != 0) - servant = obj->_servant()->_downcast ("IDL:Messaging/RoutingPolicy:1.0"); - if (servant == 0) - ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::RoutingPolicy::_nil ()); - - Messaging::RoutingPolicy_ptr retval = - Messaging::RoutingPolicy::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_Messaging::_tao_collocated_RoutingPolicy ( - ACE_reinterpret_cast (POA_Messaging::RoutingPolicy_ptr, - servant), - stub - ), - Messaging::RoutingPolicy::_nil () - ); - - return retval; + return RoutingPolicy::_nil (); + return + ACE_reinterpret_cast + ( + RoutingPolicy_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &RoutingPolicy::_narrow + ) + ) + ); } -CORBA::Boolean Messaging::RoutingPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RoutingPolicy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) - return 1; // success using local knowledge - else - return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call +Messaging::RoutingPolicy_ptr +Messaging::RoutingPolicy::_duplicate (RoutingPolicy_ptr obj) +{ + if (!CORBA::is_nil (obj)) + obj->_add_ref (); + return obj; +} + +void *Messaging::RoutingPolicy::_tao_QueryInterface (ptr_arith_t type) +{ + void *retv = 0; + if (type == ACE_reinterpret_cast + (ptr_arith_t, + &RoutingPolicy::_narrow)) + retv = ACE_reinterpret_cast (void*, this); + else if (type == ACE_reinterpret_cast + (ptr_arith_t, + &CORBA::Policy::_narrow)) + retv = ACE_reinterpret_cast + ( + void *, + ACE_static_cast + ( + CORBA::Policy_ptr, + this + ) + ); + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); + + if (retv) + this->_add_ref (); + return retv; } const char* Messaging::RoutingPolicy::_interface_repository_id (void) const { - return "IDL:Messaging/RoutingPolicy:1.0"; + return "IDL:omg.org/Messaging/RoutingPolicy:1.0"; } -static const CORBA::Long _oc_Messaging_RoutingPolicy[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f526f), ACE_NTOHL (0x7574696e), ACE_NTOHL (0x67506f6c), ACE_NTOHL (0x6963793a), ACE_NTOHL (0x312e3000), // repository ID = IDL:Messaging/RoutingPolicy:1.0 - 14, ACE_NTOHL (0x526f7574), ACE_NTOHL (0x696e6750), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x79000000), // name = RoutingPolicy, -}; -static CORBA::TypeCode _tc_TAO_tc_Messaging_RoutingPolicy (CORBA::tk_objref, sizeof (_oc_Messaging_RoutingPolicy), (char *) &_oc_Messaging_RoutingPolicy, 0, sizeof (Messaging::RoutingPolicy)); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RoutingPolicy, &_tc_TAO_tc_Messaging_RoutingPolicy) -TAO_NAMESPACE_END - #endif /* TAO_HAS_ROUTING_POLICY == 1 */ #if (TAO_HAS_MAX_HOPS_POLICY == 1) TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, MAX_HOPS_POLICY_TYPE, - TAO_MESSAGING_MAX_HOPS_POLICY_TYPE) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, MAX_HOPS_POLICY_TYPE, 34U) TAO_NAMESPACE_END Messaging::MaxHopsPolicy_ptr Messaging::MaxHopsPolicy::_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV ) { - if (CORBA::is_nil (obj)) - return Messaging::MaxHopsPolicy::_nil (); - CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/MaxHopsPolicy:1.0", ACE_TRY_ENV); - ACE_CHECK_RETURN (Messaging::MaxHopsPolicy::_nil ()); - if (is_a == 0) - return Messaging::MaxHopsPolicy::_nil (); - return Messaging::MaxHopsPolicy::_unchecked_narrow (obj, ACE_TRY_ENV); + return MaxHopsPolicy::_unchecked_narrow (obj, ACE_TRY_ENV); } Messaging::MaxHopsPolicy_ptr Messaging::MaxHopsPolicy::_unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV + CORBA::Environment & ) { - ACE_UNUSED_ARG (ACE_TRY_ENV); if (CORBA::is_nil (obj)) - return Messaging::MaxHopsPolicy::_nil (); - TAO_Stub* stub = obj->_stubobj (); - stub->_incr_refcnt (); - void* servant = 0; - if (obj->_is_collocated () && obj->_servant() != 0) - servant = obj->_servant()->_downcast ("IDL:Messaging/MaxHopsPolicy:1.0"); - if (servant == 0) - ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::MaxHopsPolicy::_nil ()); - - Messaging::MaxHopsPolicy_ptr retval = - Messaging::MaxHopsPolicy::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_Messaging::_tao_collocated_MaxHopsPolicy ( - ACE_reinterpret_cast (POA_Messaging::MaxHopsPolicy_ptr, - servant), - stub - ), - Messaging::MaxHopsPolicy::_nil () - ); - - return retval; + return MaxHopsPolicy::_nil (); + return + ACE_reinterpret_cast + ( + MaxHopsPolicy_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &MaxHopsPolicy::_narrow + ) + ) + ); } -CORBA::Boolean Messaging::MaxHopsPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/MaxHopsPolicy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) - return 1; // success using local knowledge - else - return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call +Messaging::MaxHopsPolicy_ptr +Messaging::MaxHopsPolicy::_duplicate (MaxHopsPolicy_ptr obj) +{ + if (!CORBA::is_nil (obj)) + obj->_add_ref (); + return obj; +} + +void *Messaging::MaxHopsPolicy::_tao_QueryInterface (ptr_arith_t type) +{ + void *retv = 0; + if (type == ACE_reinterpret_cast + (ptr_arith_t, + &MaxHopsPolicy::_narrow)) + retv = ACE_reinterpret_cast (void*, this); + else if (type == ACE_reinterpret_cast + (ptr_arith_t, + &CORBA::Policy::_narrow)) + retv = ACE_reinterpret_cast + ( + void *, + ACE_static_cast + ( + CORBA::Policy_ptr, + this + ) + ); + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); + + if (retv) + this->_add_ref (); + return retv; } const char* Messaging::MaxHopsPolicy::_interface_repository_id (void) const { - return "IDL:Messaging/MaxHopsPolicy:1.0"; + return "IDL:omg.org/Messaging/MaxHopsPolicy:1.0"; } -static const CORBA::Long _oc_Messaging_MaxHopsPolicy[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f4d61), ACE_NTOHL (0x78486f70), ACE_NTOHL (0x73506f6c), ACE_NTOHL (0x6963793a), ACE_NTOHL (0x312e3000), // repository ID = IDL:Messaging/MaxHopsPolicy:1.0 - 14, ACE_NTOHL (0x4d617848), ACE_NTOHL (0x6f707350), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x79000000), // name = MaxHopsPolicy, -}; -static CORBA::TypeCode _tc_TAO_tc_Messaging_MaxHopsPolicy (CORBA::tk_objref, sizeof (_oc_Messaging_MaxHopsPolicy), (char *) &_oc_Messaging_MaxHopsPolicy, 0, sizeof (Messaging::MaxHopsPolicy)); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_MaxHopsPolicy, &_tc_TAO_tc_Messaging_MaxHopsPolicy) -TAO_NAMESPACE_END - #endif /* TAO_HAS_MAX_HOPS_POLICY == 1 */ -#if (TAO_HAS_MAX_HOPS_POLICY == 1) +#if (TAO_HAS_QUEUE_ORDER_POLICY == 1) TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, QUEUE_ORDER_POLICY_TYPE, - TAO_MESSAGING_QUEUE_ORDER_POLICY_TYPE) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, QUEUE_ORDER_POLICY_TYPE, 35U) TAO_NAMESPACE_END Messaging::QueueOrderPolicy_ptr Messaging::QueueOrderPolicy::_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV ) { - if (CORBA::is_nil (obj)) - return Messaging::QueueOrderPolicy::_nil (); - CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/QueueOrderPolicy:1.0", ACE_TRY_ENV); - ACE_CHECK_RETURN (Messaging::QueueOrderPolicy::_nil ()); - if (is_a == 0) - return Messaging::QueueOrderPolicy::_nil (); - return Messaging::QueueOrderPolicy::_unchecked_narrow (obj, ACE_TRY_ENV); + return QueueOrderPolicy::_unchecked_narrow (obj, ACE_TRY_ENV); } Messaging::QueueOrderPolicy_ptr Messaging::QueueOrderPolicy::_unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV + CORBA::Environment & ) { - ACE_UNUSED_ARG (ACE_TRY_ENV); if (CORBA::is_nil (obj)) - return Messaging::QueueOrderPolicy::_nil (); - TAO_Stub* stub = obj->_stubobj (); - stub->_incr_refcnt (); - void* servant = 0; - if (obj->_is_collocated () && obj->_servant() != 0) - servant = obj->_servant()->_downcast ("IDL:Messaging/QueueOrderPolicy:1.0"); - if (servant == 0) - ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::QueueOrderPolicy::_nil ()); - - Messaging::QueueOrderPolicy_ptr retval = - Messaging::QueueOrderPolicy::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_Messaging::_tao_collocated_QueueOrderPolicy ( - ACE_reinterpret_cast (POA_Messaging::QueueOrderPolicy_ptr, - servant), - stub - ), - Messaging::QueueOrderPolicy::_nil () - ); - - return retval; + return QueueOrderPolicy::_nil (); + return + ACE_reinterpret_cast + ( + QueueOrderPolicy_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &QueueOrderPolicy::_narrow + ) + ) + ); } -CORBA::Boolean Messaging::QueueOrderPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/QueueOrderPolicy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) - return 1; // success using local knowledge - else - return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call +Messaging::QueueOrderPolicy_ptr +Messaging::QueueOrderPolicy::_duplicate (QueueOrderPolicy_ptr obj) +{ + if (!CORBA::is_nil (obj)) + obj->_add_ref (); + return obj; +} + +void *Messaging::QueueOrderPolicy::_tao_QueryInterface (ptr_arith_t type) +{ + void *retv = 0; + if (type == ACE_reinterpret_cast + (ptr_arith_t, + &QueueOrderPolicy::_narrow)) + retv = ACE_reinterpret_cast (void*, this); + else if (type == ACE_reinterpret_cast + (ptr_arith_t, + &CORBA::Policy::_narrow)) + retv = ACE_reinterpret_cast + ( + void *, + ACE_static_cast + ( + CORBA::Policy_ptr, + this + ) + ); + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); + + if (retv) + this->_add_ref (); + return retv; } const char* Messaging::QueueOrderPolicy::_interface_repository_id (void) const { - return "IDL:Messaging/QueueOrderPolicy:1.0"; + return "IDL:omg.org/Messaging/QueueOrderPolicy:1.0"; } -static const CORBA::Long _oc_Messaging_QueueOrderPolicy[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5175), ACE_NTOHL (0x6575654f), ACE_NTOHL (0x72646572), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63793a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:Messaging/QueueOrderPolicy:1.0 - 17, ACE_NTOHL (0x51756575), ACE_NTOHL (0x654f7264), ACE_NTOHL (0x6572506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x0), // name = QueueOrderPolicy, -}; -static CORBA::TypeCode _tc_TAO_tc_Messaging_QueueOrderPolicy (CORBA::tk_objref, sizeof (_oc_Messaging_QueueOrderPolicy), (char *) &_oc_Messaging_QueueOrderPolicy, 0, sizeof (Messaging::QueueOrderPolicy)); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_QueueOrderPolicy, &_tc_TAO_tc_Messaging_QueueOrderPolicy) -TAO_NAMESPACE_END - #endif /* TAO_HAS_QUEUE_ORDER_POLICY == 1 */ static const CORBA::Long _oc_Messaging_PolicyValue[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x56616c75), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:Messaging/PolicyValue:1.0 + 38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x56616c75), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/Messaging/PolicyValue:1.0 12, ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c756500), // name = PolicyValue 2, // member count - 6, ACE_NTOHL (0x70747970), ACE_NTOHL (0x65000000), // name = ptype - 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 (0x434f5242), ACE_NTOHL (0x412f506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x54797065), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/PolicyType:1.0 - 11, ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795479), ACE_NTOHL (0x70650000), // name = PolicyType - CORBA::tk_ulong, + 6, ACE_NTOHL (0x70747970), ACE_NTOHL (0x65000000), // name = ptype + 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 (0x434f5242), ACE_NTOHL (0x412f506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x54797065), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/PolicyType:1.0 + 11, ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795479), ACE_NTOHL (0x70650000), // name = PolicyType + CORBA::tk_ulong, - 7, ACE_NTOHL (0x7076616c), ACE_NTOHL (0x75650000), // name = pvalue - CORBA::tk_sequence, // typecode kind - 12, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_octet, - 0, + 7, ACE_NTOHL (0x7076616c), ACE_NTOHL (0x75650000), // name = pvalue + CORBA::tk_sequence, // typecode kind + 12, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + CORBA::tk_octet, + + 0U, + }; static CORBA::TypeCode _tc_TAO_tc_Messaging_PolicyValue (CORBA::tk_struct, sizeof (_oc_Messaging_PolicyValue), (char *) &_oc_Messaging_PolicyValue, 0, sizeof (Messaging::PolicyValue)); TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (Messaging) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PolicyValue, &_tc_TAO_tc_Messaging_PolicyValue) TAO_NAMESPACE_END +void Messaging::PolicyValue::_tao_any_destructor (void *x) +{ + PolicyValue *tmp = ACE_static_cast (PolicyValue*,x); + delete tmp; +} + #if !defined (_MESSAGING_POLICYVALUE__TAO_SEQ_OCTET_CS_) #define _MESSAGING_POLICYVALUE__TAO_SEQ_OCTET_CS_ @@ -1340,26 +1316,94 @@ TAO_NAMESPACE_END Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (void) {} Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size - : TAO_Unbounded_Sequence<CORBA::Octet> (max) + : +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + TAO_Unbounded_Sequence<CORBA::Octet> +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<CORBA::Octet> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (max) {} Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release) - : TAO_Unbounded_Sequence<CORBA::Octet> (max, length, buffer, release) + : +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + TAO_Unbounded_Sequence<CORBA::Octet> +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<CORBA::Octet> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (max, length, buffer, release) {} Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor - : TAO_Unbounded_Sequence<CORBA::Octet> (seq) + : +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + TAO_Unbounded_Sequence<CORBA::Octet> +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<CORBA::Octet> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (seq) {} Messaging::PolicyValue::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor {} - -static const CORBA::Long _oc_Messaging_PolicyValue__tao_seq_Octet[] = +void Messaging::PolicyValue::_tao_seq_Octet::_tao_any_destructor (void *x) { - TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_octet, + _tao_seq_Octet *tmp = ACE_static_cast (_tao_seq_Octet*,x); + delete tmp; +} - 0, -}; -static CORBA::TypeCode _tc_TAO_tc_Messaging_PolicyValue__tao_seq_Octet (CORBA::tk_sequence, sizeof (_oc_Messaging_PolicyValue__tao_seq_Octet), (char *) &_oc_Messaging_PolicyValue__tao_seq_Octet, 0, sizeof (Messaging::PolicyValue::_tao_seq_Octet)); -CORBA::TypeCode_ptr Messaging::PolicyValue::_tc__tao_seq_Octet = &_tc_TAO_tc_Messaging_PolicyValue__tao_seq_Octet; + +#endif /* end #if !defined */ + + +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + +#if !defined (__TAO_UNBOUNDED_SEQUENCE_MESSAGING_POLICYVALUESEQ_CS_) +#define __TAO_UNBOUNDED_SEQUENCE_MESSAGING_POLICYVALUESEQ_CS_ + + void + Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_allocate_buffer (CORBA::ULong length) + { + Messaging::PolicyValue* tmp = 0; + tmp = _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (length); + + if (this->buffer_ != 0) + { + Messaging::PolicyValue *old = ACE_reinterpret_cast (Messaging::PolicyValue *,this->buffer_); + + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp[i] = old[i]; + + if (this->release_) + _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (old); + + } + this->buffer_ = tmp; + } + + void + Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_deallocate_buffer (void) + { + if (this->buffer_ == 0 || this->release_ == 0) + return; + + Messaging::PolicyValue *tmp = ACE_reinterpret_cast (Messaging::PolicyValue *,this->buffer_); + + _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (tmp); + this->buffer_ = 0; + } + + Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::~_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (void) // Dtor. + { + this->_deallocate_buffer (); + } + + +#endif /* end #if !defined */ + + +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + +#if !defined (_MESSAGING_POLICYVALUESEQ_CS_) +#define _MESSAGING_POLICYVALUESEQ_CS_ // ************************************************************* // Messaging::PolicyValueSeq @@ -1368,16 +1412,39 @@ CORBA::TypeCode_ptr Messaging::PolicyValue::_tc__tao_seq_Octet = &_tc_TAO_tc_Mes Messaging::PolicyValueSeq::PolicyValueSeq (void) {} Messaging::PolicyValueSeq::PolicyValueSeq (CORBA::ULong max) // uses max size - : TAO_Unbounded_Sequence<Messaging::PolicyValue> (max) + : +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<Messaging::PolicyValue> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (max) {} Messaging::PolicyValueSeq::PolicyValueSeq (CORBA::ULong max, CORBA::ULong length, Messaging::PolicyValue *buffer, CORBA::Boolean release) - : TAO_Unbounded_Sequence<Messaging::PolicyValue> (max, length, buffer, release) + : +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<Messaging::PolicyValue> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (max, length, buffer, release) {} Messaging::PolicyValueSeq::PolicyValueSeq (const PolicyValueSeq &seq) // copy ctor - : TAO_Unbounded_Sequence<Messaging::PolicyValue> (seq) + : +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<Messaging::PolicyValue> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (seq) {} Messaging::PolicyValueSeq::~PolicyValueSeq (void) // dtor {} +void Messaging::PolicyValueSeq::_tao_any_destructor (void *x) +{ + PolicyValueSeq *tmp = ACE_static_cast (PolicyValueSeq*,x); + delete tmp; +} #endif /* end #if !defined */ @@ -1385,33 +1452,37 @@ Messaging::PolicyValueSeq::~PolicyValueSeq (void) // dtor static const CORBA::Long _oc_Messaging_PolicyValueSeq[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:Messaging/PolicyValueSeq:1.0 + 41, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/Messaging/PolicyValueSeq:1.0 15, ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c756553), ACE_NTOHL (0x65710000), // name = PolicyValueSeq CORBA::tk_sequence, // typecode kind - 192, // encapsulation length + 200, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order CORBA::tk_struct, // typecode kind - 176, // encapsulation length + 184, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order - 30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x56616c75), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:Messaging/PolicyValue:1.0 + 38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x56616c75), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/Messaging/PolicyValue:1.0 12, ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c756500), // name = PolicyValue 2, // member count - 6, ACE_NTOHL (0x70747970), ACE_NTOHL (0x65000000), // name = ptype - 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 (0x434f5242), ACE_NTOHL (0x412f506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x54797065), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/PolicyType:1.0 - 11, ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795479), ACE_NTOHL (0x70650000), // name = PolicyType - CORBA::tk_ulong, - - 7, ACE_NTOHL (0x7076616c), ACE_NTOHL (0x75650000), // name = pvalue - CORBA::tk_sequence, // typecode kind - 12, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_octet, - - 0, - 0 + 6, ACE_NTOHL (0x70747970), ACE_NTOHL (0x65000000), // name = ptype + 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 (0x434f5242), ACE_NTOHL (0x412f506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x54797065), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/PolicyType:1.0 + 11, ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795479), ACE_NTOHL (0x70650000), // name = PolicyType + CORBA::tk_ulong, + + + 7, ACE_NTOHL (0x7076616c), ACE_NTOHL (0x75650000), // name = pvalue + CORBA::tk_sequence, // typecode kind + 12, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + CORBA::tk_octet, + + 0U, + + + 0U, + }; static CORBA::TypeCode _tc_TAO_tc_Messaging_PolicyValueSeq (CORBA::tk_alias, sizeof (_oc_Messaging_PolicyValueSeq), (char *) &_oc_Messaging_PolicyValueSeq, 0, sizeof (Messaging::PolicyValueSeq)); TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) @@ -1420,16 +1491,41 @@ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PolicyValueSeq, &_tc_TAO_tc_Messa TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_POLICIES, 2) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_POLICIES, 2U) TAO_NAMESPACE_END TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE (const CORBA::ULong, INVOCATION_POLICIES, 2) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, INVOCATION_POLICIES, 2U) TAO_NAMESPACE_END +static const CORBA::Long _oc_Messaging_ExceptionHolder[] = +{ + TAO_ENCAP_BYTE_ORDER, // byte order + 34, ACE_NTOHL (0x49444c3a), 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:Messaging/ExceptionHolder:1.0 + 16, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e486f6c), ACE_NTOHL (0x64657200), // name = ExceptionHolder + 3, // member count + 20, ACE_NTOHL (0x69735f73), ACE_NTOHL (0x79737465), ACE_NTOHL (0x6d5f6578), ACE_NTOHL (0x63657074), ACE_NTOHL (0x696f6e00), // name = is_system_exception + CORBA::tk_boolean, -// **************************************************************** + 11, ACE_NTOHL (0x62797465), ACE_NTOHL (0x5f6f7264), ACE_NTOHL (0x65720000), // name = byte_order + CORBA::tk_boolean, -#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) + 20, ACE_NTOHL (0x6d617273), ACE_NTOHL (0x68616c65), ACE_NTOHL (0x645f6578), ACE_NTOHL (0x63657074), ACE_NTOHL (0x696f6e00), // name = marshaled_exception + CORBA::tk_sequence, // typecode kind + 12, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + CORBA::tk_octet, + + 0U, + +}; +static CORBA::TypeCode _tc_TAO_tc_Messaging_ExceptionHolder (CORBA::tk_struct, sizeof (_oc_Messaging_ExceptionHolder), (char *) &_oc_Messaging_ExceptionHolder, 0, sizeof (Messaging::ExceptionHolder)); +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (Messaging) +TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ExceptionHolder, &_tc_TAO_tc_Messaging_ExceptionHolder) +TAO_NAMESPACE_END + +#if !defined (_MESSAGING_EXCEPTIONHOLDER__TAO_SEQ_OCTET_CS_) +#define _MESSAGING_EXCEPTIONHOLDER__TAO_SEQ_OCTET_CS_ // ************************************************************* // Messaging::ExceptionHolder::_tao_seq_Octet @@ -1438,165 +1534,157 @@ TAO_NAMESPACE_END Messaging::ExceptionHolder::_tao_seq_Octet::_tao_seq_Octet (void) {} Messaging::ExceptionHolder::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size - : TAO_Unbounded_Sequence<CORBA::Octet> (max) + : +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + TAO_Unbounded_Sequence<CORBA::Octet> +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<CORBA::Octet> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (max) {} Messaging::ExceptionHolder::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release) - : TAO_Unbounded_Sequence<CORBA::Octet> (max, length, buffer, release) + : +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + TAO_Unbounded_Sequence<CORBA::Octet> +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<CORBA::Octet> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (max, length, buffer, release) {} Messaging::ExceptionHolder::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor - : TAO_Unbounded_Sequence<CORBA::Octet> (seq) + : +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + TAO_Unbounded_Sequence<CORBA::Octet> +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<CORBA::Octet> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (seq) {} Messaging::ExceptionHolder::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor {} - -static const CORBA::Long _oc_Messaging_ExceptionHolder__tao_seq_Octet[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_octet, - 0, -}; - - -Messaging::ExceptionHolder* Messaging::ExceptionHolder::_downcast (CORBA::ValueBase* v) -{ - if (v == 0) return 0; - return (ExceptionHolder* ) v->_tao_obv_narrow ((ptr_arith_t) &_downcast); -} - -const char* Messaging::ExceptionHolder::_tao_obv_repository_id () const -{ - return this->_tao_obv_static_repository_id (); -} - -void* Messaging::ExceptionHolder::_tao_obv_narrow (ptr_arith_t type_id) -{ - if (type_id == (ptr_arith_t) &_downcast) - return this; - void *rval = 0; - return rval; -} - -CORBA::Boolean Messaging::ExceptionHolder::_tao_marshal_v (TAO_OutputCDR & strm) +void Messaging::ExceptionHolder::_tao_seq_Octet::_tao_any_destructor (void *x) { - return this->_tao_marshal__Messaging_ExceptionHolder (strm); -} - -CORBA::Boolean Messaging::ExceptionHolder::_tao_unmarshal_v (TAO_InputCDR & strm) -{ - return this->_tao_unmarshal__Messaging_ExceptionHolder (strm); -} - -CORBA::Boolean Messaging::ExceptionHolder::_tao_unmarshal (TAO_InputCDR &strm, Messaging::ExceptionHolder *&new_object) -{ - CORBA::Boolean retval = 1; - CORBA::ValueBase *base; // %! should be a _var - CORBA::ValueFactory_ptr factory; // %! should be a _var - if (!CORBA::ValueBase::_tao_unmarshal_pre (strm, factory, base, - Messaging::ExceptionHolder::_tao_obv_static_repository_id ()) ) - { - return 0; - } - if (factory != 0) - { - base = factory->create_for_unmarshal (); - factory->_remove_ref (); - if (base == 0) return 0; // %! except.? - //%! ACE_DEBUG ((LM_DEBUG, "Messaging::ExceptionHolder::_tao_unmarshal %s\n", base->_tao_obv_repository_id () )); - retval = base->_tao_unmarshal_v (strm); - //%! ACE_DEBUG ((LM_DEBUG, "Messaging::ExceptionHolder::_tao_unmarshal retval unmarshal_v is %d\n", retval)); - if (!retval) return 0; - } - // Now base must be null or point to the unmarshaled object. - // Align the pointer to the right subobject. - new_object = Messaging::ExceptionHolder::_downcast (base); - // %! unmarshal_post - return 1; + _tao_seq_Octet *tmp = ACE_static_cast (_tao_seq_Octet*,x); + delete tmp; } -#if !defined (_MESSAGING_EXCEPTIONHOLDER___INIT_CS_) -#define _MESSAGING_EXCEPTIONHOLDER___INIT_CS_ - -Messaging::ExceptionHolder_init::~ExceptionHolder_init () -{ -} +#endif /* end #if !defined */ -const char* -Messaging::ExceptionHolder_init::tao_repository_id () +void Messaging::ReplyHandler::_tao_any_destructor (void *x) { - return Messaging::ExceptionHolder::_tao_obv_static_repository_id (); + ReplyHandler *tmp = ACE_static_cast (ReplyHandler*,x); + CORBA::release (tmp); } - -#endif /* end #if !defined */ - - -// **************************************************************** - - Messaging::ReplyHandler_ptr Messaging::ReplyHandler::_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV ) { if (CORBA::is_nil (obj)) - return Messaging::ReplyHandler::_nil (); - CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/ReplyHandler:1.0", ACE_TRY_ENV); - ACE_CHECK_RETURN (Messaging::ReplyHandler::_nil ()); - if (is_a == 0) - return Messaging::ReplyHandler::_nil (); - return Messaging::ReplyHandler::_unchecked_narrow (obj, ACE_TRY_ENV); + return ReplyHandler::_nil (); + if (! obj->_is_local ()) + { + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/Messaging/ReplyHandler:1.0", ACE_TRY_ENV); + ACE_CHECK_RETURN (ReplyHandler::_nil ()); + if (is_a == 0) + return ReplyHandler::_nil (); + } + return ReplyHandler::_unchecked_narrow (obj, ACE_TRY_ENV); } - Messaging::ReplyHandler_ptr Messaging::ReplyHandler::_unchecked_narrow ( CORBA::Object_ptr obj, CORBA::Environment & ) { if (CORBA::is_nil (obj)) - return Messaging::ReplyHandler::_nil (); - TAO_Stub* stub = obj->_stubobj (); - stub->_incr_refcnt (); - if (obj->_is_collocated () && _TAO_collocation_Messaging_ReplyHandler_Stub_Factory_function_pointer != 0) + return ReplyHandler::_nil (); + if (! obj->_is_local ()) { - ReplyHandler_ptr retv = _TAO_collocation_Messaging_ReplyHandler_Stub_Factory_function_pointer (obj); - if (retv != 0) - return retv; + TAO_Stub* stub = obj->_stubobj (); + if (stub) + stub->_incr_refcnt (); + ReplyHandler_ptr default_proxy = ReplyHandler::_nil (); + + if (obj->_is_collocated () && _TAO_collocation_Messaging_ReplyHandler_Stub_Factory_function_pointer != 0) + { + default_proxy = _TAO_collocation_Messaging_ReplyHandler_Stub_Factory_function_pointer (obj); + } + if (CORBA::is_nil (default_proxy)) + ACE_NEW_RETURN (default_proxy, ReplyHandler (stub), ReplyHandler::_nil ()); + #if (TAO_HAS_SMART_PROXIES == 1) + return TAO_Messaging_ReplyHandler_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy); + #else + return default_proxy; + #endif /*TAO_HAS_SMART_PROXIES == 1*/ } - Messaging::ReplyHandler_ptr retval = 0; - ACE_NEW_RETURN (retval, Messaging::ReplyHandler (stub), 0); - return retval; + else + return + ACE_reinterpret_cast + ( + ReplyHandler_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &ReplyHandler::_narrow + ) + ) + ); } - +Messaging::ReplyHandler_ptr +Messaging::ReplyHandler::_duplicate (ReplyHandler_ptr obj) +{ + if (!CORBA::is_nil (obj)) + obj->_add_ref (); + return obj; +} CORBA::Boolean Messaging::ReplyHandler::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) { if ( - (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/ReplyHandler:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/Messaging/ReplyHandler:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call + return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); +} + +void *Messaging::ReplyHandler::_tao_QueryInterface (ptr_arith_t type) +{ + void *retv = 0; + if (type == ACE_reinterpret_cast + (ptr_arith_t, + &ReplyHandler::_narrow)) + retv = ACE_reinterpret_cast (void*, this); + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); + + if (retv) + this->_add_ref (); + return retv; } const char* Messaging::ReplyHandler::_interface_repository_id (void) const { - return "IDL:Messaging/ReplyHandler:1.0"; + return "IDL:omg.org/Messaging/ReplyHandler:1.0"; } -#if (TAO_HAS_SMART_PROXIES == 1) - Messaging::TAO_Messaging_ReplyHandler_Default_Proxy_Factory::TAO_Messaging_ReplyHandler_Default_Proxy_Factory (int register_proxy_factory) - { - if (register_proxy_factory) - { - TAO_Messaging_ReplyHandler_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this); - } - } +Messaging::TAO_Messaging_ReplyHandler_Default_Proxy_Factory::TAO_Messaging_ReplyHandler_Default_Proxy_Factory (int register_proxy_factory) +{ + if (register_proxy_factory) + { + TAO_Messaging_ReplyHandler_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this); + } +} - Messaging::TAO_Messaging_ReplyHandler_Default_Proxy_Factory::~TAO_Messaging_ReplyHandler_Default_Proxy_Factory (void) - { +Messaging::TAO_Messaging_ReplyHandler_Default_Proxy_Factory::~TAO_Messaging_ReplyHandler_Default_Proxy_Factory (void) +{ } Messaging::ReplyHandler_ptr @@ -1710,1735 +1798,367 @@ Messaging::TAO_Messaging_ReplyHandler_Smart_Proxy_Base::get_proxy (void) #pragma instantiate ACE_Singleton<Messaging::TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -#endif /*TAO_HAS_SMART_PROXIES*/ - -static const CORBA::Long _oc_Messaging_ReplyHandler[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x706c7948), ACE_NTOHL (0x616e646c), ACE_NTOHL (0x65723a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:Messaging/ReplyHandler:1.0 - 13, ACE_NTOHL (0x5265706c), ACE_NTOHL (0x7948616e), ACE_NTOHL (0x646c6572), ACE_NTOHL (0x0), // name = ReplyHandler, -}; -static CORBA::TypeCode _tc_TAO_tc_Messaging_ReplyHandler (CORBA::tk_objref, sizeof (_oc_Messaging_ReplyHandler), (char *) &_oc_Messaging_ReplyHandler, 0, sizeof (Messaging::ReplyHandler)); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ReplyHandler, &_tc_TAO_tc_Messaging_ReplyHandler) -TAO_NAMESPACE_END - -CORBA::Boolean -OBV_Messaging::ExceptionHolder::_tao_marshal__Messaging_ExceptionHolder (TAO_OutputCDR &strm){ - return _tao_marshal_state (strm); - -} -CORBA::Boolean OBV_Messaging::ExceptionHolder::_tao_unmarshal__Messaging_ExceptionHolder (TAO_InputCDR &strm){ - return _tao_unmarshal_state (strm); - -} -// accessor to set the member -void -OBV_Messaging::ExceptionHolder::is_system_exception (CORBA::Boolean val) // set -{ - // set the value - this->_pd_is_system_exception = val; -} -// retrieve the member -CORBA::Boolean -OBV_Messaging::ExceptionHolder::is_system_exception (void) const -{ - return this->_pd_is_system_exception; -} - -// accessor to set the member -void -OBV_Messaging::ExceptionHolder::byte_order (CORBA::Boolean val) // set -{ - // set the value - this->_pd_byte_order = val; -} -// retrieve the member -CORBA::Boolean -OBV_Messaging::ExceptionHolder::byte_order (void) const -{ - return this->_pd_byte_order; -} - -// accessor to set the member -void -OBV_Messaging::ExceptionHolder::marshaled_exception (const Messaging::ExceptionHolder::_tao_seq_Octet &val) -{ - ACE_NEW ( - this->_pd_marshaled_exception, - /*Messaging::ExceptionHolder::*/_tao_seq_Octet (val) - ); -} -// readonly get method -const Messaging::ExceptionHolder::_tao_seq_Octet & -OBV_Messaging::ExceptionHolder::marshaled_exception (void) const -{ - return *this->_pd_marshaled_exception; -} -// read/write get method -Messaging::ExceptionHolder::_tao_seq_Octet & -OBV_Messaging::ExceptionHolder::marshaled_exception (void) -{ - return *this->_pd_marshaled_exception; -} - - -#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */ - -#if (TAO_HAS_AMI_POLLER == 1) - -Messaging::Poller_ptr Messaging::Poller::_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV - ) -{ - if (CORBA::is_nil (obj)) - return Messaging::Poller::_nil (); - CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/Poller:1.0", ACE_TRY_ENV); - ACE_CHECK_RETURN (Messaging::Poller::_nil ()); - if (is_a == 0) - return Messaging::Poller::_nil (); - return Messaging::Poller::_unchecked_narrow (obj, ACE_TRY_ENV); -} - -Messaging::Poller_ptr Messaging::Poller::_unchecked_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV - ) -{ - ACE_UNUSED_ARG (ACE_TRY_ENV); - if (CORBA::is_nil (obj)) - return Messaging::Poller::_nil (); - TAO_Stub* stub = obj->_stubobj (); - stub->_incr_refcnt (); - void* servant = 0; - if (obj->_is_collocated () && obj->_servant() != 0) - servant = obj->_servant()->_downcast ("IDL:Messaging/Poller:1.0"); - if (servant == 0) - { - Messaging::Poller_ptr rval = Messaging::Poller::_nil (); - - ACE_NEW_RETURN (rval, - Messaging::Poller (stub), - Messaging::Poller::_nil ()); - - return rval; - } - - Messaging::Poller_ptr retval = - Messaging::Poller::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_Messaging::_tao_collocated_Poller ( - ACE_reinterpret_cast (POA_Messaging::Poller_ptr, - servant), - stub - ), - Messaging::Poller::_nil () - ); - - return retval; -} - -CORBA::Object_ptr Messaging::Poller::operation_target ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - CORBA::Object_ptr _tao_retval = 0; - - TAO_Stub *istub = this->_stubobj (); - if (istub == 0) - ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval); - - - TAO_GIOP_Twoway_Invocation _tao_call ( - istub, - "_get_""operation_target", - 21, - istub->orb_core () - ); - - - for (;;) - { - ACE_TRY_ENV.clear (); - _tao_call.start (ACE_TRY_ENV); - ACE_CHECK_RETURN (_tao_retval); - - CORBA::Short flag = 131; - - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), - ACE_TRY_ENV); - ACE_CHECK_RETURN (_tao_retval); - - int _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); - ACE_CHECK_RETURN (_tao_retval); - - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - // if (_invoke_status == TAO_INVOKE_EXCEPTION) - // cannot happen - if (_invoke_status != TAO_INVOKE_OK) - { - ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); - - } - break; - - } - TAO_InputCDR &_tao_in = _tao_call.inp_stream (); - if (!( - (_tao_in >> _tao_retval) - )) - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); - return _tao_retval; -} - -char * Messaging::Poller::operation_name ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - char *_tao_retval = 0; - - TAO_Stub *istub = this->_stubobj (); - if (istub == 0) - ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval); - - - TAO_GIOP_Twoway_Invocation _tao_call ( - istub, - "_get_""operation_name", - 19, - istub->orb_core () - ); - - - for (;;) - { - ACE_TRY_ENV.clear (); - _tao_call.start (ACE_TRY_ENV); - ACE_CHECK_RETURN (_tao_retval); - - CORBA::Short flag = 131; - - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), - ACE_TRY_ENV); - ACE_CHECK_RETURN (_tao_retval); - - int _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); - ACE_CHECK_RETURN (_tao_retval); - - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - // if (_invoke_status == TAO_INVOKE_EXCEPTION) - // cannot happen - if (_invoke_status != TAO_INVOKE_OK) - { - ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); - - } - break; - - } - TAO_InputCDR &_tao_in = _tao_call.inp_stream (); - if (!( - (_tao_in >> _tao_retval) - )) - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); - return _tao_retval; -} - -Messaging::ReplyHandler_ptr Messaging::Poller::associated_handler ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - Messaging::ReplyHandler_ptr _tao_retval = Messaging::ReplyHandler::_nil (); - - TAO_Stub *istub = this->_stubobj (); - if (istub == 0) - ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval); - - - TAO_GIOP_Twoway_Invocation _tao_call ( - istub, - "_get_""associated_handler", - 23, - istub->orb_core () - ); - - - for (;;) - { - ACE_TRY_ENV.clear (); - _tao_call.start (ACE_TRY_ENV); - ACE_CHECK_RETURN (_tao_retval); - - CORBA::Short flag = 131; - - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), - ACE_TRY_ENV); - ACE_CHECK_RETURN (_tao_retval); - - int _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); - ACE_CHECK_RETURN (_tao_retval); - - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - // if (_invoke_status == TAO_INVOKE_EXCEPTION) - // cannot happen - if (_invoke_status != TAO_INVOKE_OK) - { - ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); - - } - break; - - } - TAO_InputCDR &_tao_in = _tao_call.inp_stream (); - if (!( - (_tao_in >> _tao_retval) - )) - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); - return _tao_retval; -} - -void Messaging::Poller::associated_handler ( - Messaging::ReplyHandler_ptr associated_handler, - CORBA::Environment &ACE_TRY_ENV - ) -{ - - TAO_Stub *istub = this->_stubobj (); - if (istub == 0) - ACE_THROW (CORBA::INTERNAL ()); - - - TAO_GIOP_Twoway_Invocation _tao_call ( - istub, - "_set_""associated_handler", - 23, - istub->orb_core () - ); - - - for (;;) + static const CORBA::Long _oc_Messaging_ReplyHandler[] = { - ACE_TRY_ENV.clear (); - _tao_call.start (ACE_TRY_ENV); - ACE_CHECK; - - CORBA::Short flag = 131; - - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), - ACE_TRY_ENV); - ACE_CHECK; - - TAO_OutputCDR &_tao_out = _tao_call.out_stream (); - if (!( - (_tao_out << associated_handler) - )) - ACE_THROW (CORBA::MARSHAL ()); - - int _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); - ACE_CHECK; - - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - // if (_invoke_status == TAO_INVOKE_EXCEPTION) - // cannot happen - if (_invoke_status != TAO_INVOKE_OK) - { - ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); - - } - break; - - } - -} - -CORBA::Boolean Messaging::Poller::is_from_poller ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - CORBA::Boolean _tao_retval = 0; - - TAO_Stub *istub = this->_stubobj (); - if (istub == 0) - ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval); - - - TAO_GIOP_Twoway_Invocation _tao_call ( - istub, - "_get_""is_from_poller", - 19, - istub->orb_core () - ); - - - for (;;) - { - ACE_TRY_ENV.clear (); - _tao_call.start (ACE_TRY_ENV); - ACE_CHECK_RETURN (_tao_retval); - - CORBA::Short flag = 131; - - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), - ACE_TRY_ENV); - ACE_CHECK_RETURN (_tao_retval); - - int _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); - ACE_CHECK_RETURN (_tao_retval); - - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - // if (_invoke_status == TAO_INVOKE_EXCEPTION) - // cannot happen - if (_invoke_status != TAO_INVOKE_OK) - { - ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); - - } - break; - - } - TAO_InputCDR &_tao_in = _tao_call.inp_stream (); - if (!( - (_tao_in >> CORBA::Any::to_boolean (_tao_retval)) - )) - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); - return _tao_retval; -} - -CORBA::Object_ptr Messaging::Poller::target ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - CORBA::Object_ptr _tao_retval = 0; - - TAO_Stub *istub = this->_stubobj (); - if (istub == 0) - ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval); - - - TAO_GIOP_Twoway_Invocation _tao_call ( - istub, - "_get_""target", - 11, - istub->orb_core () - ); - - - for (;;) - { - ACE_TRY_ENV.clear (); - _tao_call.start (ACE_TRY_ENV); - ACE_CHECK_RETURN (_tao_retval); - - CORBA::Short flag = 131; - - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), - ACE_TRY_ENV); - ACE_CHECK_RETURN (_tao_retval); - - int _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); - ACE_CHECK_RETURN (_tao_retval); - - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - // if (_invoke_status == TAO_INVOKE_EXCEPTION) - // cannot happen - if (_invoke_status != TAO_INVOKE_OK) - { - ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); - - } - break; - - } - TAO_InputCDR &_tao_in = _tao_call.inp_stream (); - if (!( - (_tao_in >> _tao_retval) - )) - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); - return _tao_retval; -} - -char * Messaging::Poller::op_name ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - char *_tao_retval = 0; - - TAO_Stub *istub = this->_stubobj (); - if (istub == 0) - ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval); - - - TAO_GIOP_Twoway_Invocation _tao_call ( - istub, - "_get_""op_name", - 12, - istub->orb_core () - ); - - - for (;;) - { - ACE_TRY_ENV.clear (); - _tao_call.start (ACE_TRY_ENV); - ACE_CHECK_RETURN (_tao_retval); - - CORBA::Short flag = 131; - - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), - ACE_TRY_ENV); - ACE_CHECK_RETURN (_tao_retval); - - int _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); - ACE_CHECK_RETURN (_tao_retval); - - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - // if (_invoke_status == TAO_INVOKE_EXCEPTION) - // cannot happen - if (_invoke_status != TAO_INVOKE_OK) - { - ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); - - } - break; - - } - TAO_InputCDR &_tao_in = _tao_call.inp_stream (); - if (!( - (_tao_in >> _tao_retval) - )) - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); - return _tao_retval; -} - -CORBA::Boolean Messaging::Poller::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/Poller:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Pollable:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) - return 1; // success using local knowledge - else - return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call -} - -const char* Messaging::Poller::_interface_repository_id (void) const -{ - return "IDL:Messaging/Poller:1.0"; -} - -static const CORBA::Long _oc_Messaging_Poller[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 25, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f506f), ACE_NTOHL (0x6c6c6572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:Messaging/Poller:1.0 - 7, ACE_NTOHL (0x506f6c6c), ACE_NTOHL (0x65720000), // name = Poller, + 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 (0x2e300000), // repository ID = IDL:omg.org/Messaging/ReplyHandler:1.0 + 13, ACE_NTOHL (0x5265706c), ACE_NTOHL (0x7948616e), ACE_NTOHL (0x646c6572), ACE_NTOHL (0x0), // name = ReplyHandler }; -static CORBA::TypeCode _tc_TAO_tc_Messaging_Poller (CORBA::tk_objref, sizeof (_oc_Messaging_Poller), (char *) &_oc_Messaging_Poller, 0, sizeof (Messaging::Poller)); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Poller, &_tc_TAO_tc_Messaging_Poller) -TAO_NAMESPACE_END - -#endif /* TAO_HAS_AMI_POLLER == 1 */ - -// **************************************************************** - -#if (TAO_HAS_REBIND_POLICY == 1) - -void operator<<= (CORBA::Any &_tao_any, Messaging::RebindPolicy_ptr _tao_elem) -{ - TAO_OutputCDR stream; - if (stream << _tao_elem) - { - _tao_any._tao_replace ( - Messaging::_tc_RebindPolicy, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); - } -} - -void Messaging::RebindPolicy::_tao_any_destructor (void *x) -{ - Messaging::RebindPolicy *tmp = ACE_static_cast(Messaging::RebindPolicy*,x); - CORBA::release (tmp); -} - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::RebindPolicy_ptr &_tao_elem) -{ - ACE_TRY_NEW_ENV - { - _tao_elem = Messaging::RebindPolicy::_nil (); - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (Messaging::_tc_RebindPolicy, ACE_TRY_ENV)) // not equal - { - return 0; - } - ACE_TRY_CHECK; - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - CORBA::Object_var _tao_obj_var; - if (stream >> _tao_obj_var.out ()) - { - _tao_elem = Messaging::RebindPolicy::_narrow (_tao_obj_var.in (), ACE_TRY_ENV); - ACE_TRY_CHECK; - ((CORBA::Any *)&_tao_any)->_tao_replace ( - Messaging::_tc_RebindPolicy, - 1, - _tao_elem, - Messaging::RebindPolicy::_tao_any_destructor - ); - return 1; - } - } - ACE_CATCHANY - { - _tao_elem = Messaging::RebindPolicy::_nil (); - return 0; - } - ACE_ENDTRY; - _tao_elem = Messaging::RebindPolicy::_nil (); - return 0; -} - -#endif /* TAO_HAS_REBIND_POLICY == 1 */ - -#if (TAO_HAS_SYNC_SCOPE_POLICY == 1) - -void operator<<= (CORBA::Any &_tao_any, Messaging::SyncScopePolicy_ptr _tao_elem) -{ - TAO_OutputCDR stream; - if (stream << _tao_elem) - { - _tao_any._tao_replace ( - Messaging::_tc_SyncScopePolicy, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); - } -} - -void Messaging::SyncScopePolicy::_tao_any_destructor (void *x) -{ - Messaging::SyncScopePolicy *tmp = ACE_static_cast(Messaging::SyncScopePolicy*,x); - CORBA::release (tmp); -} - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::SyncScopePolicy_ptr &_tao_elem) -{ - ACE_TRY_NEW_ENV - { - _tao_elem = Messaging::SyncScopePolicy::_nil (); - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (Messaging::_tc_SyncScopePolicy, ACE_TRY_ENV)) // not equal - { - return 0; - } - ACE_TRY_CHECK; - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - CORBA::Object_var _tao_obj_var; - if (stream >> _tao_obj_var.out ()) - { - _tao_elem = Messaging::SyncScopePolicy::_narrow (_tao_obj_var.in (), ACE_TRY_ENV); - ACE_TRY_CHECK; - ((CORBA::Any *)&_tao_any)->_tao_replace ( - Messaging::_tc_SyncScopePolicy, - 1, - _tao_elem, - Messaging::SyncScopePolicy::_tao_any_destructor - ); - return 1; - } - } - ACE_CATCHANY - { - _tao_elem = Messaging::SyncScopePolicy::_nil (); - return 0; - } - ACE_ENDTRY; - _tao_elem = Messaging::SyncScopePolicy::_nil (); - return 0; -} - -#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ - -#if (TAO_HAS_PRIORITY_POLICIES == 1) + static CORBA::TypeCode _tc_TAO_tc_Messaging_ReplyHandler (CORBA::tk_objref, sizeof (_oc_Messaging_ReplyHandler), (char *) &_oc_Messaging_ReplyHandler, 0, sizeof (Messaging::ReplyHandler)); + TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) + TAO_NAMESPACE_BEGIN (Messaging) + TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ReplyHandler, &_tc_TAO_tc_Messaging_ReplyHandler) + TAO_NAMESPACE_END void operator<<= (CORBA::Any &_tao_any, const Messaging::PriorityRange &_tao_elem) // copying { - TAO_OutputCDR stream; - stream << _tao_elem; - _tao_any._tao_replace ( - Messaging::_tc_PriorityRange, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); + TAO_OutputCDR stream; + stream << _tao_elem; + _tao_any._tao_replace ( + Messaging::_tc_PriorityRange, + TAO_ENCAP_BYTE_ORDER, + stream.begin () + ); } -void Messaging::PriorityRange::_tao_any_destructor (void *x) +void operator<<= (CORBA::Any &_tao_any, Messaging::PriorityRange *_tao_elem) // non copying { - Messaging::PriorityRange *tmp = ACE_static_cast(Messaging::PriorityRange*,x); - delete tmp; + TAO_OutputCDR stream; + stream << *_tao_elem; + _tao_any._tao_replace ( + Messaging::_tc_PriorityRange, + TAO_ENCAP_BYTE_ORDER, + stream.begin (), + 1, + _tao_elem, + Messaging::PriorityRange::_tao_any_destructor + ); } -void operator<<= (CORBA::Any &_tao_any, Messaging::PriorityRange *_tao_elem) // non copying +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::PriorityRange *&_tao_elem) { - TAO_OutputCDR stream; - stream << *_tao_elem; - _tao_any._tao_replace ( - Messaging::_tc_PriorityRange, - TAO_ENCAP_BYTE_ORDER, - stream.begin (), - 1, - _tao_elem, - Messaging::PriorityRange::_tao_any_destructor - ); + return _tao_any >>= ACE_const_cast(const Messaging::PriorityRange*&,_tao_elem); } -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::PriorityRange *&_tao_elem) +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Messaging::PriorityRange *&_tao_elem) { + _tao_elem = 0; ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); if (!type->equivalent (Messaging::_tc_PriorityRange, ACE_TRY_ENV)) // not equal { - _tao_elem = 0; return 0; } ACE_TRY_CHECK; if (_tao_any.any_owns_data ()) { - _tao_elem = (Messaging::PriorityRange *)_tao_any.value (); + _tao_elem = ACE_static_cast( + const Messaging::PriorityRange*, + _tao_any.value () + ); return 1; } else { - ACE_NEW_RETURN (_tao_elem, Messaging::PriorityRange, 0); + Messaging::PriorityRange *tmp; + ACE_NEW_RETURN (tmp, Messaging::PriorityRange, 0); TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () ); - if (stream >> *_tao_elem) + if (stream >> *tmp) { ((CORBA::Any *)&_tao_any)->_tao_replace ( Messaging::_tc_PriorityRange, 1, - ACE_reinterpret_cast (void *, _tao_elem), + ACE_static_cast (void *, tmp), Messaging::PriorityRange::_tao_any_destructor ); + _tao_elem = tmp; return 1; } else { - delete _tao_elem; - _tao_elem = 0; - } - } - } - ACE_CATCHANY - { - delete _tao_elem; - _tao_elem = 0; - return 0; - } - ACE_ENDTRY; - return 0; -} - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Messaging::PriorityRange *&_tao_elem) -{ - return _tao_any >>= ACE_const_cast(Messaging::PriorityRange *&,_tao_elem); -} - -void operator<<= (CORBA::Any &_tao_any, Messaging::RequestPriorityPolicy_ptr _tao_elem) -{ - TAO_OutputCDR stream; - if (stream << _tao_elem) - { - _tao_any._tao_replace ( - Messaging::_tc_RequestPriorityPolicy, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); - } -} - -void Messaging::RequestPriorityPolicy::_tao_any_destructor (void *x) -{ - Messaging::RequestPriorityPolicy *tmp = ACE_static_cast(Messaging::RequestPriorityPolicy*,x); - CORBA::release (tmp); -} - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::RequestPriorityPolicy_ptr &_tao_elem) -{ - ACE_TRY_NEW_ENV - { - _tao_elem = Messaging::RequestPriorityPolicy::_nil (); - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (Messaging::_tc_RequestPriorityPolicy, ACE_TRY_ENV)) // not equal - { - return 0; - } - ACE_TRY_CHECK; - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - CORBA::Object_var _tao_obj_var; - if (stream >> _tao_obj_var.out ()) - { - _tao_elem = Messaging::RequestPriorityPolicy::_narrow (_tao_obj_var.in (), ACE_TRY_ENV); - ACE_TRY_CHECK; - ((CORBA::Any *)&_tao_any)->_tao_replace ( - Messaging::_tc_RequestPriorityPolicy, - 1, - _tao_elem, - Messaging::RequestPriorityPolicy::_tao_any_destructor - ); - return 1; - } - } - ACE_CATCHANY - { - _tao_elem = Messaging::RequestPriorityPolicy::_nil (); - return 0; - } - ACE_ENDTRY; - _tao_elem = Messaging::RequestPriorityPolicy::_nil (); - return 0; -} - -void operator<<= (CORBA::Any &_tao_any, Messaging::ReplyPriorityPolicy_ptr _tao_elem) -{ - TAO_OutputCDR stream; - if (stream << _tao_elem) - { - _tao_any._tao_replace ( - Messaging::_tc_ReplyPriorityPolicy, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); - } -} - -void Messaging::ReplyPriorityPolicy::_tao_any_destructor (void *x) -{ - Messaging::ReplyPriorityPolicy *tmp = ACE_static_cast(Messaging::ReplyPriorityPolicy*,x); - CORBA::release (tmp); -} - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::ReplyPriorityPolicy_ptr &_tao_elem) -{ - ACE_TRY_NEW_ENV - { - _tao_elem = Messaging::ReplyPriorityPolicy::_nil (); - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (Messaging::_tc_ReplyPriorityPolicy, ACE_TRY_ENV)) // not equal - { - return 0; + delete tmp; } - ACE_TRY_CHECK; - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - CORBA::Object_var _tao_obj_var; - if (stream >> _tao_obj_var.out ()) - { - _tao_elem = Messaging::ReplyPriorityPolicy::_narrow (_tao_obj_var.in (), ACE_TRY_ENV); - ACE_TRY_CHECK; - ((CORBA::Any *)&_tao_any)->_tao_replace ( - Messaging::_tc_ReplyPriorityPolicy, - 1, - _tao_elem, - Messaging::ReplyPriorityPolicy::_tao_any_destructor - ); - return 1; } } ACE_CATCHANY { - _tao_elem = Messaging::ReplyPriorityPolicy::_nil (); - return 0; } ACE_ENDTRY; - _tao_elem = Messaging::ReplyPriorityPolicy::_nil (); return 0; } -#endif /* TAO_HAS_PRIORITY_POLICIES == 1 */ - -#if (TAO_HAS_REQUEST_START_TIME_POLICY == 1) - -void operator<<= (CORBA::Any &_tao_any, Messaging::RequestStartTimePolicy_ptr _tao_elem) -{ - TAO_OutputCDR stream; - if (stream << _tao_elem) - { - _tao_any._tao_replace ( - Messaging::_tc_RequestStartTimePolicy, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); - } -} - -void Messaging::RequestStartTimePolicy::_tao_any_destructor (void *x) -{ - Messaging::RequestStartTimePolicy *tmp = ACE_static_cast(Messaging::RequestStartTimePolicy*,x); - CORBA::release (tmp); -} - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::RequestStartTimePolicy_ptr &_tao_elem) -{ - ACE_TRY_NEW_ENV - { - _tao_elem = Messaging::RequestStartTimePolicy::_nil (); - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (Messaging::_tc_RequestStartTimePolicy, ACE_TRY_ENV)) // not equal - { - return 0; - } - ACE_TRY_CHECK; - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - CORBA::Object_var _tao_obj_var; - if (stream >> _tao_obj_var.out ()) - { - _tao_elem = Messaging::RequestStartTimePolicy::_narrow (_tao_obj_var.in (), ACE_TRY_ENV); - ACE_TRY_CHECK; - ((CORBA::Any *)&_tao_any)->_tao_replace ( - Messaging::_tc_RequestStartTimePolicy, - 1, - _tao_elem, - Messaging::RequestStartTimePolicy::_tao_any_destructor - ); - return 1; - } - } - ACE_CATCHANY - { - _tao_elem = Messaging::RequestStartTimePolicy::_nil (); - return 0; - } - ACE_ENDTRY; - _tao_elem = Messaging::RequestStartTimePolicy::_nil (); - return 0; -} - -#endif /* TAO_HAS_REQUEST_START_TIME_POLICY == 1 */ - -#if (TAO_HAS_REQUEST_END_TIME_POLICY == 1) - -void operator<<= (CORBA::Any &_tao_any, Messaging::RequestEndTimePolicy_ptr _tao_elem) -{ - TAO_OutputCDR stream; - if (stream << _tao_elem) - { - _tao_any._tao_replace ( - Messaging::_tc_RequestEndTimePolicy, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); - } -} - -void Messaging::RequestEndTimePolicy::_tao_any_destructor (void *x) -{ - Messaging::RequestEndTimePolicy *tmp = ACE_static_cast(Messaging::RequestEndTimePolicy*,x); - CORBA::release (tmp); -} - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::RequestEndTimePolicy_ptr &_tao_elem) -{ - ACE_TRY_NEW_ENV - { - _tao_elem = Messaging::RequestEndTimePolicy::_nil (); - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (Messaging::_tc_RequestEndTimePolicy, ACE_TRY_ENV)) // not equal - { - return 0; - } - ACE_TRY_CHECK; - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - CORBA::Object_var _tao_obj_var; - if (stream >> _tao_obj_var.out ()) - { - _tao_elem = Messaging::RequestEndTimePolicy::_narrow (_tao_obj_var.in (), ACE_TRY_ENV); - ACE_TRY_CHECK; - ((CORBA::Any *)&_tao_any)->_tao_replace ( - Messaging::_tc_RequestEndTimePolicy, - 1, - _tao_elem, - Messaging::RequestEndTimePolicy::_tao_any_destructor - ); - return 1; - } - } - ACE_CATCHANY - { - _tao_elem = Messaging::RequestEndTimePolicy::_nil (); - return 0; - } - ACE_ENDTRY; - _tao_elem = Messaging::RequestEndTimePolicy::_nil (); - return 0; -} - -#endif /* TAO_HAS_REQUEST_END_TIME_POLICY == 1 */ - -#if (TAO_HAS_REPLY_START_TIME_POLICY == 1) - -void operator<<= (CORBA::Any &_tao_any, Messaging::ReplyStartTimePolicy_ptr _tao_elem) -{ - TAO_OutputCDR stream; - if (stream << _tao_elem) - { - _tao_any._tao_replace ( - Messaging::_tc_ReplyStartTimePolicy, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); - } -} - -void Messaging::ReplyStartTimePolicy::_tao_any_destructor (void *x) -{ - Messaging::ReplyStartTimePolicy *tmp = ACE_static_cast(Messaging::ReplyStartTimePolicy*,x); - CORBA::release (tmp); -} - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::ReplyStartTimePolicy_ptr &_tao_elem) -{ - ACE_TRY_NEW_ENV - { - _tao_elem = Messaging::ReplyStartTimePolicy::_nil (); - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (Messaging::_tc_ReplyStartTimePolicy, ACE_TRY_ENV)) // not equal - { - return 0; - } - ACE_TRY_CHECK; - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - CORBA::Object_var _tao_obj_var; - if (stream >> _tao_obj_var.out ()) - { - _tao_elem = Messaging::ReplyStartTimePolicy::_narrow (_tao_obj_var.in (), ACE_TRY_ENV); - ACE_TRY_CHECK; - ((CORBA::Any *)&_tao_any)->_tao_replace ( - Messaging::_tc_ReplyStartTimePolicy, - 1, - _tao_elem, - Messaging::ReplyStartTimePolicy::_tao_any_destructor - ); - return 1; - } - } - ACE_CATCHANY - { - _tao_elem = Messaging::ReplyStartTimePolicy::_nil (); - return 0; - } - ACE_ENDTRY; - _tao_elem = Messaging::ReplyStartTimePolicy::_nil (); - return 0; -} - -#endif /* TAO_HAS_REPLY_START_TIME_POLICY == 1 */ - -#if (TAO_HAS_REPLY_END_TIME_POLICY == 1) - -void operator<<= (CORBA::Any &_tao_any, Messaging::ReplyEndTimePolicy_ptr _tao_elem) -{ - TAO_OutputCDR stream; - if (stream << _tao_elem) - { - _tao_any._tao_replace ( - Messaging::_tc_ReplyEndTimePolicy, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); - } -} - -void Messaging::ReplyEndTimePolicy::_tao_any_destructor (void *x) -{ - Messaging::ReplyEndTimePolicy *tmp = ACE_static_cast(Messaging::ReplyEndTimePolicy*,x); - CORBA::release (tmp); -} - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::ReplyEndTimePolicy_ptr &_tao_elem) -{ - ACE_TRY_NEW_ENV - { - _tao_elem = Messaging::ReplyEndTimePolicy::_nil (); - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (Messaging::_tc_ReplyEndTimePolicy, ACE_TRY_ENV)) // not equal - { - return 0; - } - ACE_TRY_CHECK; - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - CORBA::Object_var _tao_obj_var; - if (stream >> _tao_obj_var.out ()) - { - _tao_elem = Messaging::ReplyEndTimePolicy::_narrow (_tao_obj_var.in (), ACE_TRY_ENV); - ACE_TRY_CHECK; - ((CORBA::Any *)&_tao_any)->_tao_replace ( - Messaging::_tc_ReplyEndTimePolicy, - 1, - _tao_elem, - Messaging::ReplyEndTimePolicy::_tao_any_destructor - ); - return 1; - } - } - ACE_CATCHANY - { - _tao_elem = Messaging::ReplyEndTimePolicy::_nil (); - return 0; - } - ACE_ENDTRY; - _tao_elem = Messaging::ReplyEndTimePolicy::_nil (); - return 0; -} - -#endif /* TAO_HAS_REPLY_END_TIME_POLICY == 1 */ - -#if (TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1) - -void operator<<= (CORBA::Any &_tao_any, Messaging::RelativeRequestTimeoutPolicy_ptr _tao_elem) -{ - TAO_OutputCDR stream; - if (stream << _tao_elem) - { - _tao_any._tao_replace ( - Messaging::_tc_RelativeRequestTimeoutPolicy, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); - } -} - -void Messaging::RelativeRequestTimeoutPolicy::_tao_any_destructor -(void *x) -{ - Messaging::RelativeRequestTimeoutPolicy *tmp = ACE_static_cast(Messaging::RelativeRequestTimeoutPolicy*,x); - CORBA::release (tmp); -} - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::RelativeRequestTimeoutPolicy_ptr &_tao_elem) -{ - ACE_TRY_NEW_ENV - { - _tao_elem = Messaging::RelativeRequestTimeoutPolicy::_nil (); - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (Messaging::_tc_RelativeRequestTimeoutPolicy, ACE_TRY_ENV)) // not equal - { - return 0; - } - ACE_TRY_CHECK; - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - CORBA::Object_var _tao_obj_var; - if (stream >> _tao_obj_var.out ()) - { - _tao_elem = Messaging::RelativeRequestTimeoutPolicy::_narrow (_tao_obj_var.in (), ACE_TRY_ENV); - ACE_TRY_CHECK; - ((CORBA::Any *)&_tao_any)->_tao_replace ( - Messaging::_tc_RelativeRequestTimeoutPolicy, - 1, - _tao_elem, - Messaging::RelativeRequestTimeoutPolicy::_tao_any_destructor - ); - return 1; - } - } - ACE_CATCHANY - { - _tao_elem = Messaging::RelativeRequestTimeoutPolicy::_nil (); - return 0; - } - ACE_ENDTRY; - _tao_elem = Messaging::RelativeRequestTimeoutPolicy::_nil (); - return 0; -} - -#endif /* TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1 */ - -#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) - -void operator<<= (CORBA::Any &_tao_any, Messaging::RelativeRoundtripTimeoutPolicy_ptr _tao_elem) -{ - TAO_OutputCDR stream; - if (stream << _tao_elem) - { - _tao_any._tao_replace ( - Messaging::_tc_RelativeRoundtripTimeoutPolicy, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); - } -} - -void Messaging::RelativeRoundtripTimeoutPolicy::_tao_any_destructor (void *x) -{ - Messaging::RelativeRoundtripTimeoutPolicy *tmp = ACE_static_cast(Messaging::RelativeRoundtripTimeoutPolicy*,x); - CORBA::release (tmp); -} - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::RelativeRoundtripTimeoutPolicy_ptr &_tao_elem) -{ - ACE_TRY_NEW_ENV - { - _tao_elem = Messaging::RelativeRoundtripTimeoutPolicy::_nil (); - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (Messaging::_tc_RelativeRoundtripTimeoutPolicy, ACE_TRY_ENV)) // not equal - { - return 0; - } - ACE_TRY_CHECK; - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - CORBA::Object_var _tao_obj_var; - if (stream >> _tao_obj_var.out ()) - { - _tao_elem = Messaging::RelativeRoundtripTimeoutPolicy::_narrow (_tao_obj_var.in (), ACE_TRY_ENV); - ACE_TRY_CHECK; - ((CORBA::Any *)&_tao_any)->_tao_replace ( - Messaging::_tc_RelativeRoundtripTimeoutPolicy, - 1, - _tao_elem, - Messaging::RelativeRoundtripTimeoutPolicy::_tao_any_destructor - ); - return 1; - } - } - ACE_CATCHANY - { - _tao_elem = Messaging::RelativeRoundtripTimeoutPolicy::_nil (); - return 0; - } - ACE_ENDTRY; - _tao_elem = Messaging::RelativeRoundtripTimeoutPolicy::_nil (); - return 0; -} - -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ - -#if (TAO_HAS_ROUTING_POLICY == 1) - void operator<<= (CORBA::Any &_tao_any, const Messaging::RoutingTypeRange &_tao_elem) // copying { - TAO_OutputCDR stream; - stream << _tao_elem; - _tao_any._tao_replace ( - Messaging::_tc_RoutingTypeRange, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); + TAO_OutputCDR stream; + stream << _tao_elem; + _tao_any._tao_replace ( + Messaging::_tc_RoutingTypeRange, + TAO_ENCAP_BYTE_ORDER, + stream.begin () + ); } -void Messaging::RoutingTypeRange::_tao_any_destructor (void *x) +void operator<<= (CORBA::Any &_tao_any, Messaging::RoutingTypeRange *_tao_elem) // non copying { - Messaging::RoutingTypeRange *tmp = ACE_static_cast(Messaging::RoutingTypeRange*,x); - delete tmp; + TAO_OutputCDR stream; + stream << *_tao_elem; + _tao_any._tao_replace ( + Messaging::_tc_RoutingTypeRange, + TAO_ENCAP_BYTE_ORDER, + stream.begin (), + 1, + _tao_elem, + Messaging::RoutingTypeRange::_tao_any_destructor + ); } -void operator<<= (CORBA::Any &_tao_any, Messaging::RoutingTypeRange *_tao_elem) // non copying +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::RoutingTypeRange *&_tao_elem) { - TAO_OutputCDR stream; - stream << *_tao_elem; - _tao_any._tao_replace ( - Messaging::_tc_RoutingTypeRange, - TAO_ENCAP_BYTE_ORDER, - stream.begin (), - 1, - _tao_elem, - Messaging::RoutingTypeRange::_tao_any_destructor - ); + return _tao_any >>= ACE_const_cast(const Messaging::RoutingTypeRange*&,_tao_elem); } -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::RoutingTypeRange *&_tao_elem) +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Messaging::RoutingTypeRange *&_tao_elem) { + _tao_elem = 0; ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); if (!type->equivalent (Messaging::_tc_RoutingTypeRange, ACE_TRY_ENV)) // not equal { - _tao_elem = 0; return 0; } ACE_TRY_CHECK; if (_tao_any.any_owns_data ()) { - _tao_elem = (Messaging::RoutingTypeRange *)_tao_any.value (); + _tao_elem = ACE_static_cast( + const Messaging::RoutingTypeRange*, + _tao_any.value () + ); return 1; } else { - ACE_NEW_RETURN (_tao_elem, Messaging::RoutingTypeRange, 0); + Messaging::RoutingTypeRange *tmp; + ACE_NEW_RETURN (tmp, Messaging::RoutingTypeRange, 0); TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () ); - if (stream >> *_tao_elem) + if (stream >> *tmp) { ((CORBA::Any *)&_tao_any)->_tao_replace ( Messaging::_tc_RoutingTypeRange, 1, - ACE_reinterpret_cast (void *, _tao_elem), + ACE_static_cast (void *, tmp), Messaging::RoutingTypeRange::_tao_any_destructor ); + _tao_elem = tmp; return 1; } else { - delete _tao_elem; - _tao_elem = 0; - } - } - } - ACE_CATCHANY - { - delete _tao_elem; - _tao_elem = 0; - return 0; - } - ACE_ENDTRY; - return 0; -} - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Messaging::RoutingTypeRange *&_tao_elem) -{ - return _tao_any >>= ACE_const_cast(Messaging::RoutingTypeRange *&,_tao_elem); -} - -void operator<<= (CORBA::Any &_tao_any, Messaging::RoutingPolicy_ptr _tao_elem) -{ - TAO_OutputCDR stream; - if (stream << _tao_elem) - { - _tao_any._tao_replace ( - Messaging::_tc_RoutingPolicy, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); - } -} - -void Messaging::RoutingPolicy::_tao_any_destructor (void *x) -{ - Messaging::RoutingPolicy *tmp = ACE_static_cast(Messaging::RoutingPolicy*,x); - CORBA::release (tmp); -} - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::RoutingPolicy_ptr &_tao_elem) -{ - ACE_TRY_NEW_ENV - { - _tao_elem = Messaging::RoutingPolicy::_nil (); - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (Messaging::_tc_RoutingPolicy, ACE_TRY_ENV)) // not equal - { - return 0; - } - ACE_TRY_CHECK; - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - CORBA::Object_var _tao_obj_var; - if (stream >> _tao_obj_var.out ()) - { - _tao_elem = Messaging::RoutingPolicy::_narrow (_tao_obj_var.in (), ACE_TRY_ENV); - ACE_TRY_CHECK; - ((CORBA::Any *)&_tao_any)->_tao_replace ( - Messaging::_tc_RoutingPolicy, - 1, - _tao_elem, - Messaging::RoutingPolicy::_tao_any_destructor - ); - return 1; - } - } - ACE_CATCHANY - { - _tao_elem = Messaging::RoutingPolicy::_nil (); - return 0; - } - ACE_ENDTRY; - _tao_elem = Messaging::RoutingPolicy::_nil (); - return 0; -} - -#endif /* TAO_HAS_ROUTING_POLICY == 1 */ - -#if (TAO_HAS_MAX_HOPS_POLICY == 1) - -void operator<<= (CORBA::Any &_tao_any, Messaging::MaxHopsPolicy_ptr _tao_elem) -{ - TAO_OutputCDR stream; - if (stream << _tao_elem) - { - _tao_any._tao_replace ( - Messaging::_tc_MaxHopsPolicy, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); - } -} - -void Messaging::MaxHopsPolicy::_tao_any_destructor (void *x) -{ - Messaging::MaxHopsPolicy *tmp = ACE_static_cast(Messaging::MaxHopsPolicy*,x); - CORBA::release (tmp); -} - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::MaxHopsPolicy_ptr &_tao_elem) -{ - ACE_TRY_NEW_ENV - { - _tao_elem = Messaging::MaxHopsPolicy::_nil (); - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (Messaging::_tc_MaxHopsPolicy, ACE_TRY_ENV)) // not equal - { - return 0; - } - ACE_TRY_CHECK; - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - CORBA::Object_var _tao_obj_var; - if (stream >> _tao_obj_var.out ()) - { - _tao_elem = Messaging::MaxHopsPolicy::_narrow (_tao_obj_var.in (), ACE_TRY_ENV); - ACE_TRY_CHECK; - ((CORBA::Any *)&_tao_any)->_tao_replace ( - Messaging::_tc_MaxHopsPolicy, - 1, - _tao_elem, - Messaging::MaxHopsPolicy::_tao_any_destructor - ); - return 1; - } - } - ACE_CATCHANY - { - _tao_elem = Messaging::MaxHopsPolicy::_nil (); - return 0; - } - ACE_ENDTRY; - _tao_elem = Messaging::MaxHopsPolicy::_nil (); - return 0; -} - -#endif /* TAO_HAS_MAX_HOPS_POLICY == 1 */ - -#if (TAO_HAS_QUEUE_ORDER_POLICY == 1) - -void operator<<= (CORBA::Any &_tao_any, Messaging::QueueOrderPolicy_ptr _tao_elem) -{ - TAO_OutputCDR stream; - if (stream << _tao_elem) - { - _tao_any._tao_replace ( - Messaging::_tc_QueueOrderPolicy, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); - } -} - -void Messaging::QueueOrderPolicy::_tao_any_destructor (void *x) -{ - Messaging::QueueOrderPolicy *tmp = ACE_static_cast(Messaging::QueueOrderPolicy*,x); - CORBA::release (tmp); -} - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::QueueOrderPolicy_ptr &_tao_elem) -{ - ACE_TRY_NEW_ENV - { - _tao_elem = Messaging::QueueOrderPolicy::_nil (); - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (Messaging::_tc_QueueOrderPolicy, ACE_TRY_ENV)) // not equal - { - return 0; + delete tmp; } - ACE_TRY_CHECK; - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - CORBA::Object_var _tao_obj_var; - if (stream >> _tao_obj_var.out ()) - { - _tao_elem = Messaging::QueueOrderPolicy::_narrow (_tao_obj_var.in (), ACE_TRY_ENV); - ACE_TRY_CHECK; - ((CORBA::Any *)&_tao_any)->_tao_replace ( - Messaging::_tc_QueueOrderPolicy, - 1, - _tao_elem, - Messaging::QueueOrderPolicy::_tao_any_destructor - ); - return 1; } } ACE_CATCHANY { - _tao_elem = Messaging::QueueOrderPolicy::_nil (); - return 0; } ACE_ENDTRY; - _tao_elem = Messaging::QueueOrderPolicy::_nil (); return 0; } -#endif /* TAO_HAS_QUEUE_ORDER_POLICY == 1 */ - void operator<<= (CORBA::Any &_tao_any, const Messaging::PolicyValue &_tao_elem) // copying { - TAO_OutputCDR stream; - stream << _tao_elem; - _tao_any._tao_replace ( - Messaging::_tc_PolicyValue, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); + TAO_OutputCDR stream; + stream << _tao_elem; + _tao_any._tao_replace ( + Messaging::_tc_PolicyValue, + TAO_ENCAP_BYTE_ORDER, + stream.begin () + ); } -void Messaging::PolicyValue::_tao_any_destructor (void *x) +void operator<<= (CORBA::Any &_tao_any, Messaging::PolicyValue *_tao_elem) // non copying { - Messaging::PolicyValue *tmp = ACE_static_cast(Messaging::PolicyValue*,x); - delete tmp; + TAO_OutputCDR stream; + stream << *_tao_elem; + _tao_any._tao_replace ( + Messaging::_tc_PolicyValue, + TAO_ENCAP_BYTE_ORDER, + stream.begin (), + 1, + _tao_elem, + Messaging::PolicyValue::_tao_any_destructor + ); } -void operator<<= (CORBA::Any &_tao_any, Messaging::PolicyValue *_tao_elem) // non copying +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::PolicyValue *&_tao_elem) { - TAO_OutputCDR stream; - stream << *_tao_elem; - _tao_any._tao_replace ( - Messaging::_tc_PolicyValue, - TAO_ENCAP_BYTE_ORDER, - stream.begin (), - 1, - _tao_elem, - Messaging::PolicyValue::_tao_any_destructor - ); + return _tao_any >>= ACE_const_cast(const Messaging::PolicyValue*&,_tao_elem); } -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::PolicyValue *&_tao_elem) +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Messaging::PolicyValue *&_tao_elem) { + _tao_elem = 0; ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); if (!type->equivalent (Messaging::_tc_PolicyValue, ACE_TRY_ENV)) // not equal { - _tao_elem = 0; return 0; } ACE_TRY_CHECK; if (_tao_any.any_owns_data ()) { - _tao_elem = (Messaging::PolicyValue *)_tao_any.value (); + _tao_elem = ACE_static_cast( + const Messaging::PolicyValue*, + _tao_any.value () + ); return 1; } else { - ACE_NEW_RETURN (_tao_elem, Messaging::PolicyValue, 0); + Messaging::PolicyValue *tmp; + ACE_NEW_RETURN (tmp, Messaging::PolicyValue, 0); TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () ); - if (stream >> *_tao_elem) + if (stream >> *tmp) { ((CORBA::Any *)&_tao_any)->_tao_replace ( Messaging::_tc_PolicyValue, 1, - ACE_reinterpret_cast (void *, _tao_elem), + ACE_static_cast (void *, tmp), Messaging::PolicyValue::_tao_any_destructor ); + _tao_elem = tmp; return 1; } else { - delete _tao_elem; - _tao_elem = 0; + delete tmp; } } } ACE_CATCHANY { - delete _tao_elem; - _tao_elem = 0; - return 0; } ACE_ENDTRY; return 0; } -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Messaging::PolicyValue *&_tao_elem) -{ - return _tao_any >>= ACE_const_cast(Messaging::PolicyValue *&,_tao_elem); -} - -// **************************************************************** - void operator<<= ( CORBA::Any &_tao_any, const Messaging::PolicyValueSeq &_tao_elem ) // copying { - TAO_OutputCDR stream; - if (stream << _tao_elem) - { - _tao_any._tao_replace ( - Messaging::_tc_PolicyValueSeq, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); - } + TAO_OutputCDR stream; + if (stream << _tao_elem) + { + _tao_any._tao_replace ( + Messaging::_tc_PolicyValueSeq, + TAO_ENCAP_BYTE_ORDER, + stream.begin () + ); + } } -void Messaging::PolicyValueSeq::_tao_any_destructor (void *x) +void operator<<= (CORBA::Any &_tao_any, Messaging::PolicyValueSeq *_tao_elem) // non copying { - Messaging::PolicyValueSeq *tmp = ACE_static_cast(Messaging::PolicyValueSeq*,x); - delete tmp; + TAO_OutputCDR stream; + stream << *_tao_elem; + _tao_any._tao_replace ( + Messaging::_tc_PolicyValueSeq, + TAO_ENCAP_BYTE_ORDER, + stream.begin (), + 1, + _tao_elem, + Messaging::PolicyValueSeq::_tao_any_destructor + ); } -void operator<<= (CORBA::Any &_tao_any, Messaging::PolicyValueSeq *_tao_elem) // non copying +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::PolicyValueSeq *&_tao_elem) { - TAO_OutputCDR stream; - stream << *_tao_elem; - _tao_any._tao_replace ( - Messaging::_tc_PolicyValueSeq, - TAO_ENCAP_BYTE_ORDER, - stream.begin (), - 1, - _tao_elem, - Messaging::PolicyValueSeq::_tao_any_destructor - ); + return _tao_any >>= ACE_const_cast( + const Messaging::PolicyValueSeq*&, + _tao_elem + ); } -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::PolicyValueSeq *&_tao_elem) +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Messaging::PolicyValueSeq *&_tao_elem) { + _tao_elem = 0; ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); if (!type->equivalent (Messaging::_tc_PolicyValueSeq, ACE_TRY_ENV)) // not equal { - _tao_elem = 0; return 0; } ACE_TRY_CHECK; if (_tao_any.any_owns_data ()) { - _tao_elem = (Messaging::PolicyValueSeq *)_tao_any.value (); + _tao_elem = ACE_static_cast( + const Messaging::PolicyValueSeq*, + _tao_any.value () + ); return 1; } else { - ACE_NEW_RETURN (_tao_elem, Messaging::PolicyValueSeq, 0); + Messaging::PolicyValueSeq *tmp; + ACE_NEW_RETURN (tmp, Messaging::PolicyValueSeq, 0); TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () ); - if (stream >> *_tao_elem) + if (stream >> *tmp) { ((CORBA::Any *)&_tao_any)->_tao_replace ( Messaging::_tc_PolicyValueSeq, 1, - ACE_reinterpret_cast (void *, _tao_elem), + ACE_static_cast (void *, tmp), Messaging::PolicyValueSeq::_tao_any_destructor ); + _tao_elem = tmp; return 1; } else { - delete _tao_elem; - _tao_elem = 0; + delete tmp; } } } ACE_CATCHANY { - delete _tao_elem; - _tao_elem = 0; - return 0; } ACE_ENDTRY; return 0; } -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Messaging::PolicyValueSeq *&_tao_elem) -{ - return _tao_any >>= ACE_const_cast(Messaging::PolicyValueSeq *&,_tao_elem); -} - -// **************************************************************** - -#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) - Messaging::ReplyHandler_ptr (*_TAO_collocation_Messaging_ReplyHandler_Stub_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; - void operator<<= (CORBA::Any &_tao_any, Messaging::ReplyHandler_ptr _tao_elem) { - TAO_OutputCDR stream; - if (stream << _tao_elem) - { - _tao_any._tao_replace ( - Messaging::_tc_ReplyHandler, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); - } -} - -void Messaging::ReplyHandler::_tao_any_destructor (void *x) -{ - Messaging::ReplyHandler *tmp = ACE_static_cast(Messaging::ReplyHandler*,x); - CORBA::release (tmp); + TAO_OutputCDR stream; + if (stream << _tao_elem) + { + _tao_any._tao_replace ( + Messaging::_tc_ReplyHandler, + TAO_ENCAP_BYTE_ORDER, + stream.begin (), + 1, + Messaging::ReplyHandler::_duplicate (_tao_elem), + Messaging::ReplyHandler::_tao_any_destructor + ); + } } CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::ReplyHandler_ptr &_tao_elem) @@ -3461,6 +2181,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::ReplyHandler_ { _tao_elem = Messaging::ReplyHandler::_narrow (_tao_obj_var.in (), ACE_TRY_ENV); ACE_TRY_CHECK; + ((CORBA::Any *)&_tao_any)->_tao_replace ( Messaging::_tc_ReplyHandler, 1, @@ -3480,96 +2201,191 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::ReplyHandler_ return 0; } -#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER */ +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ + defined (ACE_HAS_GNU_REPO) + template class TAO_Object_Manager<Messaging::ReplyHandler,Messaging::ReplyHandler_var>; + #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + # pragma instantiate TAO_Object_Manager<Messaging::ReplyHandler,Messaging::ReplyHandler_var> +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -// **************************************************************** -#if (TAO_HAS_AMI_POLLER == 1) +#if !defined _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_CPP_ +#define _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_CPP_ -void operator<<= (CORBA::Any &_tao_any, Messaging::Poller_ptr _tao_elem) +CORBA::Boolean operator<< ( + TAO_OutputCDR &strm, + const Messaging::PolicyValue::_tao_seq_Octet &_tao_sequence + ) { - TAO_OutputCDR stream; - if (stream << _tao_elem) + if (strm << _tao_sequence.length ()) + { + // encode all elements + +#if defined (TAO_NO_COPY_OCTET_SEQUENCES) { - _tao_any._tao_replace ( - Messaging::_tc_Poller, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); + TAO_Unbounded_Sequence<CORBA::Octet> *oseq = + ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (Messaging::PolicyValue::_tao_seq_Octet *)&_tao_sequence); + if (oseq->mb ()) + return strm.write_octet_array_mb (oseq->mb ()); + else + return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); } + +#else /* TAO_NO_COPY_OCTET_SEQUENCES */ + return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); + +#endif /* TAO_NO_COPY_OCTET_SEQUENCES */ + } + return 0; // error } -void Messaging::Poller::_tao_any_destructor (void *x) +CORBA::Boolean operator>> ( + TAO_InputCDR &strm, + Messaging::PolicyValue::_tao_seq_Octet &_tao_sequence + ) { - Messaging::Poller *tmp = ACE_static_cast(Messaging::Poller*,x); - CORBA::release (tmp); + CORBA::ULong _tao_seq_len; + if (strm >> _tao_seq_len) + { + // set the length of the sequence + _tao_sequence.length (_tao_seq_len); + // If length is 0 we return true. + if (0 >= _tao_seq_len) + return 1; + // retrieve all the elements + +#if defined (TAO_NO_COPY_OCTET_SEQUENCES) + if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE)) + { + TAO_Unbounded_Sequence<CORBA::Octet> *oseq = + ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence); + oseq->replace (_tao_seq_len, strm.start ()); + oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len); + strm.skip_bytes (_tao_seq_len); + return 1; + } + else + return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len); + +#else /* TAO_NO_COPY_OCTET_SEQUENCES */ + return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); + +#endif /* TAO_NO_COPY_OCTET_SEQUENCES */ + } + return 0; // error } -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::Poller_ptr &_tao_elem) +#endif /* _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_CPP_ */ + +CORBA::Boolean operator<< ( + TAO_OutputCDR &strm, + const Messaging::PolicyValueSeq &_tao_sequence + ) { - ACE_TRY_NEW_ENV + if (strm << _tao_sequence.length ()) { - _tao_elem = Messaging::Poller::_nil (); - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (Messaging::_tc_Poller, ACE_TRY_ENV)) // not equal - { - return 0; - } - ACE_TRY_CHECK; - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - CORBA::Object_var _tao_obj_var; - if (stream >> _tao_obj_var.out ()) + // encode all elements + CORBA::Boolean _tao_marshal_flag = 1; + for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) { - _tao_elem = Messaging::Poller::_narrow (_tao_obj_var.in (), ACE_TRY_ENV); - ACE_TRY_CHECK; - ((CORBA::Any *)&_tao_any)->_tao_replace ( - Messaging::_tc_Poller, - 1, - _tao_elem, - Messaging::Poller::_tao_any_destructor - ); - return 1; + _tao_marshal_flag = (strm << _tao_sequence[i]); } + return _tao_marshal_flag; } - ACE_CATCHANY + return 0; // error +} + +CORBA::Boolean operator>> ( + TAO_InputCDR &strm, + Messaging::PolicyValueSeq &_tao_sequence + ) +{ + CORBA::ULong _tao_seq_len; + if (strm >> _tao_seq_len) { - _tao_elem = Messaging::Poller::_nil (); - 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) + return 1; + // retrieve all the elements + CORBA::Boolean _tao_marshal_flag = 1; + for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) + { + _tao_marshal_flag = (strm >> _tao_sequence[i]); + } + return _tao_marshal_flag; } - ACE_ENDTRY; - _tao_elem = Messaging::Poller::_nil (); - return 0; + return 0; // error } -#endif /* TAO_HAS_AMI_POLLER == 1 */ -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) +#if !defined _TAO_CDR_OP_Messaging_ExceptionHolder__tao_seq_Octet_CPP_ +#define _TAO_CDR_OP_Messaging_ExceptionHolder__tao_seq_Octet_CPP_ - template class TAO_Unbounded_Sequence<Messaging::PolicyValue>; +CORBA::Boolean operator<< ( + TAO_OutputCDR &strm, + const Messaging::ExceptionHolder::_tao_seq_Octet &_tao_sequence + ) +{ + if (strm << _tao_sequence.length ()) + { + // encode all elements -#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) - template class TAO_Object_Manager<Messaging::ReplyHandler,Messaging::ReplyHandler_var>; -#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */ +#if defined (TAO_NO_COPY_OCTET_SEQUENCES) + { + TAO_Unbounded_Sequence<CORBA::Octet> *oseq = + ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (Messaging::ExceptionHolder::_tao_seq_Octet *)&_tao_sequence); + if (oseq->mb ()) + return strm.write_octet_array_mb (oseq->mb ()); + else + return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); + } + +#else /* TAO_NO_COPY_OCTET_SEQUENCES */ + return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); -#if (TAO_HAS_AMI_POLLER == 1) - template class TAO_Object_Manager<Messaging::Poller,Messaging::Poller_var>; -#endif /* TAO_HAS_AMI_POLLER == 1 */ +#endif /* TAO_NO_COPY_OCTET_SEQUENCES */ + } + return 0; // error +} -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +CORBA::Boolean operator>> ( + TAO_InputCDR &strm, + Messaging::ExceptionHolder::_tao_seq_Octet &_tao_sequence + ) +{ + CORBA::ULong _tao_seq_len; + if (strm >> _tao_seq_len) + { + // set the length of the sequence + _tao_sequence.length (_tao_seq_len); + // If length is 0 we return true. + if (0 >= _tao_seq_len) + return 1; + // retrieve all the elements -#pragma instantiate TAO_Unbounded_Sequence<Messaging::PolicyValue> +#if defined (TAO_NO_COPY_OCTET_SEQUENCES) + if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE)) + { + TAO_Unbounded_Sequence<CORBA::Octet> *oseq = + ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence); + oseq->replace (_tao_seq_len, strm.start ()); + oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len); + strm.skip_bytes (_tao_seq_len); + return 1; + } + else + return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len); -#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) -# pragma instantiate TAO_Object_Manager<Messaging::ReplyHandler,Messaging::ReplyHandler_var> -#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */ +#else /* TAO_NO_COPY_OCTET_SEQUENCES */ + return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); -#if (TAO_HAS_AMI_POLLER == 1) -# pragma instantiate TAO_Object_Manager<Messaging::Poller,Messaging::Poller_var> -#endif /* TAO_HAS_AMI_POLLER == 1 */ +#endif /* TAO_NO_COPY_OCTET_SEQUENCES */ + } + return 0; // error +} -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* _TAO_CDR_OP_Messaging_ExceptionHolder__tao_seq_Octet_CPP_ */ #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ diff --git a/TAO/tao/MessagingC.h b/TAO/tao/MessagingC.h index 97da5f5ab86..d028a29acc2 100644 --- a/TAO/tao/MessagingC.h +++ b/TAO/tao/MessagingC.h @@ -1,25 +1,14 @@ -/* -*- C++ -*- */ -// -// $Id$ -// -// ================================================================ -// -// = LIBRARY -// TAO -// -// = FILENAME -// MessagingC.h -// -// = DESCRIPTION -// Generated from MessagingC.pidl, the CORBA module for the Message -// specification. -// The code was generated by the IDL compiler and then hand-crafted -// to reduce the includes interdependencies. +/* -*- C++ -*- $Id$ */ + +// ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* +// TAO and the TAO IDL Compiler have been developed by the Center for +// Distributed Object Computing at Washington University, St. Louis. // -// ================================================================ +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef TAO_IDL_MESSAGINGC_H -#define TAO_IDL_MESSAGINGC_H +#ifndef _TAO_IDL_MESSAGINGC_H_ +#define _TAO_IDL_MESSAGINGC_H_ #include "ace/pre.h" #include "tao/orbconf.h" @@ -47,12 +36,20 @@ #if (TAO_HAS_SMART_PROXIES == 1) #include "tao/Smart_Proxies.h" #include "ace/Singleton.h" -#endif /*TAO_HAS_SMART_PROXIES ==1*/ +#endif /*TAO_HAS_SMART_PROXIES == 1*/ #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO #endif #define TAO_EXPORT_MACRO TAO_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_Export +#endif /* TAO_EXPORT_NESTED_CLASSES */ + #if defined(_MSC_VER) #if (_MSC_VER >= 1200) #pragma warning(push) @@ -89,7 +86,6 @@ TAO_NAMESPACE Messaging TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_WITH_TARGET; - // = TAO specific. TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_EAGER_BUFFERING; TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_DELAYED_BUFFERING; @@ -128,9 +124,19 @@ TAO_NAMESPACE Messaging TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REBIND_POLICY_TYPE; + +#if !defined (_MESSAGING_REBINDPOLICY___PTR_CH_) +#define _MESSAGING_REBINDPOLICY___PTR_CH_ + class RebindPolicy; typedef RebindPolicy *RebindPolicy_ptr; +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_REBINDPOLICY___VAR_CH_) +#define _MESSAGING_REBINDPOLICY___VAR_CH_ + class TAO_Export RebindPolicy_var { public: @@ -156,6 +162,13 @@ TAO_NAMESPACE Messaging RebindPolicy_ptr ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_REBINDPOLICY___OUT_CH_) +#define _MESSAGING_REBINDPOLICY___OUT_CH_ + class TAO_Export RebindPolicy_out { public: @@ -173,52 +186,60 @@ TAO_NAMESPACE Messaging RebindPolicy_ptr &ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_REBINDPOLICY_CH_) +#define _MESSAGING_REBINDPOLICY_CH_ + class TAO_Export RebindPolicy: public virtual CORBA::Policy { public: - #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) typedef RebindPolicy_ptr _ptr_type; typedef RebindPolicy_var _var_type; - #endif /* __GNUC__ */ + #endif /* ! __GNUC__ || g++ >= 2.8 */ // the static operations static RebindPolicy_ptr _duplicate (RebindPolicy_ptr obj); static RebindPolicy_ptr _narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + TAO_default_environment () ); static RebindPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + TAO_default_environment () ); - static RebindPolicy_ptr _nil (void); - static void _tao_any_destructor (void *); + static RebindPolicy_ptr _nil (void) + { + return (RebindPolicy_ptr)0; + } - virtual RebindMode rebind_mode ( + virtual Messaging::RebindMode rebind_mode ( CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ) = 0; - virtual CORBA::Boolean _is_a ( - const CORBA::Char *type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual const char* _interface_repository_id (void) const; + protected: - RebindPolicy (void); // default constructor - RebindPolicy (TAO_Stub *objref, - TAO_ServantBase *_tao_servant = 0, - CORBA::Boolean _tao_collocated = 0 - ); + RebindPolicy (void); virtual ~RebindPolicy (void); private: RebindPolicy (const RebindPolicy &); void operator= (const RebindPolicy &); }; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RebindPolicy; + +#endif /* end #if !defined */ #endif /* TAO_HAS_REBIND_POLICY == 1 */ @@ -226,9 +247,19 @@ TAO_NAMESPACE Messaging TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong SYNC_SCOPE_POLICY_TYPE; + +#if !defined (_MESSAGING_SYNCSCOPEPOLICY___PTR_CH_) +#define _MESSAGING_SYNCSCOPEPOLICY___PTR_CH_ + class SyncScopePolicy; typedef SyncScopePolicy *SyncScopePolicy_ptr; +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_SYNCSCOPEPOLICY___VAR_CH_) +#define _MESSAGING_SYNCSCOPEPOLICY___VAR_CH_ + class TAO_Export SyncScopePolicy_var { public: @@ -254,6 +285,13 @@ TAO_NAMESPACE Messaging SyncScopePolicy_ptr ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_SYNCSCOPEPOLICY___OUT_CH_) +#define _MESSAGING_SYNCSCOPEPOLICY___OUT_CH_ + class TAO_Export SyncScopePolicy_out { public: @@ -271,52 +309,60 @@ TAO_NAMESPACE Messaging SyncScopePolicy_ptr &ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_SYNCSCOPEPOLICY_CH_) +#define _MESSAGING_SYNCSCOPEPOLICY_CH_ + class TAO_Export SyncScopePolicy: public virtual CORBA::Policy { public: - #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) typedef SyncScopePolicy_ptr _ptr_type; typedef SyncScopePolicy_var _var_type; - #endif /* __GNUC__ */ + #endif /* ! __GNUC__ || g++ >= 2.8 */ // the static operations static SyncScopePolicy_ptr _duplicate (SyncScopePolicy_ptr obj); static SyncScopePolicy_ptr _narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + TAO_default_environment () ); static SyncScopePolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + TAO_default_environment () ); - static SyncScopePolicy_ptr _nil (void); - static void _tao_any_destructor (void *); + static SyncScopePolicy_ptr _nil (void) + { + return (SyncScopePolicy_ptr)0; + } - virtual SyncScope synchronization ( + virtual Messaging::SyncScope synchronization ( CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ) = 0; - virtual CORBA::Boolean _is_a ( - const CORBA::Char *type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual const char* _interface_repository_id (void) const; + protected: - SyncScopePolicy (void); // default constructor - SyncScopePolicy (TAO_Stub *objref, - TAO_ServantBase *_tao_servant = 0, - CORBA::Boolean _tao_collocated = 0 - ); + SyncScopePolicy (void); virtual ~SyncScopePolicy (void); private: SyncScopePolicy (const SyncScopePolicy &); void operator= (const SyncScopePolicy &); }; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_SyncScopePolicy; + +#endif /* end #if !defined */ #endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ @@ -324,12 +370,20 @@ TAO_NAMESPACE Messaging TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REQUEST_PRIORITY_POLICY_TYPE; + struct PriorityRange; + class PriorityRange_var; + struct TAO_Export PriorityRange { - static void _tao_any_destructor (void *); - Priority min; - Priority max; +#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef PriorityRange_var _var_type; +#endif /* ! __GNUC__ || g++ >= 2.8 */ + + static void _tao_any_destructor (void*); + + ACE_NESTED_CLASS (Messaging, Priority) min; + ACE_NESTED_CLASS (Messaging, Priority) max; }; class TAO_Export PriorityRange_var @@ -338,16 +392,19 @@ TAO_NAMESPACE Messaging PriorityRange_var (void); // default constructor PriorityRange_var (PriorityRange *); PriorityRange_var (const PriorityRange_var &); // copy constructor + PriorityRange_var (const PriorityRange &); // fixed-size types only ~PriorityRange_var (void); // destructor PriorityRange_var &operator= (PriorityRange *); PriorityRange_var &operator= (const PriorityRange_var &); + PriorityRange_var &operator= (const PriorityRange &); // fixed-size types only PriorityRange *operator-> (void); const PriorityRange *operator-> (void) const; operator const PriorityRange &() const; operator PriorityRange &(); operator PriorityRange &() const; + // in, inout, out, _retn const PriorityRange &in (void) const; PriorityRange &inout (void); @@ -363,9 +420,19 @@ TAO_NAMESPACE Messaging TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PriorityRange; + +#if !defined (_MESSAGING_REQUESTPRIORITYPOLICY___PTR_CH_) +#define _MESSAGING_REQUESTPRIORITYPOLICY___PTR_CH_ + class RequestPriorityPolicy; typedef RequestPriorityPolicy *RequestPriorityPolicy_ptr; +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_REQUESTPRIORITYPOLICY___VAR_CH_) +#define _MESSAGING_REQUESTPRIORITYPOLICY___VAR_CH_ + class TAO_Export RequestPriorityPolicy_var { public: @@ -391,6 +458,13 @@ TAO_NAMESPACE Messaging RequestPriorityPolicy_ptr ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_REQUESTPRIORITYPOLICY___OUT_CH_) +#define _MESSAGING_REQUESTPRIORITYPOLICY___OUT_CH_ + class TAO_Export RequestPriorityPolicy_out { public: @@ -408,58 +482,76 @@ TAO_NAMESPACE Messaging RequestPriorityPolicy_ptr &ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_REQUESTPRIORITYPOLICY_CH_) +#define _MESSAGING_REQUESTPRIORITYPOLICY_CH_ + class TAO_Export RequestPriorityPolicy: public virtual CORBA::Policy { public: - #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) typedef RequestPriorityPolicy_ptr _ptr_type; typedef RequestPriorityPolicy_var _var_type; - #endif /* __GNUC__ */ + #endif /* ! __GNUC__ || g++ >= 2.8 */ // the static operations static RequestPriorityPolicy_ptr _duplicate (RequestPriorityPolicy_ptr obj); static RequestPriorityPolicy_ptr _narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + TAO_default_environment () ); static RequestPriorityPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + TAO_default_environment () ); - static RequestPriorityPolicy_ptr _nil (void); - static void _tao_any_destructor (void *); + static RequestPriorityPolicy_ptr _nil (void) + { + return (RequestPriorityPolicy_ptr)0; + } - virtual PriorityRange priority_range ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ) = 0; - virtual CORBA::Boolean _is_a ( - const CORBA::Char *type_id, + virtual Messaging::PriorityRange priority_range ( CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual const char* _interface_repository_id (void) const; + protected: - RequestPriorityPolicy (void); // default constructor - RequestPriorityPolicy (TAO_Stub *objref, - TAO_ServantBase *_tao_servant = 0, - CORBA::Boolean _tao_collocated = 0 - ); + RequestPriorityPolicy (void); virtual ~RequestPriorityPolicy (void); private: RequestPriorityPolicy (const RequestPriorityPolicy &); void operator= (const RequestPriorityPolicy &); }; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RequestPriorityPolicy; + +#endif /* end #if !defined */ TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REPLY_PRIORITY_POLICY_TYPE; + +#if !defined (_MESSAGING_REPLYPRIORITYPOLICY___PTR_CH_) +#define _MESSAGING_REPLYPRIORITYPOLICY___PTR_CH_ + class ReplyPriorityPolicy; typedef ReplyPriorityPolicy *ReplyPriorityPolicy_ptr; +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_REPLYPRIORITYPOLICY___VAR_CH_) +#define _MESSAGING_REPLYPRIORITYPOLICY___VAR_CH_ + class TAO_Export ReplyPriorityPolicy_var { public: @@ -485,6 +577,13 @@ TAO_NAMESPACE Messaging ReplyPriorityPolicy_ptr ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_REPLYPRIORITYPOLICY___OUT_CH_) +#define _MESSAGING_REPLYPRIORITYPOLICY___OUT_CH_ + class TAO_Export ReplyPriorityPolicy_out { public: @@ -502,52 +601,60 @@ TAO_NAMESPACE Messaging ReplyPriorityPolicy_ptr &ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_REPLYPRIORITYPOLICY_CH_) +#define _MESSAGING_REPLYPRIORITYPOLICY_CH_ + class TAO_Export ReplyPriorityPolicy: public virtual CORBA::Policy { public: - #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) typedef ReplyPriorityPolicy_ptr _ptr_type; typedef ReplyPriorityPolicy_var _var_type; - #endif /* __GNUC__ */ + #endif /* ! __GNUC__ || g++ >= 2.8 */ // the static operations static ReplyPriorityPolicy_ptr _duplicate (ReplyPriorityPolicy_ptr obj); static ReplyPriorityPolicy_ptr _narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + TAO_default_environment () ); static ReplyPriorityPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + TAO_default_environment () ); - static ReplyPriorityPolicy_ptr _nil (void); - static void _tao_any_destructor (void *); + static ReplyPriorityPolicy_ptr _nil (void) + { + return (ReplyPriorityPolicy_ptr)0; + } - virtual PriorityRange priority_range ( + virtual Messaging::PriorityRange priority_range ( CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ) = 0; - virtual CORBA::Boolean _is_a ( - const CORBA::Char *type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual const char* _interface_repository_id (void) const; + protected: - ReplyPriorityPolicy (void); // default constructor - ReplyPriorityPolicy (TAO_Stub *objref, - TAO_ServantBase *_tao_servant = 0, - CORBA::Boolean _tao_collocated = 0 - ); + ReplyPriorityPolicy (void); virtual ~ReplyPriorityPolicy (void); private: ReplyPriorityPolicy (const ReplyPriorityPolicy &); void operator= (const ReplyPriorityPolicy &); }; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ReplyPriorityPolicy; + +#endif /* end #if !defined */ #endif /* TAO_HAS_PRIORITY_POLICIES == 1 */ @@ -555,9 +662,19 @@ TAO_NAMESPACE Messaging TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REQUEST_START_TIME_POLICY_TYPE; + +#if !defined (_MESSAGING_REQUESTSTARTTIMEPOLICY___PTR_CH_) +#define _MESSAGING_REQUESTSTARTTIMEPOLICY___PTR_CH_ + class RequestStartTimePolicy; typedef RequestStartTimePolicy *RequestStartTimePolicy_ptr; +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_REQUESTSTARTTIMEPOLICY___VAR_CH_) +#define _MESSAGING_REQUESTSTARTTIMEPOLICY___VAR_CH_ + class TAO_Export RequestStartTimePolicy_var { public: @@ -583,6 +700,13 @@ TAO_NAMESPACE Messaging RequestStartTimePolicy_ptr ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_REQUESTSTARTTIMEPOLICY___OUT_CH_) +#define _MESSAGING_REQUESTSTARTTIMEPOLICY___OUT_CH_ + class TAO_Export RequestStartTimePolicy_out { public: @@ -600,52 +724,60 @@ TAO_NAMESPACE Messaging RequestStartTimePolicy_ptr &ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_REQUESTSTARTTIMEPOLICY_CH_) +#define _MESSAGING_REQUESTSTARTTIMEPOLICY_CH_ + class TAO_Export RequestStartTimePolicy: public virtual CORBA::Policy { public: - #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) typedef RequestStartTimePolicy_ptr _ptr_type; typedef RequestStartTimePolicy_var _var_type; - #endif /* __GNUC__ */ + #endif /* ! __GNUC__ || g++ >= 2.8 */ // the static operations static RequestStartTimePolicy_ptr _duplicate (RequestStartTimePolicy_ptr obj); static RequestStartTimePolicy_ptr _narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + TAO_default_environment () ); static RequestStartTimePolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + TAO_default_environment () ); - static RequestStartTimePolicy_ptr _nil (void); - static void _tao_any_destructor (void *); + static RequestStartTimePolicy_ptr _nil (void) + { + return (RequestStartTimePolicy_ptr)0; + } virtual TimeBase::UtcT start_time ( CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ) = 0; - virtual CORBA::Boolean _is_a ( - const CORBA::Char *type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual const char* _interface_repository_id (void) const; + protected: - RequestStartTimePolicy (void); // default constructor - RequestStartTimePolicy (TAO_Stub *objref, - TAO_ServantBase *_tao_servant = 0, - CORBA::Boolean _tao_collocated = 0 - ); + RequestStartTimePolicy (void); virtual ~RequestStartTimePolicy (void); private: RequestStartTimePolicy (const RequestStartTimePolicy &); void operator= (const RequestStartTimePolicy &); }; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RequestStartTimePolicy; + +#endif /* end #if !defined */ #endif /* TAO_HAS_REQUEST_START_TIME_POLICY == 1 */ @@ -653,9 +785,19 @@ TAO_NAMESPACE Messaging TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REQUEST_END_TIME_POLICY_TYPE; + +#if !defined (_MESSAGING_REQUESTENDTIMEPOLICY___PTR_CH_) +#define _MESSAGING_REQUESTENDTIMEPOLICY___PTR_CH_ + class RequestEndTimePolicy; typedef RequestEndTimePolicy *RequestEndTimePolicy_ptr; +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_REQUESTENDTIMEPOLICY___VAR_CH_) +#define _MESSAGING_REQUESTENDTIMEPOLICY___VAR_CH_ + class TAO_Export RequestEndTimePolicy_var { public: @@ -681,6 +823,13 @@ TAO_NAMESPACE Messaging RequestEndTimePolicy_ptr ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_REQUESTENDTIMEPOLICY___OUT_CH_) +#define _MESSAGING_REQUESTENDTIMEPOLICY___OUT_CH_ + class TAO_Export RequestEndTimePolicy_out { public: @@ -698,52 +847,60 @@ TAO_NAMESPACE Messaging RequestEndTimePolicy_ptr &ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_REQUESTENDTIMEPOLICY_CH_) +#define _MESSAGING_REQUESTENDTIMEPOLICY_CH_ + class TAO_Export RequestEndTimePolicy: public virtual CORBA::Policy { public: - #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) typedef RequestEndTimePolicy_ptr _ptr_type; typedef RequestEndTimePolicy_var _var_type; - #endif /* __GNUC__ */ + #endif /* ! __GNUC__ || g++ >= 2.8 */ // the static operations static RequestEndTimePolicy_ptr _duplicate (RequestEndTimePolicy_ptr obj); static RequestEndTimePolicy_ptr _narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + TAO_default_environment () ); static RequestEndTimePolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + TAO_default_environment () ); - static RequestEndTimePolicy_ptr _nil (void); - static void _tao_any_destructor (void *); + static RequestEndTimePolicy_ptr _nil (void) + { + return (RequestEndTimePolicy_ptr)0; + } virtual TimeBase::UtcT end_time ( CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ) = 0; - virtual CORBA::Boolean _is_a ( - const CORBA::Char *type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual const char* _interface_repository_id (void) const; + protected: - RequestEndTimePolicy (void); // default constructor - RequestEndTimePolicy (TAO_Stub *objref, - TAO_ServantBase *_tao_servant = 0, - CORBA::Boolean _tao_collocated = 0 - ); + RequestEndTimePolicy (void); virtual ~RequestEndTimePolicy (void); private: RequestEndTimePolicy (const RequestEndTimePolicy &); void operator= (const RequestEndTimePolicy &); }; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RequestEndTimePolicy; + +#endif /* end #if !defined */ #endif /* TAO_HAS_REQUEST_END_TIME_POLICY == 1 */ @@ -751,9 +908,19 @@ TAO_NAMESPACE Messaging TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REPLY_START_TIME_POLICY_TYPE; + +#if !defined (_MESSAGING_REPLYSTARTTIMEPOLICY___PTR_CH_) +#define _MESSAGING_REPLYSTARTTIMEPOLICY___PTR_CH_ + class ReplyStartTimePolicy; typedef ReplyStartTimePolicy *ReplyStartTimePolicy_ptr; +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_REPLYSTARTTIMEPOLICY___VAR_CH_) +#define _MESSAGING_REPLYSTARTTIMEPOLICY___VAR_CH_ + class TAO_Export ReplyStartTimePolicy_var { public: @@ -779,6 +946,13 @@ TAO_NAMESPACE Messaging ReplyStartTimePolicy_ptr ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_REPLYSTARTTIMEPOLICY___OUT_CH_) +#define _MESSAGING_REPLYSTARTTIMEPOLICY___OUT_CH_ + class TAO_Export ReplyStartTimePolicy_out { public: @@ -796,52 +970,60 @@ TAO_NAMESPACE Messaging ReplyStartTimePolicy_ptr &ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_REPLYSTARTTIMEPOLICY_CH_) +#define _MESSAGING_REPLYSTARTTIMEPOLICY_CH_ + class TAO_Export ReplyStartTimePolicy: public virtual CORBA::Policy { public: - #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) typedef ReplyStartTimePolicy_ptr _ptr_type; typedef ReplyStartTimePolicy_var _var_type; - #endif /* __GNUC__ */ + #endif /* ! __GNUC__ || g++ >= 2.8 */ // the static operations static ReplyStartTimePolicy_ptr _duplicate (ReplyStartTimePolicy_ptr obj); static ReplyStartTimePolicy_ptr _narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + TAO_default_environment () ); static ReplyStartTimePolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + TAO_default_environment () ); - static ReplyStartTimePolicy_ptr _nil (void); - static void _tao_any_destructor (void *); + static ReplyStartTimePolicy_ptr _nil (void) + { + return (ReplyStartTimePolicy_ptr)0; + } virtual TimeBase::UtcT start_time ( CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ) = 0; - virtual CORBA::Boolean _is_a ( - const CORBA::Char *type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual const char* _interface_repository_id (void) const; + protected: - ReplyStartTimePolicy (void); // default constructor - ReplyStartTimePolicy (TAO_Stub *objref, - TAO_ServantBase *_tao_servant = 0, - CORBA::Boolean _tao_collocated = 0 - ); + ReplyStartTimePolicy (void); virtual ~ReplyStartTimePolicy (void); private: ReplyStartTimePolicy (const ReplyStartTimePolicy &); void operator= (const ReplyStartTimePolicy &); }; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ReplyStartTimePolicy; + +#endif /* end #if !defined */ #endif /* TAO_HAS_REPLY_START_TIME_POLICY == 1 */ @@ -849,9 +1031,19 @@ TAO_NAMESPACE Messaging TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REPLY_END_TIME_POLICY_TYPE; + +#if !defined (_MESSAGING_REPLYENDTIMEPOLICY___PTR_CH_) +#define _MESSAGING_REPLYENDTIMEPOLICY___PTR_CH_ + class ReplyEndTimePolicy; typedef ReplyEndTimePolicy *ReplyEndTimePolicy_ptr; +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_REPLYENDTIMEPOLICY___VAR_CH_) +#define _MESSAGING_REPLYENDTIMEPOLICY___VAR_CH_ + class TAO_Export ReplyEndTimePolicy_var { public: @@ -877,6 +1069,13 @@ TAO_NAMESPACE Messaging ReplyEndTimePolicy_ptr ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_REPLYENDTIMEPOLICY___OUT_CH_) +#define _MESSAGING_REPLYENDTIMEPOLICY___OUT_CH_ + class TAO_Export ReplyEndTimePolicy_out { public: @@ -894,52 +1093,60 @@ TAO_NAMESPACE Messaging ReplyEndTimePolicy_ptr &ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_REPLYENDTIMEPOLICY_CH_) +#define _MESSAGING_REPLYENDTIMEPOLICY_CH_ + class TAO_Export ReplyEndTimePolicy: public virtual CORBA::Policy { public: - #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) typedef ReplyEndTimePolicy_ptr _ptr_type; typedef ReplyEndTimePolicy_var _var_type; - #endif /* __GNUC__ */ + #endif /* ! __GNUC__ || g++ >= 2.8 */ // the static operations static ReplyEndTimePolicy_ptr _duplicate (ReplyEndTimePolicy_ptr obj); static ReplyEndTimePolicy_ptr _narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + TAO_default_environment () ); static ReplyEndTimePolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + TAO_default_environment () ); - static ReplyEndTimePolicy_ptr _nil (void); - static void _tao_any_destructor (void *); + static ReplyEndTimePolicy_ptr _nil (void) + { + return (ReplyEndTimePolicy_ptr)0; + } virtual TimeBase::UtcT end_time ( CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ) = 0; - virtual CORBA::Boolean _is_a ( - const CORBA::Char *type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual const char* _interface_repository_id (void) const; + protected: - ReplyEndTimePolicy (void); // default constructor - ReplyEndTimePolicy (TAO_Stub *objref, - TAO_ServantBase *_tao_servant = 0, - CORBA::Boolean _tao_collocated = 0 - ); + ReplyEndTimePolicy (void); virtual ~ReplyEndTimePolicy (void); private: ReplyEndTimePolicy (const ReplyEndTimePolicy &); void operator= (const ReplyEndTimePolicy &); }; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ReplyEndTimePolicy; + +#endif /* end #if !defined */ #endif /* TAO_HAS_REPLY_END_TIME_POLICY == 1 */ @@ -947,9 +1154,19 @@ TAO_NAMESPACE Messaging TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong RELATIVE_REQ_TIMEOUT_POLICY_TYPE; + +#if !defined (_MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY___PTR_CH_) +#define _MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY___PTR_CH_ + class RelativeRequestTimeoutPolicy; typedef RelativeRequestTimeoutPolicy *RelativeRequestTimeoutPolicy_ptr; +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY___VAR_CH_) +#define _MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY___VAR_CH_ + class TAO_Export RelativeRequestTimeoutPolicy_var { public: @@ -975,6 +1192,13 @@ TAO_NAMESPACE Messaging RelativeRequestTimeoutPolicy_ptr ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY___OUT_CH_) +#define _MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY___OUT_CH_ + class TAO_Export RelativeRequestTimeoutPolicy_out { public: @@ -992,52 +1216,60 @@ TAO_NAMESPACE Messaging RelativeRequestTimeoutPolicy_ptr &ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY_CH_) +#define _MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY_CH_ + class TAO_Export RelativeRequestTimeoutPolicy: public virtual CORBA::Policy { public: - #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) typedef RelativeRequestTimeoutPolicy_ptr _ptr_type; typedef RelativeRequestTimeoutPolicy_var _var_type; - #endif /* __GNUC__ */ + #endif /* ! __GNUC__ || g++ >= 2.8 */ // the static operations static RelativeRequestTimeoutPolicy_ptr _duplicate (RelativeRequestTimeoutPolicy_ptr obj); static RelativeRequestTimeoutPolicy_ptr _narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + TAO_default_environment () ); static RelativeRequestTimeoutPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + TAO_default_environment () ); - static RelativeRequestTimeoutPolicy_ptr _nil (void); - static void _tao_any_destructor (void *); + static RelativeRequestTimeoutPolicy_ptr _nil (void) + { + return (RelativeRequestTimeoutPolicy_ptr)0; + } virtual TimeBase::TimeT relative_expiry ( CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ) = 0; - virtual CORBA::Boolean _is_a ( - const CORBA::Char *type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual const char* _interface_repository_id (void) const; + protected: - RelativeRequestTimeoutPolicy (void); // default constructor - RelativeRequestTimeoutPolicy (TAO_Stub *objref, - TAO_ServantBase *_tao_servant = 0, - CORBA::Boolean _tao_collocated = 0 - ); + RelativeRequestTimeoutPolicy (void); virtual ~RelativeRequestTimeoutPolicy (void); private: RelativeRequestTimeoutPolicy (const RelativeRequestTimeoutPolicy &); void operator= (const RelativeRequestTimeoutPolicy &); }; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RelativeRequestTimeoutPolicy; + +#endif /* end #if !defined */ #endif /* TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1 */ @@ -1045,9 +1277,19 @@ TAO_NAMESPACE Messaging TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong RELATIVE_RT_TIMEOUT_POLICY_TYPE; + +#if !defined (_MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY___PTR_CH_) +#define _MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY___PTR_CH_ + class RelativeRoundtripTimeoutPolicy; typedef RelativeRoundtripTimeoutPolicy *RelativeRoundtripTimeoutPolicy_ptr; +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY___VAR_CH_) +#define _MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY___VAR_CH_ + class TAO_Export RelativeRoundtripTimeoutPolicy_var { public: @@ -1073,6 +1315,13 @@ TAO_NAMESPACE Messaging RelativeRoundtripTimeoutPolicy_ptr ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY___OUT_CH_) +#define _MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY___OUT_CH_ + class TAO_Export RelativeRoundtripTimeoutPolicy_out { public: @@ -1090,52 +1339,60 @@ TAO_NAMESPACE Messaging RelativeRoundtripTimeoutPolicy_ptr &ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY_CH_) +#define _MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY_CH_ + class TAO_Export RelativeRoundtripTimeoutPolicy: public virtual CORBA::Policy { public: - #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) typedef RelativeRoundtripTimeoutPolicy_ptr _ptr_type; typedef RelativeRoundtripTimeoutPolicy_var _var_type; - #endif /* __GNUC__ */ + #endif /* ! __GNUC__ || g++ >= 2.8 */ // the static operations static RelativeRoundtripTimeoutPolicy_ptr _duplicate (RelativeRoundtripTimeoutPolicy_ptr obj); static RelativeRoundtripTimeoutPolicy_ptr _narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + TAO_default_environment () ); static RelativeRoundtripTimeoutPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + TAO_default_environment () ); - static RelativeRoundtripTimeoutPolicy_ptr _nil (void); - static void _tao_any_destructor (void *); + static RelativeRoundtripTimeoutPolicy_ptr _nil (void) + { + return (RelativeRoundtripTimeoutPolicy_ptr)0; + } virtual TimeBase::TimeT relative_expiry ( CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ) = 0; - virtual CORBA::Boolean _is_a ( - const CORBA::Char *type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual const char* _interface_repository_id (void) const; + protected: - RelativeRoundtripTimeoutPolicy (void); // default constructor - RelativeRoundtripTimeoutPolicy (TAO_Stub *objref, - TAO_ServantBase *_tao_servant = 0, - CORBA::Boolean _tao_collocated = 0 - ); + RelativeRoundtripTimeoutPolicy (void); virtual ~RelativeRoundtripTimeoutPolicy (void); private: RelativeRoundtripTimeoutPolicy (const RelativeRoundtripTimeoutPolicy &); void operator= (const RelativeRoundtripTimeoutPolicy &); }; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RelativeRoundtripTimeoutPolicy; + +#endif /* end #if !defined */ #endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ @@ -1143,12 +1400,20 @@ TAO_NAMESPACE Messaging TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong ROUTING_POLICY_TYPE; + struct RoutingTypeRange; + class RoutingTypeRange_var; + struct TAO_Export RoutingTypeRange { - static void _tao_any_destructor (void *); - RoutingType min; - RoutingType max; +#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef RoutingTypeRange_var _var_type; +#endif /* ! __GNUC__ || g++ >= 2.8 */ + + static void _tao_any_destructor (void*); + + ACE_NESTED_CLASS (Messaging, RoutingType) min; + ACE_NESTED_CLASS (Messaging, RoutingType) max; }; class TAO_Export RoutingTypeRange_var @@ -1157,16 +1422,19 @@ TAO_NAMESPACE Messaging RoutingTypeRange_var (void); // default constructor RoutingTypeRange_var (RoutingTypeRange *); RoutingTypeRange_var (const RoutingTypeRange_var &); // copy constructor + RoutingTypeRange_var (const RoutingTypeRange &); // fixed-size types only ~RoutingTypeRange_var (void); // destructor RoutingTypeRange_var &operator= (RoutingTypeRange *); RoutingTypeRange_var &operator= (const RoutingTypeRange_var &); + RoutingTypeRange_var &operator= (const RoutingTypeRange &); // fixed-size types only RoutingTypeRange *operator-> (void); const RoutingTypeRange *operator-> (void) const; operator const RoutingTypeRange &() const; operator RoutingTypeRange &(); operator RoutingTypeRange &() const; + // in, inout, out, _retn const RoutingTypeRange &in (void) const; RoutingTypeRange &inout (void); @@ -1182,9 +1450,19 @@ TAO_NAMESPACE Messaging TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RoutingTypeRange; + +#if !defined (_MESSAGING_ROUTINGPOLICY___PTR_CH_) +#define _MESSAGING_ROUTINGPOLICY___PTR_CH_ + class RoutingPolicy; typedef RoutingPolicy *RoutingPolicy_ptr; +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_ROUTINGPOLICY___VAR_CH_) +#define _MESSAGING_ROUTINGPOLICY___VAR_CH_ + class TAO_Export RoutingPolicy_var { public: @@ -1210,6 +1488,13 @@ TAO_NAMESPACE Messaging RoutingPolicy_ptr ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_ROUTINGPOLICY___OUT_CH_) +#define _MESSAGING_ROUTINGPOLICY___OUT_CH_ + class TAO_Export RoutingPolicy_out { public: @@ -1227,52 +1512,60 @@ TAO_NAMESPACE Messaging RoutingPolicy_ptr &ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_ROUTINGPOLICY_CH_) +#define _MESSAGING_ROUTINGPOLICY_CH_ + class TAO_Export RoutingPolicy: public virtual CORBA::Policy { public: - #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) typedef RoutingPolicy_ptr _ptr_type; typedef RoutingPolicy_var _var_type; - #endif /* __GNUC__ */ + #endif /* ! __GNUC__ || g++ >= 2.8 */ // the static operations static RoutingPolicy_ptr _duplicate (RoutingPolicy_ptr obj); static RoutingPolicy_ptr _narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + TAO_default_environment () ); static RoutingPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + TAO_default_environment () ); - static RoutingPolicy_ptr _nil (void); - static void _tao_any_destructor (void *); + static RoutingPolicy_ptr _nil (void) + { + return (RoutingPolicy_ptr)0; + } - virtual RoutingTypeRange routing_range ( + virtual Messaging::RoutingTypeRange routing_range ( CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ) = 0; - virtual CORBA::Boolean _is_a ( - const CORBA::Char *type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual const char* _interface_repository_id (void) const; + protected: - RoutingPolicy (void); // default constructor - RoutingPolicy (TAO_Stub *objref, - TAO_ServantBase *_tao_servant = 0, - CORBA::Boolean _tao_collocated = 0 - ); + RoutingPolicy (void); virtual ~RoutingPolicy (void); private: RoutingPolicy (const RoutingPolicy &); void operator= (const RoutingPolicy &); }; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RoutingPolicy; + +#endif /* end #if !defined */ #endif /* TAO_HAS_ROUTING_POLICY == 1 */ @@ -1280,9 +1573,19 @@ TAO_NAMESPACE Messaging TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong MAX_HOPS_POLICY_TYPE; + +#if !defined (_MESSAGING_MAXHOPSPOLICY___PTR_CH_) +#define _MESSAGING_MAXHOPSPOLICY___PTR_CH_ + class MaxHopsPolicy; typedef MaxHopsPolicy *MaxHopsPolicy_ptr; +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_MAXHOPSPOLICY___VAR_CH_) +#define _MESSAGING_MAXHOPSPOLICY___VAR_CH_ + class TAO_Export MaxHopsPolicy_var { public: @@ -1308,6 +1611,13 @@ TAO_NAMESPACE Messaging MaxHopsPolicy_ptr ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_MAXHOPSPOLICY___OUT_CH_) +#define _MESSAGING_MAXHOPSPOLICY___OUT_CH_ + class TAO_Export MaxHopsPolicy_out { public: @@ -1325,52 +1635,60 @@ TAO_NAMESPACE Messaging MaxHopsPolicy_ptr &ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_MAXHOPSPOLICY_CH_) +#define _MESSAGING_MAXHOPSPOLICY_CH_ + class TAO_Export MaxHopsPolicy: public virtual CORBA::Policy { public: - #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) typedef MaxHopsPolicy_ptr _ptr_type; typedef MaxHopsPolicy_var _var_type; - #endif /* __GNUC__ */ + #endif /* ! __GNUC__ || g++ >= 2.8 */ // the static operations static MaxHopsPolicy_ptr _duplicate (MaxHopsPolicy_ptr obj); static MaxHopsPolicy_ptr _narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + TAO_default_environment () ); static MaxHopsPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + TAO_default_environment () ); - static MaxHopsPolicy_ptr _nil (void); - static void _tao_any_destructor (void *); + static MaxHopsPolicy_ptr _nil (void) + { + return (MaxHopsPolicy_ptr)0; + } virtual CORBA::UShort max_hops ( CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ) = 0; - virtual CORBA::Boolean _is_a ( - const CORBA::Char *type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual const char* _interface_repository_id (void) const; + protected: - MaxHopsPolicy (void); // default constructor - MaxHopsPolicy (TAO_Stub *objref, - TAO_ServantBase *_tao_servant = 0, - CORBA::Boolean _tao_collocated = 0 - ); + MaxHopsPolicy (void); virtual ~MaxHopsPolicy (void); private: MaxHopsPolicy (const MaxHopsPolicy &); void operator= (const MaxHopsPolicy &); }; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_MaxHopsPolicy; + +#endif /* end #if !defined */ #endif /* TAO_HAS_MAX_HOPS_POLICY == 1 */ @@ -1378,9 +1696,19 @@ TAO_NAMESPACE Messaging TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong QUEUE_ORDER_POLICY_TYPE; + +#if !defined (_MESSAGING_QUEUEORDERPOLICY___PTR_CH_) +#define _MESSAGING_QUEUEORDERPOLICY___PTR_CH_ + class QueueOrderPolicy; typedef QueueOrderPolicy *QueueOrderPolicy_ptr; +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_QUEUEORDERPOLICY___VAR_CH_) +#define _MESSAGING_QUEUEORDERPOLICY___VAR_CH_ + class TAO_Export QueueOrderPolicy_var { public: @@ -1406,6 +1734,13 @@ TAO_NAMESPACE Messaging QueueOrderPolicy_ptr ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_QUEUEORDERPOLICY___OUT_CH_) +#define _MESSAGING_QUEUEORDERPOLICY___OUT_CH_ + class TAO_Export QueueOrderPolicy_out { public: @@ -1423,66 +1758,93 @@ TAO_NAMESPACE Messaging QueueOrderPolicy_ptr &ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_QUEUEORDERPOLICY_CH_) +#define _MESSAGING_QUEUEORDERPOLICY_CH_ + class TAO_Export QueueOrderPolicy: public virtual CORBA::Policy { public: - #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) typedef QueueOrderPolicy_ptr _ptr_type; typedef QueueOrderPolicy_var _var_type; - #endif /* __GNUC__ */ + #endif /* ! __GNUC__ || g++ >= 2.8 */ // the static operations static QueueOrderPolicy_ptr _duplicate (QueueOrderPolicy_ptr obj); static QueueOrderPolicy_ptr _narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + TAO_default_environment () ); static QueueOrderPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + TAO_default_environment () ); - static QueueOrderPolicy_ptr _nil (void); - static void _tao_any_destructor (void *); + static QueueOrderPolicy_ptr _nil (void) + { + return (QueueOrderPolicy_ptr)0; + } - virtual Ordering allowed_orders ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ) = 0; - virtual CORBA::Boolean _is_a ( - const CORBA::Char *type_id, + virtual Messaging::Ordering allowed_orders ( CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual const char* _interface_repository_id (void) const; + protected: - QueueOrderPolicy (void); // default constructor - QueueOrderPolicy (TAO_Stub *objref, - TAO_ServantBase *_tao_servant = 0, - CORBA::Boolean _tao_collocated = 0 - ); + QueueOrderPolicy (void); virtual ~QueueOrderPolicy (void); private: QueueOrderPolicy (const QueueOrderPolicy &); void operator= (const QueueOrderPolicy &); }; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_QueueOrderPolicy; + +#endif /* end #if !defined */ #endif /* TAO_HAS_QUEUE_ORDER_POLICY == 1 */ + struct PolicyValue; + class PolicyValue_var; + struct TAO_Export PolicyValue { - static void _tao_any_destructor (void *); + +#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef PolicyValue_var _var_type; +#endif /* ! __GNUC__ || g++ >= 2.8 */ + + static void _tao_any_destructor (void*); CORBA::PolicyType ptype; +#if !defined (_MESSAGING_POLICYVALUE__TAO_SEQ_OCTET_CH_) +#define _MESSAGING_POLICYVALUE__TAO_SEQ_OCTET_CH_ + + class _tao_seq_Octet; + class _tao_seq_Octet_var; + // ************************************************************* // _tao_seq_Octet // ************************************************************* - class TAO_Export _tao_seq_Octet : public TAO_Unbounded_Sequence<CORBA::Octet> + class TAO_Export _tao_seq_Octet : public +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + TAO_Unbounded_Sequence<CORBA::Octet> +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<CORBA::Octet> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ { public: _tao_seq_Octet (void); // default ctor @@ -1494,7 +1856,13 @@ TAO_NAMESPACE Messaging CORBA::Boolean release=0 ); _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor - ~_tao_seq_Octet (void); // dtor + ~_tao_seq_Octet (void); + static void _tao_any_destructor (void*); + +#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef _tao_seq_Octet_var _var_type; +#endif /* ! __GNUC__ || g++ >= 2.8 */ + #if defined(TAO_NO_COPY_OCTET_SEQUENCES) _tao_seq_Octet ( @@ -1505,9 +1873,82 @@ TAO_NAMESPACE Messaging #endif /* TAO_NO_COPY_OCTET_SEQUENCE */ }; - static CORBA::TypeCode_ptr _tc__tao_seq_Octet; - _tao_seq_Octet pvalue; +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_POLICYVALUE__TAO_SEQ_OCTET___VAR_CH_) +#define _MESSAGING_POLICYVALUE__TAO_SEQ_OCTET___VAR_CH_ + + // ************************************************************* + // class Messaging::PolicyValue::_tao_seq_Octet_var + // ************************************************************* + + class TAO_Export _tao_seq_Octet_var + { + public: + _tao_seq_Octet_var (void); // default constructor + _tao_seq_Octet_var (_tao_seq_Octet *); + _tao_seq_Octet_var (const _tao_seq_Octet_var &); // copy constructor + _tao_seq_Octet_var (const _tao_seq_Octet &); // fixed-size base types only + ~_tao_seq_Octet_var (void); // destructor + + _tao_seq_Octet_var &operator= (_tao_seq_Octet *); + _tao_seq_Octet_var &operator= (const _tao_seq_Octet_var &); + _tao_seq_Octet_var &operator= (const _tao_seq_Octet &); // fixed-size base types only + _tao_seq_Octet *operator-> (void); + const _tao_seq_Octet *operator-> (void) const; + + operator const _tao_seq_Octet &() const; + operator _tao_seq_Octet &(); + operator _tao_seq_Octet &() const; + + CORBA::Octet &operator[] (CORBA::ULong index); + // in, inout, out, _retn + const _tao_seq_Octet &in (void) const; + _tao_seq_Octet &inout (void); + _tao_seq_Octet *&out (void); + _tao_seq_Octet *_retn (void); + _tao_seq_Octet *ptr (void) const; + + private: + _tao_seq_Octet *ptr_; + }; + + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_POLICYVALUE__TAO_SEQ_OCTET___OUT_CH_) +#define _MESSAGING_POLICYVALUE__TAO_SEQ_OCTET___OUT_CH_ + + class TAO_Export _tao_seq_Octet_out + { + public: + _tao_seq_Octet_out (_tao_seq_Octet *&); + _tao_seq_Octet_out (_tao_seq_Octet_var &); + _tao_seq_Octet_out (const _tao_seq_Octet_out &); + _tao_seq_Octet_out &operator= (const _tao_seq_Octet_out &); + _tao_seq_Octet_out &operator= (_tao_seq_Octet *); + operator _tao_seq_Octet *&(); + _tao_seq_Octet *&ptr (void); + _tao_seq_Octet *operator-> (void); + CORBA::Octet &operator[] (CORBA::ULong index); + + private: + _tao_seq_Octet *&ptr_; + // assignment from T_var not allowed + void operator= (const _tao_seq_Octet_var &); + }; + + +#endif /* end #if !defined */ + +#if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef _tao_seq_Octet _pvalue_seq; + #endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */ + + _tao_seq_Octet pvalue; }; class TAO_Export PolicyValue_var @@ -1526,6 +1967,8 @@ TAO_NAMESPACE Messaging operator const PolicyValue &() const; operator PolicyValue &(); operator PolicyValue &() const; + operator PolicyValue *&(); // variable-size types only + // in, inout, out, _retn const PolicyValue &in (void) const; PolicyValue &inout (void); @@ -1557,11 +2000,65 @@ TAO_NAMESPACE Messaging TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PolicyValue; + +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + +#if !defined (__TAO_UNBOUNDED_SEQUENCE_MESSAGING_POLICYVALUESEQ_CH_) +#define __TAO_UNBOUNDED_SEQUENCE_MESSAGING_POLICYVALUESEQ_CH_ + + class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq : public TAO_Unbounded_Base_Sequence + { + public: + // = Initialization and termination methods. + + _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (void); // Default constructor. + _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (CORBA::ULong maximum); + _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (CORBA::ULong maximum, + CORBA::ULong length, + PolicyValue *data, + CORBA::Boolean release = 0); + _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (const _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq &rhs); + _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq &operator= (const _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq &rhs); + virtual ~_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (void); // Dtor. + // = Accessors. + PolicyValue &operator[] (CORBA::ULong i); + const PolicyValue &operator[] (CORBA::ULong i) const; + // = Static operations. + static PolicyValue *allocbuf (CORBA::ULong size); + static void freebuf (PolicyValue *buffer); + virtual void _allocate_buffer (CORBA::ULong length); + virtual void _deallocate_buffer (void); + // Implement the TAO_Base_Sequence methods (see Sequence.h) + + PolicyValue *get_buffer (CORBA::Boolean orphan = 0); + const PolicyValue *get_buffer (void) const; + void replace (CORBA::ULong max, + CORBA::ULong length, + PolicyValue *data, + CORBA::Boolean release); + }; + +#endif /* end #if !defined */ + + +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + +#if !defined (_MESSAGING_POLICYVALUESEQ_CH_) +#define _MESSAGING_POLICYVALUESEQ_CH_ + + class PolicyValueSeq; + class PolicyValueSeq_var; + // ************************************************************* // PolicyValueSeq // ************************************************************* - class TAO_Export PolicyValueSeq : public TAO_Unbounded_Sequence<PolicyValue> + class TAO_Export PolicyValueSeq : public +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<PolicyValue> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ { public: PolicyValueSeq (void); // default ctor @@ -1573,11 +2070,20 @@ TAO_NAMESPACE Messaging CORBA::Boolean release=0 ); PolicyValueSeq (const PolicyValueSeq &); // copy ctor - ~PolicyValueSeq (void); // dtor + ~PolicyValueSeq (void); + static void _tao_any_destructor (void*); + +#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef PolicyValueSeq_var _var_type; +#endif /* ! __GNUC__ || g++ >= 2.8 */ - static void _tao_any_destructor (void *); }; - typedef PolicyValueSeq *PolicyValueSeq_ptr; + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_POLICYVALUESEQ___VAR_CH_) +#define _MESSAGING_POLICYVALUESEQ___VAR_CH_ // ************************************************************* // class Messaging::PolicyValueSeq_var @@ -1599,7 +2105,9 @@ TAO_NAMESPACE Messaging operator const PolicyValueSeq &() const; operator PolicyValueSeq &(); operator PolicyValueSeq &() const; - PolicyValue &operator[] (CORBA::ULong slot); + operator PolicyValueSeq *&(); // variable-size base types only + + PolicyValue &operator[] (CORBA::ULong index); // in, inout, out, _retn const PolicyValueSeq &in (void) const; PolicyValueSeq &inout (void); @@ -1611,6 +2119,13 @@ TAO_NAMESPACE Messaging PolicyValueSeq *ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_POLICYVALUESEQ___OUT_CH_) +#define _MESSAGING_POLICYVALUESEQ___OUT_CH_ + class TAO_Export PolicyValueSeq_out { public: @@ -1622,7 +2137,7 @@ TAO_NAMESPACE Messaging operator PolicyValueSeq *&(); PolicyValueSeq *&ptr (void); PolicyValueSeq *operator-> (void); - PolicyValue &operator[] (CORBA::ULong slot); + PolicyValue &operator[] (CORBA::ULong index); private: PolicyValueSeq *&ptr_; @@ -1630,6 +2145,9 @@ TAO_NAMESPACE Messaging void operator= (const PolicyValueSeq_var &); }; + +#endif /* end #if !defined */ + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PolicyValueSeq; TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_POLICIES; @@ -1702,7 +2220,7 @@ TAO_NAMESPACE Messaging #if !defined (_MESSAGING_EXCEPTIONHOLDER___INIT_CH_) #define _MESSAGING_EXCEPTIONHOLDER___INIT_CH_ - class TAO_Export ExceptionHolder_init : public ACE_CORBA_1 (ValueFactoryBase) + class TAO_Export ExceptionHolder_init : public CORBA_ValueFactoryBase { public: virtual ~ExceptionHolder_init (); @@ -1718,7 +2236,7 @@ TAO_NAMESPACE Messaging #if !defined (_MESSAGING_EXCEPTIONHOLDER_CH_) #define _MESSAGING_EXCEPTIONHOLDER_CH_ - class TAO_Export ExceptionHolder : public virtual ACE_CORBA_1 (ValueBase) + class TAO_Export ExceptionHolder : public virtual CORBA_ValueBase { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -1744,11 +2262,12 @@ TAO_NAMESPACE Messaging #if !defined (_MESSAGING_EXCEPTIONHOLDER__TAO_SEQ_OCTET_CH_) #define _MESSAGING_EXCEPTIONHOLDER__TAO_SEQ_OCTET_CH_ + class _tao_seq_Octet; + class _tao_seq_Octet_var; + // ************************************************************* // _tao_seq_Octet // ************************************************************* - class _tao_seq_Octet; - class _tao_seq_Octet_var; class TAO_Export _tao_seq_Octet : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) @@ -1767,12 +2286,14 @@ TAO_NAMESPACE Messaging CORBA::Boolean release=0 ); _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor - ~_tao_seq_Octet (void); // dtor + ~_tao_seq_Octet (void); + static void _tao_any_destructor (void*); #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef _tao_seq_Octet_var _var_type; + typedef _tao_seq_Octet_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ + #if defined(TAO_NO_COPY_OCTET_SEQUENCES) _tao_seq_Octet ( CORBA::ULong length, @@ -1789,7 +2310,7 @@ TAO_NAMESPACE Messaging #if !defined (_MESSAGING_EXCEPTIONHOLDER__TAO_SEQ_OCTET___VAR_CH_) #define _MESSAGING_EXCEPTIONHOLDER__TAO_SEQ_OCTET___VAR_CH_ -// ************************************************************* + // ************************************************************* // class Messaging::ExceptionHolder::_tao_seq_Octet_var // ************************************************************* @@ -1799,16 +2320,19 @@ TAO_NAMESPACE Messaging _tao_seq_Octet_var (void); // default constructor _tao_seq_Octet_var (_tao_seq_Octet *); _tao_seq_Octet_var (const _tao_seq_Octet_var &); // copy constructor + _tao_seq_Octet_var (const _tao_seq_Octet &); // fixed-size base types only ~_tao_seq_Octet_var (void); // destructor _tao_seq_Octet_var &operator= (_tao_seq_Octet *); _tao_seq_Octet_var &operator= (const _tao_seq_Octet_var &); + _tao_seq_Octet_var &operator= (const _tao_seq_Octet &); // fixed-size base types only _tao_seq_Octet *operator-> (void); const _tao_seq_Octet *operator-> (void) const; operator const _tao_seq_Octet &() const; operator _tao_seq_Octet &(); operator _tao_seq_Octet &() const; + CORBA::Octet &operator[] (CORBA::ULong index); // in, inout, out, _retn const _tao_seq_Octet &in (void) const; @@ -1847,20 +2371,21 @@ TAO_NAMESPACE Messaging void operator= (const _tao_seq_Octet_var &); }; + #endif /* end #if !defined */ #if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef _tao_seq_Octet _marshaled_exception_seq; -#endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */ + typedef _tao_seq_Octet _marshaled_exception_seq; + #endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */ - virtual void marshaled_exception (const _tao_seq_Octet &) = 0; // set - virtual const _tao_seq_Octet &marshaled_exception (void) const = 0; // get method (read only) - virtual _tao_seq_Octet &marshaled_exception (void) = 0; // get method (read/write only) + virtual void marshaled_exception (const Messaging::ExceptionHolder::_tao_seq_Octet &) = 0; // set + virtual const Messaging::ExceptionHolder::_tao_seq_Octet &marshaled_exception (void) const = 0; // get method (read only) + virtual Messaging::ExceptionHolder::_tao_seq_Octet &marshaled_exception (void) = 0; // get method (read/write only) protected: - ExceptionHolder (void); // default constructor - virtual ~ExceptionHolder (void); + ExceptionHolder (); // default constructor + virtual ~ExceptionHolder (); // TAO internals virtual void *_tao_obv_narrow (ptr_arith_t); @@ -1879,9 +2404,18 @@ TAO_NAMESPACE Messaging #endif /* end #if !defined */ +#if !defined (_MESSAGING_REPLYHANDLER___PTR_CH_) +#define _MESSAGING_REPLYHANDLER___PTR_CH_ + class ReplyHandler; typedef ReplyHandler *ReplyHandler_ptr; +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_REPLYHANDLER___VAR_CH_) +#define _MESSAGING_REPLYHANDLER___VAR_CH_ + class TAO_Export ReplyHandler_var { public: @@ -1907,6 +2441,13 @@ TAO_NAMESPACE Messaging ReplyHandler_ptr ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_REPLYHANDLER___OUT_CH_) +#define _MESSAGING_REPLYHANDLER___OUT_CH_ + class TAO_Export ReplyHandler_out { public: @@ -1924,37 +2465,51 @@ TAO_NAMESPACE Messaging ReplyHandler_ptr &ptr_; }; - class TAO_Export ReplyHandler : public virtual ACE_CORBA_1 (Object) + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_REPLYHANDLER_CH_) +#define _MESSAGING_REPLYHANDLER_CH_ + + class TAO_Export ReplyHandler : public virtual CORBA_Object { public: - #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) typedef ReplyHandler_ptr _ptr_type; typedef ReplyHandler_var _var_type; - #endif /* __GNUC__ */ + #endif /* ! __GNUC__ || g++ >= 2.8 */ // the static operations static ReplyHandler_ptr _duplicate (ReplyHandler_ptr obj); static ReplyHandler_ptr _narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + TAO_default_environment () ); static ReplyHandler_ptr _unchecked_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + TAO_default_environment () ); - static ReplyHandler_ptr _nil (void); - static void _tao_any_destructor (void *); + static ReplyHandler_ptr _nil (void) + { + return (ReplyHandler_ptr)0; + } + + static void _tao_any_destructor (void*); virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id, CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + TAO_default_environment () ); + virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual const char* _interface_repository_id (void) const; + protected: - ReplyHandler (void); // default constructor + ReplyHandler (void); ReplyHandler (TAO_Stub *objref, TAO_ServantBase *_tao_servant = 0, CORBA::Boolean _tao_collocated = 0 @@ -1966,195 +2521,218 @@ TAO_NAMESPACE Messaging }; #if (TAO_HAS_SMART_PROXIES == 1) -class TAO_Messaging_ReplyHandler_Default_Proxy_Factory -{ -public: +class TAO_Export TAO_Messaging_ReplyHandler_Default_Proxy_Factory + { + public: - TAO_Messaging_ReplyHandler_Default_Proxy_Factory (int register_proxy_factory = 1); + TAO_Messaging_ReplyHandler_Default_Proxy_Factory (int register_proxy_factory = 1); - virtual ~TAO_Messaging_ReplyHandler_Default_Proxy_Factory (void); + virtual ~TAO_Messaging_ReplyHandler_Default_Proxy_Factory (void); - virtual ReplyHandler_ptr create_proxy ( - ReplyHandler_ptr proxy, - CORBA::Environment &env = - TAO_default_environment () - ); -}; + virtual ReplyHandler_ptr create_proxy ( + ReplyHandler_ptr proxy, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + }; -class TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter -{ -public: +class TAO_Export TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter + { + public: - friend class ACE_Singleton<TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>; + friend class ACE_Singleton<TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>; - int register_proxy_factory ( - TAO_Messaging_ReplyHandler_Default_Proxy_Factory *df, - CORBA::Environment &env = - TAO_default_environment () - ); + int register_proxy_factory ( + TAO_Messaging_ReplyHandler_Default_Proxy_Factory *df, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); - int unregister_proxy_factory ( - CORBA::Environment &env = - TAO_default_environment () - ); + int unregister_proxy_factory ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); - ReplyHandler_ptr create_proxy ( - ReplyHandler_ptr proxy, - CORBA::Environment &env = - TAO_default_environment () - ); + ReplyHandler_ptr create_proxy ( + ReplyHandler_ptr proxy, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); -protected: - TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter (void); - ~TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter (void); - TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter &operator= ( - const TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter & - ); - TAO_Messaging_ReplyHandler_Default_Proxy_Factory *proxy_factory_; - int delete_proxy_factory_; - ACE_SYNCH_RECURSIVE_MUTEX lock_; + protected: + TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter (void); + ~TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter (void); + TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter &operator= ( + const TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter & + ); + TAO_Messaging_ReplyHandler_Default_Proxy_Factory *proxy_factory_; + int delete_proxy_factory_; + ACE_SYNCH_RECURSIVE_MUTEX lock_; -}; + }; -typedef ACE_Singleton<TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_Messaging_ReplyHandler_PROXY_FACTORY_ADAPTER; + typedef ACE_Singleton<TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_Messaging_ReplyHandler_PROXY_FACTORY_ADAPTER; -class TAO_Messaging_ReplyHandler_Smart_Proxy_Base - : public virtual ReplyHandler, - public virtual TAO_Smart_Proxy_Base -{ -public: - TAO_Messaging_ReplyHandler_Smart_Proxy_Base (void); - ~TAO_Messaging_ReplyHandler_Smart_Proxy_Base (void); - virtual TAO_Stub *_stubobj (void) const; - -protected: - ::Messaging::ReplyHandler_ptr get_proxy (void); - ::Messaging::ReplyHandler_var proxy_; -}; + class TAO_Export TAO_Messaging_ReplyHandler_Smart_Proxy_Base + : public virtual ReplyHandler, + public virtual TAO_Smart_Proxy_Base + { + public: + TAO_Messaging_ReplyHandler_Smart_Proxy_Base (void); + ~TAO_Messaging_ReplyHandler_Smart_Proxy_Base (void); + virtual TAO_Stub *_stubobj (void) const; + protected: + ::Messaging::ReplyHandler_ptr get_proxy (void); + ::Messaging::ReplyHandler_var proxy_; + }; + +#endif /* TAO_HAS_SMART_PROXIES */ + +#endif /* end #if !defined */ -#endif /*TAO_HAS_SMART_PROXIES*/ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ReplyHandler; #endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */ #if (TAO_HAS_AMI_POLLER == 1) +// valuetype class class Poller; typedef Poller *Poller_ptr; +#if !defined (_MESSAGING_POLLER___VAR_CH_) +#define _MESSAGING_POLLER___VAR_CH_ + class TAO_Export Poller_var { public: Poller_var (void); // default constructor - Poller_var (Poller_ptr); + Poller_var (Poller*); + Poller_var (const Poller*); // (TAO extension) Poller_var (const Poller_var &); // copy constructor ~Poller_var (void); // destructor - Poller_var &operator= (Poller_ptr); + Poller_var &operator= (Poller*); Poller_var &operator= (const Poller_var &); - Poller_ptr operator-> (void) const; + Poller* operator-> (void) const; - operator const Poller_ptr &() const; - operator Poller_ptr &(); + operator const Poller* () const; + operator Poller* (); // in, inout, out, _retn - Poller_ptr in (void) const; - Poller_ptr &inout (void); - Poller_ptr &out (void); - Poller_ptr _retn (void); - Poller_ptr ptr (void) const; + Poller* in (void) const; + Poller* &inout (void); + Poller* &out (void); + Poller* _retn (void); + Poller* ptr (void) const; private: - Poller_ptr ptr_; + Poller* ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_POLLER___OUT_CH_) +#define _MESSAGING_POLLER___OUT_CH_ + class TAO_Export Poller_out { public: - Poller_out (Poller_ptr &); + Poller_out (Poller* &); Poller_out (Poller_var &); Poller_out (const Poller_out &); Poller_out &operator= (const Poller_out &); Poller_out &operator= (const Poller_var &); - Poller_out &operator= (Poller_ptr); - operator Poller_ptr &(); - Poller_ptr &ptr (void); - Poller_ptr operator-> (void); + Poller_out &operator= (Poller*); + operator Poller* &(); + Poller* &ptr (void); + Poller* operator-> (void); private: - Poller_ptr &ptr_; + Poller* &ptr_; + }; + + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_POLLER___INIT_CH_) +#define _MESSAGING_POLLER___INIT_CH_ + + class TAO_Export Poller_init : public CORBA_ValueFactoryBase + { + public: + virtual ~Poller_init (); + virtual const char* tao_repository_id (); + + // create () goes here + }; - class TAO_Export Poller: public virtual CORBA::Pollable +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_POLLER_CH_) +#define _MESSAGING_POLLER_CH_ + + class TAO_Export Poller : public virtual CORBA_ValueBase { public: - #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 - typedef Poller_ptr _ptr_type; + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef Poller* _ptr_type; typedef Poller_var _var_type; - #endif /* __GNUC__ */ + #endif /* ! __GNUC__ || g++ >= 2.8 */ + + static Poller* _downcast (CORBA::ValueBase* ); + // The address of static _downcast is implicit used as type id + + // (TAO extensions or internals) + static CORBA::Boolean _tao_unmarshal (TAO_InputCDR &, Poller *&); + virtual const char* _tao_obv_repository_id () const; + static const char* _tao_obv_static_repository_id (); + public: + virtual CORBA::Object_ptr operation_target ( CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment ()) = 0; + virtual char * operation_name ( CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment ()) = 0; + virtual Messaging::ReplyHandler_ptr associated_handler ( CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment ()) = 0; + virtual void associated_handler (Messaging::ReplyHandler_ptr, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment ()) = 0; + virtual CORBA::Boolean is_from_poller ( CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment ()) = 0; + virtual void target (CORBA::Object_ptr) = 0; // set + virtual CORBA::Object_ptr target (void) const = 0; // get method + + virtual void op_name (char *) = 0; // set + virtual void op_name (const char *) = 0; // set + virtual void op_name (const CORBA::String_var&) = 0; // set + virtual const char *op_name (void) const = 0; // get method - // the static operations - static Poller_ptr _duplicate (Poller_ptr obj); - static Poller_ptr _narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - static Poller_ptr _unchecked_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - static Poller_ptr _nil (void); - static void _tao_any_destructor (void *); - virtual CORBA::Object_ptr operation_target ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual char * operation_name ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual ReplyHandler_ptr associated_handler ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual void associated_handler ( - ReplyHandler_ptr associated_handler, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual CORBA::Boolean is_from_poller ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual CORBA::Object_ptr target ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual char * op_name ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual CORBA::Boolean _is_a ( - const CORBA::Char *type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual const char* _interface_repository_id (void) const; protected: - Poller (void); // default constructor - Poller (TAO_Stub *objref, - TAO_ServantBase *_tao_servant = 0, - CORBA::Boolean _tao_collocated = 0 - ); - virtual ~Poller (void); + Poller (); // default constructor + virtual ~Poller (); + + // TAO internals + virtual void *_tao_obv_narrow (ptr_arith_t); + virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &); + virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &); + private: Poller (const Poller &); void operator= (const Poller &); + + protected: + virtual CORBA::Boolean _tao_marshal__Messaging_Poller (TAO_OutputCDR &) = 0; + virtual CORBA::Boolean _tao_unmarshal__Messaging_Poller (TAO_InputCDR &) = 0; + }; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Poller; +#endif /* end #if !defined */ + #endif /* TAO_HAS_AMI_POLLER == 1 */ } @@ -2169,7 +2747,7 @@ TAO_NAMESPACE OBV_Messaging #define _MESSAGING_EXCEPTIONHOLDER___OBV_CH_ // OBV_ class - class TAO_Export ExceptionHolder : public virtual Messaging::ExceptionHolder + class ExceptionHolder : public virtual Messaging::ExceptionHolder { public: virtual void is_system_exception (CORBA::Boolean); // set @@ -2178,9 +2756,13 @@ TAO_NAMESPACE OBV_Messaging virtual void byte_order (CORBA::Boolean); // set virtual CORBA::Boolean byte_order (void) const; // get method - virtual void marshaled_exception (const _tao_seq_Octet &); // set - virtual const _tao_seq_Octet &marshaled_exception (void) const; // get method (read only) - virtual _tao_seq_Octet &marshaled_exception (void); // get method (read/write only) +#if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef _tao_seq_Octet _marshaled_exception_seq; + #endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */ + + virtual void marshaled_exception (const Messaging::ExceptionHolder::_tao_seq_Octet &); // set + virtual const Messaging::ExceptionHolder::_tao_seq_Octet &marshaled_exception (void) const; // get method (read only) + virtual Messaging::ExceptionHolder::_tao_seq_Octet &marshaled_exception (void); // get method (read/write only) protected: @@ -2193,12 +2775,38 @@ TAO_NAMESPACE OBV_Messaging private: CORBA::Boolean _pd_is_system_exception; CORBA::Boolean _pd_byte_order; -#if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef _tao_seq_Octet _marshaled_exception_seq; - #endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */ + _tao_seq_Octet _pd_marshaled_exception; + }; + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_POLLER___OBV_CH_) +#define _MESSAGING_POLLER___OBV_CH_ + + // OBV_ class + class Poller : public virtual Messaging::Poller + { + public: + virtual void target (CORBA::Object_ptr); // set + virtual CORBA::Object_ptr target (void) const; // get method + + virtual void op_name (char *); // set + virtual void op_name (const char *); // set + virtual void op_name (const CORBA::String_var&); // set + virtual const char *op_name (void) const; // get method - // @@ Michael: Needed to add the "*" - _tao_seq_Octet *_pd_marshaled_exception; + + protected: + virtual CORBA::Boolean _tao_marshal__Messaging_Poller (TAO_OutputCDR &); + virtual CORBA::Boolean _tao_unmarshal__Messaging_Poller (TAO_InputCDR &); + CORBA::Boolean _tao_marshal_state (TAO_OutputCDR &); + CORBA::Boolean _tao_unmarshal_state (TAO_InputCDR &); + + + private: + CORBA::Object_var _pd_target; + TAO_String_Manager _pd_op_name; }; #endif /* end #if !defined */ @@ -2240,20 +2848,6 @@ typedef void (*TAO_Reply_Handler_Skeleton)( #endif /* TAO_HAS_AMI_CALLBACK == 1 */ -#if (TAO_HAS_REBIND_POLICY == 1) - -TAO_Export void operator<<= (CORBA::Any &, Messaging::RebindPolicy_ptr); -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::RebindPolicy *&); - -#endif /* TAO_HAS_REBIND_POLICY == 1 */ - -#if (TAO_HAS_SYNC_SCOPE_POLICY == 1) - -TAO_Export void operator<<= (CORBA::Any &, Messaging::SyncScopePolicy_ptr); -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::SyncScopePolicy *&); - -#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ - #if (TAO_HAS_PRIORITY_POLICIES == 1) TAO_Export void operator<<= (CORBA::Any &, const Messaging::PriorityRange &); // copying version @@ -2261,240 +2855,115 @@ TAO_Export void operator<<= (CORBA::Any &, Messaging::PriorityRange*); // noncop TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::PriorityRange *&); // deprecated TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Messaging::PriorityRange *&); -TAO_Export void operator<<= (CORBA::Any &, Messaging::RequestPriorityPolicy_ptr); -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::RequestPriorityPolicy *&); - -TAO_Export void operator<<= (CORBA::Any &, Messaging::ReplyPriorityPolicy_ptr); -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::ReplyPriorityPolicy *&); - #endif /* TAO_HAS_PRIORITY_POLICIES == 1 */ -#if (TAO_HAS_REQUEST_START_TIME_POLICY == 1) - -TAO_Export void operator<<= (CORBA::Any &, Messaging::RequestStartTimePolicy_ptr); -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::RequestStartTimePolicy *&); - -#endif /* TAO_HAS_REQUEST_START_TIME_POLICY == 1 */ - -#if (TAO_HAS_REQUEST_END_TIME_POLICY == 1) - -TAO_Export void operator<<= (CORBA::Any &, Messaging::RequestEndTimePolicy_ptr); -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::RequestEndTimePolicy *&); - -#endif /* TAO_HAS_REQUEST_END_TIME_POLICY == 1 */ - -#if (TAO_HAS_REPLY_START_TIME_POLICY == 1) - -TAO_Export void operator<<= (CORBA::Any &, Messaging::ReplyStartTimePolicy_ptr); -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::ReplyStartTimePolicy *&); - -#endif /* TAO_HAS_REPLY_START_TIME_POLICY == 1 */ - -#if (TAO_HAS_REPLY_END_TIME_POLICY == 1) - -TAO_Export void operator<<= (CORBA::Any &, Messaging::ReplyEndTimePolicy_ptr); -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::ReplyEndTimePolicy *&); - -#endif /* TAO_HAS_REPLY_END_TIME_POLICY == 1 */ - -#if (TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1) - -TAO_Export void operator<<= (CORBA::Any &, Messaging::RelativeRequestTimeoutPolicy_ptr); -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::RelativeRequestTimeoutPolicy *&); - -#endif /* TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1 */ - -#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) - -TAO_Export void operator<<= (CORBA::Any &, Messaging::RelativeRoundtripTimeoutPolicy_ptr); -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::RelativeRoundtripTimeoutPolicy *&); - -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ - #if (TAO_HAS_ROUTING_POLICY == 1) TAO_Export void operator<<= (CORBA::Any &, const Messaging::RoutingTypeRange &); // copying version TAO_Export void operator<<= (CORBA::Any &, Messaging::RoutingTypeRange*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::RoutingTypeRange *&); +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::RoutingTypeRange *&); // deprecated TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Messaging::RoutingTypeRange *&); -TAO_Export void operator<<= (CORBA::Any &, Messaging::RoutingPolicy_ptr); -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::RoutingPolicy *&); - #endif /* TAO_HAS_ROUTING_POLICY == 1 */ -#if (TAO_HAS_MAX_HOPS_POLICY == 1) - -TAO_Export void operator<<= (CORBA::Any &, Messaging::MaxHopsPolicy_ptr); -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::MaxHopsPolicy *&); - -#endif /* TAO_HAS_MAX_HOPS_POLICY == 1 */ - -#if (TAO_HAS_QUEUE_ORDER_POLICY == 1) - -TAO_Export void operator<<= (CORBA::Any &, Messaging::QueueOrderPolicy_ptr); -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::QueueOrderPolicy *&); - -#endif /* TAO_HAS_QUEUE_ORDER_POLICY == 1 */ - TAO_Export void operator<<= (CORBA::Any &, const Messaging::PolicyValue &); // copying version TAO_Export void operator<<= (CORBA::Any &, Messaging::PolicyValue*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::PolicyValue *&); +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::PolicyValue *&); // deprecated TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Messaging::PolicyValue *&); - TAO_Export void operator<<= (CORBA::Any &, const Messaging::PolicyValueSeq &); // copying version TAO_Export void operator<<= (CORBA::Any &, Messaging::PolicyValueSeq*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::PolicyValueSeq *&); +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::PolicyValueSeq *&); // deprecated TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Messaging::PolicyValueSeq *&); #if (TAO_HAS_AMI_CALLBACK == 1) -extern TAO_Export Messaging::ReplyHandler_ptr (*_TAO_collocation_Messaging_ReplyHandler_Stub_Factory_function_pointer) ( - CORBA::Object_ptr obj); - +extern TAO_Export Messaging::ReplyHandler_ptr (*_TAO_collocation_Messaging_ReplyHandler_Stub_Factory_function_pointer) ( + CORBA::Object_ptr obj + ); // Any operators for interface Messaging::ReplyHandler TAO_Export void operator<<= (CORBA::Any &, Messaging::ReplyHandler_ptr); TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::ReplyHandler *&); -#endif /* TAO_HAS_AMI_CALLBACK == 1 */ - -#if (TAO_HAS_AMI_POLLER == 1) - -// Any operators for interface Messaging::Poller -TAO_Export void operator<<= (CORBA::Any &, Messaging::Poller_ptr); -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::Poller *&); - -#endif /* TAO_HAS_AMI_POLLER == 1 */ +#endif /* TAO_HAS_AMI_CALLBACK */ #ifndef __ACE_INLINE__ -#if (TAO_HAS_REBIND_POLICY == 1) - -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::RebindPolicy_ptr ); -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::RebindPolicy_ptr &); - -#endif /* TAO_HAS_REBIND_POLICY == 1 */ - -#if (TAO_HAS_SYNC_SCOPE_POLICY == 1) - -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::SyncScopePolicy_ptr ); -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::SyncScopePolicy_ptr &); - -#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ - #if (TAO_HAS_PRIORITY_POLICIES == 1) -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::PriorityRange &); // +TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::PriorityRange &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::PriorityRange &); -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::RequestPriorityPolicy_ptr ); -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::RequestPriorityPolicy_ptr &); -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ReplyPriorityPolicy_ptr ); -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ReplyPriorityPolicy_ptr &); #endif /* TAO_HAS_PRIORITY_POLICIES == 1 */ -#if (TAO_HAS_REQUEST_START_TIME_POLICY == 1) - -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::RequestStartTimePolicy_ptr ); -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::RequestStartTimePolicy_ptr &); - -#endif /* TAO_HAS_REQUEST_START_TIME_POLICY == 1 */ - -#if (TAO_HAS_REQUEST_END_TIME_POLICY == 1) - -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::RequestEndTimePolicy_ptr ); -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::RequestEndTimePolicy_ptr &); - -#endif /* TAO_HAS_REQUEST_END_TIME_POLICY == 1 */ - -#if (TAO_HAS_REPLY_START_TIME_POLICY == 1) - -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ReplyStartTimePolicy_ptr ); -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ReplyStartTimePolicy_ptr &); - -#endif /* TAO_HAS_REPLY_START_TIME_POLICY == 1 */ - -#if (TAO_HAS_REPLY_END_TIME_POLICY == 1) - -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ReplyEndTimePolicy_ptr ); -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ReplyEndTimePolicy_ptr &); - -#endif /* TAO_HAS_REPLY_END_TIME_POLICY == 1 */ - -#if (TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1) - -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::RelativeRequestTimeoutPolicy_ptr ); -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::RelativeRequestTimeoutPolicy_ptr &); - -#endif /* TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1 */ - -#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) - -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::RelativeRoundtripTimeoutPolicy_ptr ); -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::RelativeRoundtripTimeoutPolicy_ptr &); - -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ - #if (TAO_HAS_ROUTING_POLICY == 1) -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::RoutingTypeRange &); // +TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::RoutingTypeRange &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::RoutingTypeRange &); -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::RoutingPolicy_ptr ); -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::RoutingPolicy_ptr &); +TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::PolicyValue &); +TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::PolicyValue &); #endif /* TAO_HAS_ROUTING_POLICY == 1 */ -#if (TAO_HAS_MAX_HOPS_POLICY == 1) +#if !defined _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_H_ +#define _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_H_ -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::MaxHopsPolicy_ptr ); -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::MaxHopsPolicy_ptr &); +TAO_Export CORBA::Boolean operator<< ( + TAO_OutputCDR &, + const Messaging::PolicyValue::_tao_seq_Octet & + ); +TAO_Export CORBA::Boolean operator>> ( + TAO_InputCDR &, + Messaging::PolicyValue::_tao_seq_Octet & + ); -#endif /* TAO_HAS_MAX_HOPS_POLICY == 1 */ +#endif /* _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_H_ */ -#if (TAO_HAS_QUEUE_ORDER_POLICY == 1) -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::QueueOrderPolicy_ptr ); -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::QueueOrderPolicy_ptr &); +#if !defined _TAO_CDR_OP_Messaging_PolicyValueSeq_H_ +#define _TAO_CDR_OP_Messaging_PolicyValueSeq_H_ -#endif /* TAO_HAS_QUEUE_ORDER_POLICY == 1 */ - -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::PolicyValue &); // -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::PolicyValue &); -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::PolicyValue::_tao_seq_Octet &); // -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::PolicyValue::_tao_seq_Octet &); -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::PolicyValueSeq &); // -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::PolicyValueSeq &); +TAO_Export CORBA::Boolean operator<< ( + TAO_OutputCDR &, + const Messaging::PolicyValueSeq & + ); +TAO_Export CORBA::Boolean operator>> ( + TAO_InputCDR &, + Messaging::PolicyValueSeq & + ); -#if (TAO_HAS_AMI_CALLBACK == 1) +#endif /* _TAO_CDR_OP_Messaging_PolicyValueSeq_H_ */ -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ReplyHandler_ptr ); -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ReplyHandler_ptr &); -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ExceptionHolder &); // +TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ExceptionHolder &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ExceptionHolder &); -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ExceptionHolder::_tao_seq_Octet &); // -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ExceptionHolder::_tao_seq_Octet &); -#endif /* TAO_HAS_AMI_CALLBACK == 1 */ +#if !defined _TAO_CDR_OP_Messaging_ExceptionHolder__tao_seq_Octet_H_ +#define _TAO_CDR_OP_Messaging_ExceptionHolder__tao_seq_Octet_H_ -#if (TAO_HAS_AMI_POLLER == 1) +TAO_Export CORBA::Boolean operator<< ( + TAO_OutputCDR &, + const Messaging::ExceptionHolder::_tao_seq_Octet & + ); +TAO_Export CORBA::Boolean operator>> ( + TAO_InputCDR &, + Messaging::ExceptionHolder::_tao_seq_Octet & + ); -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::Poller_ptr ); -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Poller_ptr &); +#endif /* _TAO_CDR_OP_Messaging_ExceptionHolder__tao_seq_Octet_H_ */ -#endif /* TAO_HAS_AMI_POLLER == 1 */ +TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ReplyHandler_ptr ); +TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ReplyHandler_ptr &); #endif /* __ACE_INLINE__ */ #if defined (__ACE_INLINE__) -#include "tao/MessagingC.i" +#include "MessagingC.i" #endif /* defined INLINE */ #if defined(_MSC_VER) && (_MSC_VER >= 1200) #pragma warning(pop) #endif /* _MSC_VER */ -#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ +#endif /* TAO_HAS_CORBA_MESSAGING */ -#include "ace/post.h" -#endif /* TAO_IDL_MESSAGINGC_H */ +#endif /* ifndef */ diff --git a/TAO/tao/MessagingC.i b/TAO/tao/MessagingC.i index 92ca400b508..6ae6d573f1a 100644 --- a/TAO/tao/MessagingC.i +++ b/TAO/tao/MessagingC.i @@ -1,5 +1,4 @@ -/* -*- C++ -*- */ -// $Id$ +/* -*- C++ -*- $Id$ */ // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* // TAO and the TAO IDL Compiler have been developed by the Center for @@ -15,27 +14,12 @@ Messaging::RebindPolicy::RebindPolicy (void) // default constructor {} ACE_INLINE -Messaging::RebindPolicy::RebindPolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor - : CORBA_Object (objref, _tao_servant, _tao_collocated) -{} - -ACE_INLINE Messaging::RebindPolicy::~RebindPolicy (void) // destructor {} -ACE_INLINE Messaging::RebindPolicy_ptr -Messaging::RebindPolicy::_duplicate (Messaging::RebindPolicy_ptr obj) -{ - if (!CORBA::is_nil (obj)) - obj->_add_ref (); - return obj; -} -ACE_INLINE Messaging::RebindPolicy_ptr -Messaging::RebindPolicy::_nil (void) -{ - return (Messaging::RebindPolicy_ptr)0; -} +#if !defined (_MESSAGING_REBINDPOLICY___VAR_CI_) +#define _MESSAGING_REBINDPOLICY___VAR_CI_ // ************************************************************* // Inline operations for class Messaging::RebindPolicy_var @@ -43,23 +27,23 @@ Messaging::RebindPolicy::_nil (void) ACE_INLINE Messaging::RebindPolicy_var::RebindPolicy_var (void) // default constructor - : ptr_ (Messaging::RebindPolicy::_nil ()) + : ptr_ (RebindPolicy::_nil ()) {} ACE_INLINE -Messaging::RebindPolicy_var::RebindPolicy_var (Messaging::RebindPolicy_ptr p) +Messaging::RebindPolicy_var::RebindPolicy_var (RebindPolicy_ptr p) : ptr_ (p) {} -ACE_INLINE Messaging::RebindPolicy_ptr +ACE_INLINE ::Messaging::RebindPolicy_ptr Messaging::RebindPolicy_var::ptr (void) const { return this->ptr_; } ACE_INLINE -Messaging::RebindPolicy_var::RebindPolicy_var (const Messaging::RebindPolicy_var &p) // copy constructor - : ptr_ (Messaging::RebindPolicy::_duplicate (p.ptr ())) +Messaging::RebindPolicy_var::RebindPolicy_var (const ::Messaging::RebindPolicy_var &p) // copy constructor + : ptr_ (RebindPolicy::_duplicate (p.ptr ())) {} ACE_INLINE @@ -69,7 +53,7 @@ Messaging::RebindPolicy_var::~RebindPolicy_var (void) // destructor } ACE_INLINE Messaging::RebindPolicy_var & -Messaging::RebindPolicy_var::operator= (Messaging::RebindPolicy_ptr p) +Messaging::RebindPolicy_var::operator= (RebindPolicy_ptr p) { CORBA::release (this->ptr_); this->ptr_ = p; @@ -77,126 +61,136 @@ Messaging::RebindPolicy_var::operator= (Messaging::RebindPolicy_ptr p) } ACE_INLINE Messaging::RebindPolicy_var & -Messaging::RebindPolicy_var::operator= (const Messaging::RebindPolicy_var &p) +Messaging::RebindPolicy_var::operator= (const ::Messaging::RebindPolicy_var &p) { if (this != &p) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::RebindPolicy::_duplicate (p.ptr ()); + this->ptr_ = ::Messaging::RebindPolicy::_duplicate (p.ptr ()); } return *this; } -ACE_INLINE -Messaging::RebindPolicy_var::operator const Messaging::RebindPolicy_ptr &() const // cast +ACE_INLINE +Messaging::RebindPolicy_var::operator const ::Messaging::RebindPolicy_ptr &() const // cast { return this->ptr_; } -ACE_INLINE -Messaging::RebindPolicy_var::operator Messaging::RebindPolicy_ptr &() // cast +ACE_INLINE +Messaging::RebindPolicy_var::operator ::Messaging::RebindPolicy_ptr &() // cast { return this->ptr_; } -ACE_INLINE Messaging::RebindPolicy_ptr +ACE_INLINE ::Messaging::RebindPolicy_ptr Messaging::RebindPolicy_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE Messaging::RebindPolicy_ptr +ACE_INLINE ::Messaging::RebindPolicy_ptr Messaging::RebindPolicy_var::in (void) const { return this->ptr_; } -ACE_INLINE Messaging::RebindPolicy_ptr & +ACE_INLINE ::Messaging::RebindPolicy_ptr & Messaging::RebindPolicy_var::inout (void) { return this->ptr_; } -ACE_INLINE Messaging::RebindPolicy_ptr & +ACE_INLINE ::Messaging::RebindPolicy_ptr & Messaging::RebindPolicy_var::out (void) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::RebindPolicy::_nil (); + this->ptr_ = ::Messaging::RebindPolicy::_nil (); return this->ptr_; } -ACE_INLINE Messaging::RebindPolicy_ptr +ACE_INLINE ::Messaging::RebindPolicy_ptr Messaging::RebindPolicy_var::_retn (void) { // yield ownership of managed obj reference - Messaging::RebindPolicy_ptr val = this->ptr_; - this->ptr_ = Messaging::RebindPolicy::_nil (); + ::Messaging::RebindPolicy_ptr val = this->ptr_; + this->ptr_ = ::Messaging::RebindPolicy::_nil (); return val; } + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_REBINDPOLICY___OUT_CI_) +#define _MESSAGING_REBINDPOLICY___OUT_CI_ + // ************************************************************* // Inline operations for class Messaging::RebindPolicy_out // ************************************************************* ACE_INLINE -Messaging::RebindPolicy_out::RebindPolicy_out (Messaging::RebindPolicy_ptr &p) +Messaging::RebindPolicy_out::RebindPolicy_out (RebindPolicy_ptr &p) : ptr_ (p) { - this->ptr_ = Messaging::RebindPolicy::_nil (); + this->ptr_ = ::Messaging::RebindPolicy::_nil (); } ACE_INLINE -Messaging::RebindPolicy_out::RebindPolicy_out (Messaging::RebindPolicy_var &p) // constructor from _var +Messaging::RebindPolicy_out::RebindPolicy_out (RebindPolicy_var &p) // constructor from _var : ptr_ (p.out ()) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::RebindPolicy::_nil (); + this->ptr_ = ::Messaging::RebindPolicy::_nil (); } ACE_INLINE -Messaging::RebindPolicy_out::RebindPolicy_out (const Messaging::RebindPolicy_out &p) // copy constructor - : ptr_ (ACE_const_cast (Messaging::RebindPolicy_out&,p).ptr_) +Messaging::RebindPolicy_out::RebindPolicy_out (const ::Messaging::RebindPolicy_out &p) // copy constructor + : ptr_ (ACE_const_cast (RebindPolicy_out &, p).ptr_) {} -ACE_INLINE Messaging::RebindPolicy_out & -Messaging::RebindPolicy_out::operator= (const Messaging::RebindPolicy_out &p) +ACE_INLINE ::Messaging::RebindPolicy_out & +Messaging::RebindPolicy_out::operator= (const ::Messaging::RebindPolicy_out &p) { - this->ptr_ = ACE_const_cast (Messaging::RebindPolicy_out&,p).ptr_; + this->ptr_ = ACE_const_cast (RebindPolicy_out&, p).ptr_; return *this; } ACE_INLINE Messaging::RebindPolicy_out & -Messaging::RebindPolicy_out::operator= (const Messaging::RebindPolicy_var &p) +Messaging::RebindPolicy_out::operator= (const ::Messaging::RebindPolicy_var &p) { - this->ptr_ = Messaging::RebindPolicy::_duplicate (p.ptr ()); + this->ptr_ = ::Messaging::RebindPolicy::_duplicate (p.ptr ()); return *this; } ACE_INLINE Messaging::RebindPolicy_out & -Messaging::RebindPolicy_out::operator= (Messaging::RebindPolicy_ptr p) +Messaging::RebindPolicy_out::operator= (RebindPolicy_ptr p) { this->ptr_ = p; return *this; } -ACE_INLINE -Messaging::RebindPolicy_out::operator Messaging::RebindPolicy_ptr &() // cast +ACE_INLINE +Messaging::RebindPolicy_out::operator ::Messaging::RebindPolicy_ptr &() // cast { return this->ptr_; } -ACE_INLINE Messaging::RebindPolicy_ptr & +ACE_INLINE ::Messaging::RebindPolicy_ptr & Messaging::RebindPolicy_out::ptr (void) // ptr { return this->ptr_; } -ACE_INLINE Messaging::RebindPolicy_ptr +ACE_INLINE ::Messaging::RebindPolicy_ptr Messaging::RebindPolicy_out::operator-> (void) { return this->ptr_; } + +#endif /* end #if !defined */ + #endif /* TAO_HAS_REBIND_POLICY == 1 */ #if (TAO_HAS_SYNC_SCOPE_POLICY == 1) @@ -206,27 +200,12 @@ Messaging::SyncScopePolicy::SyncScopePolicy (void) // default constructor {} ACE_INLINE -Messaging::SyncScopePolicy::SyncScopePolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor - : CORBA_Object (objref, _tao_servant, _tao_collocated) -{} - -ACE_INLINE Messaging::SyncScopePolicy::~SyncScopePolicy (void) // destructor {} -ACE_INLINE Messaging::SyncScopePolicy_ptr -Messaging::SyncScopePolicy::_duplicate (Messaging::SyncScopePolicy_ptr obj) -{ - if (!CORBA::is_nil (obj)) - obj->_add_ref (); - return obj; -} -ACE_INLINE Messaging::SyncScopePolicy_ptr -Messaging::SyncScopePolicy::_nil (void) -{ - return (Messaging::SyncScopePolicy_ptr)0; -} +#if !defined (_MESSAGING_SYNCSCOPEPOLICY___VAR_CI_) +#define _MESSAGING_SYNCSCOPEPOLICY___VAR_CI_ // ************************************************************* // Inline operations for class Messaging::SyncScopePolicy_var @@ -234,23 +213,23 @@ Messaging::SyncScopePolicy::_nil (void) ACE_INLINE Messaging::SyncScopePolicy_var::SyncScopePolicy_var (void) // default constructor - : ptr_ (Messaging::SyncScopePolicy::_nil ()) + : ptr_ (SyncScopePolicy::_nil ()) {} ACE_INLINE -Messaging::SyncScopePolicy_var::SyncScopePolicy_var (Messaging::SyncScopePolicy_ptr p) +Messaging::SyncScopePolicy_var::SyncScopePolicy_var (SyncScopePolicy_ptr p) : ptr_ (p) {} -ACE_INLINE Messaging::SyncScopePolicy_ptr +ACE_INLINE ::Messaging::SyncScopePolicy_ptr Messaging::SyncScopePolicy_var::ptr (void) const { return this->ptr_; } ACE_INLINE -Messaging::SyncScopePolicy_var::SyncScopePolicy_var (const Messaging::SyncScopePolicy_var &p) // copy constructor - : ptr_ (Messaging::SyncScopePolicy::_duplicate (p.ptr ())) +Messaging::SyncScopePolicy_var::SyncScopePolicy_var (const ::Messaging::SyncScopePolicy_var &p) // copy constructor + : ptr_ (SyncScopePolicy::_duplicate (p.ptr ())) {} ACE_INLINE @@ -260,7 +239,7 @@ Messaging::SyncScopePolicy_var::~SyncScopePolicy_var (void) // destructor } ACE_INLINE Messaging::SyncScopePolicy_var & -Messaging::SyncScopePolicy_var::operator= (Messaging::SyncScopePolicy_ptr p) +Messaging::SyncScopePolicy_var::operator= (SyncScopePolicy_ptr p) { CORBA::release (this->ptr_); this->ptr_ = p; @@ -268,126 +247,136 @@ Messaging::SyncScopePolicy_var::operator= (Messaging::SyncScopePolicy_ptr p) } ACE_INLINE Messaging::SyncScopePolicy_var & -Messaging::SyncScopePolicy_var::operator= (const Messaging::SyncScopePolicy_var &p) +Messaging::SyncScopePolicy_var::operator= (const ::Messaging::SyncScopePolicy_var &p) { if (this != &p) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::SyncScopePolicy::_duplicate (p.ptr ()); + this->ptr_ = ::Messaging::SyncScopePolicy::_duplicate (p.ptr ()); } return *this; } -ACE_INLINE -Messaging::SyncScopePolicy_var::operator const Messaging::SyncScopePolicy_ptr &() const // cast +ACE_INLINE +Messaging::SyncScopePolicy_var::operator const ::Messaging::SyncScopePolicy_ptr &() const // cast { return this->ptr_; } -ACE_INLINE -Messaging::SyncScopePolicy_var::operator Messaging::SyncScopePolicy_ptr &() // cast +ACE_INLINE +Messaging::SyncScopePolicy_var::operator ::Messaging::SyncScopePolicy_ptr &() // cast { return this->ptr_; } -ACE_INLINE Messaging::SyncScopePolicy_ptr +ACE_INLINE ::Messaging::SyncScopePolicy_ptr Messaging::SyncScopePolicy_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE Messaging::SyncScopePolicy_ptr +ACE_INLINE ::Messaging::SyncScopePolicy_ptr Messaging::SyncScopePolicy_var::in (void) const { return this->ptr_; } -ACE_INLINE Messaging::SyncScopePolicy_ptr & +ACE_INLINE ::Messaging::SyncScopePolicy_ptr & Messaging::SyncScopePolicy_var::inout (void) { return this->ptr_; } -ACE_INLINE Messaging::SyncScopePolicy_ptr & +ACE_INLINE ::Messaging::SyncScopePolicy_ptr & Messaging::SyncScopePolicy_var::out (void) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::SyncScopePolicy::_nil (); + this->ptr_ = ::Messaging::SyncScopePolicy::_nil (); return this->ptr_; } -ACE_INLINE Messaging::SyncScopePolicy_ptr +ACE_INLINE ::Messaging::SyncScopePolicy_ptr Messaging::SyncScopePolicy_var::_retn (void) { // yield ownership of managed obj reference - Messaging::SyncScopePolicy_ptr val = this->ptr_; - this->ptr_ = Messaging::SyncScopePolicy::_nil (); + ::Messaging::SyncScopePolicy_ptr val = this->ptr_; + this->ptr_ = ::Messaging::SyncScopePolicy::_nil (); return val; } + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_SYNCSCOPEPOLICY___OUT_CI_) +#define _MESSAGING_SYNCSCOPEPOLICY___OUT_CI_ + // ************************************************************* // Inline operations for class Messaging::SyncScopePolicy_out // ************************************************************* ACE_INLINE -Messaging::SyncScopePolicy_out::SyncScopePolicy_out (Messaging::SyncScopePolicy_ptr &p) +Messaging::SyncScopePolicy_out::SyncScopePolicy_out (SyncScopePolicy_ptr &p) : ptr_ (p) { - this->ptr_ = Messaging::SyncScopePolicy::_nil (); + this->ptr_ = ::Messaging::SyncScopePolicy::_nil (); } ACE_INLINE -Messaging::SyncScopePolicy_out::SyncScopePolicy_out (Messaging::SyncScopePolicy_var &p) // constructor from _var +Messaging::SyncScopePolicy_out::SyncScopePolicy_out (SyncScopePolicy_var &p) // constructor from _var : ptr_ (p.out ()) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::SyncScopePolicy::_nil (); + this->ptr_ = ::Messaging::SyncScopePolicy::_nil (); } ACE_INLINE -Messaging::SyncScopePolicy_out::SyncScopePolicy_out (const Messaging::SyncScopePolicy_out &p) // copy constructor - : ptr_ (ACE_const_cast (Messaging::SyncScopePolicy_out&,p).ptr_) +Messaging::SyncScopePolicy_out::SyncScopePolicy_out (const ::Messaging::SyncScopePolicy_out &p) // copy constructor + : ptr_ (ACE_const_cast (SyncScopePolicy_out &, p).ptr_) {} -ACE_INLINE Messaging::SyncScopePolicy_out & -Messaging::SyncScopePolicy_out::operator= (const Messaging::SyncScopePolicy_out &p) +ACE_INLINE ::Messaging::SyncScopePolicy_out & +Messaging::SyncScopePolicy_out::operator= (const ::Messaging::SyncScopePolicy_out &p) { - this->ptr_ = ACE_const_cast (Messaging::SyncScopePolicy_out&,p).ptr_; + this->ptr_ = ACE_const_cast (SyncScopePolicy_out&, p).ptr_; return *this; } ACE_INLINE Messaging::SyncScopePolicy_out & -Messaging::SyncScopePolicy_out::operator= (const Messaging::SyncScopePolicy_var &p) +Messaging::SyncScopePolicy_out::operator= (const ::Messaging::SyncScopePolicy_var &p) { - this->ptr_ = Messaging::SyncScopePolicy::_duplicate (p.ptr ()); + this->ptr_ = ::Messaging::SyncScopePolicy::_duplicate (p.ptr ()); return *this; } ACE_INLINE Messaging::SyncScopePolicy_out & -Messaging::SyncScopePolicy_out::operator= (Messaging::SyncScopePolicy_ptr p) +Messaging::SyncScopePolicy_out::operator= (SyncScopePolicy_ptr p) { this->ptr_ = p; return *this; } -ACE_INLINE -Messaging::SyncScopePolicy_out::operator Messaging::SyncScopePolicy_ptr &() // cast +ACE_INLINE +Messaging::SyncScopePolicy_out::operator ::Messaging::SyncScopePolicy_ptr &() // cast { return this->ptr_; } -ACE_INLINE Messaging::SyncScopePolicy_ptr & +ACE_INLINE ::Messaging::SyncScopePolicy_ptr & Messaging::SyncScopePolicy_out::ptr (void) // ptr { return this->ptr_; } -ACE_INLINE Messaging::SyncScopePolicy_ptr +ACE_INLINE ::Messaging::SyncScopePolicy_ptr Messaging::SyncScopePolicy_out::operator-> (void) { return this->ptr_; } + +#endif /* end #if !defined */ + #endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ #if (TAO_HAS_PRIORITY_POLICIES == 1) @@ -402,20 +391,26 @@ Messaging::PriorityRange_var::PriorityRange_var (void) // default constructor {} ACE_INLINE -Messaging::PriorityRange_var::PriorityRange_var (Messaging::PriorityRange *p) +Messaging::PriorityRange_var::PriorityRange_var (PriorityRange *p) : ptr_ (p) {} ACE_INLINE -Messaging::PriorityRange_var::PriorityRange_var (const Messaging::PriorityRange_var &p) // copy constructor +Messaging::PriorityRange_var::PriorityRange_var (const ::Messaging::PriorityRange_var &p) // copy constructor { if (p.ptr_) - ACE_NEW (this->ptr_, - Messaging::PriorityRange(*p.ptr_)); + ACE_NEW (this->ptr_, ::Messaging::PriorityRange (*p.ptr_)); else this->ptr_ = 0; } +// fixed-size types only +ACE_INLINE +Messaging::PriorityRange_var::PriorityRange_var (const ::Messaging::PriorityRange &p) +{ + ACE_NEW (this->ptr_, ::Messaging::PriorityRange (p)); +} + ACE_INLINE Messaging::PriorityRange_var::~PriorityRange_var (void) // destructor { @@ -423,82 +418,92 @@ Messaging::PriorityRange_var::~PriorityRange_var (void) // destructor } ACE_INLINE Messaging::PriorityRange_var & -Messaging::PriorityRange_var::operator= (Messaging::PriorityRange *p) +Messaging::PriorityRange_var::operator= (PriorityRange *p) { delete this->ptr_; this->ptr_ = p; return *this; } -ACE_INLINE Messaging::PriorityRange_var & -Messaging::PriorityRange_var::operator= (const Messaging::PriorityRange_var &p) +ACE_INLINE ::Messaging::PriorityRange_var & +Messaging::PriorityRange_var::operator= (const ::Messaging::PriorityRange_var &p) { if (this != &p) { delete this->ptr_; - ACE_NEW_RETURN (this->ptr_, - Messaging::PriorityRange (*p.ptr_), - *this); + ACE_NEW_RETURN (this->ptr_, ::Messaging::PriorityRange (*p.ptr_), *this); + } + return *this; +} + +// fixed-size types only +ACE_INLINE Messaging::PriorityRange_var & +Messaging::PriorityRange_var::operator= (const ::Messaging::PriorityRange &p) +{ + if (this->ptr_ != &p) + { + delete this->ptr_; + ACE_NEW_RETURN (this->ptr_, ::Messaging::PriorityRange (p), *this); } return *this; } -ACE_INLINE const Messaging::PriorityRange * +ACE_INLINE const ::Messaging::PriorityRange * Messaging::PriorityRange_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE Messaging::PriorityRange * +ACE_INLINE ::Messaging::PriorityRange * Messaging::PriorityRange_var::operator-> (void) { return this->ptr_; } ACE_INLINE -Messaging::PriorityRange_var::operator const Messaging::PriorityRange &() const // cast +Messaging::PriorityRange_var::operator const ::Messaging::PriorityRange &() const // cast { return *this->ptr_; } ACE_INLINE -Messaging::PriorityRange_var::operator Messaging::PriorityRange &() // cast +Messaging::PriorityRange_var::operator ::Messaging::PriorityRange &() // cast { return *this->ptr_; } ACE_INLINE -Messaging::PriorityRange_var::operator Messaging::PriorityRange &() const// cast +Messaging::PriorityRange_var::operator ::Messaging::PriorityRange &() const // cast { return *this->ptr_; } -ACE_INLINE const Messaging::PriorityRange & +ACE_INLINE const ::Messaging::PriorityRange & Messaging::PriorityRange_var::in (void) const { return *this->ptr_; } -ACE_INLINE Messaging::PriorityRange & +ACE_INLINE ::Messaging::PriorityRange & Messaging::PriorityRange_var::inout (void) { return *this->ptr_; } -// mapping for fixed size -ACE_INLINE Messaging::PriorityRange & +// mapping for fixed size +ACE_INLINE ::Messaging::PriorityRange & Messaging::PriorityRange_var::out (void) { return *this->ptr_; } -ACE_INLINE Messaging::PriorityRange +ACE_INLINE ::Messaging::PriorityRange Messaging::PriorityRange_var::_retn (void) { return *this->ptr_; } -ACE_INLINE Messaging::PriorityRange * +ACE_INLINE ::Messaging::PriorityRange * Messaging::PriorityRange_var::ptr (void) const { return this->ptr_; @@ -509,27 +514,12 @@ Messaging::RequestPriorityPolicy::RequestPriorityPolicy (void) // default constr {} ACE_INLINE -Messaging::RequestPriorityPolicy::RequestPriorityPolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor - : CORBA_Object (objref, _tao_servant, _tao_collocated) -{} - -ACE_INLINE Messaging::RequestPriorityPolicy::~RequestPriorityPolicy (void) // destructor {} -ACE_INLINE Messaging::RequestPriorityPolicy_ptr -Messaging::RequestPriorityPolicy::_duplicate (Messaging::RequestPriorityPolicy_ptr obj) -{ - if (!CORBA::is_nil (obj)) - obj->_add_ref (); - return obj; -} -ACE_INLINE Messaging::RequestPriorityPolicy_ptr -Messaging::RequestPriorityPolicy::_nil (void) -{ - return (Messaging::RequestPriorityPolicy_ptr)0; -} +#if !defined (_MESSAGING_REQUESTPRIORITYPOLICY___VAR_CI_) +#define _MESSAGING_REQUESTPRIORITYPOLICY___VAR_CI_ // ************************************************************* // Inline operations for class Messaging::RequestPriorityPolicy_var @@ -537,23 +527,23 @@ Messaging::RequestPriorityPolicy::_nil (void) ACE_INLINE Messaging::RequestPriorityPolicy_var::RequestPriorityPolicy_var (void) // default constructor - : ptr_ (Messaging::RequestPriorityPolicy::_nil ()) + : ptr_ (RequestPriorityPolicy::_nil ()) {} ACE_INLINE -Messaging::RequestPriorityPolicy_var::RequestPriorityPolicy_var (Messaging::RequestPriorityPolicy_ptr p) +Messaging::RequestPriorityPolicy_var::RequestPriorityPolicy_var (RequestPriorityPolicy_ptr p) : ptr_ (p) {} -ACE_INLINE Messaging::RequestPriorityPolicy_ptr +ACE_INLINE ::Messaging::RequestPriorityPolicy_ptr Messaging::RequestPriorityPolicy_var::ptr (void) const { return this->ptr_; } ACE_INLINE -Messaging::RequestPriorityPolicy_var::RequestPriorityPolicy_var (const Messaging::RequestPriorityPolicy_var &p) // copy constructor - : ptr_ (Messaging::RequestPriorityPolicy::_duplicate (p.ptr ())) +Messaging::RequestPriorityPolicy_var::RequestPriorityPolicy_var (const ::Messaging::RequestPriorityPolicy_var &p) // copy constructor + : ptr_ (RequestPriorityPolicy::_duplicate (p.ptr ())) {} ACE_INLINE @@ -563,7 +553,7 @@ Messaging::RequestPriorityPolicy_var::~RequestPriorityPolicy_var (void) // destr } ACE_INLINE Messaging::RequestPriorityPolicy_var & -Messaging::RequestPriorityPolicy_var::operator= (Messaging::RequestPriorityPolicy_ptr p) +Messaging::RequestPriorityPolicy_var::operator= (RequestPriorityPolicy_ptr p) { CORBA::release (this->ptr_); this->ptr_ = p; @@ -571,152 +561,147 @@ Messaging::RequestPriorityPolicy_var::operator= (Messaging::RequestPriorityPolic } ACE_INLINE Messaging::RequestPriorityPolicy_var & -Messaging::RequestPriorityPolicy_var::operator= (const Messaging::RequestPriorityPolicy_var &p) +Messaging::RequestPriorityPolicy_var::operator= (const ::Messaging::RequestPriorityPolicy_var &p) { if (this != &p) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::RequestPriorityPolicy::_duplicate (p.ptr ()); + this->ptr_ = ::Messaging::RequestPriorityPolicy::_duplicate (p.ptr ()); } return *this; } -ACE_INLINE -Messaging::RequestPriorityPolicy_var::operator const Messaging::RequestPriorityPolicy_ptr &() const // cast +ACE_INLINE +Messaging::RequestPriorityPolicy_var::operator const ::Messaging::RequestPriorityPolicy_ptr &() const // cast { return this->ptr_; } -ACE_INLINE -Messaging::RequestPriorityPolicy_var::operator Messaging::RequestPriorityPolicy_ptr &() // cast +ACE_INLINE +Messaging::RequestPriorityPolicy_var::operator ::Messaging::RequestPriorityPolicy_ptr &() // cast { return this->ptr_; } -ACE_INLINE Messaging::RequestPriorityPolicy_ptr +ACE_INLINE ::Messaging::RequestPriorityPolicy_ptr Messaging::RequestPriorityPolicy_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE Messaging::RequestPriorityPolicy_ptr +ACE_INLINE ::Messaging::RequestPriorityPolicy_ptr Messaging::RequestPriorityPolicy_var::in (void) const { return this->ptr_; } -ACE_INLINE Messaging::RequestPriorityPolicy_ptr & +ACE_INLINE ::Messaging::RequestPriorityPolicy_ptr & Messaging::RequestPriorityPolicy_var::inout (void) { return this->ptr_; } -ACE_INLINE Messaging::RequestPriorityPolicy_ptr & +ACE_INLINE ::Messaging::RequestPriorityPolicy_ptr & Messaging::RequestPriorityPolicy_var::out (void) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::RequestPriorityPolicy::_nil (); + this->ptr_ = ::Messaging::RequestPriorityPolicy::_nil (); return this->ptr_; } -ACE_INLINE Messaging::RequestPriorityPolicy_ptr +ACE_INLINE ::Messaging::RequestPriorityPolicy_ptr Messaging::RequestPriorityPolicy_var::_retn (void) { // yield ownership of managed obj reference - Messaging::RequestPriorityPolicy_ptr val = this->ptr_; - this->ptr_ = Messaging::RequestPriorityPolicy::_nil (); + ::Messaging::RequestPriorityPolicy_ptr val = this->ptr_; + this->ptr_ = ::Messaging::RequestPriorityPolicy::_nil (); return val; } + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_REQUESTPRIORITYPOLICY___OUT_CI_) +#define _MESSAGING_REQUESTPRIORITYPOLICY___OUT_CI_ + // ************************************************************* // Inline operations for class Messaging::RequestPriorityPolicy_out // ************************************************************* ACE_INLINE -Messaging::RequestPriorityPolicy_out::RequestPriorityPolicy_out (Messaging::RequestPriorityPolicy_ptr &p) +Messaging::RequestPriorityPolicy_out::RequestPriorityPolicy_out (RequestPriorityPolicy_ptr &p) : ptr_ (p) { - this->ptr_ = Messaging::RequestPriorityPolicy::_nil (); + this->ptr_ = ::Messaging::RequestPriorityPolicy::_nil (); } ACE_INLINE -Messaging::RequestPriorityPolicy_out::RequestPriorityPolicy_out (Messaging::RequestPriorityPolicy_var &p) // constructor from _var +Messaging::RequestPriorityPolicy_out::RequestPriorityPolicy_out (RequestPriorityPolicy_var &p) // constructor from _var : ptr_ (p.out ()) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::RequestPriorityPolicy::_nil (); + this->ptr_ = ::Messaging::RequestPriorityPolicy::_nil (); } ACE_INLINE -Messaging::RequestPriorityPolicy_out::RequestPriorityPolicy_out (const Messaging::RequestPriorityPolicy_out &p) // copy constructor - : ptr_ (ACE_const_cast (Messaging::RequestPriorityPolicy_out&,p).ptr_) +Messaging::RequestPriorityPolicy_out::RequestPriorityPolicy_out (const ::Messaging::RequestPriorityPolicy_out &p) // copy constructor + : ptr_ (ACE_const_cast (RequestPriorityPolicy_out &, p).ptr_) {} -ACE_INLINE Messaging::RequestPriorityPolicy_out & -Messaging::RequestPriorityPolicy_out::operator= (const Messaging::RequestPriorityPolicy_out &p) +ACE_INLINE ::Messaging::RequestPriorityPolicy_out & +Messaging::RequestPriorityPolicy_out::operator= (const ::Messaging::RequestPriorityPolicy_out &p) { - this->ptr_ = ACE_const_cast (Messaging::RequestPriorityPolicy_out&,p).ptr_; + this->ptr_ = ACE_const_cast (RequestPriorityPolicy_out&, p).ptr_; return *this; } ACE_INLINE Messaging::RequestPriorityPolicy_out & -Messaging::RequestPriorityPolicy_out::operator= (const Messaging::RequestPriorityPolicy_var &p) +Messaging::RequestPriorityPolicy_out::operator= (const ::Messaging::RequestPriorityPolicy_var &p) { - this->ptr_ = Messaging::RequestPriorityPolicy::_duplicate (p.ptr ()); + this->ptr_ = ::Messaging::RequestPriorityPolicy::_duplicate (p.ptr ()); return *this; } ACE_INLINE Messaging::RequestPriorityPolicy_out & -Messaging::RequestPriorityPolicy_out::operator= (Messaging::RequestPriorityPolicy_ptr p) +Messaging::RequestPriorityPolicy_out::operator= (RequestPriorityPolicy_ptr p) { this->ptr_ = p; return *this; } -ACE_INLINE -Messaging::RequestPriorityPolicy_out::operator Messaging::RequestPriorityPolicy_ptr &() // cast +ACE_INLINE +Messaging::RequestPriorityPolicy_out::operator ::Messaging::RequestPriorityPolicy_ptr &() // cast { return this->ptr_; } -ACE_INLINE Messaging::RequestPriorityPolicy_ptr & +ACE_INLINE ::Messaging::RequestPriorityPolicy_ptr & Messaging::RequestPriorityPolicy_out::ptr (void) // ptr { return this->ptr_; } -ACE_INLINE Messaging::RequestPriorityPolicy_ptr +ACE_INLINE ::Messaging::RequestPriorityPolicy_ptr Messaging::RequestPriorityPolicy_out::operator-> (void) { return this->ptr_; } -ACE_INLINE -Messaging::ReplyPriorityPolicy::ReplyPriorityPolicy (void) // default constructor -{} + +#endif /* end #if !defined */ ACE_INLINE -Messaging::ReplyPriorityPolicy::ReplyPriorityPolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor - : CORBA_Object (objref, _tao_servant, _tao_collocated) +Messaging::ReplyPriorityPolicy::ReplyPriorityPolicy (void) // default constructor {} ACE_INLINE Messaging::ReplyPriorityPolicy::~ReplyPriorityPolicy (void) // destructor {} -ACE_INLINE Messaging::ReplyPriorityPolicy_ptr -Messaging::ReplyPriorityPolicy::_duplicate (Messaging::ReplyPriorityPolicy_ptr obj) -{ - if (!CORBA::is_nil (obj)) - obj->_add_ref (); - return obj; -} -ACE_INLINE Messaging::ReplyPriorityPolicy_ptr -Messaging::ReplyPriorityPolicy::_nil (void) -{ - return (Messaging::ReplyPriorityPolicy_ptr)0; -} +#if !defined (_MESSAGING_REPLYPRIORITYPOLICY___VAR_CI_) +#define _MESSAGING_REPLYPRIORITYPOLICY___VAR_CI_ // ************************************************************* // Inline operations for class Messaging::ReplyPriorityPolicy_var @@ -724,23 +709,23 @@ Messaging::ReplyPriorityPolicy::_nil (void) ACE_INLINE Messaging::ReplyPriorityPolicy_var::ReplyPriorityPolicy_var (void) // default constructor - : ptr_ (Messaging::ReplyPriorityPolicy::_nil ()) + : ptr_ (ReplyPriorityPolicy::_nil ()) {} ACE_INLINE -Messaging::ReplyPriorityPolicy_var::ReplyPriorityPolicy_var (Messaging::ReplyPriorityPolicy_ptr p) +Messaging::ReplyPriorityPolicy_var::ReplyPriorityPolicy_var (ReplyPriorityPolicy_ptr p) : ptr_ (p) {} -ACE_INLINE Messaging::ReplyPriorityPolicy_ptr +ACE_INLINE ::Messaging::ReplyPriorityPolicy_ptr Messaging::ReplyPriorityPolicy_var::ptr (void) const { return this->ptr_; } ACE_INLINE -Messaging::ReplyPriorityPolicy_var::ReplyPriorityPolicy_var (const Messaging::ReplyPriorityPolicy_var &p) // copy constructor - : ptr_ (Messaging::ReplyPriorityPolicy::_duplicate (p.ptr ())) +Messaging::ReplyPriorityPolicy_var::ReplyPriorityPolicy_var (const ::Messaging::ReplyPriorityPolicy_var &p) // copy constructor + : ptr_ (ReplyPriorityPolicy::_duplicate (p.ptr ())) {} ACE_INLINE @@ -750,7 +735,7 @@ Messaging::ReplyPriorityPolicy_var::~ReplyPriorityPolicy_var (void) // destructo } ACE_INLINE Messaging::ReplyPriorityPolicy_var & -Messaging::ReplyPriorityPolicy_var::operator= (Messaging::ReplyPriorityPolicy_ptr p) +Messaging::ReplyPriorityPolicy_var::operator= (ReplyPriorityPolicy_ptr p) { CORBA::release (this->ptr_); this->ptr_ = p; @@ -758,126 +743,136 @@ Messaging::ReplyPriorityPolicy_var::operator= (Messaging::ReplyPriorityPolicy_pt } ACE_INLINE Messaging::ReplyPriorityPolicy_var & -Messaging::ReplyPriorityPolicy_var::operator= (const Messaging::ReplyPriorityPolicy_var &p) +Messaging::ReplyPriorityPolicy_var::operator= (const ::Messaging::ReplyPriorityPolicy_var &p) { if (this != &p) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::ReplyPriorityPolicy::_duplicate (p.ptr ()); + this->ptr_ = ::Messaging::ReplyPriorityPolicy::_duplicate (p.ptr ()); } return *this; } -ACE_INLINE -Messaging::ReplyPriorityPolicy_var::operator const Messaging::ReplyPriorityPolicy_ptr &() const // cast +ACE_INLINE +Messaging::ReplyPriorityPolicy_var::operator const ::Messaging::ReplyPriorityPolicy_ptr &() const // cast { return this->ptr_; } -ACE_INLINE -Messaging::ReplyPriorityPolicy_var::operator Messaging::ReplyPriorityPolicy_ptr &() // cast +ACE_INLINE +Messaging::ReplyPriorityPolicy_var::operator ::Messaging::ReplyPriorityPolicy_ptr &() // cast { return this->ptr_; } -ACE_INLINE Messaging::ReplyPriorityPolicy_ptr +ACE_INLINE ::Messaging::ReplyPriorityPolicy_ptr Messaging::ReplyPriorityPolicy_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE Messaging::ReplyPriorityPolicy_ptr +ACE_INLINE ::Messaging::ReplyPriorityPolicy_ptr Messaging::ReplyPriorityPolicy_var::in (void) const { return this->ptr_; } -ACE_INLINE Messaging::ReplyPriorityPolicy_ptr & +ACE_INLINE ::Messaging::ReplyPriorityPolicy_ptr & Messaging::ReplyPriorityPolicy_var::inout (void) { return this->ptr_; } -ACE_INLINE Messaging::ReplyPriorityPolicy_ptr & +ACE_INLINE ::Messaging::ReplyPriorityPolicy_ptr & Messaging::ReplyPriorityPolicy_var::out (void) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::ReplyPriorityPolicy::_nil (); + this->ptr_ = ::Messaging::ReplyPriorityPolicy::_nil (); return this->ptr_; } -ACE_INLINE Messaging::ReplyPriorityPolicy_ptr +ACE_INLINE ::Messaging::ReplyPriorityPolicy_ptr Messaging::ReplyPriorityPolicy_var::_retn (void) { // yield ownership of managed obj reference - Messaging::ReplyPriorityPolicy_ptr val = this->ptr_; - this->ptr_ = Messaging::ReplyPriorityPolicy::_nil (); + ::Messaging::ReplyPriorityPolicy_ptr val = this->ptr_; + this->ptr_ = ::Messaging::ReplyPriorityPolicy::_nil (); return val; } + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_REPLYPRIORITYPOLICY___OUT_CI_) +#define _MESSAGING_REPLYPRIORITYPOLICY___OUT_CI_ + // ************************************************************* // Inline operations for class Messaging::ReplyPriorityPolicy_out // ************************************************************* ACE_INLINE -Messaging::ReplyPriorityPolicy_out::ReplyPriorityPolicy_out (Messaging::ReplyPriorityPolicy_ptr &p) +Messaging::ReplyPriorityPolicy_out::ReplyPriorityPolicy_out (ReplyPriorityPolicy_ptr &p) : ptr_ (p) { - this->ptr_ = Messaging::ReplyPriorityPolicy::_nil (); + this->ptr_ = ::Messaging::ReplyPriorityPolicy::_nil (); } ACE_INLINE -Messaging::ReplyPriorityPolicy_out::ReplyPriorityPolicy_out (Messaging::ReplyPriorityPolicy_var &p) // constructor from _var +Messaging::ReplyPriorityPolicy_out::ReplyPriorityPolicy_out (ReplyPriorityPolicy_var &p) // constructor from _var : ptr_ (p.out ()) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::ReplyPriorityPolicy::_nil (); + this->ptr_ = ::Messaging::ReplyPriorityPolicy::_nil (); } ACE_INLINE -Messaging::ReplyPriorityPolicy_out::ReplyPriorityPolicy_out (const Messaging::ReplyPriorityPolicy_out &p) // copy constructor - : ptr_ (ACE_const_cast (Messaging::ReplyPriorityPolicy_out&,p).ptr_) +Messaging::ReplyPriorityPolicy_out::ReplyPriorityPolicy_out (const ::Messaging::ReplyPriorityPolicy_out &p) // copy constructor + : ptr_ (ACE_const_cast (ReplyPriorityPolicy_out &, p).ptr_) {} -ACE_INLINE Messaging::ReplyPriorityPolicy_out & -Messaging::ReplyPriorityPolicy_out::operator= (const Messaging::ReplyPriorityPolicy_out &p) +ACE_INLINE ::Messaging::ReplyPriorityPolicy_out & +Messaging::ReplyPriorityPolicy_out::operator= (const ::Messaging::ReplyPriorityPolicy_out &p) { - this->ptr_ = ACE_const_cast (Messaging::ReplyPriorityPolicy_out&,p).ptr_; + this->ptr_ = ACE_const_cast (ReplyPriorityPolicy_out&, p).ptr_; return *this; } ACE_INLINE Messaging::ReplyPriorityPolicy_out & -Messaging::ReplyPriorityPolicy_out::operator= (const Messaging::ReplyPriorityPolicy_var &p) +Messaging::ReplyPriorityPolicy_out::operator= (const ::Messaging::ReplyPriorityPolicy_var &p) { - this->ptr_ = Messaging::ReplyPriorityPolicy::_duplicate (p.ptr ()); + this->ptr_ = ::Messaging::ReplyPriorityPolicy::_duplicate (p.ptr ()); return *this; } ACE_INLINE Messaging::ReplyPriorityPolicy_out & -Messaging::ReplyPriorityPolicy_out::operator= (Messaging::ReplyPriorityPolicy_ptr p) +Messaging::ReplyPriorityPolicy_out::operator= (ReplyPriorityPolicy_ptr p) { this->ptr_ = p; return *this; } -ACE_INLINE -Messaging::ReplyPriorityPolicy_out::operator Messaging::ReplyPriorityPolicy_ptr &() // cast +ACE_INLINE +Messaging::ReplyPriorityPolicy_out::operator ::Messaging::ReplyPriorityPolicy_ptr &() // cast { return this->ptr_; } -ACE_INLINE Messaging::ReplyPriorityPolicy_ptr & +ACE_INLINE ::Messaging::ReplyPriorityPolicy_ptr & Messaging::ReplyPriorityPolicy_out::ptr (void) // ptr { return this->ptr_; } -ACE_INLINE Messaging::ReplyPriorityPolicy_ptr +ACE_INLINE ::Messaging::ReplyPriorityPolicy_ptr Messaging::ReplyPriorityPolicy_out::operator-> (void) { return this->ptr_; } + +#endif /* end #if !defined */ + #endif /* TAO_HAS_PRIORITY_POLICIES == 1 */ #if (TAO_HAS_REQUEST_START_TIME_POLICY == 1) @@ -887,27 +882,12 @@ Messaging::RequestStartTimePolicy::RequestStartTimePolicy (void) // default cons {} ACE_INLINE -Messaging::RequestStartTimePolicy::RequestStartTimePolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor - : CORBA_Object (objref, _tao_servant, _tao_collocated) -{} - -ACE_INLINE Messaging::RequestStartTimePolicy::~RequestStartTimePolicy (void) // destructor {} -ACE_INLINE Messaging::RequestStartTimePolicy_ptr -Messaging::RequestStartTimePolicy::_duplicate (Messaging::RequestStartTimePolicy_ptr obj) -{ - if (!CORBA::is_nil (obj)) - obj->_add_ref (); - return obj; -} -ACE_INLINE Messaging::RequestStartTimePolicy_ptr -Messaging::RequestStartTimePolicy::_nil (void) -{ - return (Messaging::RequestStartTimePolicy_ptr)0; -} +#if !defined (_MESSAGING_REQUESTSTARTTIMEPOLICY___VAR_CI_) +#define _MESSAGING_REQUESTSTARTTIMEPOLICY___VAR_CI_ // ************************************************************* // Inline operations for class Messaging::RequestStartTimePolicy_var @@ -915,23 +895,23 @@ Messaging::RequestStartTimePolicy::_nil (void) ACE_INLINE Messaging::RequestStartTimePolicy_var::RequestStartTimePolicy_var (void) // default constructor - : ptr_ (Messaging::RequestStartTimePolicy::_nil ()) + : ptr_ (RequestStartTimePolicy::_nil ()) {} ACE_INLINE -Messaging::RequestStartTimePolicy_var::RequestStartTimePolicy_var (Messaging::RequestStartTimePolicy_ptr p) +Messaging::RequestStartTimePolicy_var::RequestStartTimePolicy_var (RequestStartTimePolicy_ptr p) : ptr_ (p) {} -ACE_INLINE Messaging::RequestStartTimePolicy_ptr +ACE_INLINE ::Messaging::RequestStartTimePolicy_ptr Messaging::RequestStartTimePolicy_var::ptr (void) const { return this->ptr_; } ACE_INLINE -Messaging::RequestStartTimePolicy_var::RequestStartTimePolicy_var (const Messaging::RequestStartTimePolicy_var &p) // copy constructor - : ptr_ (Messaging::RequestStartTimePolicy::_duplicate (p.ptr ())) +Messaging::RequestStartTimePolicy_var::RequestStartTimePolicy_var (const ::Messaging::RequestStartTimePolicy_var &p) // copy constructor + : ptr_ (RequestStartTimePolicy::_duplicate (p.ptr ())) {} ACE_INLINE @@ -941,7 +921,7 @@ Messaging::RequestStartTimePolicy_var::~RequestStartTimePolicy_var (void) // des } ACE_INLINE Messaging::RequestStartTimePolicy_var & -Messaging::RequestStartTimePolicy_var::operator= (Messaging::RequestStartTimePolicy_ptr p) +Messaging::RequestStartTimePolicy_var::operator= (RequestStartTimePolicy_ptr p) { CORBA::release (this->ptr_); this->ptr_ = p; @@ -949,126 +929,136 @@ Messaging::RequestStartTimePolicy_var::operator= (Messaging::RequestStartTimePol } ACE_INLINE Messaging::RequestStartTimePolicy_var & -Messaging::RequestStartTimePolicy_var::operator= (const Messaging::RequestStartTimePolicy_var &p) +Messaging::RequestStartTimePolicy_var::operator= (const ::Messaging::RequestStartTimePolicy_var &p) { if (this != &p) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::RequestStartTimePolicy::_duplicate (p.ptr ()); + this->ptr_ = ::Messaging::RequestStartTimePolicy::_duplicate (p.ptr ()); } return *this; } -ACE_INLINE -Messaging::RequestStartTimePolicy_var::operator const Messaging::RequestStartTimePolicy_ptr &() const // cast +ACE_INLINE +Messaging::RequestStartTimePolicy_var::operator const ::Messaging::RequestStartTimePolicy_ptr &() const // cast { return this->ptr_; } -ACE_INLINE -Messaging::RequestStartTimePolicy_var::operator Messaging::RequestStartTimePolicy_ptr &() // cast +ACE_INLINE +Messaging::RequestStartTimePolicy_var::operator ::Messaging::RequestStartTimePolicy_ptr &() // cast { return this->ptr_; } -ACE_INLINE Messaging::RequestStartTimePolicy_ptr +ACE_INLINE ::Messaging::RequestStartTimePolicy_ptr Messaging::RequestStartTimePolicy_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE Messaging::RequestStartTimePolicy_ptr +ACE_INLINE ::Messaging::RequestStartTimePolicy_ptr Messaging::RequestStartTimePolicy_var::in (void) const { return this->ptr_; } -ACE_INLINE Messaging::RequestStartTimePolicy_ptr & +ACE_INLINE ::Messaging::RequestStartTimePolicy_ptr & Messaging::RequestStartTimePolicy_var::inout (void) { return this->ptr_; } -ACE_INLINE Messaging::RequestStartTimePolicy_ptr & +ACE_INLINE ::Messaging::RequestStartTimePolicy_ptr & Messaging::RequestStartTimePolicy_var::out (void) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::RequestStartTimePolicy::_nil (); + this->ptr_ = ::Messaging::RequestStartTimePolicy::_nil (); return this->ptr_; } -ACE_INLINE Messaging::RequestStartTimePolicy_ptr +ACE_INLINE ::Messaging::RequestStartTimePolicy_ptr Messaging::RequestStartTimePolicy_var::_retn (void) { // yield ownership of managed obj reference - Messaging::RequestStartTimePolicy_ptr val = this->ptr_; - this->ptr_ = Messaging::RequestStartTimePolicy::_nil (); + ::Messaging::RequestStartTimePolicy_ptr val = this->ptr_; + this->ptr_ = ::Messaging::RequestStartTimePolicy::_nil (); return val; } + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_REQUESTSTARTTIMEPOLICY___OUT_CI_) +#define _MESSAGING_REQUESTSTARTTIMEPOLICY___OUT_CI_ + // ************************************************************* // Inline operations for class Messaging::RequestStartTimePolicy_out // ************************************************************* ACE_INLINE -Messaging::RequestStartTimePolicy_out::RequestStartTimePolicy_out (Messaging::RequestStartTimePolicy_ptr &p) +Messaging::RequestStartTimePolicy_out::RequestStartTimePolicy_out (RequestStartTimePolicy_ptr &p) : ptr_ (p) { - this->ptr_ = Messaging::RequestStartTimePolicy::_nil (); + this->ptr_ = ::Messaging::RequestStartTimePolicy::_nil (); } ACE_INLINE -Messaging::RequestStartTimePolicy_out::RequestStartTimePolicy_out (Messaging::RequestStartTimePolicy_var &p) // constructor from _var +Messaging::RequestStartTimePolicy_out::RequestStartTimePolicy_out (RequestStartTimePolicy_var &p) // constructor from _var : ptr_ (p.out ()) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::RequestStartTimePolicy::_nil (); + this->ptr_ = ::Messaging::RequestStartTimePolicy::_nil (); } ACE_INLINE -Messaging::RequestStartTimePolicy_out::RequestStartTimePolicy_out (const Messaging::RequestStartTimePolicy_out &p) // copy constructor - : ptr_ (ACE_const_cast (Messaging::RequestStartTimePolicy_out&,p).ptr_) +Messaging::RequestStartTimePolicy_out::RequestStartTimePolicy_out (const ::Messaging::RequestStartTimePolicy_out &p) // copy constructor + : ptr_ (ACE_const_cast (RequestStartTimePolicy_out &, p).ptr_) {} -ACE_INLINE Messaging::RequestStartTimePolicy_out & -Messaging::RequestStartTimePolicy_out::operator= (const Messaging::RequestStartTimePolicy_out &p) +ACE_INLINE ::Messaging::RequestStartTimePolicy_out & +Messaging::RequestStartTimePolicy_out::operator= (const ::Messaging::RequestStartTimePolicy_out &p) { - this->ptr_ = ACE_const_cast (Messaging::RequestStartTimePolicy_out&,p).ptr_; + this->ptr_ = ACE_const_cast (RequestStartTimePolicy_out&, p).ptr_; return *this; } ACE_INLINE Messaging::RequestStartTimePolicy_out & -Messaging::RequestStartTimePolicy_out::operator= (const Messaging::RequestStartTimePolicy_var &p) +Messaging::RequestStartTimePolicy_out::operator= (const ::Messaging::RequestStartTimePolicy_var &p) { - this->ptr_ = Messaging::RequestStartTimePolicy::_duplicate (p.ptr ()); + this->ptr_ = ::Messaging::RequestStartTimePolicy::_duplicate (p.ptr ()); return *this; } ACE_INLINE Messaging::RequestStartTimePolicy_out & -Messaging::RequestStartTimePolicy_out::operator= (Messaging::RequestStartTimePolicy_ptr p) +Messaging::RequestStartTimePolicy_out::operator= (RequestStartTimePolicy_ptr p) { this->ptr_ = p; return *this; } -ACE_INLINE -Messaging::RequestStartTimePolicy_out::operator Messaging::RequestStartTimePolicy_ptr &() // cast +ACE_INLINE +Messaging::RequestStartTimePolicy_out::operator ::Messaging::RequestStartTimePolicy_ptr &() // cast { return this->ptr_; } -ACE_INLINE Messaging::RequestStartTimePolicy_ptr & +ACE_INLINE ::Messaging::RequestStartTimePolicy_ptr & Messaging::RequestStartTimePolicy_out::ptr (void) // ptr { return this->ptr_; } -ACE_INLINE Messaging::RequestStartTimePolicy_ptr +ACE_INLINE ::Messaging::RequestStartTimePolicy_ptr Messaging::RequestStartTimePolicy_out::operator-> (void) { return this->ptr_; } + +#endif /* end #if !defined */ + #endif /* TAO_HAS_REQUEST_START_TIME_POLICY == 1 */ #if (TAO_HAS_REQUEST_END_TIME_POLICY == 1) @@ -1078,27 +1068,12 @@ Messaging::RequestEndTimePolicy::RequestEndTimePolicy (void) // default construc {} ACE_INLINE -Messaging::RequestEndTimePolicy::RequestEndTimePolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor - : CORBA_Object (objref, _tao_servant, _tao_collocated) -{} - -ACE_INLINE Messaging::RequestEndTimePolicy::~RequestEndTimePolicy (void) // destructor {} -ACE_INLINE Messaging::RequestEndTimePolicy_ptr -Messaging::RequestEndTimePolicy::_duplicate (Messaging::RequestEndTimePolicy_ptr obj) -{ - if (!CORBA::is_nil (obj)) - obj->_add_ref (); - return obj; -} -ACE_INLINE Messaging::RequestEndTimePolicy_ptr -Messaging::RequestEndTimePolicy::_nil (void) -{ - return (Messaging::RequestEndTimePolicy_ptr)0; -} +#if !defined (_MESSAGING_REQUESTENDTIMEPOLICY___VAR_CI_) +#define _MESSAGING_REQUESTENDTIMEPOLICY___VAR_CI_ // ************************************************************* // Inline operations for class Messaging::RequestEndTimePolicy_var @@ -1106,23 +1081,23 @@ Messaging::RequestEndTimePolicy::_nil (void) ACE_INLINE Messaging::RequestEndTimePolicy_var::RequestEndTimePolicy_var (void) // default constructor - : ptr_ (Messaging::RequestEndTimePolicy::_nil ()) + : ptr_ (RequestEndTimePolicy::_nil ()) {} ACE_INLINE -Messaging::RequestEndTimePolicy_var::RequestEndTimePolicy_var (Messaging::RequestEndTimePolicy_ptr p) +Messaging::RequestEndTimePolicy_var::RequestEndTimePolicy_var (RequestEndTimePolicy_ptr p) : ptr_ (p) {} -ACE_INLINE Messaging::RequestEndTimePolicy_ptr +ACE_INLINE ::Messaging::RequestEndTimePolicy_ptr Messaging::RequestEndTimePolicy_var::ptr (void) const { return this->ptr_; } ACE_INLINE -Messaging::RequestEndTimePolicy_var::RequestEndTimePolicy_var (const Messaging::RequestEndTimePolicy_var &p) // copy constructor - : ptr_ (Messaging::RequestEndTimePolicy::_duplicate (p.ptr ())) +Messaging::RequestEndTimePolicy_var::RequestEndTimePolicy_var (const ::Messaging::RequestEndTimePolicy_var &p) // copy constructor + : ptr_ (RequestEndTimePolicy::_duplicate (p.ptr ())) {} ACE_INLINE @@ -1132,7 +1107,7 @@ Messaging::RequestEndTimePolicy_var::~RequestEndTimePolicy_var (void) // destruc } ACE_INLINE Messaging::RequestEndTimePolicy_var & -Messaging::RequestEndTimePolicy_var::operator= (Messaging::RequestEndTimePolicy_ptr p) +Messaging::RequestEndTimePolicy_var::operator= (RequestEndTimePolicy_ptr p) { CORBA::release (this->ptr_); this->ptr_ = p; @@ -1140,126 +1115,136 @@ Messaging::RequestEndTimePolicy_var::operator= (Messaging::RequestEndTimePolicy_ } ACE_INLINE Messaging::RequestEndTimePolicy_var & -Messaging::RequestEndTimePolicy_var::operator= (const Messaging::RequestEndTimePolicy_var &p) +Messaging::RequestEndTimePolicy_var::operator= (const ::Messaging::RequestEndTimePolicy_var &p) { if (this != &p) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::RequestEndTimePolicy::_duplicate (p.ptr ()); + this->ptr_ = ::Messaging::RequestEndTimePolicy::_duplicate (p.ptr ()); } return *this; } -ACE_INLINE -Messaging::RequestEndTimePolicy_var::operator const Messaging::RequestEndTimePolicy_ptr &() const // cast +ACE_INLINE +Messaging::RequestEndTimePolicy_var::operator const ::Messaging::RequestEndTimePolicy_ptr &() const // cast { return this->ptr_; } -ACE_INLINE -Messaging::RequestEndTimePolicy_var::operator Messaging::RequestEndTimePolicy_ptr &() // cast +ACE_INLINE +Messaging::RequestEndTimePolicy_var::operator ::Messaging::RequestEndTimePolicy_ptr &() // cast { return this->ptr_; } -ACE_INLINE Messaging::RequestEndTimePolicy_ptr +ACE_INLINE ::Messaging::RequestEndTimePolicy_ptr Messaging::RequestEndTimePolicy_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE Messaging::RequestEndTimePolicy_ptr +ACE_INLINE ::Messaging::RequestEndTimePolicy_ptr Messaging::RequestEndTimePolicy_var::in (void) const { return this->ptr_; } -ACE_INLINE Messaging::RequestEndTimePolicy_ptr & +ACE_INLINE ::Messaging::RequestEndTimePolicy_ptr & Messaging::RequestEndTimePolicy_var::inout (void) { return this->ptr_; } -ACE_INLINE Messaging::RequestEndTimePolicy_ptr & +ACE_INLINE ::Messaging::RequestEndTimePolicy_ptr & Messaging::RequestEndTimePolicy_var::out (void) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::RequestEndTimePolicy::_nil (); + this->ptr_ = ::Messaging::RequestEndTimePolicy::_nil (); return this->ptr_; } -ACE_INLINE Messaging::RequestEndTimePolicy_ptr +ACE_INLINE ::Messaging::RequestEndTimePolicy_ptr Messaging::RequestEndTimePolicy_var::_retn (void) { // yield ownership of managed obj reference - Messaging::RequestEndTimePolicy_ptr val = this->ptr_; - this->ptr_ = Messaging::RequestEndTimePolicy::_nil (); + ::Messaging::RequestEndTimePolicy_ptr val = this->ptr_; + this->ptr_ = ::Messaging::RequestEndTimePolicy::_nil (); return val; } + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_REQUESTENDTIMEPOLICY___OUT_CI_) +#define _MESSAGING_REQUESTENDTIMEPOLICY___OUT_CI_ + // ************************************************************* // Inline operations for class Messaging::RequestEndTimePolicy_out // ************************************************************* ACE_INLINE -Messaging::RequestEndTimePolicy_out::RequestEndTimePolicy_out (Messaging::RequestEndTimePolicy_ptr &p) +Messaging::RequestEndTimePolicy_out::RequestEndTimePolicy_out (RequestEndTimePolicy_ptr &p) : ptr_ (p) { - this->ptr_ = Messaging::RequestEndTimePolicy::_nil (); + this->ptr_ = ::Messaging::RequestEndTimePolicy::_nil (); } ACE_INLINE -Messaging::RequestEndTimePolicy_out::RequestEndTimePolicy_out (Messaging::RequestEndTimePolicy_var &p) // constructor from _var +Messaging::RequestEndTimePolicy_out::RequestEndTimePolicy_out (RequestEndTimePolicy_var &p) // constructor from _var : ptr_ (p.out ()) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::RequestEndTimePolicy::_nil (); + this->ptr_ = ::Messaging::RequestEndTimePolicy::_nil (); } ACE_INLINE -Messaging::RequestEndTimePolicy_out::RequestEndTimePolicy_out (const Messaging::RequestEndTimePolicy_out &p) // copy constructor - : ptr_ (ACE_const_cast (Messaging::RequestEndTimePolicy_out&,p).ptr_) +Messaging::RequestEndTimePolicy_out::RequestEndTimePolicy_out (const ::Messaging::RequestEndTimePolicy_out &p) // copy constructor + : ptr_ (ACE_const_cast (RequestEndTimePolicy_out &, p).ptr_) {} -ACE_INLINE Messaging::RequestEndTimePolicy_out & -Messaging::RequestEndTimePolicy_out::operator= (const Messaging::RequestEndTimePolicy_out &p) +ACE_INLINE ::Messaging::RequestEndTimePolicy_out & +Messaging::RequestEndTimePolicy_out::operator= (const ::Messaging::RequestEndTimePolicy_out &p) { - this->ptr_ = ACE_const_cast (Messaging::RequestEndTimePolicy_out&,p).ptr_; + this->ptr_ = ACE_const_cast (RequestEndTimePolicy_out&, p).ptr_; return *this; } ACE_INLINE Messaging::RequestEndTimePolicy_out & -Messaging::RequestEndTimePolicy_out::operator= (const Messaging::RequestEndTimePolicy_var &p) +Messaging::RequestEndTimePolicy_out::operator= (const ::Messaging::RequestEndTimePolicy_var &p) { - this->ptr_ = Messaging::RequestEndTimePolicy::_duplicate (p.ptr ()); + this->ptr_ = ::Messaging::RequestEndTimePolicy::_duplicate (p.ptr ()); return *this; } ACE_INLINE Messaging::RequestEndTimePolicy_out & -Messaging::RequestEndTimePolicy_out::operator= (Messaging::RequestEndTimePolicy_ptr p) +Messaging::RequestEndTimePolicy_out::operator= (RequestEndTimePolicy_ptr p) { this->ptr_ = p; return *this; } -ACE_INLINE -Messaging::RequestEndTimePolicy_out::operator Messaging::RequestEndTimePolicy_ptr &() // cast +ACE_INLINE +Messaging::RequestEndTimePolicy_out::operator ::Messaging::RequestEndTimePolicy_ptr &() // cast { return this->ptr_; } -ACE_INLINE Messaging::RequestEndTimePolicy_ptr & +ACE_INLINE ::Messaging::RequestEndTimePolicy_ptr & Messaging::RequestEndTimePolicy_out::ptr (void) // ptr { return this->ptr_; } -ACE_INLINE Messaging::RequestEndTimePolicy_ptr +ACE_INLINE ::Messaging::RequestEndTimePolicy_ptr Messaging::RequestEndTimePolicy_out::operator-> (void) { return this->ptr_; } + +#endif /* end #if !defined */ + #endif /* TAO_HAS_REQUEST_END_TIME_POLICY == 1 */ #if (TAO_HAS_REPLY_START_TIME_POLICY == 1) @@ -1269,27 +1254,12 @@ Messaging::ReplyStartTimePolicy::ReplyStartTimePolicy (void) // default construc {} ACE_INLINE -Messaging::ReplyStartTimePolicy::ReplyStartTimePolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor - : CORBA_Object (objref, _tao_servant, _tao_collocated) -{} - -ACE_INLINE Messaging::ReplyStartTimePolicy::~ReplyStartTimePolicy (void) // destructor {} -ACE_INLINE Messaging::ReplyStartTimePolicy_ptr -Messaging::ReplyStartTimePolicy::_duplicate (Messaging::ReplyStartTimePolicy_ptr obj) -{ - if (!CORBA::is_nil (obj)) - obj->_add_ref (); - return obj; -} -ACE_INLINE Messaging::ReplyStartTimePolicy_ptr -Messaging::ReplyStartTimePolicy::_nil (void) -{ - return (Messaging::ReplyStartTimePolicy_ptr)0; -} +#if !defined (_MESSAGING_REPLYSTARTTIMEPOLICY___VAR_CI_) +#define _MESSAGING_REPLYSTARTTIMEPOLICY___VAR_CI_ // ************************************************************* // Inline operations for class Messaging::ReplyStartTimePolicy_var @@ -1297,23 +1267,23 @@ Messaging::ReplyStartTimePolicy::_nil (void) ACE_INLINE Messaging::ReplyStartTimePolicy_var::ReplyStartTimePolicy_var (void) // default constructor - : ptr_ (Messaging::ReplyStartTimePolicy::_nil ()) + : ptr_ (ReplyStartTimePolicy::_nil ()) {} ACE_INLINE -Messaging::ReplyStartTimePolicy_var::ReplyStartTimePolicy_var (Messaging::ReplyStartTimePolicy_ptr p) +Messaging::ReplyStartTimePolicy_var::ReplyStartTimePolicy_var (ReplyStartTimePolicy_ptr p) : ptr_ (p) {} -ACE_INLINE Messaging::ReplyStartTimePolicy_ptr +ACE_INLINE ::Messaging::ReplyStartTimePolicy_ptr Messaging::ReplyStartTimePolicy_var::ptr (void) const { return this->ptr_; } ACE_INLINE -Messaging::ReplyStartTimePolicy_var::ReplyStartTimePolicy_var (const Messaging::ReplyStartTimePolicy_var &p) // copy constructor - : ptr_ (Messaging::ReplyStartTimePolicy::_duplicate (p.ptr ())) +Messaging::ReplyStartTimePolicy_var::ReplyStartTimePolicy_var (const ::Messaging::ReplyStartTimePolicy_var &p) // copy constructor + : ptr_ (ReplyStartTimePolicy::_duplicate (p.ptr ())) {} ACE_INLINE @@ -1323,7 +1293,7 @@ Messaging::ReplyStartTimePolicy_var::~ReplyStartTimePolicy_var (void) // destruc } ACE_INLINE Messaging::ReplyStartTimePolicy_var & -Messaging::ReplyStartTimePolicy_var::operator= (Messaging::ReplyStartTimePolicy_ptr p) +Messaging::ReplyStartTimePolicy_var::operator= (ReplyStartTimePolicy_ptr p) { CORBA::release (this->ptr_); this->ptr_ = p; @@ -1331,126 +1301,136 @@ Messaging::ReplyStartTimePolicy_var::operator= (Messaging::ReplyStartTimePolicy_ } ACE_INLINE Messaging::ReplyStartTimePolicy_var & -Messaging::ReplyStartTimePolicy_var::operator= (const Messaging::ReplyStartTimePolicy_var &p) +Messaging::ReplyStartTimePolicy_var::operator= (const ::Messaging::ReplyStartTimePolicy_var &p) { if (this != &p) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::ReplyStartTimePolicy::_duplicate (p.ptr ()); + this->ptr_ = ::Messaging::ReplyStartTimePolicy::_duplicate (p.ptr ()); } return *this; } -ACE_INLINE -Messaging::ReplyStartTimePolicy_var::operator const Messaging::ReplyStartTimePolicy_ptr &() const // cast +ACE_INLINE +Messaging::ReplyStartTimePolicy_var::operator const ::Messaging::ReplyStartTimePolicy_ptr &() const // cast { return this->ptr_; } -ACE_INLINE -Messaging::ReplyStartTimePolicy_var::operator Messaging::ReplyStartTimePolicy_ptr &() // cast +ACE_INLINE +Messaging::ReplyStartTimePolicy_var::operator ::Messaging::ReplyStartTimePolicy_ptr &() // cast { return this->ptr_; } -ACE_INLINE Messaging::ReplyStartTimePolicy_ptr +ACE_INLINE ::Messaging::ReplyStartTimePolicy_ptr Messaging::ReplyStartTimePolicy_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE Messaging::ReplyStartTimePolicy_ptr +ACE_INLINE ::Messaging::ReplyStartTimePolicy_ptr Messaging::ReplyStartTimePolicy_var::in (void) const { return this->ptr_; } -ACE_INLINE Messaging::ReplyStartTimePolicy_ptr & +ACE_INLINE ::Messaging::ReplyStartTimePolicy_ptr & Messaging::ReplyStartTimePolicy_var::inout (void) { return this->ptr_; } -ACE_INLINE Messaging::ReplyStartTimePolicy_ptr & +ACE_INLINE ::Messaging::ReplyStartTimePolicy_ptr & Messaging::ReplyStartTimePolicy_var::out (void) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::ReplyStartTimePolicy::_nil (); + this->ptr_ = ::Messaging::ReplyStartTimePolicy::_nil (); return this->ptr_; } -ACE_INLINE Messaging::ReplyStartTimePolicy_ptr +ACE_INLINE ::Messaging::ReplyStartTimePolicy_ptr Messaging::ReplyStartTimePolicy_var::_retn (void) { // yield ownership of managed obj reference - Messaging::ReplyStartTimePolicy_ptr val = this->ptr_; - this->ptr_ = Messaging::ReplyStartTimePolicy::_nil (); + ::Messaging::ReplyStartTimePolicy_ptr val = this->ptr_; + this->ptr_ = ::Messaging::ReplyStartTimePolicy::_nil (); return val; } + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_REPLYSTARTTIMEPOLICY___OUT_CI_) +#define _MESSAGING_REPLYSTARTTIMEPOLICY___OUT_CI_ + // ************************************************************* // Inline operations for class Messaging::ReplyStartTimePolicy_out // ************************************************************* ACE_INLINE -Messaging::ReplyStartTimePolicy_out::ReplyStartTimePolicy_out (Messaging::ReplyStartTimePolicy_ptr &p) +Messaging::ReplyStartTimePolicy_out::ReplyStartTimePolicy_out (ReplyStartTimePolicy_ptr &p) : ptr_ (p) { - this->ptr_ = Messaging::ReplyStartTimePolicy::_nil (); + this->ptr_ = ::Messaging::ReplyStartTimePolicy::_nil (); } ACE_INLINE -Messaging::ReplyStartTimePolicy_out::ReplyStartTimePolicy_out (Messaging::ReplyStartTimePolicy_var &p) // constructor from _var +Messaging::ReplyStartTimePolicy_out::ReplyStartTimePolicy_out (ReplyStartTimePolicy_var &p) // constructor from _var : ptr_ (p.out ()) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::ReplyStartTimePolicy::_nil (); + this->ptr_ = ::Messaging::ReplyStartTimePolicy::_nil (); } ACE_INLINE -Messaging::ReplyStartTimePolicy_out::ReplyStartTimePolicy_out (const Messaging::ReplyStartTimePolicy_out &p) // copy constructor - : ptr_ (ACE_const_cast (Messaging::ReplyStartTimePolicy_out&,p).ptr_) +Messaging::ReplyStartTimePolicy_out::ReplyStartTimePolicy_out (const ::Messaging::ReplyStartTimePolicy_out &p) // copy constructor + : ptr_ (ACE_const_cast (ReplyStartTimePolicy_out &, p).ptr_) {} -ACE_INLINE Messaging::ReplyStartTimePolicy_out & -Messaging::ReplyStartTimePolicy_out::operator= (const Messaging::ReplyStartTimePolicy_out &p) +ACE_INLINE ::Messaging::ReplyStartTimePolicy_out & +Messaging::ReplyStartTimePolicy_out::operator= (const ::Messaging::ReplyStartTimePolicy_out &p) { - this->ptr_ = ACE_const_cast (Messaging::ReplyStartTimePolicy_out&,p).ptr_; + this->ptr_ = ACE_const_cast (ReplyStartTimePolicy_out&, p).ptr_; return *this; } ACE_INLINE Messaging::ReplyStartTimePolicy_out & -Messaging::ReplyStartTimePolicy_out::operator= (const Messaging::ReplyStartTimePolicy_var &p) +Messaging::ReplyStartTimePolicy_out::operator= (const ::Messaging::ReplyStartTimePolicy_var &p) { - this->ptr_ = Messaging::ReplyStartTimePolicy::_duplicate (p.ptr ()); + this->ptr_ = ::Messaging::ReplyStartTimePolicy::_duplicate (p.ptr ()); return *this; } ACE_INLINE Messaging::ReplyStartTimePolicy_out & -Messaging::ReplyStartTimePolicy_out::operator= (Messaging::ReplyStartTimePolicy_ptr p) +Messaging::ReplyStartTimePolicy_out::operator= (ReplyStartTimePolicy_ptr p) { this->ptr_ = p; return *this; } -ACE_INLINE -Messaging::ReplyStartTimePolicy_out::operator Messaging::ReplyStartTimePolicy_ptr &() // cast +ACE_INLINE +Messaging::ReplyStartTimePolicy_out::operator ::Messaging::ReplyStartTimePolicy_ptr &() // cast { return this->ptr_; } -ACE_INLINE Messaging::ReplyStartTimePolicy_ptr & +ACE_INLINE ::Messaging::ReplyStartTimePolicy_ptr & Messaging::ReplyStartTimePolicy_out::ptr (void) // ptr { return this->ptr_; } -ACE_INLINE Messaging::ReplyStartTimePolicy_ptr +ACE_INLINE ::Messaging::ReplyStartTimePolicy_ptr Messaging::ReplyStartTimePolicy_out::operator-> (void) { return this->ptr_; } + +#endif /* end #if !defined */ + #endif /* TAO_HAS_REPLY_START_TIME_POLICY == 1 */ #if (TAO_HAS_REPLY_END_TIME_POLICY == 1) @@ -1460,27 +1440,12 @@ Messaging::ReplyEndTimePolicy::ReplyEndTimePolicy (void) // default constructor {} ACE_INLINE -Messaging::ReplyEndTimePolicy::ReplyEndTimePolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor - : CORBA_Object (objref, _tao_servant, _tao_collocated) -{} - -ACE_INLINE Messaging::ReplyEndTimePolicy::~ReplyEndTimePolicy (void) // destructor {} -ACE_INLINE Messaging::ReplyEndTimePolicy_ptr -Messaging::ReplyEndTimePolicy::_duplicate (Messaging::ReplyEndTimePolicy_ptr obj) -{ - if (!CORBA::is_nil (obj)) - obj->_add_ref (); - return obj; -} -ACE_INLINE Messaging::ReplyEndTimePolicy_ptr -Messaging::ReplyEndTimePolicy::_nil (void) -{ - return (Messaging::ReplyEndTimePolicy_ptr)0; -} +#if !defined (_MESSAGING_REPLYENDTIMEPOLICY___VAR_CI_) +#define _MESSAGING_REPLYENDTIMEPOLICY___VAR_CI_ // ************************************************************* // Inline operations for class Messaging::ReplyEndTimePolicy_var @@ -1488,23 +1453,23 @@ Messaging::ReplyEndTimePolicy::_nil (void) ACE_INLINE Messaging::ReplyEndTimePolicy_var::ReplyEndTimePolicy_var (void) // default constructor - : ptr_ (Messaging::ReplyEndTimePolicy::_nil ()) + : ptr_ (ReplyEndTimePolicy::_nil ()) {} ACE_INLINE -Messaging::ReplyEndTimePolicy_var::ReplyEndTimePolicy_var (Messaging::ReplyEndTimePolicy_ptr p) +Messaging::ReplyEndTimePolicy_var::ReplyEndTimePolicy_var (ReplyEndTimePolicy_ptr p) : ptr_ (p) {} -ACE_INLINE Messaging::ReplyEndTimePolicy_ptr +ACE_INLINE ::Messaging::ReplyEndTimePolicy_ptr Messaging::ReplyEndTimePolicy_var::ptr (void) const { return this->ptr_; } ACE_INLINE -Messaging::ReplyEndTimePolicy_var::ReplyEndTimePolicy_var (const Messaging::ReplyEndTimePolicy_var &p) // copy constructor - : ptr_ (Messaging::ReplyEndTimePolicy::_duplicate (p.ptr ())) +Messaging::ReplyEndTimePolicy_var::ReplyEndTimePolicy_var (const ::Messaging::ReplyEndTimePolicy_var &p) // copy constructor + : ptr_ (ReplyEndTimePolicy::_duplicate (p.ptr ())) {} ACE_INLINE @@ -1514,7 +1479,7 @@ Messaging::ReplyEndTimePolicy_var::~ReplyEndTimePolicy_var (void) // destructor } ACE_INLINE Messaging::ReplyEndTimePolicy_var & -Messaging::ReplyEndTimePolicy_var::operator= (Messaging::ReplyEndTimePolicy_ptr p) +Messaging::ReplyEndTimePolicy_var::operator= (ReplyEndTimePolicy_ptr p) { CORBA::release (this->ptr_); this->ptr_ = p; @@ -1522,126 +1487,136 @@ Messaging::ReplyEndTimePolicy_var::operator= (Messaging::ReplyEndTimePolicy_ptr } ACE_INLINE Messaging::ReplyEndTimePolicy_var & -Messaging::ReplyEndTimePolicy_var::operator= (const Messaging::ReplyEndTimePolicy_var &p) +Messaging::ReplyEndTimePolicy_var::operator= (const ::Messaging::ReplyEndTimePolicy_var &p) { if (this != &p) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::ReplyEndTimePolicy::_duplicate (p.ptr ()); + this->ptr_ = ::Messaging::ReplyEndTimePolicy::_duplicate (p.ptr ()); } return *this; } -ACE_INLINE -Messaging::ReplyEndTimePolicy_var::operator const Messaging::ReplyEndTimePolicy_ptr &() const // cast +ACE_INLINE +Messaging::ReplyEndTimePolicy_var::operator const ::Messaging::ReplyEndTimePolicy_ptr &() const // cast { return this->ptr_; } -ACE_INLINE -Messaging::ReplyEndTimePolicy_var::operator Messaging::ReplyEndTimePolicy_ptr &() // cast +ACE_INLINE +Messaging::ReplyEndTimePolicy_var::operator ::Messaging::ReplyEndTimePolicy_ptr &() // cast { return this->ptr_; } -ACE_INLINE Messaging::ReplyEndTimePolicy_ptr +ACE_INLINE ::Messaging::ReplyEndTimePolicy_ptr Messaging::ReplyEndTimePolicy_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE Messaging::ReplyEndTimePolicy_ptr +ACE_INLINE ::Messaging::ReplyEndTimePolicy_ptr Messaging::ReplyEndTimePolicy_var::in (void) const { return this->ptr_; } -ACE_INLINE Messaging::ReplyEndTimePolicy_ptr & +ACE_INLINE ::Messaging::ReplyEndTimePolicy_ptr & Messaging::ReplyEndTimePolicy_var::inout (void) { return this->ptr_; } -ACE_INLINE Messaging::ReplyEndTimePolicy_ptr & +ACE_INLINE ::Messaging::ReplyEndTimePolicy_ptr & Messaging::ReplyEndTimePolicy_var::out (void) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::ReplyEndTimePolicy::_nil (); + this->ptr_ = ::Messaging::ReplyEndTimePolicy::_nil (); return this->ptr_; } -ACE_INLINE Messaging::ReplyEndTimePolicy_ptr +ACE_INLINE ::Messaging::ReplyEndTimePolicy_ptr Messaging::ReplyEndTimePolicy_var::_retn (void) { // yield ownership of managed obj reference - Messaging::ReplyEndTimePolicy_ptr val = this->ptr_; - this->ptr_ = Messaging::ReplyEndTimePolicy::_nil (); + ::Messaging::ReplyEndTimePolicy_ptr val = this->ptr_; + this->ptr_ = ::Messaging::ReplyEndTimePolicy::_nil (); return val; } + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_REPLYENDTIMEPOLICY___OUT_CI_) +#define _MESSAGING_REPLYENDTIMEPOLICY___OUT_CI_ + // ************************************************************* // Inline operations for class Messaging::ReplyEndTimePolicy_out // ************************************************************* ACE_INLINE -Messaging::ReplyEndTimePolicy_out::ReplyEndTimePolicy_out (Messaging::ReplyEndTimePolicy_ptr &p) +Messaging::ReplyEndTimePolicy_out::ReplyEndTimePolicy_out (ReplyEndTimePolicy_ptr &p) : ptr_ (p) { - this->ptr_ = Messaging::ReplyEndTimePolicy::_nil (); + this->ptr_ = ::Messaging::ReplyEndTimePolicy::_nil (); } ACE_INLINE -Messaging::ReplyEndTimePolicy_out::ReplyEndTimePolicy_out (Messaging::ReplyEndTimePolicy_var &p) // constructor from _var +Messaging::ReplyEndTimePolicy_out::ReplyEndTimePolicy_out (ReplyEndTimePolicy_var &p) // constructor from _var : ptr_ (p.out ()) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::ReplyEndTimePolicy::_nil (); + this->ptr_ = ::Messaging::ReplyEndTimePolicy::_nil (); } ACE_INLINE -Messaging::ReplyEndTimePolicy_out::ReplyEndTimePolicy_out (const Messaging::ReplyEndTimePolicy_out &p) // copy constructor - : ptr_ (ACE_const_cast (Messaging::ReplyEndTimePolicy_out&,p).ptr_) +Messaging::ReplyEndTimePolicy_out::ReplyEndTimePolicy_out (const ::Messaging::ReplyEndTimePolicy_out &p) // copy constructor + : ptr_ (ACE_const_cast (ReplyEndTimePolicy_out &, p).ptr_) {} -ACE_INLINE Messaging::ReplyEndTimePolicy_out & -Messaging::ReplyEndTimePolicy_out::operator= (const Messaging::ReplyEndTimePolicy_out &p) +ACE_INLINE ::Messaging::ReplyEndTimePolicy_out & +Messaging::ReplyEndTimePolicy_out::operator= (const ::Messaging::ReplyEndTimePolicy_out &p) { - this->ptr_ = ACE_const_cast (Messaging::ReplyEndTimePolicy_out&,p).ptr_; + this->ptr_ = ACE_const_cast (ReplyEndTimePolicy_out&, p).ptr_; return *this; } ACE_INLINE Messaging::ReplyEndTimePolicy_out & -Messaging::ReplyEndTimePolicy_out::operator= (const Messaging::ReplyEndTimePolicy_var &p) +Messaging::ReplyEndTimePolicy_out::operator= (const ::Messaging::ReplyEndTimePolicy_var &p) { - this->ptr_ = Messaging::ReplyEndTimePolicy::_duplicate (p.ptr ()); + this->ptr_ = ::Messaging::ReplyEndTimePolicy::_duplicate (p.ptr ()); return *this; } ACE_INLINE Messaging::ReplyEndTimePolicy_out & -Messaging::ReplyEndTimePolicy_out::operator= (Messaging::ReplyEndTimePolicy_ptr p) +Messaging::ReplyEndTimePolicy_out::operator= (ReplyEndTimePolicy_ptr p) { this->ptr_ = p; return *this; } -ACE_INLINE -Messaging::ReplyEndTimePolicy_out::operator Messaging::ReplyEndTimePolicy_ptr &() // cast +ACE_INLINE +Messaging::ReplyEndTimePolicy_out::operator ::Messaging::ReplyEndTimePolicy_ptr &() // cast { return this->ptr_; } -ACE_INLINE Messaging::ReplyEndTimePolicy_ptr & +ACE_INLINE ::Messaging::ReplyEndTimePolicy_ptr & Messaging::ReplyEndTimePolicy_out::ptr (void) // ptr { return this->ptr_; } -ACE_INLINE Messaging::ReplyEndTimePolicy_ptr +ACE_INLINE ::Messaging::ReplyEndTimePolicy_ptr Messaging::ReplyEndTimePolicy_out::operator-> (void) { return this->ptr_; } + +#endif /* end #if !defined */ + #endif /* TAO_HAS_REPLY_END_TIME_POLICY == 1 */ #if (TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1) @@ -1651,27 +1626,12 @@ Messaging::RelativeRequestTimeoutPolicy::RelativeRequestTimeoutPolicy (void) // {} ACE_INLINE -Messaging::RelativeRequestTimeoutPolicy::RelativeRequestTimeoutPolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor - : CORBA_Object (objref, _tao_servant, _tao_collocated) -{} - -ACE_INLINE Messaging::RelativeRequestTimeoutPolicy::~RelativeRequestTimeoutPolicy (void) // destructor {} -ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_ptr -Messaging::RelativeRequestTimeoutPolicy::_duplicate (Messaging::RelativeRequestTimeoutPolicy_ptr obj) -{ - if (!CORBA::is_nil (obj)) - obj->_add_ref (); - return obj; -} -ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_ptr -Messaging::RelativeRequestTimeoutPolicy::_nil (void) -{ - return (Messaging::RelativeRequestTimeoutPolicy_ptr)0; -} +#if !defined (_MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY___VAR_CI_) +#define _MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY___VAR_CI_ // ************************************************************* // Inline operations for class Messaging::RelativeRequestTimeoutPolicy_var @@ -1679,23 +1639,23 @@ Messaging::RelativeRequestTimeoutPolicy::_nil (void) ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_var::RelativeRequestTimeoutPolicy_var (void) // default constructor - : ptr_ (Messaging::RelativeRequestTimeoutPolicy::_nil ()) + : ptr_ (RelativeRequestTimeoutPolicy::_nil ()) {} ACE_INLINE -Messaging::RelativeRequestTimeoutPolicy_var::RelativeRequestTimeoutPolicy_var (Messaging::RelativeRequestTimeoutPolicy_ptr p) +Messaging::RelativeRequestTimeoutPolicy_var::RelativeRequestTimeoutPolicy_var (RelativeRequestTimeoutPolicy_ptr p) : ptr_ (p) {} -ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_ptr +ACE_INLINE ::Messaging::RelativeRequestTimeoutPolicy_ptr Messaging::RelativeRequestTimeoutPolicy_var::ptr (void) const { return this->ptr_; } ACE_INLINE -Messaging::RelativeRequestTimeoutPolicy_var::RelativeRequestTimeoutPolicy_var (const Messaging::RelativeRequestTimeoutPolicy_var &p) // copy constructor - : ptr_ (Messaging::RelativeRequestTimeoutPolicy::_duplicate (p.ptr ())) +Messaging::RelativeRequestTimeoutPolicy_var::RelativeRequestTimeoutPolicy_var (const ::Messaging::RelativeRequestTimeoutPolicy_var &p) // copy constructor + : ptr_ (RelativeRequestTimeoutPolicy::_duplicate (p.ptr ())) {} ACE_INLINE @@ -1705,7 +1665,7 @@ Messaging::RelativeRequestTimeoutPolicy_var::~RelativeRequestTimeoutPolicy_var ( } ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_var & -Messaging::RelativeRequestTimeoutPolicy_var::operator= (Messaging::RelativeRequestTimeoutPolicy_ptr p) +Messaging::RelativeRequestTimeoutPolicy_var::operator= (RelativeRequestTimeoutPolicy_ptr p) { CORBA::release (this->ptr_); this->ptr_ = p; @@ -1713,126 +1673,136 @@ Messaging::RelativeRequestTimeoutPolicy_var::operator= (Messaging::RelativeReque } ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_var & -Messaging::RelativeRequestTimeoutPolicy_var::operator= (const Messaging::RelativeRequestTimeoutPolicy_var &p) +Messaging::RelativeRequestTimeoutPolicy_var::operator= (const ::Messaging::RelativeRequestTimeoutPolicy_var &p) { if (this != &p) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::RelativeRequestTimeoutPolicy::_duplicate (p.ptr ()); + this->ptr_ = ::Messaging::RelativeRequestTimeoutPolicy::_duplicate (p.ptr ()); } return *this; } -ACE_INLINE -Messaging::RelativeRequestTimeoutPolicy_var::operator const Messaging::RelativeRequestTimeoutPolicy_ptr &() const // cast +ACE_INLINE +Messaging::RelativeRequestTimeoutPolicy_var::operator const ::Messaging::RelativeRequestTimeoutPolicy_ptr &() const // cast { return this->ptr_; } -ACE_INLINE -Messaging::RelativeRequestTimeoutPolicy_var::operator Messaging::RelativeRequestTimeoutPolicy_ptr &() // cast +ACE_INLINE +Messaging::RelativeRequestTimeoutPolicy_var::operator ::Messaging::RelativeRequestTimeoutPolicy_ptr &() // cast { return this->ptr_; } -ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_ptr +ACE_INLINE ::Messaging::RelativeRequestTimeoutPolicy_ptr Messaging::RelativeRequestTimeoutPolicy_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_ptr +ACE_INLINE ::Messaging::RelativeRequestTimeoutPolicy_ptr Messaging::RelativeRequestTimeoutPolicy_var::in (void) const { return this->ptr_; } -ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_ptr & +ACE_INLINE ::Messaging::RelativeRequestTimeoutPolicy_ptr & Messaging::RelativeRequestTimeoutPolicy_var::inout (void) { return this->ptr_; } -ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_ptr & +ACE_INLINE ::Messaging::RelativeRequestTimeoutPolicy_ptr & Messaging::RelativeRequestTimeoutPolicy_var::out (void) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::RelativeRequestTimeoutPolicy::_nil (); + this->ptr_ = ::Messaging::RelativeRequestTimeoutPolicy::_nil (); return this->ptr_; } -ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_ptr +ACE_INLINE ::Messaging::RelativeRequestTimeoutPolicy_ptr Messaging::RelativeRequestTimeoutPolicy_var::_retn (void) { // yield ownership of managed obj reference - Messaging::RelativeRequestTimeoutPolicy_ptr val = this->ptr_; - this->ptr_ = Messaging::RelativeRequestTimeoutPolicy::_nil (); + ::Messaging::RelativeRequestTimeoutPolicy_ptr val = this->ptr_; + this->ptr_ = ::Messaging::RelativeRequestTimeoutPolicy::_nil (); return val; } + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY___OUT_CI_) +#define _MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY___OUT_CI_ + // ************************************************************* // Inline operations for class Messaging::RelativeRequestTimeoutPolicy_out // ************************************************************* ACE_INLINE -Messaging::RelativeRequestTimeoutPolicy_out::RelativeRequestTimeoutPolicy_out (Messaging::RelativeRequestTimeoutPolicy_ptr &p) +Messaging::RelativeRequestTimeoutPolicy_out::RelativeRequestTimeoutPolicy_out (RelativeRequestTimeoutPolicy_ptr &p) : ptr_ (p) { - this->ptr_ = Messaging::RelativeRequestTimeoutPolicy::_nil (); + this->ptr_ = ::Messaging::RelativeRequestTimeoutPolicy::_nil (); } ACE_INLINE -Messaging::RelativeRequestTimeoutPolicy_out::RelativeRequestTimeoutPolicy_out (Messaging::RelativeRequestTimeoutPolicy_var &p) // constructor from _var +Messaging::RelativeRequestTimeoutPolicy_out::RelativeRequestTimeoutPolicy_out (RelativeRequestTimeoutPolicy_var &p) // constructor from _var : ptr_ (p.out ()) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::RelativeRequestTimeoutPolicy::_nil (); + this->ptr_ = ::Messaging::RelativeRequestTimeoutPolicy::_nil (); } ACE_INLINE -Messaging::RelativeRequestTimeoutPolicy_out::RelativeRequestTimeoutPolicy_out (const Messaging::RelativeRequestTimeoutPolicy_out &p) // copy constructor - : ptr_ (ACE_const_cast (Messaging::RelativeRequestTimeoutPolicy_out&,p).ptr_) +Messaging::RelativeRequestTimeoutPolicy_out::RelativeRequestTimeoutPolicy_out (const ::Messaging::RelativeRequestTimeoutPolicy_out &p) // copy constructor + : ptr_ (ACE_const_cast (RelativeRequestTimeoutPolicy_out &, p).ptr_) {} -ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_out & -Messaging::RelativeRequestTimeoutPolicy_out::operator= (const Messaging::RelativeRequestTimeoutPolicy_out &p) +ACE_INLINE ::Messaging::RelativeRequestTimeoutPolicy_out & +Messaging::RelativeRequestTimeoutPolicy_out::operator= (const ::Messaging::RelativeRequestTimeoutPolicy_out &p) { - this->ptr_ = ACE_const_cast (Messaging::RelativeRequestTimeoutPolicy_out&,p).ptr_; + this->ptr_ = ACE_const_cast (RelativeRequestTimeoutPolicy_out&, p).ptr_; return *this; } ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_out & -Messaging::RelativeRequestTimeoutPolicy_out::operator= (const Messaging::RelativeRequestTimeoutPolicy_var &p) +Messaging::RelativeRequestTimeoutPolicy_out::operator= (const ::Messaging::RelativeRequestTimeoutPolicy_var &p) { - this->ptr_ = Messaging::RelativeRequestTimeoutPolicy::_duplicate (p.ptr ()); + this->ptr_ = ::Messaging::RelativeRequestTimeoutPolicy::_duplicate (p.ptr ()); return *this; } ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_out & -Messaging::RelativeRequestTimeoutPolicy_out::operator= (Messaging::RelativeRequestTimeoutPolicy_ptr p) +Messaging::RelativeRequestTimeoutPolicy_out::operator= (RelativeRequestTimeoutPolicy_ptr p) { this->ptr_ = p; return *this; } -ACE_INLINE -Messaging::RelativeRequestTimeoutPolicy_out::operator Messaging::RelativeRequestTimeoutPolicy_ptr &() // cast +ACE_INLINE +Messaging::RelativeRequestTimeoutPolicy_out::operator ::Messaging::RelativeRequestTimeoutPolicy_ptr &() // cast { return this->ptr_; } -ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_ptr & +ACE_INLINE ::Messaging::RelativeRequestTimeoutPolicy_ptr & Messaging::RelativeRequestTimeoutPolicy_out::ptr (void) // ptr { return this->ptr_; } -ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_ptr +ACE_INLINE ::Messaging::RelativeRequestTimeoutPolicy_ptr Messaging::RelativeRequestTimeoutPolicy_out::operator-> (void) { return this->ptr_; } + +#endif /* end #if !defined */ + #endif /* TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1 */ #if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) @@ -1842,27 +1812,12 @@ Messaging::RelativeRoundtripTimeoutPolicy::RelativeRoundtripTimeoutPolicy (void) {} ACE_INLINE -Messaging::RelativeRoundtripTimeoutPolicy::RelativeRoundtripTimeoutPolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor - : CORBA_Object (objref, _tao_servant, _tao_collocated) -{} - -ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy::~RelativeRoundtripTimeoutPolicy (void) // destructor {} -ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_ptr -Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (Messaging::RelativeRoundtripTimeoutPolicy_ptr obj) -{ - if (!CORBA::is_nil (obj)) - obj->_add_ref (); - return obj; -} -ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_ptr -Messaging::RelativeRoundtripTimeoutPolicy::_nil (void) -{ - return (Messaging::RelativeRoundtripTimeoutPolicy_ptr)0; -} +#if !defined (_MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY___VAR_CI_) +#define _MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY___VAR_CI_ // ************************************************************* // Inline operations for class Messaging::RelativeRoundtripTimeoutPolicy_var @@ -1870,23 +1825,23 @@ Messaging::RelativeRoundtripTimeoutPolicy::_nil (void) ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_var::RelativeRoundtripTimeoutPolicy_var (void) // default constructor - : ptr_ (Messaging::RelativeRoundtripTimeoutPolicy::_nil ()) + : ptr_ (RelativeRoundtripTimeoutPolicy::_nil ()) {} ACE_INLINE -Messaging::RelativeRoundtripTimeoutPolicy_var::RelativeRoundtripTimeoutPolicy_var (Messaging::RelativeRoundtripTimeoutPolicy_ptr p) +Messaging::RelativeRoundtripTimeoutPolicy_var::RelativeRoundtripTimeoutPolicy_var (RelativeRoundtripTimeoutPolicy_ptr p) : ptr_ (p) {} -ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_ptr +ACE_INLINE ::Messaging::RelativeRoundtripTimeoutPolicy_ptr Messaging::RelativeRoundtripTimeoutPolicy_var::ptr (void) const { return this->ptr_; } ACE_INLINE -Messaging::RelativeRoundtripTimeoutPolicy_var::RelativeRoundtripTimeoutPolicy_var (const Messaging::RelativeRoundtripTimeoutPolicy_var &p) // copy constructor - : ptr_ (Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (p.ptr ())) +Messaging::RelativeRoundtripTimeoutPolicy_var::RelativeRoundtripTimeoutPolicy_var (const ::Messaging::RelativeRoundtripTimeoutPolicy_var &p) // copy constructor + : ptr_ (RelativeRoundtripTimeoutPolicy::_duplicate (p.ptr ())) {} ACE_INLINE @@ -1896,7 +1851,7 @@ Messaging::RelativeRoundtripTimeoutPolicy_var::~RelativeRoundtripTimeoutPolicy_v } ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_var & -Messaging::RelativeRoundtripTimeoutPolicy_var::operator= (Messaging::RelativeRoundtripTimeoutPolicy_ptr p) +Messaging::RelativeRoundtripTimeoutPolicy_var::operator= (RelativeRoundtripTimeoutPolicy_ptr p) { CORBA::release (this->ptr_); this->ptr_ = p; @@ -1904,154 +1859,170 @@ Messaging::RelativeRoundtripTimeoutPolicy_var::operator= (Messaging::RelativeRou } ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_var & -Messaging::RelativeRoundtripTimeoutPolicy_var::operator= (const Messaging::RelativeRoundtripTimeoutPolicy_var &p) +Messaging::RelativeRoundtripTimeoutPolicy_var::operator= (const ::Messaging::RelativeRoundtripTimeoutPolicy_var &p) { if (this != &p) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (p.ptr ()); + this->ptr_ = ::Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (p.ptr ()); } return *this; } -ACE_INLINE -Messaging::RelativeRoundtripTimeoutPolicy_var::operator const Messaging::RelativeRoundtripTimeoutPolicy_ptr &() const // cast +ACE_INLINE +Messaging::RelativeRoundtripTimeoutPolicy_var::operator const ::Messaging::RelativeRoundtripTimeoutPolicy_ptr &() const // cast { return this->ptr_; } -ACE_INLINE -Messaging::RelativeRoundtripTimeoutPolicy_var::operator Messaging::RelativeRoundtripTimeoutPolicy_ptr &() // cast +ACE_INLINE +Messaging::RelativeRoundtripTimeoutPolicy_var::operator ::Messaging::RelativeRoundtripTimeoutPolicy_ptr &() // cast { return this->ptr_; } -ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_ptr +ACE_INLINE ::Messaging::RelativeRoundtripTimeoutPolicy_ptr Messaging::RelativeRoundtripTimeoutPolicy_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_ptr +ACE_INLINE ::Messaging::RelativeRoundtripTimeoutPolicy_ptr Messaging::RelativeRoundtripTimeoutPolicy_var::in (void) const { return this->ptr_; } -ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_ptr & +ACE_INLINE ::Messaging::RelativeRoundtripTimeoutPolicy_ptr & Messaging::RelativeRoundtripTimeoutPolicy_var::inout (void) { return this->ptr_; } -ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_ptr & +ACE_INLINE ::Messaging::RelativeRoundtripTimeoutPolicy_ptr & Messaging::RelativeRoundtripTimeoutPolicy_var::out (void) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::RelativeRoundtripTimeoutPolicy::_nil (); + this->ptr_ = ::Messaging::RelativeRoundtripTimeoutPolicy::_nil (); return this->ptr_; } -ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_ptr +ACE_INLINE ::Messaging::RelativeRoundtripTimeoutPolicy_ptr Messaging::RelativeRoundtripTimeoutPolicy_var::_retn (void) { // yield ownership of managed obj reference - Messaging::RelativeRoundtripTimeoutPolicy_ptr val = this->ptr_; - this->ptr_ = Messaging::RelativeRoundtripTimeoutPolicy::_nil (); + ::Messaging::RelativeRoundtripTimeoutPolicy_ptr val = this->ptr_; + this->ptr_ = ::Messaging::RelativeRoundtripTimeoutPolicy::_nil (); return val; } + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY___OUT_CI_) +#define _MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY___OUT_CI_ + // ************************************************************* // Inline operations for class Messaging::RelativeRoundtripTimeoutPolicy_out // ************************************************************* ACE_INLINE -Messaging::RelativeRoundtripTimeoutPolicy_out::RelativeRoundtripTimeoutPolicy_out (Messaging::RelativeRoundtripTimeoutPolicy_ptr &p) +Messaging::RelativeRoundtripTimeoutPolicy_out::RelativeRoundtripTimeoutPolicy_out (RelativeRoundtripTimeoutPolicy_ptr &p) : ptr_ (p) { - this->ptr_ = Messaging::RelativeRoundtripTimeoutPolicy::_nil (); + this->ptr_ = ::Messaging::RelativeRoundtripTimeoutPolicy::_nil (); } ACE_INLINE -Messaging::RelativeRoundtripTimeoutPolicy_out::RelativeRoundtripTimeoutPolicy_out (Messaging::RelativeRoundtripTimeoutPolicy_var &p) // constructor from _var +Messaging::RelativeRoundtripTimeoutPolicy_out::RelativeRoundtripTimeoutPolicy_out (RelativeRoundtripTimeoutPolicy_var &p) // constructor from _var : ptr_ (p.out ()) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::RelativeRoundtripTimeoutPolicy::_nil (); + this->ptr_ = ::Messaging::RelativeRoundtripTimeoutPolicy::_nil (); } ACE_INLINE -Messaging::RelativeRoundtripTimeoutPolicy_out::RelativeRoundtripTimeoutPolicy_out (const Messaging::RelativeRoundtripTimeoutPolicy_out &p) // copy constructor - : ptr_ (ACE_const_cast (Messaging::RelativeRoundtripTimeoutPolicy_out&,p).ptr_) +Messaging::RelativeRoundtripTimeoutPolicy_out::RelativeRoundtripTimeoutPolicy_out (const ::Messaging::RelativeRoundtripTimeoutPolicy_out &p) // copy constructor + : ptr_ (ACE_const_cast (RelativeRoundtripTimeoutPolicy_out &, p).ptr_) {} -ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_out & -Messaging::RelativeRoundtripTimeoutPolicy_out::operator= (const Messaging::RelativeRoundtripTimeoutPolicy_out &p) +ACE_INLINE ::Messaging::RelativeRoundtripTimeoutPolicy_out & +Messaging::RelativeRoundtripTimeoutPolicy_out::operator= (const ::Messaging::RelativeRoundtripTimeoutPolicy_out &p) { - this->ptr_ = ACE_const_cast (Messaging::RelativeRoundtripTimeoutPolicy_out&,p).ptr_; + this->ptr_ = ACE_const_cast (RelativeRoundtripTimeoutPolicy_out&, p).ptr_; return *this; } ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_out & -Messaging::RelativeRoundtripTimeoutPolicy_out::operator= (const Messaging::RelativeRoundtripTimeoutPolicy_var &p) +Messaging::RelativeRoundtripTimeoutPolicy_out::operator= (const ::Messaging::RelativeRoundtripTimeoutPolicy_var &p) { - this->ptr_ = Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (p.ptr ()); + this->ptr_ = ::Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (p.ptr ()); return *this; } ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_out & -Messaging::RelativeRoundtripTimeoutPolicy_out::operator= (Messaging::RelativeRoundtripTimeoutPolicy_ptr p) +Messaging::RelativeRoundtripTimeoutPolicy_out::operator= (RelativeRoundtripTimeoutPolicy_ptr p) { this->ptr_ = p; return *this; } -ACE_INLINE -Messaging::RelativeRoundtripTimeoutPolicy_out::operator Messaging::RelativeRoundtripTimeoutPolicy_ptr &() // cast +ACE_INLINE +Messaging::RelativeRoundtripTimeoutPolicy_out::operator ::Messaging::RelativeRoundtripTimeoutPolicy_ptr &() // cast { return this->ptr_; } -ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_ptr & +ACE_INLINE ::Messaging::RelativeRoundtripTimeoutPolicy_ptr & Messaging::RelativeRoundtripTimeoutPolicy_out::ptr (void) // ptr { return this->ptr_; } -ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_ptr +ACE_INLINE ::Messaging::RelativeRoundtripTimeoutPolicy_ptr Messaging::RelativeRoundtripTimeoutPolicy_out::operator-> (void) { return this->ptr_; } -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ -#if (TAO_HAS_ROUTING_POLICY == 1) +#endif /* end #if !defined */ // ************************************************************* // Inline operations for class Messaging::RoutingTypeRange_var // ************************************************************* +#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ + +#if (TAO_HAS_ROUTING_POLICY == 1) + ACE_INLINE Messaging::RoutingTypeRange_var::RoutingTypeRange_var (void) // default constructor : ptr_ (0) {} ACE_INLINE -Messaging::RoutingTypeRange_var::RoutingTypeRange_var (Messaging::RoutingTypeRange *p) +Messaging::RoutingTypeRange_var::RoutingTypeRange_var (RoutingTypeRange *p) : ptr_ (p) {} ACE_INLINE -Messaging::RoutingTypeRange_var::RoutingTypeRange_var (const Messaging::RoutingTypeRange_var &p) // copy constructor +Messaging::RoutingTypeRange_var::RoutingTypeRange_var (const ::Messaging::RoutingTypeRange_var &p) // copy constructor { if (p.ptr_) - ACE_NEW (this->ptr_, - Messaging::RoutingTypeRange(*p.ptr_)); + ACE_NEW (this->ptr_, ::Messaging::RoutingTypeRange (*p.ptr_)); else this->ptr_ = 0; } +// fixed-size types only +ACE_INLINE +Messaging::RoutingTypeRange_var::RoutingTypeRange_var (const ::Messaging::RoutingTypeRange &p) +{ + ACE_NEW (this->ptr_, ::Messaging::RoutingTypeRange (p)); +} + ACE_INLINE Messaging::RoutingTypeRange_var::~RoutingTypeRange_var (void) // destructor { @@ -2059,82 +2030,92 @@ Messaging::RoutingTypeRange_var::~RoutingTypeRange_var (void) // destructor } ACE_INLINE Messaging::RoutingTypeRange_var & -Messaging::RoutingTypeRange_var::operator= (Messaging::RoutingTypeRange *p) +Messaging::RoutingTypeRange_var::operator= (RoutingTypeRange *p) { delete this->ptr_; this->ptr_ = p; return *this; } -ACE_INLINE Messaging::RoutingTypeRange_var & -Messaging::RoutingTypeRange_var::operator= (const Messaging::RoutingTypeRange_var &p) +ACE_INLINE ::Messaging::RoutingTypeRange_var & +Messaging::RoutingTypeRange_var::operator= (const ::Messaging::RoutingTypeRange_var &p) { if (this != &p) { delete this->ptr_; - ACE_NEW_RETURN (this->ptr_, - Messaging::RoutingTypeRange (*p.ptr_), - *this); + ACE_NEW_RETURN (this->ptr_, ::Messaging::RoutingTypeRange (*p.ptr_), *this); } return *this; } -ACE_INLINE const Messaging::RoutingTypeRange * +// fixed-size types only +ACE_INLINE Messaging::RoutingTypeRange_var & +Messaging::RoutingTypeRange_var::operator= (const ::Messaging::RoutingTypeRange &p) +{ + if (this->ptr_ != &p) + { + delete this->ptr_; + ACE_NEW_RETURN (this->ptr_, ::Messaging::RoutingTypeRange (p), *this); + } + return *this; +} + +ACE_INLINE const ::Messaging::RoutingTypeRange * Messaging::RoutingTypeRange_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE Messaging::RoutingTypeRange * +ACE_INLINE ::Messaging::RoutingTypeRange * Messaging::RoutingTypeRange_var::operator-> (void) { return this->ptr_; } ACE_INLINE -Messaging::RoutingTypeRange_var::operator const Messaging::RoutingTypeRange &() const // cast +Messaging::RoutingTypeRange_var::operator const ::Messaging::RoutingTypeRange &() const // cast { return *this->ptr_; } ACE_INLINE -Messaging::RoutingTypeRange_var::operator Messaging::RoutingTypeRange &() // cast +Messaging::RoutingTypeRange_var::operator ::Messaging::RoutingTypeRange &() // cast { return *this->ptr_; } ACE_INLINE -Messaging::RoutingTypeRange_var::operator Messaging::RoutingTypeRange &() const// cast +Messaging::RoutingTypeRange_var::operator ::Messaging::RoutingTypeRange &() const // cast { return *this->ptr_; } -ACE_INLINE const Messaging::RoutingTypeRange & +ACE_INLINE const ::Messaging::RoutingTypeRange & Messaging::RoutingTypeRange_var::in (void) const { return *this->ptr_; } -ACE_INLINE Messaging::RoutingTypeRange & +ACE_INLINE ::Messaging::RoutingTypeRange & Messaging::RoutingTypeRange_var::inout (void) { return *this->ptr_; } -// mapping for fixed size -ACE_INLINE Messaging::RoutingTypeRange & +// mapping for fixed size +ACE_INLINE ::Messaging::RoutingTypeRange & Messaging::RoutingTypeRange_var::out (void) { return *this->ptr_; } -ACE_INLINE Messaging::RoutingTypeRange +ACE_INLINE ::Messaging::RoutingTypeRange Messaging::RoutingTypeRange_var::_retn (void) { return *this->ptr_; } -ACE_INLINE Messaging::RoutingTypeRange * +ACE_INLINE ::Messaging::RoutingTypeRange * Messaging::RoutingTypeRange_var::ptr (void) const { return this->ptr_; @@ -2145,27 +2126,12 @@ Messaging::RoutingPolicy::RoutingPolicy (void) // default constructor {} ACE_INLINE -Messaging::RoutingPolicy::RoutingPolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor - : CORBA_Object (objref, _tao_servant, _tao_collocated) -{} - -ACE_INLINE Messaging::RoutingPolicy::~RoutingPolicy (void) // destructor {} -ACE_INLINE Messaging::RoutingPolicy_ptr -Messaging::RoutingPolicy::_duplicate (Messaging::RoutingPolicy_ptr obj) -{ - if (!CORBA::is_nil (obj)) - obj->_add_ref (); - return obj; -} -ACE_INLINE Messaging::RoutingPolicy_ptr -Messaging::RoutingPolicy::_nil (void) -{ - return (Messaging::RoutingPolicy_ptr)0; -} +#if !defined (_MESSAGING_ROUTINGPOLICY___VAR_CI_) +#define _MESSAGING_ROUTINGPOLICY___VAR_CI_ // ************************************************************* // Inline operations for class Messaging::RoutingPolicy_var @@ -2173,23 +2139,23 @@ Messaging::RoutingPolicy::_nil (void) ACE_INLINE Messaging::RoutingPolicy_var::RoutingPolicy_var (void) // default constructor - : ptr_ (Messaging::RoutingPolicy::_nil ()) + : ptr_ (RoutingPolicy::_nil ()) {} ACE_INLINE -Messaging::RoutingPolicy_var::RoutingPolicy_var (Messaging::RoutingPolicy_ptr p) +Messaging::RoutingPolicy_var::RoutingPolicy_var (RoutingPolicy_ptr p) : ptr_ (p) {} -ACE_INLINE Messaging::RoutingPolicy_ptr +ACE_INLINE ::Messaging::RoutingPolicy_ptr Messaging::RoutingPolicy_var::ptr (void) const { return this->ptr_; } ACE_INLINE -Messaging::RoutingPolicy_var::RoutingPolicy_var (const Messaging::RoutingPolicy_var &p) // copy constructor - : ptr_ (Messaging::RoutingPolicy::_duplicate (p.ptr ())) +Messaging::RoutingPolicy_var::RoutingPolicy_var (const ::Messaging::RoutingPolicy_var &p) // copy constructor + : ptr_ (RoutingPolicy::_duplicate (p.ptr ())) {} ACE_INLINE @@ -2199,7 +2165,7 @@ Messaging::RoutingPolicy_var::~RoutingPolicy_var (void) // destructor } ACE_INLINE Messaging::RoutingPolicy_var & -Messaging::RoutingPolicy_var::operator= (Messaging::RoutingPolicy_ptr p) +Messaging::RoutingPolicy_var::operator= (RoutingPolicy_ptr p) { CORBA::release (this->ptr_); this->ptr_ = p; @@ -2207,126 +2173,136 @@ Messaging::RoutingPolicy_var::operator= (Messaging::RoutingPolicy_ptr p) } ACE_INLINE Messaging::RoutingPolicy_var & -Messaging::RoutingPolicy_var::operator= (const Messaging::RoutingPolicy_var &p) +Messaging::RoutingPolicy_var::operator= (const ::Messaging::RoutingPolicy_var &p) { if (this != &p) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::RoutingPolicy::_duplicate (p.ptr ()); + this->ptr_ = ::Messaging::RoutingPolicy::_duplicate (p.ptr ()); } return *this; } -ACE_INLINE -Messaging::RoutingPolicy_var::operator const Messaging::RoutingPolicy_ptr &() const // cast +ACE_INLINE +Messaging::RoutingPolicy_var::operator const ::Messaging::RoutingPolicy_ptr &() const // cast { return this->ptr_; } -ACE_INLINE -Messaging::RoutingPolicy_var::operator Messaging::RoutingPolicy_ptr &() // cast +ACE_INLINE +Messaging::RoutingPolicy_var::operator ::Messaging::RoutingPolicy_ptr &() // cast { return this->ptr_; } -ACE_INLINE Messaging::RoutingPolicy_ptr +ACE_INLINE ::Messaging::RoutingPolicy_ptr Messaging::RoutingPolicy_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE Messaging::RoutingPolicy_ptr +ACE_INLINE ::Messaging::RoutingPolicy_ptr Messaging::RoutingPolicy_var::in (void) const { return this->ptr_; } -ACE_INLINE Messaging::RoutingPolicy_ptr & +ACE_INLINE ::Messaging::RoutingPolicy_ptr & Messaging::RoutingPolicy_var::inout (void) { return this->ptr_; } -ACE_INLINE Messaging::RoutingPolicy_ptr & +ACE_INLINE ::Messaging::RoutingPolicy_ptr & Messaging::RoutingPolicy_var::out (void) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::RoutingPolicy::_nil (); + this->ptr_ = ::Messaging::RoutingPolicy::_nil (); return this->ptr_; } -ACE_INLINE Messaging::RoutingPolicy_ptr +ACE_INLINE ::Messaging::RoutingPolicy_ptr Messaging::RoutingPolicy_var::_retn (void) { // yield ownership of managed obj reference - Messaging::RoutingPolicy_ptr val = this->ptr_; - this->ptr_ = Messaging::RoutingPolicy::_nil (); + ::Messaging::RoutingPolicy_ptr val = this->ptr_; + this->ptr_ = ::Messaging::RoutingPolicy::_nil (); return val; } + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_ROUTINGPOLICY___OUT_CI_) +#define _MESSAGING_ROUTINGPOLICY___OUT_CI_ + // ************************************************************* // Inline operations for class Messaging::RoutingPolicy_out // ************************************************************* ACE_INLINE -Messaging::RoutingPolicy_out::RoutingPolicy_out (Messaging::RoutingPolicy_ptr &p) +Messaging::RoutingPolicy_out::RoutingPolicy_out (RoutingPolicy_ptr &p) : ptr_ (p) { - this->ptr_ = Messaging::RoutingPolicy::_nil (); + this->ptr_ = ::Messaging::RoutingPolicy::_nil (); } ACE_INLINE -Messaging::RoutingPolicy_out::RoutingPolicy_out (Messaging::RoutingPolicy_var &p) // constructor from _var +Messaging::RoutingPolicy_out::RoutingPolicy_out (RoutingPolicy_var &p) // constructor from _var : ptr_ (p.out ()) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::RoutingPolicy::_nil (); + this->ptr_ = ::Messaging::RoutingPolicy::_nil (); } ACE_INLINE -Messaging::RoutingPolicy_out::RoutingPolicy_out (const Messaging::RoutingPolicy_out &p) // copy constructor - : ptr_ (ACE_const_cast (Messaging::RoutingPolicy_out&,p).ptr_) +Messaging::RoutingPolicy_out::RoutingPolicy_out (const ::Messaging::RoutingPolicy_out &p) // copy constructor + : ptr_ (ACE_const_cast (RoutingPolicy_out &, p).ptr_) {} -ACE_INLINE Messaging::RoutingPolicy_out & -Messaging::RoutingPolicy_out::operator= (const Messaging::RoutingPolicy_out &p) +ACE_INLINE ::Messaging::RoutingPolicy_out & +Messaging::RoutingPolicy_out::operator= (const ::Messaging::RoutingPolicy_out &p) { - this->ptr_ = ACE_const_cast (Messaging::RoutingPolicy_out&,p).ptr_; + this->ptr_ = ACE_const_cast (RoutingPolicy_out&, p).ptr_; return *this; } ACE_INLINE Messaging::RoutingPolicy_out & -Messaging::RoutingPolicy_out::operator= (const Messaging::RoutingPolicy_var &p) +Messaging::RoutingPolicy_out::operator= (const ::Messaging::RoutingPolicy_var &p) { - this->ptr_ = Messaging::RoutingPolicy::_duplicate (p.ptr ()); + this->ptr_ = ::Messaging::RoutingPolicy::_duplicate (p.ptr ()); return *this; } ACE_INLINE Messaging::RoutingPolicy_out & -Messaging::RoutingPolicy_out::operator= (Messaging::RoutingPolicy_ptr p) +Messaging::RoutingPolicy_out::operator= (RoutingPolicy_ptr p) { this->ptr_ = p; return *this; } -ACE_INLINE -Messaging::RoutingPolicy_out::operator Messaging::RoutingPolicy_ptr &() // cast +ACE_INLINE +Messaging::RoutingPolicy_out::operator ::Messaging::RoutingPolicy_ptr &() // cast { return this->ptr_; } -ACE_INLINE Messaging::RoutingPolicy_ptr & +ACE_INLINE ::Messaging::RoutingPolicy_ptr & Messaging::RoutingPolicy_out::ptr (void) // ptr { return this->ptr_; } -ACE_INLINE Messaging::RoutingPolicy_ptr +ACE_INLINE ::Messaging::RoutingPolicy_ptr Messaging::RoutingPolicy_out::operator-> (void) { return this->ptr_; } + +#endif /* end #if !defined */ + #endif /* TAO_HAS_ROUTING_POLICY == 1 */ #if (TAO_HAS_MAX_HOPS_POLICY == 1) @@ -2336,27 +2312,12 @@ Messaging::MaxHopsPolicy::MaxHopsPolicy (void) // default constructor {} ACE_INLINE -Messaging::MaxHopsPolicy::MaxHopsPolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor - : CORBA_Object (objref, _tao_servant, _tao_collocated) -{} - -ACE_INLINE Messaging::MaxHopsPolicy::~MaxHopsPolicy (void) // destructor {} -ACE_INLINE Messaging::MaxHopsPolicy_ptr -Messaging::MaxHopsPolicy::_duplicate (Messaging::MaxHopsPolicy_ptr obj) -{ - if (!CORBA::is_nil (obj)) - obj->_add_ref (); - return obj; -} -ACE_INLINE Messaging::MaxHopsPolicy_ptr -Messaging::MaxHopsPolicy::_nil (void) -{ - return (Messaging::MaxHopsPolicy_ptr)0; -} +#if !defined (_MESSAGING_MAXHOPSPOLICY___VAR_CI_) +#define _MESSAGING_MAXHOPSPOLICY___VAR_CI_ // ************************************************************* // Inline operations for class Messaging::MaxHopsPolicy_var @@ -2364,23 +2325,23 @@ Messaging::MaxHopsPolicy::_nil (void) ACE_INLINE Messaging::MaxHopsPolicy_var::MaxHopsPolicy_var (void) // default constructor - : ptr_ (Messaging::MaxHopsPolicy::_nil ()) + : ptr_ (MaxHopsPolicy::_nil ()) {} ACE_INLINE -Messaging::MaxHopsPolicy_var::MaxHopsPolicy_var (Messaging::MaxHopsPolicy_ptr p) +Messaging::MaxHopsPolicy_var::MaxHopsPolicy_var (MaxHopsPolicy_ptr p) : ptr_ (p) {} -ACE_INLINE Messaging::MaxHopsPolicy_ptr +ACE_INLINE ::Messaging::MaxHopsPolicy_ptr Messaging::MaxHopsPolicy_var::ptr (void) const { return this->ptr_; } ACE_INLINE -Messaging::MaxHopsPolicy_var::MaxHopsPolicy_var (const Messaging::MaxHopsPolicy_var &p) // copy constructor - : ptr_ (Messaging::MaxHopsPolicy::_duplicate (p.ptr ())) +Messaging::MaxHopsPolicy_var::MaxHopsPolicy_var (const ::Messaging::MaxHopsPolicy_var &p) // copy constructor + : ptr_ (MaxHopsPolicy::_duplicate (p.ptr ())) {} ACE_INLINE @@ -2390,7 +2351,7 @@ Messaging::MaxHopsPolicy_var::~MaxHopsPolicy_var (void) // destructor } ACE_INLINE Messaging::MaxHopsPolicy_var & -Messaging::MaxHopsPolicy_var::operator= (Messaging::MaxHopsPolicy_ptr p) +Messaging::MaxHopsPolicy_var::operator= (MaxHopsPolicy_ptr p) { CORBA::release (this->ptr_); this->ptr_ = p; @@ -2398,126 +2359,136 @@ Messaging::MaxHopsPolicy_var::operator= (Messaging::MaxHopsPolicy_ptr p) } ACE_INLINE Messaging::MaxHopsPolicy_var & -Messaging::MaxHopsPolicy_var::operator= (const Messaging::MaxHopsPolicy_var &p) +Messaging::MaxHopsPolicy_var::operator= (const ::Messaging::MaxHopsPolicy_var &p) { if (this != &p) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::MaxHopsPolicy::_duplicate (p.ptr ()); + this->ptr_ = ::Messaging::MaxHopsPolicy::_duplicate (p.ptr ()); } return *this; } -ACE_INLINE -Messaging::MaxHopsPolicy_var::operator const Messaging::MaxHopsPolicy_ptr &() const // cast +ACE_INLINE +Messaging::MaxHopsPolicy_var::operator const ::Messaging::MaxHopsPolicy_ptr &() const // cast { return this->ptr_; } -ACE_INLINE -Messaging::MaxHopsPolicy_var::operator Messaging::MaxHopsPolicy_ptr &() // cast +ACE_INLINE +Messaging::MaxHopsPolicy_var::operator ::Messaging::MaxHopsPolicy_ptr &() // cast { return this->ptr_; } -ACE_INLINE Messaging::MaxHopsPolicy_ptr +ACE_INLINE ::Messaging::MaxHopsPolicy_ptr Messaging::MaxHopsPolicy_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE Messaging::MaxHopsPolicy_ptr +ACE_INLINE ::Messaging::MaxHopsPolicy_ptr Messaging::MaxHopsPolicy_var::in (void) const { return this->ptr_; } -ACE_INLINE Messaging::MaxHopsPolicy_ptr & +ACE_INLINE ::Messaging::MaxHopsPolicy_ptr & Messaging::MaxHopsPolicy_var::inout (void) { return this->ptr_; } -ACE_INLINE Messaging::MaxHopsPolicy_ptr & +ACE_INLINE ::Messaging::MaxHopsPolicy_ptr & Messaging::MaxHopsPolicy_var::out (void) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::MaxHopsPolicy::_nil (); + this->ptr_ = ::Messaging::MaxHopsPolicy::_nil (); return this->ptr_; } -ACE_INLINE Messaging::MaxHopsPolicy_ptr +ACE_INLINE ::Messaging::MaxHopsPolicy_ptr Messaging::MaxHopsPolicy_var::_retn (void) { // yield ownership of managed obj reference - Messaging::MaxHopsPolicy_ptr val = this->ptr_; - this->ptr_ = Messaging::MaxHopsPolicy::_nil (); + ::Messaging::MaxHopsPolicy_ptr val = this->ptr_; + this->ptr_ = ::Messaging::MaxHopsPolicy::_nil (); return val; } + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_MAXHOPSPOLICY___OUT_CI_) +#define _MESSAGING_MAXHOPSPOLICY___OUT_CI_ + // ************************************************************* // Inline operations for class Messaging::MaxHopsPolicy_out // ************************************************************* ACE_INLINE -Messaging::MaxHopsPolicy_out::MaxHopsPolicy_out (Messaging::MaxHopsPolicy_ptr &p) +Messaging::MaxHopsPolicy_out::MaxHopsPolicy_out (MaxHopsPolicy_ptr &p) : ptr_ (p) { - this->ptr_ = Messaging::MaxHopsPolicy::_nil (); + this->ptr_ = ::Messaging::MaxHopsPolicy::_nil (); } ACE_INLINE -Messaging::MaxHopsPolicy_out::MaxHopsPolicy_out (Messaging::MaxHopsPolicy_var &p) // constructor from _var +Messaging::MaxHopsPolicy_out::MaxHopsPolicy_out (MaxHopsPolicy_var &p) // constructor from _var : ptr_ (p.out ()) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::MaxHopsPolicy::_nil (); + this->ptr_ = ::Messaging::MaxHopsPolicy::_nil (); } ACE_INLINE -Messaging::MaxHopsPolicy_out::MaxHopsPolicy_out (const Messaging::MaxHopsPolicy_out &p) // copy constructor - : ptr_ (ACE_const_cast (Messaging::MaxHopsPolicy_out&,p).ptr_) +Messaging::MaxHopsPolicy_out::MaxHopsPolicy_out (const ::Messaging::MaxHopsPolicy_out &p) // copy constructor + : ptr_ (ACE_const_cast (MaxHopsPolicy_out &, p).ptr_) {} -ACE_INLINE Messaging::MaxHopsPolicy_out & -Messaging::MaxHopsPolicy_out::operator= (const Messaging::MaxHopsPolicy_out &p) +ACE_INLINE ::Messaging::MaxHopsPolicy_out & +Messaging::MaxHopsPolicy_out::operator= (const ::Messaging::MaxHopsPolicy_out &p) { - this->ptr_ = ACE_const_cast (Messaging::MaxHopsPolicy_out&,p).ptr_; + this->ptr_ = ACE_const_cast (MaxHopsPolicy_out&, p).ptr_; return *this; } ACE_INLINE Messaging::MaxHopsPolicy_out & -Messaging::MaxHopsPolicy_out::operator= (const Messaging::MaxHopsPolicy_var &p) +Messaging::MaxHopsPolicy_out::operator= (const ::Messaging::MaxHopsPolicy_var &p) { - this->ptr_ = Messaging::MaxHopsPolicy::_duplicate (p.ptr ()); + this->ptr_ = ::Messaging::MaxHopsPolicy::_duplicate (p.ptr ()); return *this; } ACE_INLINE Messaging::MaxHopsPolicy_out & -Messaging::MaxHopsPolicy_out::operator= (Messaging::MaxHopsPolicy_ptr p) +Messaging::MaxHopsPolicy_out::operator= (MaxHopsPolicy_ptr p) { this->ptr_ = p; return *this; } -ACE_INLINE -Messaging::MaxHopsPolicy_out::operator Messaging::MaxHopsPolicy_ptr &() // cast +ACE_INLINE +Messaging::MaxHopsPolicy_out::operator ::Messaging::MaxHopsPolicy_ptr &() // cast { return this->ptr_; } -ACE_INLINE Messaging::MaxHopsPolicy_ptr & +ACE_INLINE ::Messaging::MaxHopsPolicy_ptr & Messaging::MaxHopsPolicy_out::ptr (void) // ptr { return this->ptr_; } -ACE_INLINE Messaging::MaxHopsPolicy_ptr +ACE_INLINE ::Messaging::MaxHopsPolicy_ptr Messaging::MaxHopsPolicy_out::operator-> (void) { return this->ptr_; } + +#endif /* end #if !defined */ + #endif /* TAO_HAS_MAX_HOPS_POLICY == 1 */ #if (TAO_HAS_QUEUE_ORDER_POLICY == 1) @@ -2527,27 +2498,12 @@ Messaging::QueueOrderPolicy::QueueOrderPolicy (void) // default constructor {} ACE_INLINE -Messaging::QueueOrderPolicy::QueueOrderPolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor - : CORBA_Object (objref, _tao_servant, _tao_collocated) -{} - -ACE_INLINE Messaging::QueueOrderPolicy::~QueueOrderPolicy (void) // destructor {} -ACE_INLINE Messaging::QueueOrderPolicy_ptr -Messaging::QueueOrderPolicy::_duplicate (Messaging::QueueOrderPolicy_ptr obj) -{ - if (!CORBA::is_nil (obj)) - obj->_add_ref (); - return obj; -} -ACE_INLINE Messaging::QueueOrderPolicy_ptr -Messaging::QueueOrderPolicy::_nil (void) -{ - return (Messaging::QueueOrderPolicy_ptr)0; -} +#if !defined (_MESSAGING_QUEUEORDERPOLICY___VAR_CI_) +#define _MESSAGING_QUEUEORDERPOLICY___VAR_CI_ // ************************************************************* // Inline operations for class Messaging::QueueOrderPolicy_var @@ -2555,23 +2511,23 @@ Messaging::QueueOrderPolicy::_nil (void) ACE_INLINE Messaging::QueueOrderPolicy_var::QueueOrderPolicy_var (void) // default constructor - : ptr_ (Messaging::QueueOrderPolicy::_nil ()) + : ptr_ (QueueOrderPolicy::_nil ()) {} ACE_INLINE -Messaging::QueueOrderPolicy_var::QueueOrderPolicy_var (Messaging::QueueOrderPolicy_ptr p) +Messaging::QueueOrderPolicy_var::QueueOrderPolicy_var (QueueOrderPolicy_ptr p) : ptr_ (p) {} -ACE_INLINE Messaging::QueueOrderPolicy_ptr +ACE_INLINE ::Messaging::QueueOrderPolicy_ptr Messaging::QueueOrderPolicy_var::ptr (void) const { return this->ptr_; } ACE_INLINE -Messaging::QueueOrderPolicy_var::QueueOrderPolicy_var (const Messaging::QueueOrderPolicy_var &p) // copy constructor - : ptr_ (Messaging::QueueOrderPolicy::_duplicate (p.ptr ())) +Messaging::QueueOrderPolicy_var::QueueOrderPolicy_var (const ::Messaging::QueueOrderPolicy_var &p) // copy constructor + : ptr_ (QueueOrderPolicy::_duplicate (p.ptr ())) {} ACE_INLINE @@ -2581,7 +2537,7 @@ Messaging::QueueOrderPolicy_var::~QueueOrderPolicy_var (void) // destructor } ACE_INLINE Messaging::QueueOrderPolicy_var & -Messaging::QueueOrderPolicy_var::operator= (Messaging::QueueOrderPolicy_ptr p) +Messaging::QueueOrderPolicy_var::operator= (QueueOrderPolicy_ptr p) { CORBA::release (this->ptr_); this->ptr_ = p; @@ -2589,126 +2545,136 @@ Messaging::QueueOrderPolicy_var::operator= (Messaging::QueueOrderPolicy_ptr p) } ACE_INLINE Messaging::QueueOrderPolicy_var & -Messaging::QueueOrderPolicy_var::operator= (const Messaging::QueueOrderPolicy_var &p) +Messaging::QueueOrderPolicy_var::operator= (const ::Messaging::QueueOrderPolicy_var &p) { if (this != &p) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::QueueOrderPolicy::_duplicate (p.ptr ()); + this->ptr_ = ::Messaging::QueueOrderPolicy::_duplicate (p.ptr ()); } return *this; } -ACE_INLINE -Messaging::QueueOrderPolicy_var::operator const Messaging::QueueOrderPolicy_ptr &() const // cast +ACE_INLINE +Messaging::QueueOrderPolicy_var::operator const ::Messaging::QueueOrderPolicy_ptr &() const // cast { return this->ptr_; } -ACE_INLINE -Messaging::QueueOrderPolicy_var::operator Messaging::QueueOrderPolicy_ptr &() // cast +ACE_INLINE +Messaging::QueueOrderPolicy_var::operator ::Messaging::QueueOrderPolicy_ptr &() // cast { return this->ptr_; } -ACE_INLINE Messaging::QueueOrderPolicy_ptr +ACE_INLINE ::Messaging::QueueOrderPolicy_ptr Messaging::QueueOrderPolicy_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE Messaging::QueueOrderPolicy_ptr +ACE_INLINE ::Messaging::QueueOrderPolicy_ptr Messaging::QueueOrderPolicy_var::in (void) const { return this->ptr_; } -ACE_INLINE Messaging::QueueOrderPolicy_ptr & +ACE_INLINE ::Messaging::QueueOrderPolicy_ptr & Messaging::QueueOrderPolicy_var::inout (void) { return this->ptr_; } -ACE_INLINE Messaging::QueueOrderPolicy_ptr & +ACE_INLINE ::Messaging::QueueOrderPolicy_ptr & Messaging::QueueOrderPolicy_var::out (void) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::QueueOrderPolicy::_nil (); + this->ptr_ = ::Messaging::QueueOrderPolicy::_nil (); return this->ptr_; } -ACE_INLINE Messaging::QueueOrderPolicy_ptr +ACE_INLINE ::Messaging::QueueOrderPolicy_ptr Messaging::QueueOrderPolicy_var::_retn (void) { // yield ownership of managed obj reference - Messaging::QueueOrderPolicy_ptr val = this->ptr_; - this->ptr_ = Messaging::QueueOrderPolicy::_nil (); + ::Messaging::QueueOrderPolicy_ptr val = this->ptr_; + this->ptr_ = ::Messaging::QueueOrderPolicy::_nil (); return val; } + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_QUEUEORDERPOLICY___OUT_CI_) +#define _MESSAGING_QUEUEORDERPOLICY___OUT_CI_ + // ************************************************************* // Inline operations for class Messaging::QueueOrderPolicy_out // ************************************************************* ACE_INLINE -Messaging::QueueOrderPolicy_out::QueueOrderPolicy_out (Messaging::QueueOrderPolicy_ptr &p) +Messaging::QueueOrderPolicy_out::QueueOrderPolicy_out (QueueOrderPolicy_ptr &p) : ptr_ (p) { - this->ptr_ = Messaging::QueueOrderPolicy::_nil (); + this->ptr_ = ::Messaging::QueueOrderPolicy::_nil (); } ACE_INLINE -Messaging::QueueOrderPolicy_out::QueueOrderPolicy_out (Messaging::QueueOrderPolicy_var &p) // constructor from _var +Messaging::QueueOrderPolicy_out::QueueOrderPolicy_out (QueueOrderPolicy_var &p) // constructor from _var : ptr_ (p.out ()) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::QueueOrderPolicy::_nil (); + this->ptr_ = ::Messaging::QueueOrderPolicy::_nil (); } ACE_INLINE -Messaging::QueueOrderPolicy_out::QueueOrderPolicy_out (const Messaging::QueueOrderPolicy_out &p) // copy constructor - : ptr_ (ACE_const_cast (Messaging::QueueOrderPolicy_out&,p).ptr_) +Messaging::QueueOrderPolicy_out::QueueOrderPolicy_out (const ::Messaging::QueueOrderPolicy_out &p) // copy constructor + : ptr_ (ACE_const_cast (QueueOrderPolicy_out &, p).ptr_) {} -ACE_INLINE Messaging::QueueOrderPolicy_out & -Messaging::QueueOrderPolicy_out::operator= (const Messaging::QueueOrderPolicy_out &p) +ACE_INLINE ::Messaging::QueueOrderPolicy_out & +Messaging::QueueOrderPolicy_out::operator= (const ::Messaging::QueueOrderPolicy_out &p) { - this->ptr_ = ACE_const_cast (Messaging::QueueOrderPolicy_out&,p).ptr_; + this->ptr_ = ACE_const_cast (QueueOrderPolicy_out&, p).ptr_; return *this; } ACE_INLINE Messaging::QueueOrderPolicy_out & -Messaging::QueueOrderPolicy_out::operator= (const Messaging::QueueOrderPolicy_var &p) +Messaging::QueueOrderPolicy_out::operator= (const ::Messaging::QueueOrderPolicy_var &p) { - this->ptr_ = Messaging::QueueOrderPolicy::_duplicate (p.ptr ()); + this->ptr_ = ::Messaging::QueueOrderPolicy::_duplicate (p.ptr ()); return *this; } ACE_INLINE Messaging::QueueOrderPolicy_out & -Messaging::QueueOrderPolicy_out::operator= (Messaging::QueueOrderPolicy_ptr p) +Messaging::QueueOrderPolicy_out::operator= (QueueOrderPolicy_ptr p) { this->ptr_ = p; return *this; } -ACE_INLINE -Messaging::QueueOrderPolicy_out::operator Messaging::QueueOrderPolicy_ptr &() // cast +ACE_INLINE +Messaging::QueueOrderPolicy_out::operator ::Messaging::QueueOrderPolicy_ptr &() // cast { return this->ptr_; } -ACE_INLINE Messaging::QueueOrderPolicy_ptr & +ACE_INLINE ::Messaging::QueueOrderPolicy_ptr & Messaging::QueueOrderPolicy_out::ptr (void) // ptr { return this->ptr_; } -ACE_INLINE Messaging::QueueOrderPolicy_ptr +ACE_INLINE ::Messaging::QueueOrderPolicy_ptr Messaging::QueueOrderPolicy_out::operator-> (void) { return this->ptr_; } + +#endif /* end #if !defined */ + #endif /* TAO_HAS_QUEUE_ORDER_POLICY == 1 */ // ************************************************************* @@ -2721,16 +2687,15 @@ Messaging::PolicyValue_var::PolicyValue_var (void) // default constructor {} ACE_INLINE -Messaging::PolicyValue_var::PolicyValue_var (Messaging::PolicyValue *p) +Messaging::PolicyValue_var::PolicyValue_var (PolicyValue *p) : ptr_ (p) {} ACE_INLINE -Messaging::PolicyValue_var::PolicyValue_var (const Messaging::PolicyValue_var &p) // copy constructor +Messaging::PolicyValue_var::PolicyValue_var (const ::Messaging::PolicyValue_var &p) // copy constructor { if (p.ptr_) - ACE_NEW (this->ptr_, - Messaging::PolicyValue(*p.ptr_)); + ACE_NEW (this->ptr_, ::Messaging::PolicyValue (*p.ptr_)); else this->ptr_ = 0; } @@ -2742,70 +2707,75 @@ Messaging::PolicyValue_var::~PolicyValue_var (void) // destructor } ACE_INLINE Messaging::PolicyValue_var & -Messaging::PolicyValue_var::operator= (Messaging::PolicyValue *p) +Messaging::PolicyValue_var::operator= (PolicyValue *p) { delete this->ptr_; this->ptr_ = p; return *this; } -ACE_INLINE Messaging::PolicyValue_var & -Messaging::PolicyValue_var::operator= (const Messaging::PolicyValue_var &p) +ACE_INLINE ::Messaging::PolicyValue_var & +Messaging::PolicyValue_var::operator= (const ::Messaging::PolicyValue_var &p) { if (this != &p) { delete this->ptr_; - ACE_NEW_RETURN (this->ptr_, - Messaging::PolicyValue (*p.ptr_), - *this); + ACE_NEW_RETURN (this->ptr_, ::Messaging::PolicyValue (*p.ptr_), *this); } return *this; } -ACE_INLINE const Messaging::PolicyValue * +ACE_INLINE const ::Messaging::PolicyValue * Messaging::PolicyValue_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE Messaging::PolicyValue * +ACE_INLINE ::Messaging::PolicyValue * Messaging::PolicyValue_var::operator-> (void) { return this->ptr_; } ACE_INLINE -Messaging::PolicyValue_var::operator const Messaging::PolicyValue &() const // cast +Messaging::PolicyValue_var::operator const ::Messaging::PolicyValue &() const // cast { return *this->ptr_; } ACE_INLINE -Messaging::PolicyValue_var::operator Messaging::PolicyValue &() // cast +Messaging::PolicyValue_var::operator ::Messaging::PolicyValue &() // cast { return *this->ptr_; } ACE_INLINE -Messaging::PolicyValue_var::operator Messaging::PolicyValue &() const// cast +Messaging::PolicyValue_var::operator ::Messaging::PolicyValue &() const // cast { return *this->ptr_; } -ACE_INLINE const Messaging::PolicyValue & +// variable-size types only +ACE_INLINE +Messaging::PolicyValue_var::operator ::Messaging::PolicyValue *&() // cast +{ + return this->ptr_; +} + +ACE_INLINE const ::Messaging::PolicyValue & Messaging::PolicyValue_var::in (void) const { return *this->ptr_; } -ACE_INLINE Messaging::PolicyValue & +ACE_INLINE ::Messaging::PolicyValue & Messaging::PolicyValue_var::inout (void) { return *this->ptr_; } -// mapping for variable size -ACE_INLINE Messaging::PolicyValue *& +// mapping for variable size +ACE_INLINE ::Messaging::PolicyValue *& Messaging::PolicyValue_var::out (void) { delete this->ptr_; @@ -2813,15 +2783,15 @@ Messaging::PolicyValue_var::out (void) return this->ptr_; } -ACE_INLINE Messaging::PolicyValue * +ACE_INLINE ::Messaging::PolicyValue * Messaging::PolicyValue_var::_retn (void) { - Messaging::PolicyValue *tmp = this->ptr_; + ::Messaging::PolicyValue *tmp = this->ptr_; this->ptr_ = 0; return tmp; } -ACE_INLINE Messaging::PolicyValue * +ACE_INLINE ::Messaging::PolicyValue * Messaging::PolicyValue_var::ptr (void) const { return this->ptr_; @@ -2832,14 +2802,14 @@ Messaging::PolicyValue_var::ptr (void) const // ************************************************************* ACE_INLINE -Messaging::PolicyValue_out::PolicyValue_out (Messaging::PolicyValue *&p) +Messaging::PolicyValue_out::PolicyValue_out (::Messaging::PolicyValue *&p) : ptr_ (p) { this->ptr_ = 0; } ACE_INLINE -Messaging::PolicyValue_out::PolicyValue_out (Messaging::PolicyValue_var &p) // constructor from _var +Messaging::PolicyValue_out::PolicyValue_out (PolicyValue_var &p) // constructor from _var : ptr_ (p.out ()) { delete this->ptr_; @@ -2847,177 +2817,197 @@ Messaging::PolicyValue_out::PolicyValue_out (Messaging::PolicyValue_var &p) // c } ACE_INLINE -Messaging::PolicyValue_out::PolicyValue_out (const Messaging::PolicyValue_out &p) // copy constructor - : ptr_ (ACE_const_cast (Messaging::PolicyValue_out&,p).ptr_) +Messaging::PolicyValue_out::PolicyValue_out (const ::Messaging::PolicyValue_out &p) // copy constructor + : ptr_ (ACE_const_cast (PolicyValue_out&, p).ptr_) {} ACE_INLINE Messaging::PolicyValue_out & -Messaging::PolicyValue_out::operator= (const Messaging::PolicyValue_out &p) +Messaging::PolicyValue_out::operator= (const ::Messaging::PolicyValue_out &p) { - this->ptr_ = ACE_const_cast (Messaging::PolicyValue_out&,p).ptr_; + this->ptr_ = ACE_const_cast (PolicyValue_out&, p).ptr_; return *this; } ACE_INLINE Messaging::PolicyValue_out & -Messaging::PolicyValue_out::operator= (Messaging::PolicyValue *p) +Messaging::PolicyValue_out::operator= (PolicyValue *p) { this->ptr_ = p; return *this; } -ACE_INLINE -Messaging::PolicyValue_out::operator Messaging::PolicyValue *&() // cast +ACE_INLINE +Messaging::PolicyValue_out::operator ::Messaging::PolicyValue *&() // cast { return this->ptr_; } -ACE_INLINE Messaging::PolicyValue *& +ACE_INLINE ::Messaging::PolicyValue *& Messaging::PolicyValue_out::ptr (void) // ptr { return this->ptr_; } -ACE_INLINE Messaging::PolicyValue * +ACE_INLINE ::Messaging::PolicyValue * Messaging::PolicyValue_out::operator-> (void) { return this->ptr_; } + +#if !defined (_MESSAGING_POLICYVALUE__TAO_SEQ_OCTET_CI_) +#define _MESSAGING_POLICYVALUE__TAO_SEQ_OCTET_CI_ + // ************************************************************* -// Inline operations for class Messaging::PolicyValueSeq_var +// Inline operations for class Messaging::PolicyValue::_tao_seq_Octet_var // ************************************************************* ACE_INLINE -Messaging::PolicyValueSeq_var::PolicyValueSeq_var (void) // default constructor +Messaging::PolicyValue::_tao_seq_Octet_var::_tao_seq_Octet_var (void) // default constructor : ptr_ (0) {} ACE_INLINE -Messaging::PolicyValueSeq_var::PolicyValueSeq_var (Messaging::PolicyValueSeq *p) +Messaging::PolicyValue::_tao_seq_Octet_var::_tao_seq_Octet_var (_tao_seq_Octet *p) : ptr_ (p) {} ACE_INLINE -Messaging::PolicyValueSeq_var::PolicyValueSeq_var (const Messaging::PolicyValueSeq_var &p) // copy constructor +Messaging::PolicyValue::_tao_seq_Octet_var::_tao_seq_Octet_var (const ::Messaging::PolicyValue::_tao_seq_Octet_var &p) // copy constructor { if (p.ptr_) - ACE_NEW (this->ptr_, - Messaging::PolicyValueSeq (*p.ptr_)); + ACE_NEW (this->ptr_, ::Messaging::PolicyValue::_tao_seq_Octet (*p.ptr_)); else this->ptr_ = 0; } +// fixed-size base types only ACE_INLINE -Messaging::PolicyValueSeq_var::~PolicyValueSeq_var (void) // destructor +Messaging::PolicyValue::_tao_seq_Octet_var::_tao_seq_Octet_var (const ::Messaging::PolicyValue::_tao_seq_Octet &p) +{ + ACE_NEW (this->ptr_, ::Messaging::PolicyValue::_tao_seq_Octet (p)); +} + +ACE_INLINE +Messaging::PolicyValue::_tao_seq_Octet_var::~_tao_seq_Octet_var (void) // destructor { delete this->ptr_; } -ACE_INLINE Messaging::PolicyValueSeq_var & -Messaging::PolicyValueSeq_var::operator= (Messaging::PolicyValueSeq *p) +ACE_INLINE Messaging::PolicyValue::_tao_seq_Octet_var & +Messaging::PolicyValue::_tao_seq_Octet_var::operator= (_tao_seq_Octet *p) { delete this->ptr_; this->ptr_ = p; return *this; } -ACE_INLINE Messaging::PolicyValueSeq_var & -Messaging::PolicyValueSeq_var::operator= (const Messaging::PolicyValueSeq_var &p) // deep copy +ACE_INLINE Messaging::PolicyValue::_tao_seq_Octet_var & +Messaging::PolicyValue::_tao_seq_Octet_var::operator= (const ::Messaging::PolicyValue::_tao_seq_Octet_var &p) // deep copy { if (this != &p) { delete this->ptr_; - ACE_NEW_RETURN (this->ptr_, - Messaging::PolicyValueSeq (*p.ptr_), - *this); + ACE_NEW_RETURN (this->ptr_, ::Messaging::PolicyValue::_tao_seq_Octet (*p.ptr_), *this); } return *this; } -ACE_INLINE const Messaging::PolicyValueSeq * -Messaging::PolicyValueSeq_var::operator-> (void) const +// fixed-size types only +ACE_INLINE ::Messaging::PolicyValue::_tao_seq_Octet_var & +Messaging::PolicyValue::_tao_seq_Octet_var::operator= (const ::Messaging::PolicyValue::_tao_seq_Octet &p) +{ + if (this->ptr_ != &p) + { + delete this->ptr_; + ACE_NEW_RETURN (this->ptr_, ::Messaging::PolicyValue::_tao_seq_Octet (p), *this); + } + return *this; +} + +ACE_INLINE const ::Messaging::PolicyValue::_tao_seq_Octet * +Messaging::PolicyValue::_tao_seq_Octet_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE Messaging::PolicyValueSeq * -Messaging::PolicyValueSeq_var::operator-> (void) +ACE_INLINE ::Messaging::PolicyValue::_tao_seq_Octet * +Messaging::PolicyValue::_tao_seq_Octet_var::operator-> (void) { return this->ptr_; } -ACE_INLINE -Messaging::PolicyValueSeq_var::operator const Messaging::PolicyValueSeq &() const // cast +ACE_INLINE +Messaging::PolicyValue::_tao_seq_Octet_var::operator const ::Messaging::PolicyValue::_tao_seq_Octet &() const // cast { return *this->ptr_; } -ACE_INLINE -Messaging::PolicyValueSeq_var::operator Messaging::PolicyValueSeq &() // cast +ACE_INLINE +Messaging::PolicyValue::_tao_seq_Octet_var::operator ::Messaging::PolicyValue::_tao_seq_Octet &() // cast { return *this->ptr_; } -ACE_INLINE -Messaging::PolicyValueSeq_var::operator Messaging::PolicyValueSeq &() const// cast +ACE_INLINE +Messaging::PolicyValue::_tao_seq_Octet_var::operator ::Messaging::PolicyValue::_tao_seq_Octet &() const // cast { return *this->ptr_; } -ACE_INLINE Messaging::PolicyValue & -Messaging::PolicyValueSeq_var::operator[] (CORBA::ULong slot) +ACE_INLINE CORBA::Octet & +Messaging::PolicyValue::_tao_seq_Octet_var::operator[] (CORBA::ULong index) { - return this->ptr_->operator[] (slot); + return this->ptr_->operator[] (index); } -ACE_INLINE const Messaging::PolicyValueSeq & -Messaging::PolicyValueSeq_var::in (void) const +ACE_INLINE const ::Messaging::PolicyValue::_tao_seq_Octet & +Messaging::PolicyValue::_tao_seq_Octet_var::in (void) const { return *this->ptr_; } -ACE_INLINE Messaging::PolicyValueSeq & -Messaging::PolicyValueSeq_var::inout (void) +ACE_INLINE ::Messaging::PolicyValue::_tao_seq_Octet & +Messaging::PolicyValue::_tao_seq_Octet_var::inout (void) { return *this->ptr_; } -// mapping for variable size -ACE_INLINE Messaging::PolicyValueSeq *& -Messaging::PolicyValueSeq_var::out (void) +// mapping for variable size +ACE_INLINE ::Messaging::PolicyValue::_tao_seq_Octet *& +Messaging::PolicyValue::_tao_seq_Octet_var::out (void) { delete this->ptr_; this->ptr_ = 0; return this->ptr_; } -ACE_INLINE Messaging::PolicyValueSeq * -Messaging::PolicyValueSeq_var::_retn (void) +ACE_INLINE ::Messaging::PolicyValue::_tao_seq_Octet * +Messaging::PolicyValue::_tao_seq_Octet_var::_retn (void) { - Messaging::PolicyValueSeq *tmp = this->ptr_; + ::Messaging::PolicyValue::_tao_seq_Octet *tmp = this->ptr_; this->ptr_ = 0; return tmp; } -ACE_INLINE Messaging::PolicyValueSeq * -Messaging::PolicyValueSeq_var::ptr (void) const +ACE_INLINE ::Messaging::PolicyValue::_tao_seq_Octet * +Messaging::PolicyValue::_tao_seq_Octet_var::ptr (void) const { return this->ptr_; } // ************************************************************* -// Inline operations for class Messaging::PolicyValueSeq_out +// Inline operations for class Messaging::PolicyValue::_tao_seq_Octet_out // ************************************************************* ACE_INLINE -Messaging::PolicyValueSeq_out::PolicyValueSeq_out (Messaging::PolicyValueSeq *&p) +Messaging::PolicyValue::_tao_seq_Octet_out::_tao_seq_Octet_out (_tao_seq_Octet *&p) : ptr_ (p) { this->ptr_ = 0; } ACE_INLINE -Messaging::PolicyValueSeq_out::PolicyValueSeq_out (Messaging::PolicyValueSeq_var &p) // constructor from _var +Messaging::PolicyValue::_tao_seq_Octet_out::_tao_seq_Octet_out (_tao_seq_Octet_var &p) // constructor from _var : ptr_ (p.out ()) { delete this->ptr_; @@ -3025,183 +3015,369 @@ Messaging::PolicyValueSeq_out::PolicyValueSeq_out (Messaging::PolicyValueSeq_var } ACE_INLINE -Messaging::PolicyValueSeq_out::PolicyValueSeq_out (const Messaging::PolicyValueSeq_out &p) // copy constructor - : ptr_ (ACE_const_cast (Messaging::PolicyValueSeq_out&,p).ptr_) +Messaging::PolicyValue::_tao_seq_Octet_out::_tao_seq_Octet_out (const ::Messaging::PolicyValue::_tao_seq_Octet_out &p) // copy constructor + : ptr_ (ACE_const_cast (_tao_seq_Octet_out&, p).ptr_) {} -ACE_INLINE Messaging::PolicyValueSeq_out & -Messaging::PolicyValueSeq_out::operator= (const Messaging::PolicyValueSeq_out &p) +ACE_INLINE ::Messaging::PolicyValue::_tao_seq_Octet_out & +Messaging::PolicyValue::_tao_seq_Octet_out::operator= (const ::Messaging::PolicyValue::_tao_seq_Octet_out &p) { - this->ptr_ = ACE_const_cast (Messaging::PolicyValueSeq_out&,p).ptr_; + this->ptr_ = ACE_const_cast (_tao_seq_Octet_out&, p).ptr_; return *this; } -ACE_INLINE Messaging::PolicyValueSeq_out & -Messaging::PolicyValueSeq_out::operator= (Messaging::PolicyValueSeq *p) +ACE_INLINE ::Messaging::PolicyValue::_tao_seq_Octet_out & +Messaging::PolicyValue::_tao_seq_Octet_out::operator= (_tao_seq_Octet *p) { this->ptr_ = p; return *this; } -ACE_INLINE -Messaging::PolicyValueSeq_out::operator Messaging::PolicyValueSeq *&() // cast +ACE_INLINE +Messaging::PolicyValue::_tao_seq_Octet_out::operator ::Messaging::PolicyValue::_tao_seq_Octet *&() // cast { return this->ptr_; } -ACE_INLINE Messaging::PolicyValueSeq *& -Messaging::PolicyValueSeq_out::ptr (void) // ptr +ACE_INLINE ::Messaging::PolicyValue::_tao_seq_Octet *& +Messaging::PolicyValue::_tao_seq_Octet_out::ptr (void) // ptr { return this->ptr_; } -ACE_INLINE Messaging::PolicyValueSeq * -Messaging::PolicyValueSeq_out::operator-> (void) +ACE_INLINE ::Messaging::PolicyValue::_tao_seq_Octet * +Messaging::PolicyValue::_tao_seq_Octet_out::operator-> (void) { return this->ptr_; } -ACE_INLINE Messaging::PolicyValue & -Messaging::PolicyValueSeq_out::operator[] (CORBA::ULong slot) +ACE_INLINE CORBA::Octet & +Messaging::PolicyValue::_tao_seq_Octet_out::operator[] (CORBA::ULong index) { - return this->ptr_->operator[] (slot); + return this->ptr_->operator[] (index); } -#if (TAO_HAS_AMI_CALLBACK == 1) +#endif /* end #if !defined */ + + +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + +#if !defined (__TAO_UNBOUNDED_SEQUENCE_MESSAGING_POLICYVALUESEQ_CI_) +#define __TAO_UNBOUNDED_SEQUENCE_MESSAGING_POLICYVALUESEQ_CI_ + + // = Static operations. + ACE_INLINE Messaging::PolicyValue * + Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (CORBA::ULong size) + // Allocate storage for the sequence. + { + Messaging::PolicyValue *retval = 0; + ACE_NEW_RETURN (retval, Messaging::PolicyValue[size], 0); + return retval; + } + + ACE_INLINE void Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (Messaging::PolicyValue *buffer) + // Free the sequence. + { + delete [] buffer; + } + + ACE_INLINE + Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (void) // Default constructor. + { + } + + ACE_INLINE + Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (CORBA::ULong maximum) // Constructor using a maximum length value. + : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (maximum)) + { + } + + ACE_INLINE + Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (CORBA::ULong maximum, + CORBA::ULong length, + Messaging::PolicyValue *data, + CORBA::Boolean release) + : TAO_Unbounded_Base_Sequence (maximum, length, data, release) + { + } + + ACE_INLINE + Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (const _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq &rhs) + // Copy constructor. + : TAO_Unbounded_Base_Sequence (rhs) + { + if (rhs.buffer_ != 0) + { + Messaging::PolicyValue *tmp1 = _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (this->maximum_); + Messaging::PolicyValue * const tmp2 = ACE_reinterpret_cast (Messaging::PolicyValue * ACE_CAST_CONST, rhs.buffer_); + + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp1[i] = tmp2[i]; + + this->buffer_ = tmp1; + } + else + { + this->buffer_ = 0; + } + } + + ACE_INLINE Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq & + Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::operator= (const _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq &rhs) + // Assignment operator. + { + if (this == &rhs) + return *this; + + if (this->release_) + { + if (this->maximum_ < rhs.maximum_) + { + // free the old buffer + Messaging::PolicyValue *tmp = ACE_reinterpret_cast (Messaging::PolicyValue *, this->buffer_); + _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (tmp); + this->buffer_ = _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (rhs.maximum_); + } + } + else + this->buffer_ = _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (rhs.maximum_); + + TAO_Unbounded_Base_Sequence::operator= (rhs); + + Messaging::PolicyValue *tmp1 = ACE_reinterpret_cast (Messaging::PolicyValue *, this->buffer_); + Messaging::PolicyValue * const tmp2 = ACE_reinterpret_cast (Messaging::PolicyValue * ACE_CAST_CONST, rhs.buffer_); + + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp1[i] = tmp2[i]; + + return *this; + } + + // = Accessors. + ACE_INLINE Messaging::PolicyValue & + Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::operator[] (CORBA::ULong i) + // operator [] + { + ACE_ASSERT (i < this->maximum_); + Messaging::PolicyValue* tmp = ACE_reinterpret_cast(Messaging::PolicyValue*,this->buffer_); + return tmp[i]; + } + + ACE_INLINE const Messaging::PolicyValue & + Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::operator[] (CORBA::ULong i) const + // operator [] + { + ACE_ASSERT (i < this->maximum_); + Messaging::PolicyValue * const tmp = ACE_reinterpret_cast (Messaging::PolicyValue* ACE_CAST_CONST, this->buffer_); + return tmp[i]; + } + + // Implement the TAO_Base_Sequence methods (see Sequence.h) + + ACE_INLINE Messaging::PolicyValue * + Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::get_buffer (CORBA::Boolean orphan) + { + Messaging::PolicyValue *result = 0; + if (orphan == 0) + { + // We retain ownership. + if (this->buffer_ == 0) + { + result = _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (this->length_); + this->buffer_ = result; + } + else + { + result = ACE_reinterpret_cast (Messaging::PolicyValue*, this->buffer_); + } + } + else // if (orphan == 1) + { + if (this->release_ != 0) + { + // We set the state back to default and relinquish + // ownership. + result = ACE_reinterpret_cast(Messaging::PolicyValue*,this->buffer_); + this->maximum_ = 0; + this->length_ = 0; + this->buffer_ = 0; + this->release_ = 0; + } + } + return result; + } + + ACE_INLINE const Messaging::PolicyValue * + Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::get_buffer (void) const + { + return ACE_reinterpret_cast(const Messaging::PolicyValue * ACE_CAST_CONST, this->buffer_); + } + + ACE_INLINE void + Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::replace (CORBA::ULong max, + CORBA::ULong length, + Messaging::PolicyValue *data, + CORBA::Boolean release) + { + this->maximum_ = max; + this->length_ = length; + if (this->buffer_ && this->release_ == 1) + { + Messaging::PolicyValue *tmp = ACE_reinterpret_cast(Messaging::PolicyValue*,this->buffer_); + _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (tmp); + } + this->buffer_ = data; + this->release_ = release; + } + +#endif /* end #if !defined */ + + +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + +#if !defined (_MESSAGING_POLICYVALUESEQ_CI_) +#define _MESSAGING_POLICYVALUESEQ_CI_ // ************************************************************* -// Inline operations for class Messaging::ExceptionHolder::_tao_seq_Octet_var +// Inline operations for class Messaging::PolicyValueSeq_var // ************************************************************* ACE_INLINE -Messaging::ExceptionHolder::_tao_seq_Octet_var::_tao_seq_Octet_var (void) // default constructor +Messaging::PolicyValueSeq_var::PolicyValueSeq_var (void) // default constructor : ptr_ (0) {} ACE_INLINE -Messaging::ExceptionHolder::_tao_seq_Octet_var::_tao_seq_Octet_var (Messaging::ExceptionHolder::_tao_seq_Octet *p) +Messaging::PolicyValueSeq_var::PolicyValueSeq_var (PolicyValueSeq *p) : ptr_ (p) {} ACE_INLINE -Messaging::ExceptionHolder::_tao_seq_Octet_var::_tao_seq_Octet_var (const Messaging::ExceptionHolder::_tao_seq_Octet_var &p) // copy constructor +Messaging::PolicyValueSeq_var::PolicyValueSeq_var (const ::Messaging::PolicyValueSeq_var &p) // copy constructor { if (p.ptr_) - ACE_NEW (this->ptr_, Messaging::ExceptionHolder::_tao_seq_Octet (*p.ptr_)); + ACE_NEW (this->ptr_, ::Messaging::PolicyValueSeq (*p.ptr_)); else this->ptr_ = 0; } ACE_INLINE -Messaging::ExceptionHolder::_tao_seq_Octet_var::~_tao_seq_Octet_var (void) // destructor +Messaging::PolicyValueSeq_var::~PolicyValueSeq_var (void) // destructor { delete this->ptr_; } -ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet_var & -Messaging::ExceptionHolder::_tao_seq_Octet_var::operator= (Messaging::ExceptionHolder::_tao_seq_Octet *p) +ACE_INLINE Messaging::PolicyValueSeq_var & +Messaging::PolicyValueSeq_var::operator= (PolicyValueSeq *p) { delete this->ptr_; this->ptr_ = p; return *this; } -ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet_var & -Messaging::ExceptionHolder::_tao_seq_Octet_var::operator= (const Messaging::ExceptionHolder::_tao_seq_Octet_var &p) // deep copy +ACE_INLINE Messaging::PolicyValueSeq_var & +Messaging::PolicyValueSeq_var::operator= (const ::Messaging::PolicyValueSeq_var &p) // deep copy { if (this != &p) { delete this->ptr_; - ACE_NEW_RETURN (this->ptr_, Messaging::ExceptionHolder::_tao_seq_Octet (*p.ptr_), *this); + ACE_NEW_RETURN (this->ptr_, ::Messaging::PolicyValueSeq (*p.ptr_), *this); } return *this; } -ACE_INLINE const Messaging::ExceptionHolder::_tao_seq_Octet * -Messaging::ExceptionHolder::_tao_seq_Octet_var::operator-> (void) const +ACE_INLINE const ::Messaging::PolicyValueSeq * +Messaging::PolicyValueSeq_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet * -Messaging::ExceptionHolder::_tao_seq_Octet_var::operator-> (void) +ACE_INLINE ::Messaging::PolicyValueSeq * +Messaging::PolicyValueSeq_var::operator-> (void) { return this->ptr_; } -ACE_INLINE -Messaging::ExceptionHolder::_tao_seq_Octet_var::operator const Messaging::ExceptionHolder::_tao_seq_Octet &() const // cast +ACE_INLINE +Messaging::PolicyValueSeq_var::operator const ::Messaging::PolicyValueSeq &() const // cast { return *this->ptr_; } -ACE_INLINE -Messaging::ExceptionHolder::_tao_seq_Octet_var::operator Messaging::ExceptionHolder::_tao_seq_Octet &() // cast +ACE_INLINE +Messaging::PolicyValueSeq_var::operator ::Messaging::PolicyValueSeq &() // cast { return *this->ptr_; } -ACE_INLINE -Messaging::ExceptionHolder::_tao_seq_Octet_var::operator Messaging::ExceptionHolder::_tao_seq_Octet &() const// cast +ACE_INLINE +Messaging::PolicyValueSeq_var::operator ::Messaging::PolicyValueSeq &() const // cast { return *this->ptr_; } -ACE_INLINE CORBA::Octet & -Messaging::ExceptionHolder::_tao_seq_Octet_var::operator[] (CORBA::ULong index) +// variable-size types only +ACE_INLINE +Messaging::PolicyValueSeq_var::operator ::Messaging::PolicyValueSeq *&() // cast +{ + return this->ptr_; +} + +ACE_INLINE Messaging::PolicyValue & +Messaging::PolicyValueSeq_var::operator[] (CORBA::ULong index) { return this->ptr_->operator[] (index); } -ACE_INLINE const Messaging::ExceptionHolder::_tao_seq_Octet & -Messaging::ExceptionHolder::_tao_seq_Octet_var::in (void) const +ACE_INLINE const ::Messaging::PolicyValueSeq & +Messaging::PolicyValueSeq_var::in (void) const { return *this->ptr_; } -ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet & -Messaging::ExceptionHolder::_tao_seq_Octet_var::inout (void) +ACE_INLINE ::Messaging::PolicyValueSeq & +Messaging::PolicyValueSeq_var::inout (void) { return *this->ptr_; } -// mapping for variable size -ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet *& -Messaging::ExceptionHolder::_tao_seq_Octet_var::out (void) +// mapping for variable size +ACE_INLINE ::Messaging::PolicyValueSeq *& +Messaging::PolicyValueSeq_var::out (void) { delete this->ptr_; this->ptr_ = 0; return this->ptr_; } -ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet * -Messaging::ExceptionHolder::_tao_seq_Octet_var::_retn (void) +ACE_INLINE ::Messaging::PolicyValueSeq * +Messaging::PolicyValueSeq_var::_retn (void) { - Messaging::ExceptionHolder::_tao_seq_Octet *tmp = this->ptr_; + ::Messaging::PolicyValueSeq *tmp = this->ptr_; this->ptr_ = 0; return tmp; } -ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet * -Messaging::ExceptionHolder::_tao_seq_Octet_var::ptr (void) const +ACE_INLINE ::Messaging::PolicyValueSeq * +Messaging::PolicyValueSeq_var::ptr (void) const { return this->ptr_; } // ************************************************************* -// Inline operations for class Messaging::ExceptionHolder::_tao_seq_Octet_out +// Inline operations for class Messaging::PolicyValueSeq_out // ************************************************************* ACE_INLINE -Messaging::ExceptionHolder::_tao_seq_Octet_out::_tao_seq_Octet_out (Messaging::ExceptionHolder::_tao_seq_Octet *&p) +Messaging::PolicyValueSeq_out::PolicyValueSeq_out (PolicyValueSeq *&p) : ptr_ (p) { this->ptr_ = 0; } ACE_INLINE -Messaging::ExceptionHolder::_tao_seq_Octet_out::_tao_seq_Octet_out (Messaging::ExceptionHolder::_tao_seq_Octet_var &p) // constructor from _var +Messaging::PolicyValueSeq_out::PolicyValueSeq_out (PolicyValueSeq_var &p) // constructor from _var : ptr_ (p.out ()) { delete this->ptr_; @@ -3209,64 +3385,69 @@ Messaging::ExceptionHolder::_tao_seq_Octet_out::_tao_seq_Octet_out (Messaging::E } ACE_INLINE -Messaging::ExceptionHolder::_tao_seq_Octet_out::_tao_seq_Octet_out (const Messaging::ExceptionHolder::_tao_seq_Octet_out &p) // copy constructor - : ptr_ (ACE_const_cast (Messaging::ExceptionHolder::_tao_seq_Octet_out&,p).ptr_) +Messaging::PolicyValueSeq_out::PolicyValueSeq_out (const ::Messaging::PolicyValueSeq_out &p) // copy constructor + : ptr_ (ACE_const_cast (PolicyValueSeq_out&, p).ptr_) {} -ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet_out & -Messaging::ExceptionHolder::_tao_seq_Octet_out::operator= (const Messaging::ExceptionHolder::_tao_seq_Octet_out &p) +ACE_INLINE ::Messaging::PolicyValueSeq_out & +Messaging::PolicyValueSeq_out::operator= (const ::Messaging::PolicyValueSeq_out &p) { - this->ptr_ = ACE_const_cast (Messaging::ExceptionHolder::_tao_seq_Octet_out&,p).ptr_; + this->ptr_ = ACE_const_cast (PolicyValueSeq_out&, p).ptr_; return *this; } -ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet_out & -Messaging::ExceptionHolder::_tao_seq_Octet_out::operator= (Messaging::ExceptionHolder::_tao_seq_Octet *p) +ACE_INLINE ::Messaging::PolicyValueSeq_out & +Messaging::PolicyValueSeq_out::operator= (PolicyValueSeq *p) { this->ptr_ = p; return *this; } -ACE_INLINE -Messaging::ExceptionHolder::_tao_seq_Octet_out::operator Messaging::ExceptionHolder::_tao_seq_Octet *&() // cast +ACE_INLINE +Messaging::PolicyValueSeq_out::operator ::Messaging::PolicyValueSeq *&() // cast { return this->ptr_; } -ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet *& -Messaging::ExceptionHolder::_tao_seq_Octet_out::ptr (void) // ptr +ACE_INLINE ::Messaging::PolicyValueSeq *& +Messaging::PolicyValueSeq_out::ptr (void) // ptr { return this->ptr_; } -ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet * -Messaging::ExceptionHolder::_tao_seq_Octet_out::operator-> (void) +ACE_INLINE ::Messaging::PolicyValueSeq * +Messaging::PolicyValueSeq_out::operator-> (void) { return this->ptr_; } -ACE_INLINE CORBA::Octet & -Messaging::ExceptionHolder::_tao_seq_Octet_out::operator[] (CORBA::ULong index) +ACE_INLINE Messaging::PolicyValue & +Messaging::PolicyValueSeq_out::operator[] (CORBA::ULong index) { return this->ptr_->operator[] (index); } +#endif /* end #if !defined */ ACE_INLINE -Messaging::ExceptionHolder::ExceptionHolder (void) // default constructor +Messaging::ExceptionHolder::ExceptionHolder () // default constructor {} ACE_INLINE -Messaging::ExceptionHolder::~ExceptionHolder (void) // destructor +Messaging::ExceptionHolder::~ExceptionHolder () // destructor {} -ACE_INLINE const char* +ACE_INLINE const char* Messaging::ExceptionHolder::_tao_obv_static_repository_id () { - return "IDL:Messaging/ExceptionHolder:1.0"; + return "IDL:omg.org/Messaging/ExceptionHolder:1.0"; } + +#if !defined (_MESSAGING_EXCEPTIONHOLDER___VAR_CI_) +#define _MESSAGING_EXCEPTIONHOLDER___VAR_CI_ + // ************************************************************* // Inline operations for class Messaging::ExceptionHolder_var // ************************************************************* @@ -3286,7 +3467,7 @@ Messaging::ExceptionHolder_var::ExceptionHolder_var (const Messaging::ExceptionH : ptr_ (ACE_const_cast(Messaging::ExceptionHolder*, p)) {} -ACE_INLINE Messaging::ExceptionHolder* +ACE_INLINE Messaging::ExceptionHolder* Messaging::ExceptionHolder_var::ptr (void) const { return this->ptr_; @@ -3326,19 +3507,19 @@ Messaging::ExceptionHolder_var::operator= (const Messaging::ExceptionHolder_var return *this; } -ACE_INLINE +ACE_INLINE Messaging::ExceptionHolder_var::operator const Messaging::ExceptionHolder* () const // cast { return this->ptr_; } -ACE_INLINE -Messaging::ExceptionHolder_var::operator Messaging::ExceptionHolder* () // cast +ACE_INLINE +Messaging::ExceptionHolder_var::operator Messaging::ExceptionHolder* () // cast { return this->ptr_; } -ACE_INLINE Messaging::ExceptionHolder* +ACE_INLINE Messaging::ExceptionHolder* Messaging::ExceptionHolder_var::operator-> (void) const { return this->ptr_; @@ -3364,7 +3545,7 @@ Messaging::ExceptionHolder_var::out (void) return this->ptr_; } -ACE_INLINE Messaging::ExceptionHolder* +ACE_INLINE Messaging::ExceptionHolder* Messaging::ExceptionHolder_var::_retn (void) { // yield ownership of managed obj reference @@ -3374,6 +3555,12 @@ Messaging::ExceptionHolder_var::_retn (void) } +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_EXCEPTIONHOLDER___OUT_CI_) +#define _MESSAGING_EXCEPTIONHOLDER___OUT_CI_ + // ************************************************************* // Inline operations for class Messaging::ExceptionHolder_out // ************************************************************* @@ -3421,7 +3608,7 @@ Messaging::ExceptionHolder_out::operator= (Messaging::ExceptionHolder* p) return *this; } -ACE_INLINE +ACE_INLINE Messaging::ExceptionHolder_out::operator Messaging::ExceptionHolder* &() // cast { return this->ptr_; @@ -3433,16 +3620,14 @@ Messaging::ExceptionHolder_out::ptr (void) // ptr return this->ptr_; } -ACE_INLINE Messaging::ExceptionHolder* +ACE_INLINE Messaging::ExceptionHolder* Messaging::ExceptionHolder_out::operator-> (void) { return this->ptr_; } - -// **************************************************************** - +#endif /* end #if !defined */ ACE_INLINE Messaging::ReplyHandler::ReplyHandler (void) // default constructor @@ -3457,19 +3642,9 @@ ACE_INLINE Messaging::ReplyHandler::~ReplyHandler (void) // destructor {} -ACE_INLINE Messaging::ReplyHandler_ptr -Messaging::ReplyHandler::_duplicate (Messaging::ReplyHandler_ptr obj) -{ - if (!CORBA::is_nil (obj)) - obj->_add_ref (); - return obj; -} -ACE_INLINE Messaging::ReplyHandler_ptr -Messaging::ReplyHandler::_nil (void) -{ - return (Messaging::ReplyHandler_ptr)0; -} +#if !defined (_MESSAGING_REPLYHANDLER___VAR_CI_) +#define _MESSAGING_REPLYHANDLER___VAR_CI_ // ************************************************************* // Inline operations for class Messaging::ReplyHandler_var @@ -3477,23 +3652,23 @@ Messaging::ReplyHandler::_nil (void) ACE_INLINE Messaging::ReplyHandler_var::ReplyHandler_var (void) // default constructor - : ptr_ (Messaging::ReplyHandler::_nil ()) + : ptr_ (ReplyHandler::_nil ()) {} ACE_INLINE -Messaging::ReplyHandler_var::ReplyHandler_var (Messaging::ReplyHandler_ptr p) +Messaging::ReplyHandler_var::ReplyHandler_var (ReplyHandler_ptr p) : ptr_ (p) {} -ACE_INLINE Messaging::ReplyHandler_ptr +ACE_INLINE ::Messaging::ReplyHandler_ptr Messaging::ReplyHandler_var::ptr (void) const { return this->ptr_; } ACE_INLINE -Messaging::ReplyHandler_var::ReplyHandler_var (const Messaging::ReplyHandler_var &p) // copy constructor - : ptr_ (Messaging::ReplyHandler::_duplicate (p.ptr ())) +Messaging::ReplyHandler_var::ReplyHandler_var (const ::Messaging::ReplyHandler_var &p) // copy constructor + : ptr_ (ReplyHandler::_duplicate (p.ptr ())) {} ACE_INLINE @@ -3503,7 +3678,7 @@ Messaging::ReplyHandler_var::~ReplyHandler_var (void) // destructor } ACE_INLINE Messaging::ReplyHandler_var & -Messaging::ReplyHandler_var::operator= (Messaging::ReplyHandler_ptr p) +Messaging::ReplyHandler_var::operator= (ReplyHandler_ptr p) { CORBA::release (this->ptr_); this->ptr_ = p; @@ -3511,156 +3686,153 @@ Messaging::ReplyHandler_var::operator= (Messaging::ReplyHandler_ptr p) } ACE_INLINE Messaging::ReplyHandler_var & -Messaging::ReplyHandler_var::operator= (const Messaging::ReplyHandler_var &p) +Messaging::ReplyHandler_var::operator= (const ::Messaging::ReplyHandler_var &p) { if (this != &p) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::ReplyHandler::_duplicate (p.ptr ()); + this->ptr_ = ::Messaging::ReplyHandler::_duplicate (p.ptr ()); } return *this; } -ACE_INLINE -Messaging::ReplyHandler_var::operator const Messaging::ReplyHandler_ptr &() const // cast +ACE_INLINE +Messaging::ReplyHandler_var::operator const ::Messaging::ReplyHandler_ptr &() const // cast { return this->ptr_; } -ACE_INLINE -Messaging::ReplyHandler_var::operator Messaging::ReplyHandler_ptr &() // cast +ACE_INLINE +Messaging::ReplyHandler_var::operator ::Messaging::ReplyHandler_ptr &() // cast { return this->ptr_; } -ACE_INLINE Messaging::ReplyHandler_ptr +ACE_INLINE ::Messaging::ReplyHandler_ptr Messaging::ReplyHandler_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE Messaging::ReplyHandler_ptr +ACE_INLINE ::Messaging::ReplyHandler_ptr Messaging::ReplyHandler_var::in (void) const { return this->ptr_; } -ACE_INLINE Messaging::ReplyHandler_ptr & +ACE_INLINE ::Messaging::ReplyHandler_ptr & Messaging::ReplyHandler_var::inout (void) { return this->ptr_; } -ACE_INLINE Messaging::ReplyHandler_ptr & +ACE_INLINE ::Messaging::ReplyHandler_ptr & Messaging::ReplyHandler_var::out (void) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::ReplyHandler::_nil (); + this->ptr_ = ::Messaging::ReplyHandler::_nil (); return this->ptr_; } -ACE_INLINE Messaging::ReplyHandler_ptr +ACE_INLINE ::Messaging::ReplyHandler_ptr Messaging::ReplyHandler_var::_retn (void) { // yield ownership of managed obj reference - Messaging::ReplyHandler_ptr val = this->ptr_; - this->ptr_ = Messaging::ReplyHandler::_nil (); + ::Messaging::ReplyHandler_ptr val = this->ptr_; + this->ptr_ = ::Messaging::ReplyHandler::_nil (); return val; } + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_REPLYHANDLER___OUT_CI_) +#define _MESSAGING_REPLYHANDLER___OUT_CI_ + // ************************************************************* // Inline operations for class Messaging::ReplyHandler_out // ************************************************************* ACE_INLINE -Messaging::ReplyHandler_out::ReplyHandler_out (Messaging::ReplyHandler_ptr &p) +Messaging::ReplyHandler_out::ReplyHandler_out (ReplyHandler_ptr &p) : ptr_ (p) { - this->ptr_ = Messaging::ReplyHandler::_nil (); + this->ptr_ = ::Messaging::ReplyHandler::_nil (); } ACE_INLINE -Messaging::ReplyHandler_out::ReplyHandler_out (Messaging::ReplyHandler_var &p) // constructor from _var +Messaging::ReplyHandler_out::ReplyHandler_out (ReplyHandler_var &p) // constructor from _var : ptr_ (p.out ()) { CORBA::release (this->ptr_); - this->ptr_ = Messaging::ReplyHandler::_nil (); + this->ptr_ = ::Messaging::ReplyHandler::_nil (); } ACE_INLINE -Messaging::ReplyHandler_out::ReplyHandler_out (const Messaging::ReplyHandler_out &p) // copy constructor - : ptr_ (ACE_const_cast (Messaging::ReplyHandler_out&,p).ptr_) +Messaging::ReplyHandler_out::ReplyHandler_out (const ::Messaging::ReplyHandler_out &p) // copy constructor + : ptr_ (ACE_const_cast (ReplyHandler_out &, p).ptr_) {} -ACE_INLINE Messaging::ReplyHandler_out & -Messaging::ReplyHandler_out::operator= (const Messaging::ReplyHandler_out &p) +ACE_INLINE ::Messaging::ReplyHandler_out & +Messaging::ReplyHandler_out::operator= (const ::Messaging::ReplyHandler_out &p) { - this->ptr_ = ACE_const_cast (Messaging::ReplyHandler_out&,p).ptr_; + this->ptr_ = ACE_const_cast (ReplyHandler_out&, p).ptr_; return *this; } ACE_INLINE Messaging::ReplyHandler_out & -Messaging::ReplyHandler_out::operator= (const Messaging::ReplyHandler_var &p) +Messaging::ReplyHandler_out::operator= (const ::Messaging::ReplyHandler_var &p) { - this->ptr_ = Messaging::ReplyHandler::_duplicate (p.ptr ()); + this->ptr_ = ::Messaging::ReplyHandler::_duplicate (p.ptr ()); return *this; } ACE_INLINE Messaging::ReplyHandler_out & -Messaging::ReplyHandler_out::operator= (Messaging::ReplyHandler_ptr p) +Messaging::ReplyHandler_out::operator= (ReplyHandler_ptr p) { this->ptr_ = p; return *this; } -ACE_INLINE -Messaging::ReplyHandler_out::operator Messaging::ReplyHandler_ptr &() // cast +ACE_INLINE +Messaging::ReplyHandler_out::operator ::Messaging::ReplyHandler_ptr &() // cast { return this->ptr_; } -ACE_INLINE Messaging::ReplyHandler_ptr & +ACE_INLINE ::Messaging::ReplyHandler_ptr & Messaging::ReplyHandler_out::ptr (void) // ptr { return this->ptr_; } -ACE_INLINE Messaging::ReplyHandler_ptr +ACE_INLINE ::Messaging::ReplyHandler_ptr Messaging::ReplyHandler_out::operator-> (void) { return this->ptr_; } -#endif /* TAO_HAS_AMI_CALLBACK == 1 */ -#if (TAO_HAS_AMI_POLLER == 1) +#endif /* end #if !defined */ ACE_INLINE -Messaging::Poller::Poller (void) // default constructor +Messaging::Poller::Poller () // default constructor {} ACE_INLINE -Messaging::Poller::Poller (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor - : CORBA_Object (objref, _tao_servant, _tao_collocated) +Messaging::Poller::~Poller () // destructor {} -ACE_INLINE -Messaging::Poller::~Poller (void) // destructor -{} - -ACE_INLINE Messaging::Poller_ptr -Messaging::Poller::_duplicate (Messaging::Poller_ptr obj) +ACE_INLINE const char* +Messaging::Poller::_tao_obv_static_repository_id () { - if (!CORBA::is_nil (obj)) - obj->_add_ref (); - return obj; + return "IDL:omg.org/Messaging/Poller:1.0"; } -ACE_INLINE Messaging::Poller_ptr -Messaging::Poller::_nil (void) -{ - return (Messaging::Poller_ptr)0; -} + +#if !defined (_MESSAGING_POLLER___VAR_CI_) +#define _MESSAGING_POLLER___VAR_CI_ // ************************************************************* // Inline operations for class Messaging::Poller_var @@ -3668,15 +3840,20 @@ Messaging::Poller::_nil (void) ACE_INLINE Messaging::Poller_var::Poller_var (void) // default constructor - : ptr_ (Messaging::Poller::_nil ()) + : ptr_ (0) {} ACE_INLINE -Messaging::Poller_var::Poller_var (Messaging::Poller_ptr p) +Messaging::Poller_var::Poller_var (Messaging::Poller* p) : ptr_ (p) {} -ACE_INLINE Messaging::Poller_ptr +ACE_INLINE +Messaging::Poller_var::Poller_var (const Messaging::Poller* p) + : ptr_ (ACE_const_cast(Messaging::Poller*, p)) +{} + +ACE_INLINE Messaging::Poller* Messaging::Poller_var::ptr (void) const { return this->ptr_; @@ -3684,19 +3861,21 @@ Messaging::Poller_var::ptr (void) const ACE_INLINE Messaging::Poller_var::Poller_var (const Messaging::Poller_var &p) // copy constructor - : ptr_ (Messaging::Poller::_duplicate (p.ptr ())) -{} +{ + CORBA::add_ref (p.ptr ()); + this->ptr_ = p.ptr (); +} ACE_INLINE Messaging::Poller_var::~Poller_var (void) // destructor { - CORBA::release (this->ptr_); + CORBA::remove_ref (this->ptr_); } ACE_INLINE Messaging::Poller_var & -Messaging::Poller_var::operator= (Messaging::Poller_ptr p) +Messaging::Poller_var::operator= (Messaging::Poller* p) { - CORBA::release (this->ptr_); + CORBA::remove_ref (this->ptr_); this->ptr_ = p; return *this; } @@ -3706,76 +3885,85 @@ Messaging::Poller_var::operator= (const Messaging::Poller_var &p) { if (this != &p) { - CORBA::release (this->ptr_); - this->ptr_ = Messaging::Poller::_duplicate (p.ptr ()); + CORBA::remove_ref (this->ptr_); + Poller* tmp = p.ptr (); + CORBA::add_ref (tmp); + this->ptr_ = tmp; } return *this; } -ACE_INLINE -Messaging::Poller_var::operator const Messaging::Poller_ptr &() const // cast +ACE_INLINE +Messaging::Poller_var::operator const Messaging::Poller* () const // cast { return this->ptr_; } -ACE_INLINE -Messaging::Poller_var::operator Messaging::Poller_ptr &() // cast +ACE_INLINE +Messaging::Poller_var::operator Messaging::Poller* () // cast { return this->ptr_; } -ACE_INLINE Messaging::Poller_ptr +ACE_INLINE Messaging::Poller* Messaging::Poller_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE Messaging::Poller_ptr +ACE_INLINE Messaging::Poller* Messaging::Poller_var::in (void) const { return this->ptr_; } -ACE_INLINE Messaging::Poller_ptr & +ACE_INLINE Messaging::Poller* & Messaging::Poller_var::inout (void) { return this->ptr_; } -ACE_INLINE Messaging::Poller_ptr & +ACE_INLINE Messaging::Poller* & Messaging::Poller_var::out (void) { - CORBA::release (this->ptr_); - this->ptr_ = Messaging::Poller::_nil (); + CORBA::remove_ref (this->ptr_); + this->ptr_ = 0; return this->ptr_; } -ACE_INLINE Messaging::Poller_ptr +ACE_INLINE Messaging::Poller* Messaging::Poller_var::_retn (void) { // yield ownership of managed obj reference - Messaging::Poller_ptr val = this->ptr_; - this->ptr_ = Messaging::Poller::_nil (); - return val; + Poller* tmp = this->ptr_; + this->ptr_ = 0; + return tmp; } + +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_POLLER___OUT_CI_) +#define _MESSAGING_POLLER___OUT_CI_ + // ************************************************************* // Inline operations for class Messaging::Poller_out // ************************************************************* ACE_INLINE -Messaging::Poller_out::Poller_out (Messaging::Poller_ptr &p) +Messaging::Poller_out::Poller_out (Messaging::Poller* &p) : ptr_ (p) { - this->ptr_ = Messaging::Poller::_nil (); + this->ptr_ = 0; } ACE_INLINE Messaging::Poller_out::Poller_out (Messaging::Poller_var &p) // constructor from _var : ptr_ (p.out ()) { - CORBA::release (this->ptr_); - this->ptr_ = Messaging::Poller::_nil (); + CORBA::remove_ref (this->ptr_); + this->ptr_ = 0; } ACE_INLINE @@ -3793,141 +3981,41 @@ Messaging::Poller_out::operator= (const Messaging::Poller_out &p) ACE_INLINE Messaging::Poller_out & Messaging::Poller_out::operator= (const Messaging::Poller_var &p) { - this->ptr_ = Messaging::Poller::_duplicate (p.ptr ()); + Poller* tmp = p.ptr (); + CORBA::add_ref (tmp); + this->ptr_ = tmp; return *this; } ACE_INLINE Messaging::Poller_out & -Messaging::Poller_out::operator= (Messaging::Poller_ptr p) +Messaging::Poller_out::operator= (Messaging::Poller* p) { this->ptr_ = p; return *this; } -ACE_INLINE -Messaging::Poller_out::operator Messaging::Poller_ptr &() // cast +ACE_INLINE +Messaging::Poller_out::operator Messaging::Poller* &() // cast { return this->ptr_; } -ACE_INLINE Messaging::Poller_ptr & +ACE_INLINE Messaging::Poller* & Messaging::Poller_out::ptr (void) // ptr { return this->ptr_; } -ACE_INLINE Messaging::Poller_ptr +ACE_INLINE Messaging::Poller* Messaging::Poller_out::operator-> (void) { return this->ptr_; } -#endif /* TAO_HAS_AMI_POLLER == 1 */ - -// **************************************************************** - -#if (TAO_HAS_REBIND_POLICY == 1) - -ACE_INLINE CORBA::Boolean -operator<< ( - TAO_OutputCDR &strm, - const Messaging::RebindPolicy_ptr _tao_objref - ) -{ - CORBA::Object_ptr _tao_corba_obj = _tao_objref; - return (strm << _tao_corba_obj); -} - -ACE_INLINE CORBA::Boolean -operator>> ( - TAO_InputCDR &strm, - Messaging::RebindPolicy_ptr &_tao_objref - ) -{ - ACE_TRY_NEW_ENV - { - CORBA::Object_var obj; - if ((strm >> obj.inout ()) == 0) - return 0; - // narrow to the right type - _tao_objref = - Messaging::RebindPolicy::_narrow ( - obj.in (), - ACE_TRY_ENV - ); - ACE_TRY_CHECK; - return 1; - } - ACE_CATCHANY - { - // do nothing - } - ACE_ENDTRY; - return 0; -} - -#endif /* TAO_HAS_REBIND_POLICY == 1 */ - -#if (TAO_HAS_SYNC_SCOPE_POLICY == 1) - -ACE_INLINE CORBA::Boolean -operator<< ( - TAO_OutputCDR &, - const Messaging::SyncScopePolicy_ptr - ); -ACE_INLINE CORBA::Boolean -operator>> ( - TAO_InputCDR &, - Messaging::SyncScopePolicy_ptr & - ); - -ACE_INLINE CORBA::Boolean -operator<< ( - TAO_OutputCDR &strm, - const Messaging::SyncScopePolicy_ptr _tao_objref - ) -{ - CORBA::Object_ptr _tao_corba_obj = _tao_objref; - return (strm << _tao_corba_obj); -} - -ACE_INLINE CORBA::Boolean -operator>> ( - TAO_InputCDR &strm, - Messaging::SyncScopePolicy_ptr &_tao_objref - ) -{ - ACE_TRY_NEW_ENV - { - CORBA::Object_var obj; - if ((strm >> obj.inout ()) == 0) - return 0; - // narrow to the right type - _tao_objref = - Messaging::SyncScopePolicy::_narrow ( - obj.in (), - ACE_TRY_ENV - ); - ACE_TRY_CHECK; - return 1; - } - ACE_CATCHANY - { - // do nothing - } - ACE_ENDTRY; - return 0; -} - -#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ -#if (TAO_HAS_PRIORITY_POLICIES == 1) +#endif /* end #if !defined */ -ACE_INLINE CORBA::Boolean -operator<< ( - TAO_OutputCDR &strm, - const Messaging::PriorityRange &_tao_aggregate - ) +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const Messaging::PriorityRange &_tao_aggregate) { if ( (strm << _tao_aggregate.min) && @@ -3936,14 +4024,10 @@ operator<< ( return 1; else return 0; - + } -ACE_INLINE CORBA::Boolean -operator>> ( - TAO_InputCDR &strm, - Messaging::PriorityRange &_tao_aggregate - ) +ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, Messaging::PriorityRange &_tao_aggregate) { if ( (strm >> _tao_aggregate.min) && @@ -3952,346 +4036,10 @@ operator>> ( return 1; else return 0; - + } -ACE_INLINE CORBA::Boolean -operator<< ( - TAO_OutputCDR &strm, - const Messaging::RequestPriorityPolicy_ptr _tao_objref - ) -{ - CORBA::Object_ptr _tao_corba_obj = _tao_objref; - return (strm << _tao_corba_obj); -} - -ACE_INLINE CORBA::Boolean -operator>> ( - TAO_InputCDR &strm, - Messaging::RequestPriorityPolicy_ptr &_tao_objref - ) -{ - ACE_TRY_NEW_ENV - { - CORBA::Object_var obj; - if ((strm >> obj.inout ()) == 0) - return 0; - // narrow to the right type - _tao_objref = - Messaging::RequestPriorityPolicy::_narrow ( - obj.in (), - ACE_TRY_ENV - ); - ACE_TRY_CHECK; - return 1; - } - ACE_CATCHANY - { - // do nothing - } - ACE_ENDTRY; - return 0; -} - -ACE_INLINE CORBA::Boolean -operator<< ( - TAO_OutputCDR &strm, - const Messaging::ReplyPriorityPolicy_ptr _tao_objref - ) -{ - CORBA::Object_ptr _tao_corba_obj = _tao_objref; - return (strm << _tao_corba_obj); -} - -ACE_INLINE CORBA::Boolean -operator>> ( - TAO_InputCDR &strm, - Messaging::ReplyPriorityPolicy_ptr &_tao_objref - ) -{ - ACE_TRY_NEW_ENV - { - CORBA::Object_var obj; - if ((strm >> obj.inout ()) == 0) - return 0; - // narrow to the right type - _tao_objref = - Messaging::ReplyPriorityPolicy::_narrow ( - obj.in (), - ACE_TRY_ENV - ); - ACE_TRY_CHECK; - return 1; - } - ACE_CATCHANY - { - // do nothing - } - ACE_ENDTRY; - return 0; -} - -#endif /* TAO_HAS_PRIORITY_POLICIES == 1 */ - -#if (TAO_HAS_REQUEST_START_TIME_POLICY == 1) - -ACE_INLINE CORBA::Boolean -operator<< ( - TAO_OutputCDR &strm, - const Messaging::RequestStartTimePolicy_ptr _tao_objref - ) -{ - CORBA::Object_ptr _tao_corba_obj = _tao_objref; - return (strm << _tao_corba_obj); -} - -ACE_INLINE CORBA::Boolean -operator>> ( - TAO_InputCDR &strm, - Messaging::RequestStartTimePolicy_ptr &_tao_objref - ) -{ - ACE_TRY_NEW_ENV - { - CORBA::Object_var obj; - if ((strm >> obj.inout ()) == 0) - return 0; - // narrow to the right type - _tao_objref = - Messaging::RequestStartTimePolicy::_narrow ( - obj.in (), - ACE_TRY_ENV - ); - ACE_TRY_CHECK; - return 1; - } - ACE_CATCHANY - { - // do nothing - } - ACE_ENDTRY; - return 0; -} - -#endif /* TAO_HAS_REQUEST_START_TIME_POLICY == 1 */ - -#if (TAO_HAS_REQUEST_END_TIME_POLICY == 1) - -ACE_INLINE CORBA::Boolean -operator<< ( - TAO_OutputCDR &strm, - const Messaging::RequestEndTimePolicy_ptr _tao_objref - ) -{ - CORBA::Object_ptr _tao_corba_obj = _tao_objref; - return (strm << _tao_corba_obj); -} - -ACE_INLINE CORBA::Boolean -operator>> ( - TAO_InputCDR &strm, - Messaging::RequestEndTimePolicy_ptr &_tao_objref - ) -{ - ACE_TRY_NEW_ENV - { - CORBA::Object_var obj; - if ((strm >> obj.inout ()) == 0) - return 0; - // narrow to the right type - _tao_objref = - Messaging::RequestEndTimePolicy::_narrow ( - obj.in (), - ACE_TRY_ENV - ); - ACE_TRY_CHECK; - return 1; - } - ACE_CATCHANY - { - // do nothing - } - ACE_ENDTRY; - return 0; -} - -#endif /* TAO_HAS_REQUEST_END_TIME_POLICY == 1 */ - -#if (TAO_HAS_REPLY_START_TIME_POLICY == 1) - -ACE_INLINE CORBA::Boolean -operator<< ( - TAO_OutputCDR &strm, - const Messaging::ReplyStartTimePolicy_ptr _tao_objref - ) -{ - CORBA::Object_ptr _tao_corba_obj = _tao_objref; - return (strm << _tao_corba_obj); -} - -ACE_INLINE CORBA::Boolean -operator>> ( - TAO_InputCDR &strm, - Messaging::ReplyStartTimePolicy_ptr &_tao_objref - ) -{ - ACE_TRY_NEW_ENV - { - CORBA::Object_var obj; - if ((strm >> obj.inout ()) == 0) - return 0; - // narrow to the right type - _tao_objref = - Messaging::ReplyStartTimePolicy::_narrow ( - obj.in (), - ACE_TRY_ENV - ); - ACE_TRY_CHECK; - return 1; - } - ACE_CATCHANY - { - // do nothing - } - ACE_ENDTRY; - return 0; -} - -#endif /* TAO_HAS_REPLY_START_TIME_POLICY == 1 */ - -#if (TAO_HAS_REPLY_END_TIME_POLICY == 1) - -ACE_INLINE CORBA::Boolean -operator<< ( - TAO_OutputCDR &strm, - const Messaging::ReplyEndTimePolicy_ptr _tao_objref - ) -{ - CORBA::Object_ptr _tao_corba_obj = _tao_objref; - return (strm << _tao_corba_obj); -} - -ACE_INLINE CORBA::Boolean -operator>> ( - TAO_InputCDR &strm, - Messaging::ReplyEndTimePolicy_ptr &_tao_objref - ) -{ - ACE_TRY_NEW_ENV - { - CORBA::Object_var obj; - if ((strm >> obj.inout ()) == 0) - return 0; - // narrow to the right type - _tao_objref = - Messaging::ReplyEndTimePolicy::_narrow ( - obj.in (), - ACE_TRY_ENV - ); - ACE_TRY_CHECK; - return 1; - } - ACE_CATCHANY - { - // do nothing - } - ACE_ENDTRY; - return 0; -} - -#endif /* TAO_HAS_REPLY_END_TIME_POLICY == 1 */ - -#if (TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1) - -ACE_INLINE CORBA::Boolean -operator<< ( - TAO_OutputCDR &strm, - const Messaging::RelativeRequestTimeoutPolicy_ptr _tao_objref - ) -{ - CORBA::Object_ptr _tao_corba_obj = _tao_objref; - return (strm << _tao_corba_obj); -} - -ACE_INLINE CORBA::Boolean -operator>> ( - TAO_InputCDR &strm, - Messaging::RelativeRequestTimeoutPolicy_ptr &_tao_objref - ) -{ - ACE_TRY_NEW_ENV - { - CORBA::Object_var obj; - if ((strm >> obj.inout ()) == 0) - return 0; - // narrow to the right type - _tao_objref = - Messaging::RelativeRequestTimeoutPolicy::_narrow ( - obj.in (), - ACE_TRY_ENV - ); - ACE_TRY_CHECK; - return 1; - } - ACE_CATCHANY - { - // do nothing - } - ACE_ENDTRY; - return 0; -} - -#endif /* TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1 */ - -#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) - -ACE_INLINE CORBA::Boolean -operator<< ( - TAO_OutputCDR &strm, - const Messaging::RelativeRoundtripTimeoutPolicy_ptr _tao_objref - ) -{ - CORBA::Object_ptr _tao_corba_obj = _tao_objref; - return (strm << _tao_corba_obj); -} - -ACE_INLINE CORBA::Boolean -operator>> ( - TAO_InputCDR &strm, - Messaging::RelativeRoundtripTimeoutPolicy_ptr &_tao_objref - ) -{ - ACE_TRY_NEW_ENV - { - CORBA::Object_var obj; - if ((strm >> obj.inout ()) == 0) - return 0; - // narrow to the right type - _tao_objref = - Messaging::RelativeRoundtripTimeoutPolicy::_narrow ( - obj.in (), - ACE_TRY_ENV - ); - ACE_TRY_CHECK; - return 1; - } - ACE_CATCHANY - { - // do nothing - } - ACE_ENDTRY; - return 0; -} - -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ - -#if (TAO_HAS_ROUTING_POLICY == 1) - -ACE_INLINE CORBA::Boolean -operator<< ( - TAO_OutputCDR &strm, - const Messaging::RoutingTypeRange &_tao_aggregate - ) +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const Messaging::RoutingTypeRange &_tao_aggregate) { if ( (strm << _tao_aggregate.min) && @@ -4300,14 +4048,10 @@ operator<< ( return 1; else return 0; - + } -ACE_INLINE CORBA::Boolean -operator>> ( - TAO_InputCDR &strm, - Messaging::RoutingTypeRange &_tao_aggregate - ) +ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, Messaging::RoutingTypeRange &_tao_aggregate) { if ( (strm >> _tao_aggregate.min) && @@ -4316,199 +4060,25 @@ operator>> ( return 1; else return 0; - -} - -ACE_INLINE CORBA::Boolean -operator<< ( - TAO_OutputCDR &strm, - const Messaging::RoutingPolicy_ptr _tao_objref - ) -{ - CORBA::Object_ptr _tao_corba_obj = _tao_objref; - return (strm << _tao_corba_obj); -} - -ACE_INLINE CORBA::Boolean -operator>> ( - TAO_InputCDR &strm, - Messaging::RoutingPolicy_ptr &_tao_objref - ) -{ - ACE_TRY_NEW_ENV - { - CORBA::Object_var obj; - if ((strm >> obj.inout ()) == 0) - return 0; - // narrow to the right type - _tao_objref = - Messaging::RoutingPolicy::_narrow ( - obj.in (), - ACE_TRY_ENV - ); - ACE_TRY_CHECK; - return 1; - } - ACE_CATCHANY - { - // do nothing - } - ACE_ENDTRY; - return 0; -} - -#endif /* TAO_HAS_ROUTING_POLICY == 1 */ - -#if (TAO_HAS_MAX_HOPS_POLICY == 1) - -ACE_INLINE CORBA::Boolean -operator<< ( - TAO_OutputCDR &strm, - const Messaging::MaxHopsPolicy_ptr _tao_objref - ) -{ - CORBA::Object_ptr _tao_corba_obj = _tao_objref; - return (strm << _tao_corba_obj); -} - -ACE_INLINE CORBA::Boolean -operator>> ( - TAO_InputCDR &strm, - Messaging::MaxHopsPolicy_ptr &_tao_objref - ) -{ - ACE_TRY_NEW_ENV - { - CORBA::Object_var obj; - if ((strm >> obj.inout ()) == 0) - return 0; - // narrow to the right type - _tao_objref = - Messaging::MaxHopsPolicy::_narrow ( - obj.in (), - ACE_TRY_ENV - ); - ACE_TRY_CHECK; - return 1; - } - ACE_CATCHANY - { - // do nothing - } - ACE_ENDTRY; - return 0; -} - -#endif /* TAO_HAS_MAX_HOPS_POLICY == 1 */ - -#if (TAO_HAS_QUEUE_ORDER_POLICY == 1) - -ACE_INLINE CORBA::Boolean -operator<< ( - TAO_OutputCDR &strm, - const Messaging::QueueOrderPolicy_ptr _tao_objref - ) -{ - CORBA::Object_ptr _tao_corba_obj = _tao_objref; - return (strm << _tao_corba_obj); -} - -ACE_INLINE CORBA::Boolean -operator>> ( - TAO_InputCDR &strm, - Messaging::QueueOrderPolicy_ptr &_tao_objref - ) -{ - ACE_TRY_NEW_ENV - { - CORBA::Object_var obj; - if ((strm >> obj.inout ()) == 0) - return 0; - // narrow to the right type - _tao_objref = - Messaging::QueueOrderPolicy::_narrow ( - obj.in (), - ACE_TRY_ENV - ); - ACE_TRY_CHECK; - return 1; - } - ACE_CATCHANY - { - // do nothing - } - ACE_ENDTRY; - return 0; -} - -#endif /* TAO_HAS_QUEUE_ORDER_POLICY == 1 */ - -// **************************************************************** - -ACE_INLINE CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const Messaging::PolicyValue::_tao_seq_Octet &_tao_sequence - ) -{ - if (strm << _tao_sequence.length ()) - { - // encode all elements - -#if defined (TAO_NO_COPY_OCTET_SEQUENCES) - { - TAO_Unbounded_Sequence<CORBA::Octet> *oseq = - ACE_dynamic_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (Messaging::PolicyValue::_tao_seq_Octet *)&_tao_sequence); - if (oseq->mb ()) - return strm.write_octet_array_mb (oseq->mb ()); - else - return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - } - -#else /* TAO_NO_COPY_OCTET_SEQUENCES */ - return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - -#endif /* TAO_NO_COPY_OCTET_SEQUENCES */ - } - return 0; // error + } -ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, Messaging::PolicyValue::_tao_seq_Octet &_tao_sequence) -{ - CORBA::ULong _tao_seq_len; - if (strm >> _tao_seq_len) - { - // set the length of the sequence - _tao_sequence.length (_tao_seq_len); - // retrieve all the elements -#if defined (TAO_NO_COPY_OCTET_SEQUENCES) - if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE)) - { - TAO_Unbounded_Sequence<CORBA::Octet> *oseq = - ACE_dynamic_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence); - oseq->replace (_tao_seq_len, strm.start ()); - oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len); - strm.skip_bytes (_tao_seq_len); - return 1; - } - else - return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len); - -#else /* TAO_NO_COPY_OCTET_SEQUENCES */ - return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); +#if !defined _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_I_ +#define _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_I_ -#endif /* TAO_NO_COPY_OCTET_SEQUENCES */ - } - return 0; // error -} +CORBA::Boolean TAO_Export operator<< ( + TAO_OutputCDR &, + const Messaging::PolicyValue::_tao_seq_Octet & + ); +CORBA::Boolean TAO_Export operator>> ( + TAO_InputCDR &, + Messaging::PolicyValue::_tao_seq_Octet & + ); -// **************************************************************** +#endif /* _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_I_ */ -ACE_INLINE CORBA::Boolean -operator<< ( - TAO_OutputCDR &strm, - const Messaging::PolicyValue &_tao_aggregate - ) +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const Messaging::PolicyValue &_tao_aggregate) { if ( (strm << _tao_aggregate.ptype) && @@ -4517,14 +4087,10 @@ operator<< ( return 1; else return 0; - + } -ACE_INLINE CORBA::Boolean -operator>> ( - TAO_InputCDR &strm, - Messaging::PolicyValue &_tao_aggregate - ) +ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, Messaging::PolicyValue &_tao_aggregate) { if ( (strm >> _tao_aggregate.ptype) && @@ -4533,51 +4099,23 @@ operator>> ( return 1; else return 0; - + } -// **************************************************************** -ACE_INLINE CORBA::Boolean -operator<< ( - TAO_OutputCDR &strm, - const Messaging::PolicyValueSeq &_tao_sequence - ) -{ - if (strm << _tao_sequence.length ()) - { - // encode all elements - CORBA::Boolean _tao_marshal_flag = 1; - for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) - _tao_marshal_flag = (strm << _tao_sequence[i]); - return _tao_marshal_flag; - } - return 0; // error -} +#if !defined _TAO_CDR_OP_Messaging_PolicyValueSeq_I_ +#define _TAO_CDR_OP_Messaging_PolicyValueSeq_I_ -ACE_INLINE CORBA::Boolean -operator>> ( - TAO_InputCDR &strm, - Messaging::PolicyValueSeq &_tao_sequence - ) -{ - CORBA::ULong _tao_seq_len; - if (strm >> _tao_seq_len) - { - // set the length of the sequence - _tao_sequence.length (_tao_seq_len); - // retrieve all the elements - CORBA::Boolean _tao_marshal_flag = 1; - for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) - _tao_marshal_flag = (strm >> _tao_sequence[i]); - return _tao_marshal_flag; - } - return 0; // error -} - -// **************************************************************** +CORBA::Boolean TAO_Export operator<< ( + TAO_OutputCDR &, + const Messaging::PolicyValueSeq & + ); +CORBA::Boolean TAO_Export operator>> ( + TAO_InputCDR &, + Messaging::PolicyValueSeq & + ); -#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) +#endif /* _TAO_CDR_OP_Messaging_PolicyValueSeq_I_ */ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const Messaging::ExceptionHolder *_tao_valuetype) @@ -4599,12 +4137,12 @@ OBV_Messaging::ExceptionHolder::_tao_marshal_state (TAO_OutputCDR &strm) if ( (strm << CORBA::Any::from_boolean (_pd_is_system_exception)) && (strm << CORBA::Any::from_boolean (_pd_byte_order)) && - (strm << *_pd_marshaled_exception) + (strm << _pd_marshaled_exception) ) return 1; else return 0; - + } ACE_INLINE CORBA::Boolean @@ -4613,80 +4151,14 @@ OBV_Messaging::ExceptionHolder::_tao_unmarshal_state (TAO_InputCDR &strm) if ( (strm >> CORBA::Any::to_boolean (_pd_is_system_exception)) && (strm >> CORBA::Any::to_boolean (_pd_byte_order)) && - (strm >> *_pd_marshaled_exception) + (strm >> _pd_marshaled_exception) ) return 1; else return 0; - -} - - - -ACE_INLINE CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const Messaging::ExceptionHolder::_tao_seq_Octet &_tao_sequence - ) -{ - if (strm << _tao_sequence.length ()) - { - // encode all elements - -#if defined (TAO_NO_COPY_OCTET_SEQUENCES) - { - TAO_Unbounded_Sequence<CORBA::Octet> *oseq = - ACE_dynamic_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (Messaging::PolicyValue::_tao_seq_Octet *)&_tao_sequence); - if (oseq->mb ()) - return strm.write_octet_array_mb (oseq->mb ()); - else - return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - } - -#else /* TAO_NO_COPY_OCTET_SEQUENCES */ - return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - -#endif /* TAO_NO_COPY_OCTET_SEQUENCES */ - } - return 0; // error -} - -ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, Messaging::ExceptionHolder::_tao_seq_Octet &_tao_sequence) -{ - CORBA::ULong _tao_seq_len; - if (strm >> _tao_seq_len) - { - // set the length of the sequence - _tao_sequence.length (_tao_seq_len); - // retrieve all the elements - -#if defined (TAO_NO_COPY_OCTET_SEQUENCES) - if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE)) - { - TAO_Unbounded_Sequence<CORBA::Octet> *oseq = - ACE_dynamic_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence); - oseq->replace (_tao_seq_len, strm.start ()); - oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len); - strm.skip_bytes (_tao_seq_len); - return 1; - } - else - return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len); - -#else /* TAO_NO_COPY_OCTET_SEQUENCES */ - return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - -#endif /* TAO_NO_COPY_OCTET_SEQUENCES */ - } - return 0; // error + } - -#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */ - -#if (TAO_HAS_AMI_CALLBACK == 1) - -// **************************************************************** - ACE_INLINE CORBA::Boolean operator<< ( TAO_OutputCDR &, @@ -4736,59 +4208,43 @@ operator>> ( return 0; } -#endif /* TAO_HAS_AMI_CALLBACK == 1 */ - -// **************************************************************** - -#if (TAO_HAS_AMI_POLLER == 1) - -ACE_INLINE CORBA::Boolean -operator<< ( - TAO_OutputCDR &, - const Messaging::Poller_ptr - ); ACE_INLINE CORBA::Boolean -operator>> ( - TAO_InputCDR &, - Messaging::Poller_ptr & - ); +operator<< (TAO_OutputCDR &strm, const Messaging::Poller *_tao_valuetype) +{ + return CORBA_ValueBase::_tao_marshal (strm, + ACE_const_cast (Messaging::Poller*, _tao_valuetype), + (ptr_arith_t) &Messaging::Poller::_downcast); +} ACE_INLINE CORBA::Boolean -operator<< ( - TAO_OutputCDR &strm, - const Messaging::Poller_ptr _tao_objref - ) +operator>> (TAO_InputCDR &strm, Messaging::Poller *&_tao_valuetype) { - CORBA::Object_ptr _tao_corba_obj = _tao_objref; - return (strm << _tao_corba_obj); + return Messaging::Poller::_tao_unmarshal (strm, _tao_valuetype); } ACE_INLINE CORBA::Boolean -operator>> ( - TAO_InputCDR &strm, - Messaging::Poller_ptr &_tao_objref +OBV_Messaging::Poller::_tao_marshal_state (TAO_OutputCDR &strm) +{ + if ( + (strm << _pd_target.in ()) && + (strm << _pd_op_name.in ()) ) + return 1; + else + return 0; + +} + +ACE_INLINE CORBA::Boolean +OBV_Messaging::Poller::_tao_unmarshal_state (TAO_InputCDR &strm) { - ACE_TRY_NEW_ENV - { - CORBA::Object_var obj; - if ((strm >> obj.inout ()) == 0) - return 0; - // narrow to the right type - _tao_objref = - Messaging::Poller::_narrow ( - obj.in (), - ACE_TRY_ENV - ); - ACE_TRY_CHECK; + if ( + (strm >> _pd_target.out ()) && + (strm >> _pd_op_name.out ()) + ) return 1; - } - ACE_CATCHANY - { - // do nothing - } - ACE_ENDTRY; - return 0; + else + return 0; + } -#endif /* TAO_HAS_AMI_POLLER == 1 */ diff --git a/TAO/tao/MessagingS.cpp b/TAO/tao/MessagingS.cpp index 4596df6d5d5..88f0592f683 100644 --- a/TAO/tao/MessagingS.cpp +++ b/TAO/tao/MessagingS.cpp @@ -1,5 +1,4 @@ -/* -*- C++ -*- */ -// $Id$ +/* -*- C++ -*- $Id$ */ // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* // TAO and the TAO IDL Compiler have been developed by the Center for @@ -26,1513 +25,6 @@ ACE_RCSID(tao, MessagingS, "$Id$") -#if (TAO_HAS_REBIND_POLICY == 1) - -POA_Messaging::RebindPolicy::RebindPolicy (void) -{ -} - -POA_Messaging::RebindPolicy::RebindPolicy (const RebindPolicy& rhs) - : ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs), - TAO_ServantBase (rhs) -{} - -POA_Messaging::RebindPolicy::~RebindPolicy (void) -{ -} - -CORBA::Boolean POA_Messaging::RebindPolicy::_is_a ( - const char* value, - CORBA::Environment &ACE_TRY_ENV - ) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RebindPolicy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) - return 1; - else - return 0; -} - -void* POA_Messaging::RebindPolicy::_downcast ( - const char* logical_type_id - ) -{ - if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/RebindPolicy:1.0") == 0) - return ACE_static_cast (POA_Messaging::RebindPolicy_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0) - return ACE_static_cast (POA_CORBA::Policy_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) - return ACE_static_cast(PortableServer::Servant, this); - return 0; -} - -const char* POA_Messaging::RebindPolicy::_interface_repository_id (void) const -{ - return "IDL:Messaging/RebindPolicy:1.0"; -} - -POA_Messaging::_tao_collocated_RebindPolicy::_tao_collocated_RebindPolicy ( - POA_Messaging::RebindPolicy_ptr servant, - TAO_Stub *stub - ) - : ACE_NESTED_CLASS (Messaging,RebindPolicy) (), - ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub), - CORBA_Object (stub, servant, 1), - servant_ (servant) -{ -} - -POA_Messaging::RebindPolicy_ptr POA_Messaging::_tao_collocated_RebindPolicy::_get_servant (void) const -{ - return this->servant_; -} - -CORBA::Boolean POA_Messaging::_tao_collocated_RebindPolicy::_is_a ( - const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->_is_a ( - logical_type_id, - ACE_TRY_ENV - ); -} - -Messaging::RebindMode POA_Messaging::_tao_collocated_RebindPolicy::rebind_mode ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->rebind_mode ( - ACE_TRY_ENV - ); -} - - -Messaging::RebindPolicy* -POA_Messaging::RebindPolicy::_this (CORBA_Environment &ACE_TRY_ENV) -{ - TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); - - Messaging::RebindPolicy *retval = - Messaging::RebindPolicy::_nil (); - - ACE_NEW_RETURN (retval, - POA_Messaging::_tao_collocated_RebindPolicy (this, - stub), - Messaging::RebindPolicy::_nil ()); - - return retval; -} - -void -POA_Messaging::RebindPolicy::_dispatch ( - CORBA::ServerRequest &_tao_request, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV - ) -{ - TAO_Locality_Constrained_ServantBase::_dispatch (_tao_request, - _tao_context, - ACE_TRY_ENV); -} - -#endif /* TAO_HAS_REBIND_POLICY == 1 */ - -#if (TAO_HAS_SYNC_SCOPE_POLICY == 1) - -POA_Messaging::SyncScopePolicy::SyncScopePolicy (void) -{ -} - -POA_Messaging::SyncScopePolicy::SyncScopePolicy (const SyncScopePolicy& rhs) - : ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs), - TAO_ServantBase (rhs) -{} - -POA_Messaging::SyncScopePolicy::~SyncScopePolicy (void) -{ -} - -CORBA::Boolean POA_Messaging::SyncScopePolicy::_is_a ( - const char* value, - CORBA::Environment &ACE_TRY_ENV - ) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/SyncScopePolicy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) - return 1; - else - return 0; -} - -void* POA_Messaging::SyncScopePolicy::_downcast ( - const char* logical_type_id - ) -{ - if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/SyncScopePolicy:1.0") == 0) - return ACE_static_cast (POA_Messaging::SyncScopePolicy_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0) - return ACE_static_cast (POA_CORBA::Policy_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) - return ACE_static_cast(PortableServer::Servant, this); - return 0; -} - -const char* POA_Messaging::SyncScopePolicy::_interface_repository_id (void) const -{ - return "IDL:Messaging/SyncScopePolicy:1.0"; -} - -POA_Messaging::_tao_collocated_SyncScopePolicy::_tao_collocated_SyncScopePolicy ( - POA_Messaging::SyncScopePolicy_ptr servant, - TAO_Stub *stub - ) - : ACE_NESTED_CLASS (Messaging,SyncScopePolicy) (), - ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub), - CORBA_Object (stub, servant, 1), - servant_ (servant) -{ -} - -POA_Messaging::SyncScopePolicy_ptr POA_Messaging::_tao_collocated_SyncScopePolicy::_get_servant (void) const -{ - return this->servant_; -} - -CORBA::Boolean POA_Messaging::_tao_collocated_SyncScopePolicy::_is_a ( - const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->_is_a ( - logical_type_id, - ACE_TRY_ENV - ); -} - -Messaging::SyncScope POA_Messaging::_tao_collocated_SyncScopePolicy::synchronization (CORBA::Environment &ACE_TRY_ENV) -{ - return this->servant_->synchronization (ACE_TRY_ENV); -} - -Messaging::SyncScope POA_Messaging::_tao_collocated_SyncScopePolicy::synchronization (void) -{ - return this->servant_->synchronization (); -} - - -Messaging::SyncScopePolicy* -POA_Messaging::SyncScopePolicy::_this (CORBA_Environment &ACE_TRY_ENV) -{ - TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); - - Messaging::SyncScopePolicy *retval = - Messaging::SyncScopePolicy::_nil (); - - ACE_NEW_RETURN (retval, - POA_Messaging::_tao_collocated_SyncScopePolicy (this, - stub), - Messaging::SyncScopePolicy::_nil ()); - - return retval; -} - -void -POA_Messaging::SyncScopePolicy::_dispatch ( - CORBA::ServerRequest &_tao_request, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV - ) -{ - TAO_Locality_Constrained_ServantBase::_dispatch (_tao_request, - _tao_context, - ACE_TRY_ENV); -} - -#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ - -#if (TAO_HAS_PRIORITY_POLICIES == 1) - -POA_Messaging::RequestPriorityPolicy::RequestPriorityPolicy (void) -{ -} - -POA_Messaging::RequestPriorityPolicy::RequestPriorityPolicy (const RequestPriorityPolicy& rhs) - : ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs), - TAO_ServantBase (rhs) -{} - -POA_Messaging::RequestPriorityPolicy::~RequestPriorityPolicy (void) -{ -} - -CORBA::Boolean POA_Messaging::RequestPriorityPolicy::_is_a ( - const char* value, - CORBA::Environment &ACE_TRY_ENV - ) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RequestPriorityPolicy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) - return 1; - else - return 0; -} - -void* POA_Messaging::RequestPriorityPolicy::_downcast ( - const char* logical_type_id - ) -{ - if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/RequestPriorityPolicy:1.0") == 0) - return ACE_static_cast (POA_Messaging::RequestPriorityPolicy_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0) - return ACE_static_cast (POA_CORBA::Policy_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) - return ACE_static_cast(PortableServer::Servant, this); - return 0; -} - -const char* POA_Messaging::RequestPriorityPolicy::_interface_repository_id (void) const -{ - return "IDL:Messaging/RequestPriorityPolicy:1.0"; -} - -POA_Messaging::_tao_collocated_RequestPriorityPolicy::_tao_collocated_RequestPriorityPolicy ( - POA_Messaging::RequestPriorityPolicy_ptr servant, - TAO_Stub *stub - ) - : ACE_NESTED_CLASS (Messaging,RequestPriorityPolicy) (), - ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub), - CORBA_Object (stub, servant, 1), - servant_ (servant) -{ -} - -POA_Messaging::RequestPriorityPolicy_ptr POA_Messaging::_tao_collocated_RequestPriorityPolicy::_get_servant (void) const -{ - return this->servant_; -} - -CORBA::Boolean POA_Messaging::_tao_collocated_RequestPriorityPolicy::_is_a ( - const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->_is_a ( - logical_type_id, - ACE_TRY_ENV - ); -} - -Messaging::PriorityRange POA_Messaging::_tao_collocated_RequestPriorityPolicy::priority_range ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->priority_range ( - ACE_TRY_ENV - ); -} - - -Messaging::RequestPriorityPolicy* -POA_Messaging::RequestPriorityPolicy::_this (CORBA_Environment &ACE_TRY_ENV) -{ - TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); - - Messaging::RequestPriorityPolicy *retval = - Messaging::RequestPriorityPolicy::_nil (); - - ACE_NEW_RETURN (retval, - POA_Messaging::_tao_collocated_RequestPriorityPolicy (this, - stub), - Messaging::RequestPriorityPolicy::_nil ()); - - return retval; -} - -void -POA_Messaging::RequestPriorityPolicy::_dispatch ( - CORBA::ServerRequest &_tao_request, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV - ) -{ - TAO_Locality_Constrained_ServantBase::_dispatch (_tao_request, - _tao_context, - ACE_TRY_ENV); -} - -POA_Messaging::ReplyPriorityPolicy::ReplyPriorityPolicy (void) -{ -} - -POA_Messaging::ReplyPriorityPolicy::ReplyPriorityPolicy (const ReplyPriorityPolicy& rhs) - : ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs), - TAO_ServantBase (rhs) -{} - -POA_Messaging::ReplyPriorityPolicy::~ReplyPriorityPolicy (void) -{ -} - -CORBA::Boolean POA_Messaging::ReplyPriorityPolicy::_is_a ( - const char* value, - CORBA::Environment &ACE_TRY_ENV - ) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/ReplyPriorityPolicy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) - return 1; - else - return 0; -} - -void* POA_Messaging::ReplyPriorityPolicy::_downcast ( - const char* logical_type_id - ) -{ - if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/ReplyPriorityPolicy:1.0") == 0) - return ACE_static_cast (POA_Messaging::ReplyPriorityPolicy_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0) - return ACE_static_cast (POA_CORBA::Policy_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) - return ACE_static_cast(PortableServer::Servant, this); - return 0; -} - -const char* POA_Messaging::ReplyPriorityPolicy::_interface_repository_id (void) const -{ - return "IDL:Messaging/ReplyPriorityPolicy:1.0"; -} - -POA_Messaging::_tao_collocated_ReplyPriorityPolicy::_tao_collocated_ReplyPriorityPolicy ( - POA_Messaging::ReplyPriorityPolicy_ptr servant, - TAO_Stub *stub - ) - : ACE_NESTED_CLASS (Messaging,ReplyPriorityPolicy) (), - ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub), - CORBA_Object (stub, servant, 1), - servant_ (servant) -{ -} - -POA_Messaging::ReplyPriorityPolicy_ptr POA_Messaging::_tao_collocated_ReplyPriorityPolicy::_get_servant (void) const -{ - return this->servant_; -} - -CORBA::Boolean POA_Messaging::_tao_collocated_ReplyPriorityPolicy::_is_a ( - const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->_is_a ( - logical_type_id, - ACE_TRY_ENV - ); -} - -Messaging::PriorityRange POA_Messaging::_tao_collocated_ReplyPriorityPolicy::priority_range ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->priority_range ( - ACE_TRY_ENV - ); -} - - -Messaging::ReplyPriorityPolicy* -POA_Messaging::ReplyPriorityPolicy::_this (CORBA_Environment &ACE_TRY_ENV) -{ - TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); - - Messaging::ReplyPriorityPolicy *retval = - Messaging::ReplyPriorityPolicy::_nil (); - - ACE_NEW_RETURN (retval, - POA_Messaging::_tao_collocated_ReplyPriorityPolicy (this, - stub), - Messaging::ReplyPriorityPolicy::_nil ()); - - return retval; -} - -void -POA_Messaging::ReplyPriorityPolicy::_dispatch ( - CORBA::ServerRequest &_tao_request, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV - ) -{ - TAO_Locality_Constrained_ServantBase::_dispatch (_tao_request, - _tao_context, - ACE_TRY_ENV); -} - -#endif /* TAO_HAS_PRIORITY_POLICIES == 1 */ - -#if (TAO_HAS_REQUEST_START_TIME_POLICY == 1) - -POA_Messaging::RequestStartTimePolicy::RequestStartTimePolicy (void) -{ -} - -POA_Messaging::RequestStartTimePolicy::RequestStartTimePolicy (const RequestStartTimePolicy& rhs) - : ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs), - TAO_ServantBase (rhs) -{} - -POA_Messaging::RequestStartTimePolicy::~RequestStartTimePolicy (void) -{ -} - -CORBA::Boolean POA_Messaging::RequestStartTimePolicy::_is_a ( - const char* value, - CORBA::Environment &ACE_TRY_ENV - ) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RequestStartTimePolicy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) - return 1; - else - return 0; -} - -void* POA_Messaging::RequestStartTimePolicy::_downcast ( - const char* logical_type_id - ) -{ - if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/RequestStartTimePolicy:1.0") == 0) - return ACE_static_cast (POA_Messaging::RequestStartTimePolicy_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0) - return ACE_static_cast (POA_CORBA::Policy_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) - return ACE_static_cast(PortableServer::Servant, this); - return 0; -} - -const char* POA_Messaging::RequestStartTimePolicy::_interface_repository_id (void) const -{ - return "IDL:Messaging/RequestStartTimePolicy:1.0"; -} - -POA_Messaging::_tao_collocated_RequestStartTimePolicy::_tao_collocated_RequestStartTimePolicy ( - POA_Messaging::RequestStartTimePolicy_ptr servant, - TAO_Stub *stub - ) - : ACE_NESTED_CLASS (Messaging,RequestStartTimePolicy) (), - ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub), - CORBA_Object (stub, servant, 1), - servant_ (servant) -{ -} - -POA_Messaging::RequestStartTimePolicy_ptr POA_Messaging::_tao_collocated_RequestStartTimePolicy::_get_servant (void) const -{ - return this->servant_; -} - -CORBA::Boolean POA_Messaging::_tao_collocated_RequestStartTimePolicy::_is_a ( - const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->_is_a ( - logical_type_id, - ACE_TRY_ENV - ); -} - -TimeBase::UtcT POA_Messaging::_tao_collocated_RequestStartTimePolicy::start_time ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->start_time ( - ACE_TRY_ENV - ); -} - - -Messaging::RequestStartTimePolicy* -POA_Messaging::RequestStartTimePolicy::_this (CORBA_Environment &ACE_TRY_ENV) -{ - TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); - - Messaging::RequestStartTimePolicy *retval = - Messaging::RequestStartTimePolicy::_nil (); - - ACE_NEW_RETURN (retval, - POA_Messaging::_tao_collocated_RequestStartTimePolicy (this, - stub), - Messaging::RequestStartTimePolicy::_nil ()); - - return retval; -} - -void -POA_Messaging::RequestStartTimePolicy::_dispatch ( - CORBA::ServerRequest &_tao_request, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV - ) -{ - TAO_Locality_Constrained_ServantBase::_dispatch (_tao_request, - _tao_context, - ACE_TRY_ENV); -} - -#endif /* TAO_HAS_REQUEST_START_TIME_POLICY == 1 */ - -#if (TAO_HAS_REQUEST_END_TIME_POLICY == 1) - -POA_Messaging::RequestEndTimePolicy::RequestEndTimePolicy (void) -{ -} - -POA_Messaging::RequestEndTimePolicy::RequestEndTimePolicy (const RequestEndTimePolicy& rhs) - : ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs), - TAO_ServantBase (rhs) -{} - -POA_Messaging::RequestEndTimePolicy::~RequestEndTimePolicy (void) -{ -} - -CORBA::Boolean POA_Messaging::RequestEndTimePolicy::_is_a ( - const char* value, - CORBA::Environment &ACE_TRY_ENV - ) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RequestEndTimePolicy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) - return 1; - else - return 0; -} - -void* POA_Messaging::RequestEndTimePolicy::_downcast ( - const char* logical_type_id - ) -{ - if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/RequestEndTimePolicy:1.0") == 0) - return ACE_static_cast (POA_Messaging::RequestEndTimePolicy_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0) - return ACE_static_cast (POA_CORBA::Policy_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) - return ACE_static_cast(PortableServer::Servant, this); - return 0; -} - -const char* POA_Messaging::RequestEndTimePolicy::_interface_repository_id (void) const -{ - return "IDL:Messaging/RequestEndTimePolicy:1.0"; -} - -POA_Messaging::_tao_collocated_RequestEndTimePolicy::_tao_collocated_RequestEndTimePolicy ( - POA_Messaging::RequestEndTimePolicy_ptr servant, - TAO_Stub *stub - ) - : ACE_NESTED_CLASS (Messaging,RequestEndTimePolicy) (), - ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub), - CORBA_Object (stub, servant, 1), - servant_ (servant) -{ -} - -POA_Messaging::RequestEndTimePolicy_ptr POA_Messaging::_tao_collocated_RequestEndTimePolicy::_get_servant (void) const -{ - return this->servant_; -} - -CORBA::Boolean POA_Messaging::_tao_collocated_RequestEndTimePolicy::_is_a ( - const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->_is_a ( - logical_type_id, - ACE_TRY_ENV - ); -} - -TimeBase::UtcT POA_Messaging::_tao_collocated_RequestEndTimePolicy::end_time ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->end_time ( - ACE_TRY_ENV - ); -} - - -Messaging::RequestEndTimePolicy* -POA_Messaging::RequestEndTimePolicy::_this (CORBA_Environment &ACE_TRY_ENV) -{ - TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); - - Messaging::RequestEndTimePolicy *retval = - Messaging::RequestEndTimePolicy::_nil (); - - ACE_NEW_RETURN (retval, - POA_Messaging::_tao_collocated_RequestEndTimePolicy (this, - stub), - Messaging::RequestEndTimePolicy::_nil ()); - - return retval; -} - -void -POA_Messaging::RequestEndTimePolicy::_dispatch ( - CORBA::ServerRequest &_tao_request, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV - ) -{ - TAO_Locality_Constrained_ServantBase::_dispatch (_tao_request, - _tao_context, - ACE_TRY_ENV); -} - -#endif /* TAO_HAS_REQUEST_END_TIME_POLICY == 1 */ - -#if (TAO_HAS_REPLY_START_TIME_POLICY == 1) - -POA_Messaging::ReplyStartTimePolicy::ReplyStartTimePolicy (void) -{ -} - -POA_Messaging::ReplyStartTimePolicy::ReplyStartTimePolicy (const ReplyStartTimePolicy& rhs) - : ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs), - TAO_ServantBase (rhs) -{} - -POA_Messaging::ReplyStartTimePolicy::~ReplyStartTimePolicy (void) -{ -} - -CORBA::Boolean POA_Messaging::ReplyStartTimePolicy::_is_a ( - const char* value, - CORBA::Environment &ACE_TRY_ENV - ) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/ReplyStartTimePolicy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) - return 1; - else - return 0; -} - -void* POA_Messaging::ReplyStartTimePolicy::_downcast ( - const char* logical_type_id - ) -{ - if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/ReplyStartTimePolicy:1.0") == 0) - return ACE_static_cast (POA_Messaging::ReplyStartTimePolicy_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0) - return ACE_static_cast (POA_CORBA::Policy_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) - return ACE_static_cast(PortableServer::Servant, this); - return 0; -} - -const char* POA_Messaging::ReplyStartTimePolicy::_interface_repository_id (void) const -{ - return "IDL:Messaging/ReplyStartTimePolicy:1.0"; -} - -POA_Messaging::_tao_collocated_ReplyStartTimePolicy::_tao_collocated_ReplyStartTimePolicy ( - POA_Messaging::ReplyStartTimePolicy_ptr servant, - TAO_Stub *stub - ) - : ACE_NESTED_CLASS (Messaging,ReplyStartTimePolicy) (), - ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub), - CORBA_Object (stub, servant, 1), - servant_ (servant) -{ -} - -POA_Messaging::ReplyStartTimePolicy_ptr POA_Messaging::_tao_collocated_ReplyStartTimePolicy::_get_servant (void) const -{ - return this->servant_; -} - -CORBA::Boolean POA_Messaging::_tao_collocated_ReplyStartTimePolicy::_is_a ( - const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->_is_a ( - logical_type_id, - ACE_TRY_ENV - ); -} - -TimeBase::UtcT POA_Messaging::_tao_collocated_ReplyStartTimePolicy::start_time ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->start_time ( - ACE_TRY_ENV - ); -} - - -Messaging::ReplyStartTimePolicy* -POA_Messaging::ReplyStartTimePolicy::_this (CORBA_Environment &ACE_TRY_ENV) -{ - TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); - - Messaging::ReplyStartTimePolicy *retval = - Messaging::ReplyStartTimePolicy::_nil (); - - ACE_NEW_RETURN (retval, - POA_Messaging::_tao_collocated_ReplyStartTimePolicy (this, - stub), - Messaging::ReplyStartTimePolicy::_nil ()); - - return retval; -} - -void -POA_Messaging::ReplyStartTimePolicy::_dispatch ( - CORBA::ServerRequest &_tao_request, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV - ) -{ - TAO_Locality_Constrained_ServantBase::_dispatch (_tao_request, - _tao_context, - ACE_TRY_ENV); -} - -#endif /* TAO_HAS_REPLY_START_TIME_POLICY == 1 */ - -#if (TAO_HAS_REPLY_END_TIME_POLICY == 1) - -POA_Messaging::ReplyEndTimePolicy::ReplyEndTimePolicy (void) -{ -} - -POA_Messaging::ReplyEndTimePolicy::ReplyEndTimePolicy (const ReplyEndTimePolicy& rhs) - : ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs), - TAO_ServantBase (rhs) -{} - -POA_Messaging::ReplyEndTimePolicy::~ReplyEndTimePolicy (void) -{ -} - -CORBA::Boolean POA_Messaging::ReplyEndTimePolicy::_is_a ( - const char* value, - CORBA::Environment &ACE_TRY_ENV - ) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/ReplyEndTimePolicy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) - return 1; - else - return 0; -} - -void* POA_Messaging::ReplyEndTimePolicy::_downcast ( - const char* logical_type_id - ) -{ - if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/ReplyEndTimePolicy:1.0") == 0) - return ACE_static_cast (POA_Messaging::ReplyEndTimePolicy_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0) - return ACE_static_cast (POA_CORBA::Policy_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) - return ACE_static_cast(PortableServer::Servant, this); - return 0; -} - -const char* POA_Messaging::ReplyEndTimePolicy::_interface_repository_id (void) const -{ - return "IDL:Messaging/ReplyEndTimePolicy:1.0"; -} - -POA_Messaging::_tao_collocated_ReplyEndTimePolicy::_tao_collocated_ReplyEndTimePolicy ( - POA_Messaging::ReplyEndTimePolicy_ptr servant, - TAO_Stub *stub - ) - : ACE_NESTED_CLASS (Messaging,ReplyEndTimePolicy) (), - ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub), - CORBA_Object (stub, servant, 1), - servant_ (servant) -{ -} - -POA_Messaging::ReplyEndTimePolicy_ptr POA_Messaging::_tao_collocated_ReplyEndTimePolicy::_get_servant (void) const -{ - return this->servant_; -} - -CORBA::Boolean POA_Messaging::_tao_collocated_ReplyEndTimePolicy::_is_a ( - const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->_is_a ( - logical_type_id, - ACE_TRY_ENV - ); -} - -TimeBase::UtcT POA_Messaging::_tao_collocated_ReplyEndTimePolicy::end_time ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->end_time ( - ACE_TRY_ENV - ); -} - - -Messaging::ReplyEndTimePolicy* -POA_Messaging::ReplyEndTimePolicy::_this (CORBA_Environment &ACE_TRY_ENV) -{ - TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); - - Messaging::ReplyEndTimePolicy *retval = - Messaging::ReplyEndTimePolicy::_nil (); - - ACE_NEW_RETURN (retval, - POA_Messaging::_tao_collocated_ReplyEndTimePolicy (this, - stub), - Messaging::ReplyEndTimePolicy::_nil ()); - - return retval; -} - -void -POA_Messaging::ReplyEndTimePolicy::_dispatch ( - CORBA::ServerRequest &_tao_request, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV - ) -{ - TAO_Locality_Constrained_ServantBase::_dispatch (_tao_request, - _tao_context, - ACE_TRY_ENV); -} - -#endif /* TAO_HAS_REPLY_END_TIME_POLICY == 1 */ - -#if (TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1) - -POA_Messaging::RelativeRequestTimeoutPolicy::RelativeRequestTimeoutPolicy (void) -{ -} - -POA_Messaging::RelativeRequestTimeoutPolicy::RelativeRequestTimeoutPolicy (const RelativeRequestTimeoutPolicy& rhs) - : ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs), - TAO_ServantBase (rhs) -{} - -POA_Messaging::RelativeRequestTimeoutPolicy::~RelativeRequestTimeoutPolicy (void) -{ -} - -CORBA::Boolean POA_Messaging::RelativeRequestTimeoutPolicy::_is_a ( - const char* value, - CORBA::Environment &ACE_TRY_ENV - ) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RelativeRequestTimeoutPolicy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) - return 1; - else - return 0; -} - -void* POA_Messaging::RelativeRequestTimeoutPolicy::_downcast ( - const char* logical_type_id - ) -{ - if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/RelativeRequestTimeoutPolicy:1.0") == 0) - return ACE_static_cast (POA_Messaging::RelativeRequestTimeoutPolicy_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0) - return ACE_static_cast (POA_CORBA::Policy_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) - return ACE_static_cast(PortableServer::Servant, this); - return 0; -} - -const char* POA_Messaging::RelativeRequestTimeoutPolicy::_interface_repository_id (void) const -{ - return "IDL:Messaging/RelativeRequestTimeoutPolicy:1.0"; -} - -POA_Messaging::_tao_collocated_RelativeRequestTimeoutPolicy::_tao_collocated_RelativeRequestTimeoutPolicy ( - POA_Messaging::RelativeRequestTimeoutPolicy_ptr servant, - TAO_Stub *stub - ) - : ACE_NESTED_CLASS (Messaging,RelativeRequestTimeoutPolicy) (), - ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub), - CORBA_Object (stub, servant, 1), - servant_ (servant) -{ -} - -POA_Messaging::RelativeRequestTimeoutPolicy_ptr POA_Messaging::_tao_collocated_RelativeRequestTimeoutPolicy::_get_servant (void) const -{ - return this->servant_; -} - -CORBA::Boolean POA_Messaging::_tao_collocated_RelativeRequestTimeoutPolicy::_is_a ( - const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->_is_a ( - logical_type_id, - ACE_TRY_ENV - ); -} - -TimeBase::TimeT POA_Messaging::_tao_collocated_RelativeRequestTimeoutPolicy::relative_expiry (CORBA::Environment &ACE_TRY_ENV) -{ - return this->servant_->relative_expiry (ACE_TRY_ENV); -} - -TimeBase::TimeT POA_Messaging::_tao_collocated_RelativeRequestTimeoutPolicy::relative_expiry (void) -{ - return this->servant_->relative_expiry (); -} - - -Messaging::RelativeRequestTimeoutPolicy* -POA_Messaging::RelativeRequestTimeoutPolicy::_this (CORBA_Environment &ACE_TRY_ENV) -{ - TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); - - Messaging::RelativeRequestTimeoutPolicy *retval = - Messaging::RelativeRequestTimeoutPolicy::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_Messaging::_tao_collocated_RelativeRequestTimeoutPolicy (this, - stub), - Messaging::RelativeRequestTimeoutPolicy::_nil () - ); - - return retval; -} - -void -POA_Messaging::RelativeRequestTimeoutPolicy::_dispatch ( - CORBA::ServerRequest &_tao_request, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV - ) -{ - TAO_Locality_Constrained_ServantBase::_dispatch (_tao_request, - _tao_context, - ACE_TRY_ENV); -} - -#endif /* TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1 */ - -#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) - -POA_Messaging::RelativeRoundtripTimeoutPolicy::RelativeRoundtripTimeoutPolicy (void) -{ -} - -POA_Messaging::RelativeRoundtripTimeoutPolicy::RelativeRoundtripTimeoutPolicy (const RelativeRoundtripTimeoutPolicy& rhs) - : ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs), - TAO_ServantBase (rhs) -{} - -POA_Messaging::RelativeRoundtripTimeoutPolicy::~RelativeRoundtripTimeoutPolicy (void) -{ -} - -CORBA::Boolean POA_Messaging::RelativeRoundtripTimeoutPolicy::_is_a ( - const char* value, - CORBA::Environment &ACE_TRY_ENV - ) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RelativeRoundtripTimeoutPolicy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) - return 1; - else - return 0; -} - -void* POA_Messaging::RelativeRoundtripTimeoutPolicy::_downcast ( - const char* logical_type_id - ) -{ - if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/RelativeRoundtripTimeoutPolicy:1.0") == 0) - return ACE_static_cast (POA_Messaging::RelativeRoundtripTimeoutPolicy_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0) - return ACE_static_cast (POA_CORBA::Policy_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) - return ACE_static_cast(PortableServer::Servant, this); - return 0; -} - -const char* POA_Messaging::RelativeRoundtripTimeoutPolicy::_interface_repository_id (void) const -{ - return "IDL:Messaging/RelativeRoundtripTimeoutPolicy:1.0"; -} - -POA_Messaging::_tao_collocated_RelativeRoundtripTimeoutPolicy::_tao_collocated_RelativeRoundtripTimeoutPolicy ( - POA_Messaging::RelativeRoundtripTimeoutPolicy_ptr servant, - TAO_Stub *stub - ) - : ACE_NESTED_CLASS (Messaging,RelativeRoundtripTimeoutPolicy) (), - ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub), - CORBA_Object (stub, servant, 1), - servant_ (servant) -{ -} - -POA_Messaging::RelativeRoundtripTimeoutPolicy_ptr POA_Messaging::_tao_collocated_RelativeRoundtripTimeoutPolicy::_get_servant (void) const -{ - return this->servant_; -} - -CORBA::Boolean POA_Messaging::_tao_collocated_RelativeRoundtripTimeoutPolicy::_is_a ( - const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->_is_a ( - logical_type_id, - ACE_TRY_ENV - ); -} - -TimeBase::TimeT POA_Messaging::_tao_collocated_RelativeRoundtripTimeoutPolicy::relative_expiry (CORBA::Environment &ACE_TRY_ENV) -{ - return this->servant_->relative_expiry (ACE_TRY_ENV); -} - -TimeBase::TimeT POA_Messaging::_tao_collocated_RelativeRoundtripTimeoutPolicy::relative_expiry (void) -{ - return this->servant_->relative_expiry (); -} - - -Messaging::RelativeRoundtripTimeoutPolicy* -POA_Messaging::RelativeRoundtripTimeoutPolicy::_this (CORBA_Environment &ACE_TRY_ENV) -{ - TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); - - Messaging::RelativeRoundtripTimeoutPolicy *retval = - Messaging::RelativeRoundtripTimeoutPolicy::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_Messaging::_tao_collocated_RelativeRoundtripTimeoutPolicy (this, - stub), - Messaging::RelativeRoundtripTimeoutPolicy::_nil () - ); - - return retval; -} - -void -POA_Messaging::RelativeRoundtripTimeoutPolicy::_dispatch ( - CORBA::ServerRequest &_tao_request, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV - ) -{ - TAO_Locality_Constrained_ServantBase::_dispatch (_tao_request, - _tao_context, - ACE_TRY_ENV); -} - -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ - -#if (TAO_HAS_ROUTING_POLICY == 1) - -POA_Messaging::RoutingPolicy::RoutingPolicy (void) -{ -} - -POA_Messaging::RoutingPolicy::RoutingPolicy (const RoutingPolicy& rhs) - : ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs), - TAO_ServantBase (rhs) -{} - -POA_Messaging::RoutingPolicy::~RoutingPolicy (void) -{ -} - -CORBA::Boolean POA_Messaging::RoutingPolicy::_is_a ( - const char* value, - CORBA::Environment &ACE_TRY_ENV - ) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RoutingPolicy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) - return 1; - else - return 0; -} - -void* POA_Messaging::RoutingPolicy::_downcast ( - const char* logical_type_id - ) -{ - if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/RoutingPolicy:1.0") == 0) - return ACE_static_cast (POA_Messaging::RoutingPolicy_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0) - return ACE_static_cast (POA_CORBA::Policy_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) - return ACE_static_cast(PortableServer::Servant, this); - return 0; -} - -const char* POA_Messaging::RoutingPolicy::_interface_repository_id (void) const -{ - return "IDL:Messaging/RoutingPolicy:1.0"; -} - -POA_Messaging::_tao_collocated_RoutingPolicy::_tao_collocated_RoutingPolicy ( - POA_Messaging::RoutingPolicy_ptr servant, - TAO_Stub *stub - ) - : ACE_NESTED_CLASS (Messaging,RoutingPolicy) (), - ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub), - CORBA_Object (stub, servant, 1), - servant_ (servant) -{ -} - -POA_Messaging::RoutingPolicy_ptr POA_Messaging::_tao_collocated_RoutingPolicy::_get_servant (void) const -{ - return this->servant_; -} - -CORBA::Boolean POA_Messaging::_tao_collocated_RoutingPolicy::_is_a ( - const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->_is_a ( - logical_type_id, - ACE_TRY_ENV - ); -} - -Messaging::RoutingTypeRange POA_Messaging::_tao_collocated_RoutingPolicy::routing_range ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->routing_range ( - ACE_TRY_ENV - ); -} - - -Messaging::RoutingPolicy* -POA_Messaging::RoutingPolicy::_this (CORBA_Environment &ACE_TRY_ENV) -{ - TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); - - Messaging::RoutingPolicy *retval = - Messaging::RoutingPolicy::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_Messaging::_tao_collocated_RoutingPolicy (this, - stub), - Messaging::RoutingPolicy::_nil () - ); - - return retval; -} - -void -POA_Messaging::RoutingPolicy::_dispatch ( - CORBA::ServerRequest &_tao_request, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV - ) -{ - TAO_Locality_Constrained_ServantBase::_dispatch (_tao_request, - _tao_context, - ACE_TRY_ENV); -} - -#endif /* TAO_HAS_ROUTING_POLICY == 1 */ - -#if (TAO_HAS_MAX_HOPS_POLICY == 1) - -POA_Messaging::MaxHopsPolicy::MaxHopsPolicy (void) -{ -} - -POA_Messaging::MaxHopsPolicy::MaxHopsPolicy (const MaxHopsPolicy& rhs) - : ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs), - TAO_ServantBase (rhs) -{} - -POA_Messaging::MaxHopsPolicy::~MaxHopsPolicy (void) -{ -} - -CORBA::Boolean POA_Messaging::MaxHopsPolicy::_is_a ( - const char* value, - CORBA::Environment &ACE_TRY_ENV - ) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/MaxHopsPolicy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) - return 1; - else - return 0; -} - -void* POA_Messaging::MaxHopsPolicy::_downcast ( - const char* logical_type_id - ) -{ - if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/MaxHopsPolicy:1.0") == 0) - return ACE_static_cast (POA_Messaging::MaxHopsPolicy_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0) - return ACE_static_cast (POA_CORBA::Policy_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) - return ACE_static_cast(PortableServer::Servant, this); - return 0; -} - -const char* POA_Messaging::MaxHopsPolicy::_interface_repository_id (void) const -{ - return "IDL:Messaging/MaxHopsPolicy:1.0"; -} - -POA_Messaging::_tao_collocated_MaxHopsPolicy::_tao_collocated_MaxHopsPolicy ( - POA_Messaging::MaxHopsPolicy_ptr servant, - TAO_Stub *stub - ) - : ACE_NESTED_CLASS (Messaging,MaxHopsPolicy) (), - ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub), - CORBA_Object (stub, servant, 1), - servant_ (servant) -{ -} - -POA_Messaging::MaxHopsPolicy_ptr POA_Messaging::_tao_collocated_MaxHopsPolicy::_get_servant (void) const -{ - return this->servant_; -} - -CORBA::Boolean POA_Messaging::_tao_collocated_MaxHopsPolicy::_is_a ( - const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->_is_a ( - logical_type_id, - ACE_TRY_ENV - ); -} - -CORBA::UShort POA_Messaging::_tao_collocated_MaxHopsPolicy::max_hops ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->max_hops ( - ACE_TRY_ENV - ); -} - - -Messaging::MaxHopsPolicy* -POA_Messaging::MaxHopsPolicy::_this (CORBA_Environment &ACE_TRY_ENV) -{ - TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); - - Messaging::MaxHopsPolicy *retval = - Messaging::MaxHopsPolicy::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_Messaging::_tao_collocated_MaxHopsPolicy (this, - stub), - Messaging::MaxHopsPolicy::_nil () - ); - - return retval; -} - -void -POA_Messaging::MaxHopsPolicy::_dispatch ( - CORBA::ServerRequest &_tao_request, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV - ) -{ - TAO_Locality_Constrained_ServantBase::_dispatch (_tao_request, - _tao_context, - ACE_TRY_ENV); -} - -#endif /* TAO_HAS_MAX_HOPS_POLICY == 1 */ - -#if (TAO_HAS_QUEUE_ORDER_POLICY == 1) - -POA_Messaging::QueueOrderPolicy::QueueOrderPolicy (void) -{ -} - -POA_Messaging::QueueOrderPolicy::QueueOrderPolicy (const QueueOrderPolicy& rhs) - : ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs), - TAO_ServantBase (rhs) -{} - -POA_Messaging::QueueOrderPolicy::~QueueOrderPolicy (void) -{ -} - -CORBA::Boolean POA_Messaging::QueueOrderPolicy::_is_a ( - const char* value, - CORBA::Environment &ACE_TRY_ENV - ) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/QueueOrderPolicy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) - return 1; - else - return 0; -} - -void* POA_Messaging::QueueOrderPolicy::_downcast ( - const char* logical_type_id - ) -{ - if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/QueueOrderPolicy:1.0") == 0) - return ACE_static_cast (POA_Messaging::QueueOrderPolicy_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0) - return ACE_static_cast (POA_CORBA::Policy_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) - return ACE_static_cast(PortableServer::Servant, this); - return 0; -} - -const char* POA_Messaging::QueueOrderPolicy::_interface_repository_id (void) const -{ - return "IDL:Messaging/QueueOrderPolicy:1.0"; -} - -POA_Messaging::_tao_collocated_QueueOrderPolicy::_tao_collocated_QueueOrderPolicy ( - POA_Messaging::QueueOrderPolicy_ptr servant, - TAO_Stub *stub - ) - : ACE_NESTED_CLASS (Messaging,QueueOrderPolicy) (), - ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub), - CORBA_Object (stub, servant, 1), - servant_ (servant) -{ -} - -POA_Messaging::QueueOrderPolicy_ptr POA_Messaging::_tao_collocated_QueueOrderPolicy::_get_servant (void) const -{ - return this->servant_; -} - -CORBA::Boolean POA_Messaging::_tao_collocated_QueueOrderPolicy::_is_a ( - const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->_is_a ( - logical_type_id, - ACE_TRY_ENV - ); -} - -Messaging::Ordering POA_Messaging::_tao_collocated_QueueOrderPolicy::allowed_orders ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->allowed_orders ( - ACE_TRY_ENV - ); -} - - -Messaging::QueueOrderPolicy* -POA_Messaging::QueueOrderPolicy::_this (CORBA_Environment &ACE_TRY_ENV) -{ - TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); - - Messaging::QueueOrderPolicy *retval = - Messaging::QueueOrderPolicy::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_Messaging::_tao_collocated_QueueOrderPolicy (this, - stub), - Messaging::QueueOrderPolicy::_nil () - ); - - return retval; -} - -void -POA_Messaging::QueueOrderPolicy::_dispatch ( - CORBA::ServerRequest &_tao_request, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV - ) -{ - TAO_Locality_Constrained_ServantBase::_dispatch (_tao_request, - _tao_context, - ACE_TRY_ENV); -} - -#endif /* TAO_HAS_QUEUE_ORDER_POLICY == 1 */ - -#if (TAO_HAS_AMI_CALLBACK == 1) - - class TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable { private: @@ -1540,9 +32,9 @@ private: public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; -/* starting time is 20:19:57 */ +/* starting time is 14:51:17 */ /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable -N lookup */ +/* Command-line: /export/kelvar/coryan/head/ACE_wrappers/build/Linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -1630,7 +122,7 @@ TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable::lookup (const char *str, unsign } return 0; } -/* ending time is 20:19:57 */ +/* ending time is 14:51:17 */ static TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable tao_Messaging_ReplyHandler_optable; Messaging::ReplyHandler_ptr _TAO_collocation_POA_Messaging_ReplyHandler_Stub_Factory ( @@ -1654,7 +146,7 @@ Messaging::ReplyHandler_ptr _TAO_collocation_POA_Messaging_ReplyHandler_Stub_Fac case TAO_ORB_Core::DIRECT: if (obj->_servant () != 0) { - POA_Messaging::ReplyHandler *servant = ACE_reinterpret_cast (POA_Messaging::ReplyHandler*, obj->_servant ()->_downcast ("IDL:Messaging/ReplyHandler:1.0")); + POA_Messaging::ReplyHandler *servant = ACE_reinterpret_cast (POA_Messaging::ReplyHandler*, obj->_servant ()->_downcast ("IDL:omg.org/Messaging/ReplyHandler:1.0")); if (servant != 0) { Messaging::ReplyHandler *retval = 0; @@ -1750,7 +242,7 @@ CORBA::Boolean POA_Messaging::ReplyHandler::_is_a ( ) { if ( - (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/ReplyHandler:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/Messaging/ReplyHandler:1.0")) || (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) return 1; else @@ -1761,7 +253,7 @@ void* POA_Messaging::ReplyHandler::_downcast ( const char* logical_type_id ) { -if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/ReplyHandler:1.0") == 0) +if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/Messaging/ReplyHandler:1.0") == 0) return ACE_static_cast (POA_Messaging::ReplyHandler_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) return ACE_static_cast(PortableServer::Servant, this); @@ -1784,7 +276,7 @@ void POA_Messaging::ReplyHandler::_dispatch (CORBA::ServerRequest &req, void *co const char* POA_Messaging::ReplyHandler::_interface_repository_id (void) const { - return "IDL:Messaging/ReplyHandler:1.0"; + return "IDL:omg.org/Messaging/ReplyHandler:1.0"; } Messaging::ReplyHandler* @@ -1797,7 +289,7 @@ POA_Messaging::ReplyHandler::_this (CORBA_Environment &ACE_TRY_ENV) { case TAO_ORB_Core::THRU_POA: { - Messaging::ReplyHandler_ptr retval = 0; + ::Messaging::ReplyHandler_ptr retval = 0; ACE_NEW_RETURN ( retval, POA_Messaging::_tao_thru_poa_collocated_ReplyHandler (stub), @@ -1807,7 +299,7 @@ POA_Messaging::ReplyHandler::_this (CORBA_Environment &ACE_TRY_ENV) } case TAO_ORB_Core::DIRECT: { - Messaging::ReplyHandler_ptr retval = 0; + ::Messaging::ReplyHandler_ptr retval = 0; ACE_NEW_RETURN ( retval, POA_Messaging::_tao_direct_collocated_ReplyHandler (this, stub), @@ -1824,15 +316,14 @@ POA_Messaging::ReplyHandler::_this (CORBA_Environment &ACE_TRY_ENV) CORBA::Object_ptr tmp = CORBA::Object::_nil (); ACE_NEW_RETURN (tmp, CORBA::Object (stub), 0); CORBA::Object_var obj = tmp; - return Messaging::ReplyHandler::_unchecked_narrow (obj.in ()); + return ::Messaging::ReplyHandler::_unchecked_narrow (obj.in ()); } } POA_Messaging::_tao_thru_poa_collocated_ReplyHandler::_tao_thru_poa_collocated_ReplyHandler ( TAO_Stub *stub ) - : ACE_NESTED_CLASS (Messaging,ReplyHandler) (), - CORBA_Object (stub, 0, 1) + : CORBA_Object (stub, 0, 1) { } @@ -1854,7 +345,7 @@ CORBA::Boolean POA_Messaging::_tao_thru_poa_collocated_ReplyHandler::_is_a( return ACE_reinterpret_cast ( POA_Messaging::ReplyHandler_ptr, servant_upcall.servant ()->_downcast ( - "IDL:Messaging/ReplyHandler:1.0" + "IDL:omg.org/Messaging/ReplyHandler:1.0" ) )->_is_a (logical_type_id, ACE_TRY_ENV); } @@ -1877,7 +368,7 @@ CORBA::Boolean POA_Messaging::_tao_thru_poa_collocated_ReplyHandler::_non_existe return ACE_reinterpret_cast ( POA_Messaging::ReplyHandler_ptr, servant_upcall.servant ()->_downcast ( - "IDL:Messaging/ReplyHandler:1.0" + "IDL:omg.org/Messaging/ReplyHandler:1.0" ) )->_non_existent (ACE_TRY_ENV); } @@ -1916,489 +407,4 @@ CORBA::Boolean POA_Messaging::_tao_direct_collocated_ReplyHandler::_non_existent return this->servant_->_non_existent (ACE_TRY_ENV); } -#endif /* TAO_HAS_AMI_CALLBACK == 1 */ - -// **************************************************************** - -#if (TAO_HAS_AMI_POLLER == 1) - -class TAO_Messaging_Poller_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable -{ -private: - unsigned int hash (const char *str, unsigned int len); -public: - const TAO_operation_db_entry * lookup (const char *str, unsigned int len); -}; -/* starting time is 12:37:20 */ -/* C++ code produced by gperf version 2.7 (GNU C++ version) */ -/* Command-line: /project/macarena/coryan/head/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_Messaging_Poller_Perfect_Hash_OpTable -N lookup */ -unsigned int -TAO_Messaging_Poller_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) -{ - static const unsigned char asso_values[] = - { - 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 0, 30, 0, 30, 10, - 30, 5, 30, 30, 30, 0, 30, 30, 30, 30, - 30, 30, 30, 30, 0, 30, 0, 30, 30, 30, - 30, 0, 30, 30, 30, 30, 30, 30, - }; - return len + asso_values[str[len - 1]] + asso_values[str[0]]; -} - -const class TAO_operation_db_entry * -TAO_Messaging_Poller_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len) -{ - enum - { - TOTAL_KEYWORDS = 11, - MIN_WORD_LENGTH = 5, - MAX_WORD_LENGTH = 23, - MIN_HASH_VALUE = 5, - MAX_HASH_VALUE = 29, - HASH_VALUE_RANGE = 25, - DUPLICATES = 2 - }; - - static const class TAO_operation_db_entry wordlist[] = - { - {"",0}, {"",0}, {"",0}, {"",0}, {"",0}, - {"_is_a", &POA_Messaging::Poller::_is_a_skel}, - {"is_ready", &POA_Messaging::Poller::is_ready_skel}, - {"_get_target", &POA_Messaging::Poller::_get_target_skel}, - {"_non_existent", &POA_Messaging::Poller::_non_existent_skel}, - {"_get_op_name", &POA_Messaging::Poller::_get_op_name_skel}, - {"_get_is_from_poller", &POA_Messaging::Poller::_get_is_from_poller_skel}, - {"_get_operation_target", &POA_Messaging::Poller::_get_operation_target_skel}, - {"_get_associated_handler", &POA_Messaging::Poller::_get_associated_handler_skel}, - {"_set_associated_handler", &POA_Messaging::Poller::_set_associated_handler_skel}, - {"_get_operation_name", &POA_Messaging::Poller::_get_operation_name_skel}, - {"create_pollable_set", &POA_Messaging::Poller::create_pollable_set_skel}, - }; - - static const signed char lookup[] = - { - -1, -1, -1, -1, -1, 5, -1, -1, 6, -1, -1, 7, -1, 8, - -1, -12, -2, 9, -1, 10, -1, 11, -1, -37, 14, -1, -1, -1, - -1, 15, - }; - - if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) - { - unsigned int key = hash (str, len); - - if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE) - { - int slot = lookup[key]; - - if (slot >= 0 && slot < MAX_HASH_VALUE) - { - const char *s = wordlist[slot].opname_; - - if (*str == *s && !strncmp (str + 1, s + 1, len - 1)) - return &wordlist[slot]; - } - else if (slot < 0 && slot >= -MAX_HASH_VALUE) - return 0; - else - { - u_int offset = key + slot + (slot > 0 ? -MAX_HASH_VALUE : MAX_HASH_VALUE); - const TAO_operation_db_entry *base = &wordlist[-lookup[offset]]; - const TAO_operation_db_entry *ptr = base + -lookup[offset + 1]; - - while (--ptr >= base) - if (*str == *ptr->opname_ && !strncmp (str + 1, ptr->opname_ + 1, len - 1)) - return ptr; - } - } - } - return 0; -} -/* ending time is 12:37:20 */ -TAO_Messaging_Poller_Perfect_Hash_OpTable tao_Messaging_Poller_optable; -// skeleton constructor -POA_Messaging::Poller::Poller (void) -{ - this->optable_ = &tao_Messaging_Poller_optable; -} - -// copy ctor -POA_Messaging::Poller::Poller (const Poller& rhs) - : ACE_NESTED_CLASS (POA_CORBA,Pollable) (rhs), - TAO_ServantBase (rhs) -{} -// skeleton destructor -POA_Messaging::Poller::~Poller (void) -{ -} -void POA_Messaging::Poller::_get_operation_target_skel ( - CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, - CORBA::Environment &ACE_TRY_ENV - ) -{ - POA_Messaging::Poller *_tao_impl = (POA_Messaging::Poller *)_tao_object_reference; - CORBA::Object_var _tao_retval; - _tao_retval = _tao_impl->operation_target ( - ACE_TRY_ENV - ); - ACE_CHECK; - _tao_server_request.init_reply (ACE_TRY_ENV); - ACE_CHECK; - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!( - (_tao_out << _tao_retval.in ()) - )) - ACE_THROW (CORBA::MARSHAL () ); - -} - -void POA_Messaging::Poller::_get_operation_name_skel ( - CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, - CORBA::Environment &ACE_TRY_ENV - ) -{ - POA_Messaging::Poller *_tao_impl = (POA_Messaging::Poller *)_tao_object_reference; - CORBA::String_var _tao_retval; - _tao_retval = _tao_impl->operation_name ( - ACE_TRY_ENV - ); - ACE_CHECK; - _tao_server_request.init_reply (ACE_TRY_ENV); - ACE_CHECK; - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!( - (_tao_out << _tao_retval.in ()) - )) - ACE_THROW (CORBA::MARSHAL () ); - -} - -void POA_Messaging::Poller::_get_associated_handler_skel ( - CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, - CORBA::Environment &ACE_TRY_ENV - ) -{ - POA_Messaging::Poller *_tao_impl = (POA_Messaging::Poller *)_tao_object_reference; - Messaging::ReplyHandler_var _tao_retval; - _tao_retval = _tao_impl->associated_handler ( - ACE_TRY_ENV - ); - ACE_CHECK; - _tao_server_request.init_reply (ACE_TRY_ENV); - ACE_CHECK; - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!( - (_tao_out << _tao_retval.in ()) - )) - ACE_THROW (CORBA::MARSHAL () ); - -} - -void POA_Messaging::Poller::_set_associated_handler_skel ( - CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, - CORBA::Environment &ACE_TRY_ENV - ) -{ - TAO_InputCDR &_tao_in = _tao_server_request.incoming (); - POA_Messaging::Poller *_tao_impl = (POA_Messaging::Poller *)_tao_object_reference; - Messaging::ReplyHandler_var associated_handler; - if (!( - (_tao_in >> associated_handler.out ()) - )) - ACE_THROW (CORBA::MARSHAL () ); - - _tao_impl->associated_handler ( - associated_handler.in (), - ACE_TRY_ENV - ); - ACE_CHECK; - _tao_server_request.init_reply (ACE_TRY_ENV); -} - -void POA_Messaging::Poller::_get_is_from_poller_skel ( - CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, - CORBA::Environment &ACE_TRY_ENV - ) -{ - POA_Messaging::Poller *_tao_impl = (POA_Messaging::Poller *)_tao_object_reference; - CORBA::Boolean _tao_retval = 0; - _tao_retval = _tao_impl->is_from_poller ( - ACE_TRY_ENV - ); - ACE_CHECK; - _tao_server_request.init_reply (ACE_TRY_ENV); - ACE_CHECK; - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!( - (_tao_out << CORBA::Any::from_boolean (_tao_retval)) - )) - ACE_THROW (CORBA::MARSHAL () ); - -} - -void POA_Messaging::Poller::_get_target_skel ( - CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, - CORBA::Environment &ACE_TRY_ENV - ) -{ - POA_Messaging::Poller *_tao_impl = (POA_Messaging::Poller *)_tao_object_reference; - CORBA::Object_var _tao_retval; - _tao_retval = _tao_impl->target ( - ACE_TRY_ENV - ); - ACE_CHECK; - _tao_server_request.init_reply (ACE_TRY_ENV); - ACE_CHECK; - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!( - (_tao_out << _tao_retval.in ()) - )) - ACE_THROW (CORBA::MARSHAL () ); - -} - -void POA_Messaging::Poller::_get_op_name_skel ( - CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, - CORBA::Environment &ACE_TRY_ENV - ) -{ - POA_Messaging::Poller *_tao_impl = (POA_Messaging::Poller *)_tao_object_reference; - CORBA::String_var _tao_retval; - _tao_retval = _tao_impl->op_name ( - ACE_TRY_ENV - ); - ACE_CHECK; - _tao_server_request.init_reply (ACE_TRY_ENV); - ACE_CHECK; - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!( - (_tao_out << _tao_retval.in ()) - )) - ACE_THROW (CORBA::MARSHAL () ); - -} - -void POA_Messaging::Poller::_is_a_skel ( - CORBA::ServerRequest &_tao_server_request, - void * _tao_object_reference, - void * /*context*/, - CORBA::Environment &ACE_TRY_ENV - ) -{ - TAO_InputCDR &_tao_in = _tao_server_request.incoming (); - POA_Messaging::Poller *_tao_impl = (POA_Messaging::Poller *) _tao_object_reference; - CORBA::Boolean _tao_retval = 0; - CORBA::String_var value; - if (!((_tao_in >> value.out ()))) - ACE_THROW (CORBA::MARSHAL ()); - - _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); - ACE_CHECK; - - _tao_server_request.init_reply (ACE_TRY_ENV); - ACE_CHECK; - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval)))) - ACE_THROW (CORBA::MARSHAL ()); -} - -CORBA::Boolean POA_Messaging::Poller::_is_a ( - const char* value, - CORBA::Environment &ACE_TRY_ENV - ) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/Poller:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Pollable:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) - return 1; - else - return 0; -} - -void POA_Messaging::Poller::_non_existent_skel ( - CORBA::ServerRequest &_tao_server_request, - void * _tao_object_reference , - void * /*context*/, - CORBA::Environment &ACE_TRY_ENV - ) -{ - POA_Messaging::Poller *_tao_impl = (POA_Messaging::Poller *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); - ACE_CHECK; - - _tao_server_request.init_reply (ACE_TRY_ENV); - ACE_CHECK; - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval)))) - ACE_THROW (CORBA::MARSHAL ()); -} - -void* POA_Messaging::Poller::_downcast ( - const char* logical_type_id - ) -{ - if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/Poller:1.0") == 0) - return ACE_static_cast (POA_Messaging::Poller_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Pollable:1.0") == 0) - return ACE_static_cast (POA_CORBA::Pollable_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) - return ACE_static_cast(PortableServer::Servant, this); - return 0; -} - -void POA_Messaging::Poller::_dispatch (CORBA::ServerRequest &req, void * context, CORBA::Environment &ACE_TRY_ENV) -{ - TAO_Skeleton skel; // pointer to skeleton for operation - const char *opname = req.operation (); // retrieve operation name - // find the skeleton corresponding to this opname - if (this->_find (opname, skel) == -1) - { - ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION ()); - } - else - skel (req, this, context, ACE_TRY_ENV); -} - -const char* POA_Messaging::Poller::_interface_repository_id (void) const -{ - return "IDL:Messaging/Poller:1.0"; -} - -POA_Messaging::_tao_collocated_Poller::_tao_collocated_Poller ( - POA_Messaging::Poller_ptr servant, - TAO_Stub *stub - ) - : ACE_NESTED_CLASS (Messaging,Poller) (), - ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Pollable) (servant, stub), - CORBA_Object (stub, servant, 1), - servant_ (servant) -{ -} - -POA_Messaging::Poller_ptr POA_Messaging::_tao_collocated_Poller::_get_servant (void) const -{ - return this->servant_; -} - -CORBA::Boolean POA_Messaging::_tao_collocated_Poller::_is_a ( - const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->_is_a ( - logical_type_id, - ACE_TRY_ENV - ); -} - -CORBA::Object_ptr POA_Messaging::_tao_collocated_Poller::operation_target ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->operation_target ( - ACE_TRY_ENV - ); -} - -char * POA_Messaging::_tao_collocated_Poller::operation_name ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->operation_name ( - ACE_TRY_ENV - ); -} - -Messaging::ReplyHandler_ptr POA_Messaging::_tao_collocated_Poller::associated_handler ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->associated_handler ( - ACE_TRY_ENV - ); -} - -void POA_Messaging::_tao_collocated_Poller::associated_handler ( - Messaging::ReplyHandler_ptr associated_handler, - CORBA::Environment &ACE_TRY_ENV - ) -{ - this->servant_->associated_handler ( - associated_handler, - ACE_TRY_ENV - ); -} - -CORBA::Boolean POA_Messaging::_tao_collocated_Poller::is_from_poller ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->is_from_poller ( - ACE_TRY_ENV - ); -} - -CORBA::Object_ptr POA_Messaging::_tao_collocated_Poller::target ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->target ( - ACE_TRY_ENV - ); -} - -char * POA_Messaging::_tao_collocated_Poller::op_name ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->op_name ( - ACE_TRY_ENV - ); -} - - -Messaging::Poller* -POA_Messaging::Poller::_this (CORBA_Environment &ACE_TRY_ENV) -{ - TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); - - Messaging::Poller *retval = - Messaging::Poller::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_Messaging::_tao_collocated_Poller (this, - stub), - Messaging::Poller::_nil () - ); - - return retval; -} -#endif /* TAO_HAS_AMI_POLLER == 1 */ - #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ diff --git a/TAO/tao/MessagingS.h b/TAO/tao/MessagingS.h index 68bd413a0d7..0bb048f9afc 100644 --- a/TAO/tao/MessagingS.h +++ b/TAO/tao/MessagingS.h @@ -1,5 +1,4 @@ -/* -*- C++ -*- */ -// $Id$ +/* -*- C++ -*- $Id$ */ // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* // TAO and the TAO IDL Compiler have been developed by the Center for @@ -8,8 +7,8 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef TAO_IDL_MESSAGINGS_H -#define TAO_IDL_MESSAGINGS_H +#ifndef _TAO_IDL_TMP_MESSAGINGS_H_ +#define _TAO_IDL_TMP_MESSAGINGS_H_ #include "ace/pre.h" #include "tao/orbconf.h" @@ -34,1618 +33,6 @@ TAO_NAMESPACE POA_Messaging { -#if (TAO_HAS_REBIND_POLICY == 1) - - class RebindPolicy; - typedef RebindPolicy *RebindPolicy_ptr; - class TAO_Export RebindPolicy : public virtual POA_CORBA::Policy, - public virtual TAO_Locality_Constrained_ServantBase - { - protected: - RebindPolicy (void); - public: - RebindPolicy (const RebindPolicy& rhs); - virtual ~RebindPolicy (void); - virtual CORBA::Boolean _is_a ( - const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual void* _downcast ( - const char* logical_type_id - ); - virtual Messaging::RebindMode rebind_mode ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ) = 0; - - Messaging::RebindPolicy *_this ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual const char* _interface_repository_id (void) const; - virtual void _dispatch ( - CORBA::ServerRequest &_tao_req, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - }; - - class TAO_Export _tao_collocated_RebindPolicy : public virtual Messaging::RebindPolicy, - public virtual POA_CORBA::_tao_collocated_Policy - { - public: - _tao_collocated_RebindPolicy ( - RebindPolicy_ptr servant, - TAO_Stub *stub - ); - RebindPolicy_ptr _get_servant (void) const; - virtual CORBA::Boolean _is_a ( - const char *logical_type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual Messaging::RebindMode rebind_mode ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - - private: - RebindPolicy_ptr servant_; - }; - -#if defined (ACE_HAS_USING_KEYWORD) - // TIE class: Refer to CORBA v2.2, Section 20.34.4 - template <class T> - class TAO_Export RebindPolicy_tie : public RebindPolicy - { - public: - RebindPolicy_tie (T &t); - // the T& ctor - RebindPolicy_tie (T &t, PortableServer::POA_ptr poa); - // ctor taking a POA - RebindPolicy_tie (T *tp, CORBA::Boolean release=1); - // ctor taking pointer and an ownership flag - RebindPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1); - // ctor with T*, ownership flag and a POA - ~RebindPolicy_tie (void); - // dtor - - // TIE specific functions - T *_tied_object (void); - // return the underlying object - void _tied_object (T &obj); - // set the underlying object - void _tied_object (T *obj, CORBA::Boolean release=1); - // set the underlying object and the ownership flag - CORBA::Boolean _is_owner (void); - // do we own it - void _is_owner (CORBA::Boolean b); - // set the ownership - - // overridden ServantBase operations - PortableServer::POA_ptr _default_POA ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - Messaging::RebindMode rebind_mode ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - CORBA::PolicyType policy_type ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - CORBA::Policy_ptr copy ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - void destroy ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); -private: - T *ptr_; - PortableServer::POA_var poa_; - CORBA::Boolean rel_; - - // copy and assignment are not allowed - RebindPolicy_tie (const RebindPolicy_tie &); - void operator= (const RebindPolicy_tie &); - }; - -#endif /* ACE_HAS_USING_KEYWORD */ - -#endif /* TAO_HAS_REBIND_POLICY == 1 */ - -#if (TAO_HAS_SYNC_SCOPE_POLICY == 1) - - class SyncScopePolicy; - typedef SyncScopePolicy *SyncScopePolicy_ptr; - class TAO_Export SyncScopePolicy : public virtual POA_CORBA::Policy, - public virtual TAO_Locality_Constrained_ServantBase - { - protected: - SyncScopePolicy (void); - public: - SyncScopePolicy (const SyncScopePolicy& rhs); - virtual ~SyncScopePolicy (void); - virtual CORBA::Boolean _is_a ( - const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual void* _downcast ( - const char* logical_type_id - ); - virtual Messaging::SyncScope synchronization (CORBA::Environment &ACE_TRY_ENV) = 0; - // Hacky TAO extension to reduce call to - // CORBA::Environment::default_environment () since this method - // will never raise exceptions. - virtual Messaging::SyncScope synchronization (void) = 0; - - Messaging::SyncScopePolicy *_this ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual const char* _interface_repository_id (void) const; - virtual void _dispatch ( - CORBA::ServerRequest &_tao_req, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - }; - - class TAO_Export _tao_collocated_SyncScopePolicy : public virtual Messaging::SyncScopePolicy, - public virtual POA_CORBA::_tao_collocated_Policy - { - public: - _tao_collocated_SyncScopePolicy ( - SyncScopePolicy_ptr servant, - TAO_Stub *stub - ); - SyncScopePolicy_ptr _get_servant (void) const; - virtual CORBA::Boolean _is_a ( - const char *logical_type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual Messaging::SyncScope synchronization (CORBA::Environment &ACE_TRY_ENV); - virtual Messaging::SyncScope synchronization (void); - - private: - SyncScopePolicy_ptr servant_; - }; - -#if defined (ACE_HAS_USING_KEYWORD) - // TIE class: Refer to CORBA v2.2, Section 20.34.4 - template <class T> - class TAO_Export SyncScopePolicy_tie : public SyncScopePolicy - { - public: - SyncScopePolicy_tie (T &t); - // the T& ctor - SyncScopePolicy_tie (T &t, PortableServer::POA_ptr poa); - // ctor taking a POA - SyncScopePolicy_tie (T *tp, CORBA::Boolean release=1); - // ctor taking pointer and an ownership flag - SyncScopePolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1); - // ctor with T*, ownership flag and a POA - ~SyncScopePolicy_tie (void); - // dtor - - // TIE specific functions - T *_tied_object (void); - // return the underlying object - void _tied_object (T &obj); - // set the underlying object - void _tied_object (T *obj, CORBA::Boolean release=1); - // set the underlying object and the ownership flag - CORBA::Boolean _is_owner (void); - // do we own it - void _is_owner (CORBA::Boolean b); - // set the ownership - - // overridden ServantBase operations - PortableServer::POA_ptr _default_POA ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - Messaging::SyncScope synchronization (CORBA::Environment &ACE_TRY_ENV); - Messaging::SyncScope synchronization (void); - CORBA::PolicyType policy_type ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - CORBA::Policy_ptr copy ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - void destroy ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); -private: - T *ptr_; - PortableServer::POA_var poa_; - CORBA::Boolean rel_; - - // copy and assignment are not allowed - SyncScopePolicy_tie (const SyncScopePolicy_tie &); - void operator= (const SyncScopePolicy_tie &); - }; - -#endif /* ACE_HAS_USING_KEYWORD */ - -#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ - -#if (TAO_HAS_PRIORITY_POLICIES == 1) - - class RequestPriorityPolicy; - typedef RequestPriorityPolicy *RequestPriorityPolicy_ptr; - class TAO_Export RequestPriorityPolicy : public virtual POA_CORBA::Policy, - public virtual TAO_Locality_Constrained_ServantBase - { - protected: - RequestPriorityPolicy (void); - public: - RequestPriorityPolicy (const RequestPriorityPolicy& rhs); - virtual ~RequestPriorityPolicy (void); - virtual CORBA::Boolean _is_a ( - const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual void* _downcast ( - const char* logical_type_id - ); - virtual Messaging::PriorityRange priority_range ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ) = 0; - - Messaging::RequestPriorityPolicy *_this ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual const char* _interface_repository_id (void) const; - virtual void _dispatch ( - CORBA::ServerRequest &_tao_req, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - }; - - class TAO_Export _tao_collocated_RequestPriorityPolicy : public virtual Messaging::RequestPriorityPolicy, - public virtual POA_CORBA::_tao_collocated_Policy - { - public: - _tao_collocated_RequestPriorityPolicy ( - RequestPriorityPolicy_ptr servant, - TAO_Stub *stub - ); - RequestPriorityPolicy_ptr _get_servant (void) const; - virtual CORBA::Boolean _is_a ( - const char *logical_type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual Messaging::PriorityRange priority_range ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - - private: - RequestPriorityPolicy_ptr servant_; - }; - -#if defined (ACE_HAS_USING_KEYWORD) - // TIE class: Refer to CORBA v2.2, Section 20.34.4 - template <class T> - class TAO_Export RequestPriorityPolicy_tie : public RequestPriorityPolicy - { - public: - RequestPriorityPolicy_tie (T &t); - // the T& ctor - RequestPriorityPolicy_tie (T &t, PortableServer::POA_ptr poa); - // ctor taking a POA - RequestPriorityPolicy_tie (T *tp, CORBA::Boolean release=1); - // ctor taking pointer and an ownership flag - RequestPriorityPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1); - // ctor with T*, ownership flag and a POA - ~RequestPriorityPolicy_tie (void); - // dtor - - // TIE specific functions - T *_tied_object (void); - // return the underlying object - void _tied_object (T &obj); - // set the underlying object - void _tied_object (T *obj, CORBA::Boolean release=1); - // set the underlying object and the ownership flag - CORBA::Boolean _is_owner (void); - // do we own it - void _is_owner (CORBA::Boolean b); - // set the ownership - - // overridden ServantBase operations - PortableServer::POA_ptr _default_POA ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - Messaging::PriorityRange priority_range ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - CORBA::PolicyType policy_type ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - CORBA::Policy_ptr copy ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - void destroy ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); -private: - T *ptr_; - PortableServer::POA_var poa_; - CORBA::Boolean rel_; - - // copy and assignment are not allowed - RequestPriorityPolicy_tie (const RequestPriorityPolicy_tie &); - void operator= (const RequestPriorityPolicy_tie &); - }; - -#endif /* ACE_HAS_USING_KEYWORD */ - - class ReplyPriorityPolicy; - typedef ReplyPriorityPolicy *ReplyPriorityPolicy_ptr; - class TAO_Export ReplyPriorityPolicy : public virtual POA_CORBA::Policy, - public virtual TAO_Locality_Constrained_ServantBase - { - protected: - ReplyPriorityPolicy (void); - public: - ReplyPriorityPolicy (const ReplyPriorityPolicy& rhs); - virtual ~ReplyPriorityPolicy (void); - virtual CORBA::Boolean _is_a ( - const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual void* _downcast ( - const char* logical_type_id - ); - virtual Messaging::PriorityRange priority_range ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ) = 0; - - Messaging::ReplyPriorityPolicy *_this ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual const char* _interface_repository_id (void) const; - virtual void _dispatch ( - CORBA::ServerRequest &_tao_req, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - }; - - class TAO_Export _tao_collocated_ReplyPriorityPolicy : public virtual Messaging::ReplyPriorityPolicy, - public virtual POA_CORBA::_tao_collocated_Policy - { - public: - _tao_collocated_ReplyPriorityPolicy ( - ReplyPriorityPolicy_ptr servant, - TAO_Stub *stub - ); - ReplyPriorityPolicy_ptr _get_servant (void) const; - virtual CORBA::Boolean _is_a ( - const char *logical_type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual Messaging::PriorityRange priority_range ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - - private: - ReplyPriorityPolicy_ptr servant_; - }; - -#if defined (ACE_HAS_USING_KEYWORD) - // TIE class: Refer to CORBA v2.2, Section 20.34.4 - template <class T> - class TAO_Export ReplyPriorityPolicy_tie : public ReplyPriorityPolicy - { - public: - ReplyPriorityPolicy_tie (T &t); - // the T& ctor - ReplyPriorityPolicy_tie (T &t, PortableServer::POA_ptr poa); - // ctor taking a POA - ReplyPriorityPolicy_tie (T *tp, CORBA::Boolean release=1); - // ctor taking pointer and an ownership flag - ReplyPriorityPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1); - // ctor with T*, ownership flag and a POA - ~ReplyPriorityPolicy_tie (void); - // dtor - - // TIE specific functions - T *_tied_object (void); - // return the underlying object - void _tied_object (T &obj); - // set the underlying object - void _tied_object (T *obj, CORBA::Boolean release=1); - // set the underlying object and the ownership flag - CORBA::Boolean _is_owner (void); - // do we own it - void _is_owner (CORBA::Boolean b); - // set the ownership - - // overridden ServantBase operations - PortableServer::POA_ptr _default_POA ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - Messaging::PriorityRange priority_range ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - CORBA::PolicyType policy_type ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - CORBA::Policy_ptr copy ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - void destroy ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); -private: - T *ptr_; - PortableServer::POA_var poa_; - CORBA::Boolean rel_; - - // copy and assignment are not allowed - ReplyPriorityPolicy_tie (const ReplyPriorityPolicy_tie &); - void operator= (const ReplyPriorityPolicy_tie &); - }; - -#endif /* ACE_HAS_USING_KEYWORD */ - -#endif /* TAO_HAS_PRIORITY_POLICIES == 1 */ - -#if (TAO_HAS_REQUEST_START_TIME_POLICY == 1) - - class RequestStartTimePolicy; - typedef RequestStartTimePolicy *RequestStartTimePolicy_ptr; - class TAO_Export RequestStartTimePolicy : public virtual POA_CORBA::Policy, - public virtual TAO_Locality_Constrained_ServantBase - { - protected: - RequestStartTimePolicy (void); - public: - RequestStartTimePolicy (const RequestStartTimePolicy& rhs); - virtual ~RequestStartTimePolicy (void); - virtual CORBA::Boolean _is_a ( - const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual void* _downcast ( - const char* logical_type_id - ); - virtual TimeBase::UtcT start_time ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ) = 0; - - Messaging::RequestStartTimePolicy *_this ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual const char* _interface_repository_id (void) const; - virtual void _dispatch ( - CORBA::ServerRequest &_tao_req, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - }; - - class TAO_Export _tao_collocated_RequestStartTimePolicy : public virtual Messaging::RequestStartTimePolicy, - public virtual POA_CORBA::_tao_collocated_Policy - { - public: - _tao_collocated_RequestStartTimePolicy ( - RequestStartTimePolicy_ptr servant, - TAO_Stub *stub - ); - RequestStartTimePolicy_ptr _get_servant (void) const; - virtual CORBA::Boolean _is_a ( - const char *logical_type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual TimeBase::UtcT start_time ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - - private: - RequestStartTimePolicy_ptr servant_; - }; - -#if defined (ACE_HAS_USING_KEYWORD) - // TIE class: Refer to CORBA v2.2, Section 20.34.4 - template <class T> - class TAO_Export RequestStartTimePolicy_tie : public RequestStartTimePolicy - { - public: - RequestStartTimePolicy_tie (T &t); - // the T& ctor - RequestStartTimePolicy_tie (T &t, PortableServer::POA_ptr poa); - // ctor taking a POA - RequestStartTimePolicy_tie (T *tp, CORBA::Boolean release=1); - // ctor taking pointer and an ownership flag - RequestStartTimePolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1); - // ctor with T*, ownership flag and a POA - ~RequestStartTimePolicy_tie (void); - // dtor - - // TIE specific functions - T *_tied_object (void); - // return the underlying object - void _tied_object (T &obj); - // set the underlying object - void _tied_object (T *obj, CORBA::Boolean release=1); - // set the underlying object and the ownership flag - CORBA::Boolean _is_owner (void); - // do we own it - void _is_owner (CORBA::Boolean b); - // set the ownership - - // overridden ServantBase operations - PortableServer::POA_ptr _default_POA ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - TimeBase::UtcT start_time ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - CORBA::PolicyType policy_type ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - CORBA::Policy_ptr copy ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - void destroy ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); -private: - T *ptr_; - PortableServer::POA_var poa_; - CORBA::Boolean rel_; - - // copy and assignment are not allowed - RequestStartTimePolicy_tie (const RequestStartTimePolicy_tie &); - void operator= (const RequestStartTimePolicy_tie &); - }; - -#endif /* ACE_HAS_USING_KEYWORD */ - -#endif /* TAO_HAS_REQUEST_START_TIME_POLICY == 1 */ - -#if (TAO_HAS_REQUEST_END_TIME_POLICY == 1) - - class RequestEndTimePolicy; - typedef RequestEndTimePolicy *RequestEndTimePolicy_ptr; - class TAO_Export RequestEndTimePolicy : public virtual POA_CORBA::Policy, - public virtual TAO_Locality_Constrained_ServantBase - { - protected: - RequestEndTimePolicy (void); - public: - RequestEndTimePolicy (const RequestEndTimePolicy& rhs); - virtual ~RequestEndTimePolicy (void); - virtual CORBA::Boolean _is_a ( - const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual void* _downcast ( - const char* logical_type_id - ); - virtual TimeBase::UtcT end_time ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ) = 0; - - Messaging::RequestEndTimePolicy *_this ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual const char* _interface_repository_id (void) const; - virtual void _dispatch ( - CORBA::ServerRequest &_tao_req, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - }; - - class TAO_Export _tao_collocated_RequestEndTimePolicy : public virtual Messaging::RequestEndTimePolicy, - public virtual POA_CORBA::_tao_collocated_Policy - { - public: - _tao_collocated_RequestEndTimePolicy ( - RequestEndTimePolicy_ptr servant, - TAO_Stub *stub - ); - RequestEndTimePolicy_ptr _get_servant (void) const; - virtual CORBA::Boolean _is_a ( - const char *logical_type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual TimeBase::UtcT end_time ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - - private: - RequestEndTimePolicy_ptr servant_; - }; - -#if defined (ACE_HAS_USING_KEYWORD) - // TIE class: Refer to CORBA v2.2, Section 20.34.4 - template <class T> - class TAO_Export RequestEndTimePolicy_tie : public RequestEndTimePolicy - { - public: - RequestEndTimePolicy_tie (T &t); - // the T& ctor - RequestEndTimePolicy_tie (T &t, PortableServer::POA_ptr poa); - // ctor taking a POA - RequestEndTimePolicy_tie (T *tp, CORBA::Boolean release=1); - // ctor taking pointer and an ownership flag - RequestEndTimePolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1); - // ctor with T*, ownership flag and a POA - ~RequestEndTimePolicy_tie (void); - // dtor - - // TIE specific functions - T *_tied_object (void); - // return the underlying object - void _tied_object (T &obj); - // set the underlying object - void _tied_object (T *obj, CORBA::Boolean release=1); - // set the underlying object and the ownership flag - CORBA::Boolean _is_owner (void); - // do we own it - void _is_owner (CORBA::Boolean b); - // set the ownership - - // overridden ServantBase operations - PortableServer::POA_ptr _default_POA ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - TimeBase::UtcT end_time ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - CORBA::PolicyType policy_type ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - CORBA::Policy_ptr copy ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - void destroy ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); -private: - T *ptr_; - PortableServer::POA_var poa_; - CORBA::Boolean rel_; - - // copy and assignment are not allowed - RequestEndTimePolicy_tie (const RequestEndTimePolicy_tie &); - void operator= (const RequestEndTimePolicy_tie &); - }; - -#endif /* ACE_HAS_USING_KEYWORD */ - -#endif /* TAO_HAS_REQUEST_END_TIME_POLICY == 1 */ - -#if (TAO_HAS_REPLY_START_TIME_POLICY == 1) - - class ReplyStartTimePolicy; - typedef ReplyStartTimePolicy *ReplyStartTimePolicy_ptr; - class TAO_Export ReplyStartTimePolicy : public virtual POA_CORBA::Policy, - public virtual TAO_Locality_Constrained_ServantBase - { - protected: - ReplyStartTimePolicy (void); - public: - ReplyStartTimePolicy (const ReplyStartTimePolicy& rhs); - virtual ~ReplyStartTimePolicy (void); - virtual CORBA::Boolean _is_a ( - const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual void* _downcast ( - const char* logical_type_id - ); - virtual TimeBase::UtcT start_time ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ) = 0; - - Messaging::ReplyStartTimePolicy *_this ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual const char* _interface_repository_id (void) const; - virtual void _dispatch ( - CORBA::ServerRequest &_tao_req, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - }; - - class TAO_Export _tao_collocated_ReplyStartTimePolicy : public virtual Messaging::ReplyStartTimePolicy, - public virtual POA_CORBA::_tao_collocated_Policy - { - public: - _tao_collocated_ReplyStartTimePolicy ( - ReplyStartTimePolicy_ptr servant, - TAO_Stub *stub - ); - ReplyStartTimePolicy_ptr _get_servant (void) const; - virtual CORBA::Boolean _is_a ( - const char *logical_type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual TimeBase::UtcT start_time ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - - private: - ReplyStartTimePolicy_ptr servant_; - }; - -#if defined (ACE_HAS_USING_KEYWORD) - // TIE class: Refer to CORBA v2.2, Section 20.34.4 - template <class T> - class TAO_Export ReplyStartTimePolicy_tie : public ReplyStartTimePolicy - { - public: - ReplyStartTimePolicy_tie (T &t); - // the T& ctor - ReplyStartTimePolicy_tie (T &t, PortableServer::POA_ptr poa); - // ctor taking a POA - ReplyStartTimePolicy_tie (T *tp, CORBA::Boolean release=1); - // ctor taking pointer and an ownership flag - ReplyStartTimePolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1); - // ctor with T*, ownership flag and a POA - ~ReplyStartTimePolicy_tie (void); - // dtor - - // TIE specific functions - T *_tied_object (void); - // return the underlying object - void _tied_object (T &obj); - // set the underlying object - void _tied_object (T *obj, CORBA::Boolean release=1); - // set the underlying object and the ownership flag - CORBA::Boolean _is_owner (void); - // do we own it - void _is_owner (CORBA::Boolean b); - // set the ownership - - // overridden ServantBase operations - PortableServer::POA_ptr _default_POA ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - TimeBase::UtcT start_time ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - CORBA::PolicyType policy_type ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - CORBA::Policy_ptr copy ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - void destroy ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); -private: - T *ptr_; - PortableServer::POA_var poa_; - CORBA::Boolean rel_; - - // copy and assignment are not allowed - ReplyStartTimePolicy_tie (const ReplyStartTimePolicy_tie &); - void operator= (const ReplyStartTimePolicy_tie &); - }; - -#endif /* ACE_HAS_USING_KEYWORD */ - -#endif /* TAO_HAS_REPLY_START_TIME_POLICY == 1 */ - -#if (TAO_HAS_REPLY_END_TIME_POLICY == 1) - - class ReplyEndTimePolicy; - typedef ReplyEndTimePolicy *ReplyEndTimePolicy_ptr; - class TAO_Export ReplyEndTimePolicy : public virtual POA_CORBA::Policy, - public virtual TAO_Locality_Constrained_ServantBase - { - protected: - ReplyEndTimePolicy (void); - public: - ReplyEndTimePolicy (const ReplyEndTimePolicy& rhs); - virtual ~ReplyEndTimePolicy (void); - virtual CORBA::Boolean _is_a ( - const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual void* _downcast ( - const char* logical_type_id - ); - virtual TimeBase::UtcT end_time ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ) = 0; - - Messaging::ReplyEndTimePolicy *_this ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual const char* _interface_repository_id (void) const; - virtual void _dispatch ( - CORBA::ServerRequest &_tao_req, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - }; - - class TAO_Export _tao_collocated_ReplyEndTimePolicy : public virtual Messaging::ReplyEndTimePolicy, - public virtual POA_CORBA::_tao_collocated_Policy - { - public: - _tao_collocated_ReplyEndTimePolicy ( - ReplyEndTimePolicy_ptr servant, - TAO_Stub *stub - ); - ReplyEndTimePolicy_ptr _get_servant (void) const; - virtual CORBA::Boolean _is_a ( - const char *logical_type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual TimeBase::UtcT end_time ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - - private: - ReplyEndTimePolicy_ptr servant_; - }; - -#if defined (ACE_HAS_USING_KEYWORD) - // TIE class: Refer to CORBA v2.2, Section 20.34.4 - template <class T> - class TAO_Export ReplyEndTimePolicy_tie : public ReplyEndTimePolicy - { - public: - ReplyEndTimePolicy_tie (T &t); - // the T& ctor - ReplyEndTimePolicy_tie (T &t, PortableServer::POA_ptr poa); - // ctor taking a POA - ReplyEndTimePolicy_tie (T *tp, CORBA::Boolean release=1); - // ctor taking pointer and an ownership flag - ReplyEndTimePolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1); - // ctor with T*, ownership flag and a POA - ~ReplyEndTimePolicy_tie (void); - // dtor - - // TIE specific functions - T *_tied_object (void); - // return the underlying object - void _tied_object (T &obj); - // set the underlying object - void _tied_object (T *obj, CORBA::Boolean release=1); - // set the underlying object and the ownership flag - CORBA::Boolean _is_owner (void); - // do we own it - void _is_owner (CORBA::Boolean b); - // set the ownership - - // overridden ServantBase operations - PortableServer::POA_ptr _default_POA ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - TimeBase::UtcT end_time ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - CORBA::PolicyType policy_type ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - CORBA::Policy_ptr copy ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - void destroy ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); -private: - T *ptr_; - PortableServer::POA_var poa_; - CORBA::Boolean rel_; - - // copy and assignment are not allowed - ReplyEndTimePolicy_tie (const ReplyEndTimePolicy_tie &); - void operator= (const ReplyEndTimePolicy_tie &); - }; - -#endif /* ACE_HAS_USING_KEYWORD */ - -#endif /* TAO_HAS_REPLY_END_TIME_POLICY == 1 */ - -#if (TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1) - - class RelativeRequestTimeoutPolicy; - typedef RelativeRequestTimeoutPolicy *RelativeRequestTimeoutPolicy_ptr; - class TAO_Export RelativeRequestTimeoutPolicy : public virtual POA_CORBA::Policy, - public virtual TAO_Locality_Constrained_ServantBase - { - protected: - RelativeRequestTimeoutPolicy (void); - public: - RelativeRequestTimeoutPolicy (const RelativeRequestTimeoutPolicy& rhs); - virtual ~RelativeRequestTimeoutPolicy (void); - virtual CORBA::Boolean _is_a ( - const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual void* _downcast ( - const char* logical_type_id - ); - virtual TimeBase::TimeT relative_expiry (CORBA::Environment &ACE_TRY_ENV) = 0; - // Hacky TAO extension to reduce call to - // CORBA::Environment::default_environment () since this method - // will never raise exceptions. - virtual TimeBase::TimeT relative_expiry (void) = 0; - - Messaging::RelativeRequestTimeoutPolicy *_this ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual const char* _interface_repository_id (void) const; - virtual void _dispatch ( - CORBA::ServerRequest &_tao_req, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - }; - - class TAO_Export _tao_collocated_RelativeRequestTimeoutPolicy : public virtual Messaging::RelativeRequestTimeoutPolicy, - public virtual POA_CORBA::_tao_collocated_Policy - { - public: - _tao_collocated_RelativeRequestTimeoutPolicy ( - RelativeRequestTimeoutPolicy_ptr servant, - TAO_Stub *stub - ); - RelativeRequestTimeoutPolicy_ptr _get_servant (void) const; - virtual CORBA::Boolean _is_a ( - const char *logical_type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual TimeBase::TimeT relative_expiry (CORBA::Environment &ACE_TRY_ENV); - virtual TimeBase::TimeT relative_expiry (void); - - private: - RelativeRequestTimeoutPolicy_ptr servant_; - }; - -#if defined (ACE_HAS_USING_KEYWORD) - // TIE class: Refer to CORBA v2.2, Section 20.34.4 - template <class T> - class TAO_Export RelativeRequestTimeoutPolicy_tie : public RelativeRequestTimeoutPolicy - { - public: - RelativeRequestTimeoutPolicy_tie (T &t); - // the T& ctor - RelativeRequestTimeoutPolicy_tie (T &t, PortableServer::POA_ptr poa); - // ctor taking a POA - RelativeRequestTimeoutPolicy_tie (T *tp, CORBA::Boolean release=1); - // ctor taking pointer and an ownership flag - RelativeRequestTimeoutPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1); - // ctor with T*, ownership flag and a POA - ~RelativeRequestTimeoutPolicy_tie (void); - // dtor - - // TIE specific functions - T *_tied_object (void); - // return the underlying object - void _tied_object (T &obj); - // set the underlying object - void _tied_object (T *obj, CORBA::Boolean release=1); - // set the underlying object and the ownership flag - CORBA::Boolean _is_owner (void); - // do we own it - void _is_owner (CORBA::Boolean b); - // set the ownership - - // overridden ServantBase operations - PortableServer::POA_ptr _default_POA ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - TimeBase::TimeT relative_expiry (CORBA::Environment &ACE_TRY_ENV); - TimeBase::TimeT relative_expiry (void); - CORBA::PolicyType policy_type ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - CORBA::Policy_ptr copy ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - void destroy ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); -private: - T *ptr_; - PortableServer::POA_var poa_; - CORBA::Boolean rel_; - - // copy and assignment are not allowed - RelativeRequestTimeoutPolicy_tie (const RelativeRequestTimeoutPolicy_tie &); - void operator= (const RelativeRequestTimeoutPolicy_tie &); - }; - -#endif /* ACE_HAS_USING_KEYWORD */ - -#endif /* TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1 */ - -#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) - - class RelativeRoundtripTimeoutPolicy; - typedef RelativeRoundtripTimeoutPolicy *RelativeRoundtripTimeoutPolicy_ptr; - class TAO_Export RelativeRoundtripTimeoutPolicy : public virtual POA_CORBA::Policy, - public virtual TAO_Locality_Constrained_ServantBase - { - protected: - RelativeRoundtripTimeoutPolicy (void); - public: - RelativeRoundtripTimeoutPolicy (const RelativeRoundtripTimeoutPolicy& rhs); - virtual ~RelativeRoundtripTimeoutPolicy (void); - virtual CORBA::Boolean _is_a ( - const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual void* _downcast ( - const char* logical_type_id - ); - virtual TimeBase::TimeT relative_expiry (CORBA::Environment &ACE_TRY_ENV) = 0; - // Hacky TAO extension to reduce call to - // CORBA::Environment::default_environment () since this method - // will never raise exceptions. - virtual TimeBase::TimeT relative_expiry (void) = 0; - - Messaging::RelativeRoundtripTimeoutPolicy *_this ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual const char* _interface_repository_id (void) const; - virtual void _dispatch ( - CORBA::ServerRequest &_tao_req, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - }; - - class TAO_Export _tao_collocated_RelativeRoundtripTimeoutPolicy : public virtual Messaging::RelativeRoundtripTimeoutPolicy, - public virtual POA_CORBA::_tao_collocated_Policy - { - public: - _tao_collocated_RelativeRoundtripTimeoutPolicy ( - RelativeRoundtripTimeoutPolicy_ptr servant, - TAO_Stub *stub - ); - RelativeRoundtripTimeoutPolicy_ptr _get_servant (void) const; - virtual CORBA::Boolean _is_a ( - const char *logical_type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual TimeBase::TimeT relative_expiry (CORBA::Environment &ACE_TRY_ENV); - virtual TimeBase::TimeT relative_expiry (void); - - private: - RelativeRoundtripTimeoutPolicy_ptr servant_; - }; - -#if defined (ACE_HAS_USING_KEYWORD) - // TIE class: Refer to CORBA v2.2, Section 20.34.4 - template <class T> - class TAO_Export RelativeRoundtripTimeoutPolicy_tie : public RelativeRoundtripTimeoutPolicy - { - public: - RelativeRoundtripTimeoutPolicy_tie (T &t); - // the T& ctor - RelativeRoundtripTimeoutPolicy_tie (T &t, PortableServer::POA_ptr poa); - // ctor taking a POA - RelativeRoundtripTimeoutPolicy_tie (T *tp, CORBA::Boolean release=1); - // ctor taking pointer and an ownership flag - RelativeRoundtripTimeoutPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1); - // ctor with T*, ownership flag and a POA - ~RelativeRoundtripTimeoutPolicy_tie (void); - // dtor - - // TIE specific functions - T *_tied_object (void); - // return the underlying object - void _tied_object (T &obj); - // set the underlying object - void _tied_object (T *obj, CORBA::Boolean release=1); - // set the underlying object and the ownership flag - CORBA::Boolean _is_owner (void); - // do we own it - void _is_owner (CORBA::Boolean b); - // set the ownership - - // overridden ServantBase operations - PortableServer::POA_ptr _default_POA ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - TimeBase::TimeT relative_expiry (CORBA::Environment &ACE_TRY_ENV); - TimeBase::TimeT relative_expiry (void); - CORBA::PolicyType policy_type ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - CORBA::Policy_ptr copy ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - void destroy ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); -private: - T *ptr_; - PortableServer::POA_var poa_; - CORBA::Boolean rel_; - - // copy and assignment are not allowed - RelativeRoundtripTimeoutPolicy_tie (const RelativeRoundtripTimeoutPolicy_tie &); - void operator= (const RelativeRoundtripTimeoutPolicy_tie &); - }; - -#endif /* ACE_HAS_USING_KEYWORD */ - -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ - -#if (TAO_HAS_ROUTING_POLICY == 1) - - class RoutingPolicy; - typedef RoutingPolicy *RoutingPolicy_ptr; - class TAO_Export RoutingPolicy : public virtual POA_CORBA::Policy, - public virtual TAO_Locality_Constrained_ServantBase - { - protected: - RoutingPolicy (void); - public: - RoutingPolicy (const RoutingPolicy& rhs); - virtual ~RoutingPolicy (void); - virtual CORBA::Boolean _is_a ( - const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual void* _downcast ( - const char* logical_type_id - ); - virtual Messaging::RoutingTypeRange routing_range ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ) = 0; - - Messaging::RoutingPolicy *_this ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual const char* _interface_repository_id (void) const; - virtual void _dispatch ( - CORBA::ServerRequest &_tao_req, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - }; - - class TAO_Export _tao_collocated_RoutingPolicy : public virtual Messaging::RoutingPolicy, - public virtual POA_CORBA::_tao_collocated_Policy - { - public: - _tao_collocated_RoutingPolicy ( - RoutingPolicy_ptr servant, - TAO_Stub *stub - ); - RoutingPolicy_ptr _get_servant (void) const; - virtual CORBA::Boolean _is_a ( - const char *logical_type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual Messaging::RoutingTypeRange routing_range ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - - private: - RoutingPolicy_ptr servant_; - }; - -#if defined (ACE_HAS_USING_KEYWORD) - // TIE class: Refer to CORBA v2.2, Section 20.34.4 - template <class T> - class TAO_Export RoutingPolicy_tie : public RoutingPolicy - { - public: - RoutingPolicy_tie (T &t); - // the T& ctor - RoutingPolicy_tie (T &t, PortableServer::POA_ptr poa); - // ctor taking a POA - RoutingPolicy_tie (T *tp, CORBA::Boolean release=1); - // ctor taking pointer and an ownership flag - RoutingPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1); - // ctor with T*, ownership flag and a POA - ~RoutingPolicy_tie (void); - // dtor - - // TIE specific functions - T *_tied_object (void); - // return the underlying object - void _tied_object (T &obj); - // set the underlying object - void _tied_object (T *obj, CORBA::Boolean release=1); - // set the underlying object and the ownership flag - CORBA::Boolean _is_owner (void); - // do we own it - void _is_owner (CORBA::Boolean b); - // set the ownership - - // overridden ServantBase operations - PortableServer::POA_ptr _default_POA ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - Messaging::RoutingTypeRange routing_range ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - CORBA::PolicyType policy_type ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - CORBA::Policy_ptr copy ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - void destroy ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); -private: - T *ptr_; - PortableServer::POA_var poa_; - CORBA::Boolean rel_; - - // copy and assignment are not allowed - RoutingPolicy_tie (const RoutingPolicy_tie &); - void operator= (const RoutingPolicy_tie &); - }; - -#endif /* ACE_HAS_USING_KEYWORD */ - -#endif /* TAO_HAS_ROUTING_POLICY == 1 */ - -#if (TAO_HAS_MAX_HOPS_POLICY == 1) - - class MaxHopsPolicy; - typedef MaxHopsPolicy *MaxHopsPolicy_ptr; - class TAO_Export MaxHopsPolicy : public virtual POA_CORBA::Policy, - public virtual TAO_Locality_Constrained_ServantBase - { - protected: - MaxHopsPolicy (void); - public: - MaxHopsPolicy (const MaxHopsPolicy& rhs); - virtual ~MaxHopsPolicy (void); - virtual CORBA::Boolean _is_a ( - const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual void* _downcast ( - const char* logical_type_id - ); - virtual CORBA::UShort max_hops ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ) = 0; - - Messaging::MaxHopsPolicy *_this ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual const char* _interface_repository_id (void) const; - virtual void _dispatch ( - CORBA::ServerRequest &_tao_req, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - }; - - class TAO_Export _tao_collocated_MaxHopsPolicy : public virtual Messaging::MaxHopsPolicy, - public virtual POA_CORBA::_tao_collocated_Policy - { - public: - _tao_collocated_MaxHopsPolicy ( - MaxHopsPolicy_ptr servant, - TAO_Stub *stub - ); - MaxHopsPolicy_ptr _get_servant (void) const; - virtual CORBA::Boolean _is_a ( - const char *logical_type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual CORBA::UShort max_hops ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - - private: - MaxHopsPolicy_ptr servant_; - }; - -#if defined (ACE_HAS_USING_KEYWORD) - // TIE class: Refer to CORBA v2.2, Section 20.34.4 - template <class T> - class TAO_Export MaxHopsPolicy_tie : public MaxHopsPolicy - { - public: - MaxHopsPolicy_tie (T &t); - // the T& ctor - MaxHopsPolicy_tie (T &t, PortableServer::POA_ptr poa); - // ctor taking a POA - MaxHopsPolicy_tie (T *tp, CORBA::Boolean release=1); - // ctor taking pointer and an ownership flag - MaxHopsPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1); - // ctor with T*, ownership flag and a POA - ~MaxHopsPolicy_tie (void); - // dtor - - // TIE specific functions - T *_tied_object (void); - // return the underlying object - void _tied_object (T &obj); - // set the underlying object - void _tied_object (T *obj, CORBA::Boolean release=1); - // set the underlying object and the ownership flag - CORBA::Boolean _is_owner (void); - // do we own it - void _is_owner (CORBA::Boolean b); - // set the ownership - - // overridden ServantBase operations - PortableServer::POA_ptr _default_POA ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - CORBA::UShort max_hops ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - CORBA::PolicyType policy_type ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - CORBA::Policy_ptr copy ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - void destroy ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); -private: - T *ptr_; - PortableServer::POA_var poa_; - CORBA::Boolean rel_; - - // copy and assignment are not allowed - MaxHopsPolicy_tie (const MaxHopsPolicy_tie &); - void operator= (const MaxHopsPolicy_tie &); - }; - -#endif /* ACE_HAS_USING_KEYWORD */ - -#endif /* TAO_HAS_MAX_HOPS_POLICY == 1 */ - -#if (TAO_HAS_QUEUE_ORDER_POLICY == 1) - - class QueueOrderPolicy; - typedef QueueOrderPolicy *QueueOrderPolicy_ptr; - class TAO_Export QueueOrderPolicy : public virtual POA_CORBA::Policy, - public virtual TAO_Locality_Constrained_ServantBase - { - protected: - QueueOrderPolicy (void); - public: - QueueOrderPolicy (const QueueOrderPolicy& rhs); - virtual ~QueueOrderPolicy (void); - virtual CORBA::Boolean _is_a ( - const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual void* _downcast ( - const char* logical_type_id - ); - virtual Messaging::Ordering allowed_orders ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ) = 0; - - Messaging::QueueOrderPolicy *_this ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual const char* _interface_repository_id (void) const; - virtual void _dispatch ( - CORBA::ServerRequest &_tao_req, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - }; - - class TAO_Export _tao_collocated_QueueOrderPolicy : public virtual Messaging::QueueOrderPolicy, - public virtual POA_CORBA::_tao_collocated_Policy - { - public: - _tao_collocated_QueueOrderPolicy ( - QueueOrderPolicy_ptr servant, - TAO_Stub *stub - ); - QueueOrderPolicy_ptr _get_servant (void) const; - virtual CORBA::Boolean _is_a ( - const char *logical_type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual Messaging::Ordering allowed_orders ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - - private: - QueueOrderPolicy_ptr servant_; - }; - -#if defined (ACE_HAS_USING_KEYWORD) - // TIE class: Refer to CORBA v2.2, Section 20.34.4 - template <class T> - class TAO_Export QueueOrderPolicy_tie : public QueueOrderPolicy - { - public: - QueueOrderPolicy_tie (T &t); - // the T& ctor - QueueOrderPolicy_tie (T &t, PortableServer::POA_ptr poa); - // ctor taking a POA - QueueOrderPolicy_tie (T *tp, CORBA::Boolean release=1); - // ctor taking pointer and an ownership flag - QueueOrderPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1); - // ctor with T*, ownership flag and a POA - ~QueueOrderPolicy_tie (void); - // dtor - - // TIE specific functions - T *_tied_object (void); - // return the underlying object - void _tied_object (T &obj); - // set the underlying object - void _tied_object (T *obj, CORBA::Boolean release=1); - // set the underlying object and the ownership flag - CORBA::Boolean _is_owner (void); - // do we own it - void _is_owner (CORBA::Boolean b); - // set the ownership - - // overridden ServantBase operations - PortableServer::POA_ptr _default_POA ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - Messaging::Ordering allowed_orders ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - CORBA::PolicyType policy_type ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - CORBA::Policy_ptr copy ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - void destroy ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); -private: - T *ptr_; - PortableServer::POA_var poa_; - CORBA::Boolean rel_; - - // copy and assignment are not allowed - QueueOrderPolicy_tie (const QueueOrderPolicy_tie &); - void operator= (const QueueOrderPolicy_tie &); - }; - -#endif /* ACE_HAS_USING_KEYWORD */ - -#endif /* TAO_HAS_QUEUE_ORDER_POLICY == 1 */ - #if (TAO_HAS_AMI_CALLBACK == 1) class ReplyHandler; @@ -1654,23 +41,28 @@ private: { protected: ReplyHandler (void); + public: ReplyHandler (const ReplyHandler& rhs); virtual ~ReplyHandler (void); + + virtual CORBA::Boolean _is_a ( const char* logical_type_id, CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + TAO_default_environment () ); + virtual void* _downcast ( const char* logical_type_id ); + static void _is_a_skel ( CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + TAO_default_environment () ); static void _non_existent_skel ( @@ -1678,27 +70,31 @@ private: void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + TAO_default_environment () ); - CORBA::Boolean in_mult_inheritance (void); - virtual void _dispatch ( CORBA::ServerRequest &_tao_req, void *_tao_context, CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + TAO_default_environment () ); - Messaging::ReplyHandler *_this ( + ::Messaging::ReplyHandler *_this ( CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + TAO_default_environment () ); + virtual const char* _interface_repository_id (void) const; + + }; - class TAO_Export _tao_thru_poa_collocated_ReplyHandler : public virtual Messaging::ReplyHandler +#if !defined (_MESSAGING_REPLYHANDLER___THRU_POA_COLLOCATED_SH_) +#define _MESSAGING_REPLYHANDLER___THRU_POA_COLLOCATED_SH_ + + class TAO_Export _tao_thru_poa_collocated_ReplyHandler : public virtual ::Messaging::ReplyHandler { public: _tao_thru_poa_collocated_ReplyHandler ( @@ -1713,9 +109,15 @@ private: CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); - }; + }; +#endif /* end #if !defined */ + + +#if !defined (_MESSAGING_REPLYHANDLER___DIRECT_COLLOCATED_SH_) +#define _MESSAGING_REPLYHANDLER___DIRECT_COLLOCATED_SH_ + class TAO_Export _tao_direct_collocated_ReplyHandler : public virtual Messaging::ReplyHandler { public: @@ -1739,6 +141,10 @@ private: ReplyHandler_ptr servant_; }; + +#endif /* end #if !defined */ + + #if defined (ACE_HAS_USING_KEYWORD) // TIE class: Refer to CORBA v2.2, Section 20.34.4 template <class T> @@ -1771,7 +177,7 @@ private: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + TAO_default_environment () ); private: T *ptr_; @@ -1787,298 +193,13 @@ private: #endif /* TAO_HAS_AMI_CALLBACK == 1 */ -#if (TAO_HAS_AMI_POLLER == 1) - - class Poller; - typedef Poller *Poller_ptr; - class TAO_Export Poller : public virtual POA_CORBA::Pollable - { - protected: - Poller (void); - public: - Poller (const Poller& rhs); - virtual ~Poller (void); - virtual CORBA::Boolean _is_a ( - const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual void* _downcast ( - const char* logical_type_id - ); - virtual CORBA::Object_ptr operation_target ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ) = 0; - static void _get_operation_target_skel ( - CORBA::ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - - virtual char * operation_name ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ) = 0; - static void _get_operation_name_skel ( - CORBA::ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - - virtual Messaging::ReplyHandler_ptr associated_handler ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ) = 0; - static void _get_associated_handler_skel ( - CORBA::ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - - virtual void associated_handler ( - Messaging::ReplyHandler_ptr associated_handler, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ) = 0; - static void _set_associated_handler_skel ( - CORBA::ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - - virtual CORBA::Boolean is_from_poller ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ) = 0; - static void _get_is_from_poller_skel ( - CORBA::ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - - virtual CORBA::Object_ptr target ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ) = 0; - static void _get_target_skel ( - CORBA::ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - - virtual char * op_name ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ) = 0; - static void _get_op_name_skel ( - CORBA::ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - - static void _is_a_skel ( - CORBA::ServerRequest &req, - void *obj, - void *context, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - - static void _non_existent_skel ( - CORBA::ServerRequest &req, - void *obj, - void *context, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - - CORBA::Boolean in_mult_inheritance (void); - - static void is_ready_skel ( - CORBA::ServerRequest &req, - void *obj, - void *context, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - - static void create_pollable_set_skel ( - CORBA::ServerRequest &req, - void *obj, - void *context, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - - virtual void _dispatch ( - CORBA::ServerRequest &_tao_req, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - - Messaging::Poller *_this ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual const char* _interface_repository_id (void) const; - }; - - class TAO_Export _tao_collocated_Poller : public virtual Messaging::Poller, - public virtual POA_CORBA::_tao_collocated_Pollable - { - public: - _tao_collocated_Poller ( - Poller_ptr servant, - TAO_Stub *stub - ); - Poller_ptr _get_servant (void) const; - virtual CORBA::Boolean _is_a ( - const char *logical_type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual CORBA::Object_ptr operation_target ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual char * operation_name ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual Messaging::ReplyHandler_ptr associated_handler ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual void associated_handler ( - Messaging::ReplyHandler_ptr associated_handler, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual CORBA::Boolean is_from_poller ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual CORBA::Object_ptr target ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual char * op_name ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - - private: - Poller_ptr servant_; - }; - -#if defined (ACE_HAS_USING_KEYWORD) - // TIE class: Refer to CORBA v2.2, Section 20.34.4 - template <class T> - class TAO_Export Poller_tie : public Poller - { - public: - Poller_tie (T &t); - // the T& ctor - Poller_tie (T &t, PortableServer::POA_ptr poa); - // ctor taking a POA - Poller_tie (T *tp, CORBA::Boolean release=1); - // ctor taking pointer and an ownership flag - Poller_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1); - // ctor with T*, ownership flag and a POA - ~Poller_tie (void); - // dtor - - // TIE specific functions - T *_tied_object (void); - // return the underlying object - void _tied_object (T &obj); - // set the underlying object - void _tied_object (T *obj, CORBA::Boolean release=1); - // set the underlying object and the ownership flag - CORBA::Boolean _is_owner (void); - // do we own it - void _is_owner (CORBA::Boolean b); - // set the ownership - - // overridden ServantBase operations - PortableServer::POA_ptr _default_POA ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - CORBA::Object_ptr operation_target ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - char * operation_name ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - Messaging::ReplyHandler_ptr associated_handler ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - void associated_handler ( - Messaging::ReplyHandler_ptr associated_handler, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - CORBA::Boolean is_from_poller ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - CORBA::Object_ptr target ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - char * op_name ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - CORBA::Boolean is_ready ( - CORBA::ULong timeout, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - CORBA::PollableSet_ptr create_pollable_set ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); -private: - T *ptr_; - PortableServer::POA_var poa_; - CORBA::Boolean rel_; - - // copy and assignment are not allowed - Poller_tie (const Poller_tie &); - void operator= (const Poller_tie &); - }; - -#endif /* ACE_HAS_USING_KEYWORD */ -#endif /* TAO_HAS_AMI_POLLER == 1 */ - } TAO_NAMESPACE_CLOSE -// #include "tao/MessagingS_T.h" +#include "MessagingS_T.h" #if defined (__ACE_INLINE__) -#include "tao/MessagingS.i" +#include "MessagingS.i" #endif /* defined INLINE */ #if defined(_MSC_VER) && (_MSC_VER >= 1200) @@ -2088,4 +209,4 @@ TAO_NAMESPACE_CLOSE #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ #include "ace/post.h" -#endif /* TAO_IDL_MESSAGINGS_H */ +#endif /* ifndef */ diff --git a/TAO/tao/MessagingS.i b/TAO/tao/MessagingS.i index ac235b35edc..9386d854853 100644 --- a/TAO/tao/MessagingS.i +++ b/TAO/tao/MessagingS.i @@ -1,5 +1,4 @@ -/* -*- C++ -*- */ -// $Id$ +/* -*- C++ -*- $Id$ */ // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* // TAO and the TAO IDL Compiler have been developed by the Center for @@ -7,38 +6,3 @@ // // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html - -#if (TAO_HAS_AMI_POLLER == 1) - -ACE_INLINE void POA_Messaging::Poller::is_ready_skel ( - CORBA::ServerRequest &req, - void *obj, - void *context, - CORBA::Environment &env - ) -{ - POA_CORBA::Pollable_ptr impl = (POA_Messaging::Poller_ptr) obj; - POA_CORBA::Pollable::is_ready_skel ( - req, - (POA_CORBA::Pollable_ptr) impl, - context, - env - ); -} -ACE_INLINE void POA_Messaging::Poller::create_pollable_set_skel ( - CORBA::ServerRequest &req, - void *obj, - void *context, - CORBA::Environment &env - ) -{ - POA_CORBA::Pollable_ptr impl = (POA_Messaging::Poller_ptr) obj; - POA_CORBA::Pollable::create_pollable_set_skel ( - req, - (POA_CORBA::Pollable_ptr) impl, - context, - env - ); -} - -#endif /* TAO_HAS_AMI_POLLER == 1 */ diff --git a/TAO/tao/MessagingS_T.cpp b/TAO/tao/MessagingS_T.cpp index 71addde084d..bcdb31c08ef 100644 --- a/TAO/tao/MessagingS_T.cpp +++ b/TAO/tao/MessagingS_T.cpp @@ -1,5 +1,4 @@ -/* -*- C++ -*- */ -// $Id$ +/* -*- C++ -*- $Id$ */ // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* // TAO and the TAO IDL Compiler have been developed by the Center for @@ -8,157 +7,14 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef _TAO_IDL_MESSAGINGS_T_CPP_ -#define _TAO_IDL_MESSAGINGS_T_CPP_ +#ifndef _TAO_IDL_TMP_MESSAGINGS_T_CPP_ +#define _TAO_IDL_TMP_MESSAGINGS_T_CPP_ #include "MessagingS_T.h" -#include "tao/POA.h" -#include "tao/ORB_Core.h" #if !defined (__ACE_INLINE__) -#include "tao/MessagingS_T.i" +#include "MessagingS_T.i" #endif /* !defined INLINE */ -template <class T> PortableServer::POA_ptr -POA_Messaging::RebindPolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV) -{ - if (!CORBA::is_nil (this->poa_.in ())) - return PortableServer::POA::_duplicate (this->poa_.in ()); - - return this->RebindPolicy::_default_POA (ACE_TRY_ENV); -} - -template <class T> PortableServer::POA_ptr -POA_Messaging::SyncScopePolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV) -{ - if (!CORBA::is_nil (this->poa_.in ())) - return PortableServer::POA::_duplicate (this->poa_.in ()); - - return this->SyncScopePolicy::_default_POA (ACE_TRY_ENV); -} - -template <class T> PortableServer::POA_ptr -POA_Messaging::RequestPriorityPolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV) -{ - if (!CORBA::is_nil (this->poa_.in ())) - return PortableServer::POA::_duplicate (this->poa_.in ()); - - return this->RequestPriorityPolicy::_default_POA (ACE_TRY_ENV); -} - -template <class T> PortableServer::POA_ptr -POA_Messaging::ReplyPriorityPolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV) -{ - if (!CORBA::is_nil (this->poa_.in ())) - return PortableServer::POA::_duplicate (this->poa_.in ()); - - return this->ReplyPriorityPolicy::_default_POA (ACE_TRY_ENV); -} - -template <class T> PortableServer::POA_ptr -POA_Messaging::RequestStartTimePolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV) -{ - if (!CORBA::is_nil (this->poa_.in ())) - return PortableServer::POA::_duplicate (this->poa_.in ()); - - return this->RequestStartTimePolicy::_default_POA (ACE_TRY_ENV); -} - -template <class T> PortableServer::POA_ptr -POA_Messaging::RequestEndTimePolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV) -{ - if (!CORBA::is_nil (this->poa_.in ())) - return PortableServer::POA::_duplicate (this->poa_.in ()); - - return this->RequestEndTimePolicy::_default_POA (ACE_TRY_ENV); -} - -template <class T> PortableServer::POA_ptr -POA_Messaging::ReplyStartTimePolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV) -{ - if (!CORBA::is_nil (this->poa_.in ())) - return PortableServer::POA::_duplicate (this->poa_.in ()); - - return this->ReplyStartTimePolicy::_default_POA (ACE_TRY_ENV); -} - -template <class T> PortableServer::POA_ptr -POA_Messaging::ReplyEndTimePolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV) -{ - if (!CORBA::is_nil (this->poa_.in ())) - return PortableServer::POA::_duplicate (this->poa_.in ()); - - return this->ReplyEndTimePolicy::_default_POA (ACE_TRY_ENV); -} - -template <class T> PortableServer::POA_ptr -POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV) -{ - if (!CORBA::is_nil (this->poa_.in ())) - return PortableServer::POA::_duplicate (this->poa_.in ()); - - return this->RelativeRequestTimeoutPolicy::_default_POA (ACE_TRY_ENV); -} - -template <class T> PortableServer::POA_ptr -POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV) -{ - if (!CORBA::is_nil (this->poa_.in ())) - return PortableServer::POA::_duplicate (this->poa_.in ()); - - return this->RelativeRoundtripTimeoutPolicy::_default_POA (ACE_TRY_ENV); -} - -template <class T> PortableServer::POA_ptr -POA_Messaging::RoutingPolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV) -{ - if (!CORBA::is_nil (this->poa_.in ())) - return PortableServer::POA::_duplicate (this->poa_.in ()); - - return this->RoutingPolicy::_default_POA (ACE_TRY_ENV); -} - -template <class T> PortableServer::POA_ptr -POA_Messaging::MaxHopsPolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV) -{ - if (!CORBA::is_nil (this->poa_.in ())) - return PortableServer::POA::_duplicate (this->poa_.in ()); - - return this->MaxHopsPolicy::_default_POA (ACE_TRY_ENV); -} - -template <class T> PortableServer::POA_ptr -POA_Messaging::QueueOrderPolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV) -{ - if (!CORBA::is_nil (this->poa_.in ())) - return PortableServer::POA::_duplicate (this->poa_.in ()); - - return this->QueueOrderPolicy::_default_POA (ACE_TRY_ENV); -} - -#if (TAO_HAS_AMI_CALLBACK == 1) - -template <class T> PortableServer::POA_ptr -POA_Messaging::ReplyHandler_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV) -{ - if (!CORBA::is_nil (this->poa_.in ())) - return PortableServer::POA::_duplicate (this->poa_.in ()); - - return this->ReplyHandler::_default_POA (ACE_TRY_ENV); -} - -#endif /* TAO_HAS_AMI_CALLBACK == 1 */ - -#if (TAO_HAS_AMI_POLLER == 1) - -template <class T> PortableServer::POA_ptr -POA_Messaging::Poller_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV) -{ - if (!CORBA::is_nil (this->poa_.in ())) - return PortableServer::POA::_duplicate (this->poa_.in ()); - - return this->Poller::_default_POA (ACE_TRY_ENV); -} -#endif /* TAO_HAS_AMI_POLLER == 1 */ #endif /* ifndef */ diff --git a/TAO/tao/MessagingS_T.h b/TAO/tao/MessagingS_T.h index e2b2d5594bf..73d05f29831 100644 --- a/TAO/tao/MessagingS_T.h +++ b/TAO/tao/MessagingS_T.h @@ -1,5 +1,4 @@ -/* -*- C++ -*- */ -// $Id$ +/* -*- C++ -*- $Id$ */ // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* // TAO and the TAO IDL Compiler have been developed by the Center for @@ -8,9 +7,8 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef _TAO_IDL_MESSAGINGS_T_H_ -#define _TAO_IDL_MESSAGINGS_T_H_ -#include "ace/pre.h" +#ifndef _TAO_IDL_TMP_MESSAGINGS_T_H_ +#define _TAO_IDL_TMP_MESSAGINGS_T_H_ #if defined(_MSC_VER) #if (_MSC_VER >= 1200) @@ -21,12 +19,12 @@ #if defined (__ACE_INLINE__) -#include "tao/MessagingS_T.i" +#include "MessagingS_T.i" #endif /* defined INLINE */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "tao/MessagingS_T.cpp" +#include "MessagingS_T.cpp" #endif /* defined REQUIRED SOURCE */ @@ -38,5 +36,4 @@ #pragma warning(pop) #endif /* _MSC_VER */ -#include "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/MessagingS_T.i b/TAO/tao/MessagingS_T.i index 00d92c671cb..46cda2a7a51 100644 --- a/TAO/tao/MessagingS_T.i +++ b/TAO/tao/MessagingS_T.i @@ -1,5 +1,4 @@ -/* -*- C++ -*- */ -// $Id$ +/* -*- C++ -*- $Id$ */ // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* // TAO and the TAO IDL Compiler have been developed by the Center for @@ -9,1483 +8,34 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html -#if defined (ACE_HAS_USING_KEYWORD) -template <class T> ACE_INLINE -POA_Messaging::RebindPolicy_tie<T>::RebindPolicy_tie (T &t) - : ptr_ (&t), - poa_ (PortableServer::POA::_nil ()), - rel_ (0) -{} - -template <class T> ACE_INLINE -POA_Messaging::RebindPolicy_tie<T>::RebindPolicy_tie (T &t, PortableServer::POA_ptr poa) - : ptr_ (&t), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (0) -{} - -template <class T> ACE_INLINE -POA_Messaging::RebindPolicy_tie<T>::RebindPolicy_tie (T *tp, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_nil ()), - rel_ (release) -{} - -template <class T> ACE_INLINE -POA_Messaging::RebindPolicy_tie<T>::RebindPolicy_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_Messaging::RebindPolicy_tie<T>::~RebindPolicy_tie (void) -{ - if (this->rel_) delete this->ptr_; -} - -template <class T> ACE_INLINE T * -POA_Messaging::RebindPolicy_tie<T>::_tied_object (void) -{ - return this->ptr_; -} - -template <class T> ACE_INLINE void -POA_Messaging::RebindPolicy_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_Messaging::RebindPolicy_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_Messaging::RebindPolicy_tie<T>::_is_owner (void) -{ - return this->rel_; -} - -template <class T> ACE_INLINE void -POA_Messaging::RebindPolicy_tie<T>::_is_owner (CORBA::Boolean b) -{ - this->rel_ = b; -} - -template <class T> ACE_INLINE -Messaging::RebindMode POA_Messaging::RebindPolicy_tie<T>::rebind_mode ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->rebind_mode ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -CORBA::PolicyType POA_Messaging::RebindPolicy_tie<T>::policy_type ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->policy_type ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -CORBA::Policy_ptr POA_Messaging::RebindPolicy_tie<T>::copy ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->copy ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -void POA_Messaging::RebindPolicy_tie<T>::destroy ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - this->ptr_->destroy ( - ACE_TRY_ENV - ); -} - -#endif /* ACE_HAS_USING_KEYWORD */ - -#if defined (ACE_HAS_USING_KEYWORD) -template <class T> ACE_INLINE -POA_Messaging::SyncScopePolicy_tie<T>::SyncScopePolicy_tie (T &t) - : ptr_ (&t), - poa_ (PortableServer::POA::_nil ()), - rel_ (0) -{} - -template <class T> ACE_INLINE -POA_Messaging::SyncScopePolicy_tie<T>::SyncScopePolicy_tie (T &t, PortableServer::POA_ptr poa) - : ptr_ (&t), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (0) -{} - -template <class T> ACE_INLINE -POA_Messaging::SyncScopePolicy_tie<T>::SyncScopePolicy_tie (T *tp, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_nil ()), - rel_ (release) -{} - -template <class T> ACE_INLINE -POA_Messaging::SyncScopePolicy_tie<T>::SyncScopePolicy_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_Messaging::SyncScopePolicy_tie<T>::~SyncScopePolicy_tie (void) -{ - if (this->rel_) delete this->ptr_; -} - -template <class T> ACE_INLINE T * -POA_Messaging::SyncScopePolicy_tie<T>::_tied_object (void) -{ - return this->ptr_; -} - -template <class T> ACE_INLINE void -POA_Messaging::SyncScopePolicy_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_Messaging::SyncScopePolicy_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_Messaging::SyncScopePolicy_tie<T>::_is_owner (void) -{ - return this->rel_; -} - -template <class T> ACE_INLINE void -POA_Messaging::SyncScopePolicy_tie<T>::_is_owner (CORBA::Boolean b) -{ - this->rel_ = b; -} - -template <class T> ACE_INLINE -Messaging::SyncScope POA_Messaging::SyncScopePolicy_tie<T>::synchronization ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->synchronization ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -Messaging::SyncScope POA_Messaging::SyncScopePolicy_tie<T>::synchronization (void) -{ - return this->ptr_->synchronization (); -} - -template <class T> ACE_INLINE -CORBA::PolicyType POA_Messaging::SyncScopePolicy_tie<T>::policy_type ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->policy_type ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -CORBA::Policy_ptr POA_Messaging::SyncScopePolicy_tie<T>::copy ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->copy ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -void POA_Messaging::SyncScopePolicy_tie<T>::destroy ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - this->ptr_->destroy ( - ACE_TRY_ENV - ); -} - -#endif /* ACE_HAS_USING_KEYWORD */ - -#if defined (ACE_HAS_USING_KEYWORD) -template <class T> ACE_INLINE -POA_Messaging::RequestPriorityPolicy_tie<T>::RequestPriorityPolicy_tie (T &t) - : ptr_ (&t), - poa_ (PortableServer::POA::_nil ()), - rel_ (0) -{} - -template <class T> ACE_INLINE -POA_Messaging::RequestPriorityPolicy_tie<T>::RequestPriorityPolicy_tie (T &t, PortableServer::POA_ptr poa) - : ptr_ (&t), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (0) -{} - -template <class T> ACE_INLINE -POA_Messaging::RequestPriorityPolicy_tie<T>::RequestPriorityPolicy_tie (T *tp, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_nil ()), - rel_ (release) -{} - -template <class T> ACE_INLINE -POA_Messaging::RequestPriorityPolicy_tie<T>::RequestPriorityPolicy_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_Messaging::RequestPriorityPolicy_tie<T>::~RequestPriorityPolicy_tie (void) -{ - if (this->rel_) delete this->ptr_; -} - -template <class T> ACE_INLINE T * -POA_Messaging::RequestPriorityPolicy_tie<T>::_tied_object (void) -{ - return this->ptr_; -} - -template <class T> ACE_INLINE void -POA_Messaging::RequestPriorityPolicy_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_Messaging::RequestPriorityPolicy_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_Messaging::RequestPriorityPolicy_tie<T>::_is_owner (void) -{ - return this->rel_; -} - -template <class T> ACE_INLINE void -POA_Messaging::RequestPriorityPolicy_tie<T>::_is_owner (CORBA::Boolean b) -{ - this->rel_ = b; -} - -template <class T> ACE_INLINE -Messaging::PriorityRange POA_Messaging::RequestPriorityPolicy_tie<T>::priority_range ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->priority_range ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -CORBA::PolicyType POA_Messaging::RequestPriorityPolicy_tie<T>::policy_type ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->policy_type ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -CORBA::Policy_ptr POA_Messaging::RequestPriorityPolicy_tie<T>::copy ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->copy ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -void POA_Messaging::RequestPriorityPolicy_tie<T>::destroy ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - this->ptr_->destroy ( - ACE_TRY_ENV - ); -} - -#endif /* ACE_HAS_USING_KEYWORD */ - -#if defined (ACE_HAS_USING_KEYWORD) -template <class T> ACE_INLINE -POA_Messaging::ReplyPriorityPolicy_tie<T>::ReplyPriorityPolicy_tie (T &t) - : ptr_ (&t), - poa_ (PortableServer::POA::_nil ()), - rel_ (0) -{} - -template <class T> ACE_INLINE -POA_Messaging::ReplyPriorityPolicy_tie<T>::ReplyPriorityPolicy_tie (T &t, PortableServer::POA_ptr poa) - : ptr_ (&t), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (0) -{} - -template <class T> ACE_INLINE -POA_Messaging::ReplyPriorityPolicy_tie<T>::ReplyPriorityPolicy_tie (T *tp, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_nil ()), - rel_ (release) -{} - -template <class T> ACE_INLINE -POA_Messaging::ReplyPriorityPolicy_tie<T>::ReplyPriorityPolicy_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_Messaging::ReplyPriorityPolicy_tie<T>::~ReplyPriorityPolicy_tie (void) -{ - if (this->rel_) delete this->ptr_; -} - -template <class T> ACE_INLINE T * -POA_Messaging::ReplyPriorityPolicy_tie<T>::_tied_object (void) -{ - return this->ptr_; -} - -template <class T> ACE_INLINE void -POA_Messaging::ReplyPriorityPolicy_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_Messaging::ReplyPriorityPolicy_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_Messaging::ReplyPriorityPolicy_tie<T>::_is_owner (void) -{ - return this->rel_; -} - -template <class T> ACE_INLINE void -POA_Messaging::ReplyPriorityPolicy_tie<T>::_is_owner (CORBA::Boolean b) -{ - this->rel_ = b; -} - -template <class T> ACE_INLINE -Messaging::PriorityRange POA_Messaging::ReplyPriorityPolicy_tie<T>::priority_range ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->priority_range ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -CORBA::PolicyType POA_Messaging::ReplyPriorityPolicy_tie<T>::policy_type ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->policy_type ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -CORBA::Policy_ptr POA_Messaging::ReplyPriorityPolicy_tie<T>::copy ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->copy ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -void POA_Messaging::ReplyPriorityPolicy_tie<T>::destroy ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - this->ptr_->destroy ( - ACE_TRY_ENV - ); -} - -#endif /* ACE_HAS_USING_KEYWORD */ - -#if defined (ACE_HAS_USING_KEYWORD) -template <class T> ACE_INLINE -POA_Messaging::RequestStartTimePolicy_tie<T>::RequestStartTimePolicy_tie (T &t) - : ptr_ (&t), - poa_ (PortableServer::POA::_nil ()), - rel_ (0) -{} - -template <class T> ACE_INLINE -POA_Messaging::RequestStartTimePolicy_tie<T>::RequestStartTimePolicy_tie (T &t, PortableServer::POA_ptr poa) - : ptr_ (&t), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (0) -{} - -template <class T> ACE_INLINE -POA_Messaging::RequestStartTimePolicy_tie<T>::RequestStartTimePolicy_tie (T *tp, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_nil ()), - rel_ (release) -{} - -template <class T> ACE_INLINE -POA_Messaging::RequestStartTimePolicy_tie<T>::RequestStartTimePolicy_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_Messaging::RequestStartTimePolicy_tie<T>::~RequestStartTimePolicy_tie (void) -{ - if (this->rel_) delete this->ptr_; -} - -template <class T> ACE_INLINE T * -POA_Messaging::RequestStartTimePolicy_tie<T>::_tied_object (void) -{ - return this->ptr_; -} - -template <class T> ACE_INLINE void -POA_Messaging::RequestStartTimePolicy_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_Messaging::RequestStartTimePolicy_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_Messaging::RequestStartTimePolicy_tie<T>::_is_owner (void) -{ - return this->rel_; -} - -template <class T> ACE_INLINE void -POA_Messaging::RequestStartTimePolicy_tie<T>::_is_owner (CORBA::Boolean b) -{ - this->rel_ = b; -} - -template <class T> ACE_INLINE -TimeBase::UtcT POA_Messaging::RequestStartTimePolicy_tie<T>::start_time ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->start_time ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -CORBA::PolicyType POA_Messaging::RequestStartTimePolicy_tie<T>::policy_type ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->policy_type ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -CORBA::Policy_ptr POA_Messaging::RequestStartTimePolicy_tie<T>::copy ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->copy ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -void POA_Messaging::RequestStartTimePolicy_tie<T>::destroy ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - this->ptr_->destroy ( - ACE_TRY_ENV - ); -} - -#endif /* ACE_HAS_USING_KEYWORD */ - -#if defined (ACE_HAS_USING_KEYWORD) -template <class T> ACE_INLINE -POA_Messaging::RequestEndTimePolicy_tie<T>::RequestEndTimePolicy_tie (T &t) - : ptr_ (&t), - poa_ (PortableServer::POA::_nil ()), - rel_ (0) -{} - -template <class T> ACE_INLINE -POA_Messaging::RequestEndTimePolicy_tie<T>::RequestEndTimePolicy_tie (T &t, PortableServer::POA_ptr poa) - : ptr_ (&t), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (0) -{} - -template <class T> ACE_INLINE -POA_Messaging::RequestEndTimePolicy_tie<T>::RequestEndTimePolicy_tie (T *tp, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_nil ()), - rel_ (release) -{} - -template <class T> ACE_INLINE -POA_Messaging::RequestEndTimePolicy_tie<T>::RequestEndTimePolicy_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_Messaging::RequestEndTimePolicy_tie<T>::~RequestEndTimePolicy_tie (void) -{ - if (this->rel_) delete this->ptr_; -} - -template <class T> ACE_INLINE T * -POA_Messaging::RequestEndTimePolicy_tie<T>::_tied_object (void) -{ - return this->ptr_; -} - -template <class T> ACE_INLINE void -POA_Messaging::RequestEndTimePolicy_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_Messaging::RequestEndTimePolicy_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_Messaging::RequestEndTimePolicy_tie<T>::_is_owner (void) -{ - return this->rel_; -} - -template <class T> ACE_INLINE void -POA_Messaging::RequestEndTimePolicy_tie<T>::_is_owner (CORBA::Boolean b) -{ - this->rel_ = b; -} - -template <class T> ACE_INLINE -TimeBase::UtcT POA_Messaging::RequestEndTimePolicy_tie<T>::end_time ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->end_time ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -CORBA::PolicyType POA_Messaging::RequestEndTimePolicy_tie<T>::policy_type ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->policy_type ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -CORBA::Policy_ptr POA_Messaging::RequestEndTimePolicy_tie<T>::copy ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->copy ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -void POA_Messaging::RequestEndTimePolicy_tie<T>::destroy ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - this->ptr_->destroy ( - ACE_TRY_ENV - ); -} - -#endif /* ACE_HAS_USING_KEYWORD */ - -#if defined (ACE_HAS_USING_KEYWORD) -template <class T> ACE_INLINE -POA_Messaging::ReplyStartTimePolicy_tie<T>::ReplyStartTimePolicy_tie (T &t) - : ptr_ (&t), - poa_ (PortableServer::POA::_nil ()), - rel_ (0) -{} - -template <class T> ACE_INLINE -POA_Messaging::ReplyStartTimePolicy_tie<T>::ReplyStartTimePolicy_tie (T &t, PortableServer::POA_ptr poa) - : ptr_ (&t), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (0) -{} - -template <class T> ACE_INLINE -POA_Messaging::ReplyStartTimePolicy_tie<T>::ReplyStartTimePolicy_tie (T *tp, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_nil ()), - rel_ (release) -{} - -template <class T> ACE_INLINE -POA_Messaging::ReplyStartTimePolicy_tie<T>::ReplyStartTimePolicy_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_Messaging::ReplyStartTimePolicy_tie<T>::~ReplyStartTimePolicy_tie (void) -{ - if (this->rel_) delete this->ptr_; -} - -template <class T> ACE_INLINE T * -POA_Messaging::ReplyStartTimePolicy_tie<T>::_tied_object (void) -{ - return this->ptr_; -} - -template <class T> ACE_INLINE void -POA_Messaging::ReplyStartTimePolicy_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_Messaging::ReplyStartTimePolicy_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_Messaging::ReplyStartTimePolicy_tie<T>::_is_owner (void) -{ - return this->rel_; -} - -template <class T> ACE_INLINE void -POA_Messaging::ReplyStartTimePolicy_tie<T>::_is_owner (CORBA::Boolean b) -{ - this->rel_ = b; -} - -template <class T> ACE_INLINE -TimeBase::UtcT POA_Messaging::ReplyStartTimePolicy_tie<T>::start_time ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->start_time ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -CORBA::PolicyType POA_Messaging::ReplyStartTimePolicy_tie<T>::policy_type ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->policy_type ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -CORBA::Policy_ptr POA_Messaging::ReplyStartTimePolicy_tie<T>::copy ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->copy ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -void POA_Messaging::ReplyStartTimePolicy_tie<T>::destroy ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - this->ptr_->destroy ( - ACE_TRY_ENV - ); -} - -#endif /* ACE_HAS_USING_KEYWORD */ - -#if defined (ACE_HAS_USING_KEYWORD) -template <class T> ACE_INLINE -POA_Messaging::ReplyEndTimePolicy_tie<T>::ReplyEndTimePolicy_tie (T &t) - : ptr_ (&t), - poa_ (PortableServer::POA::_nil ()), - rel_ (0) -{} - -template <class T> ACE_INLINE -POA_Messaging::ReplyEndTimePolicy_tie<T>::ReplyEndTimePolicy_tie (T &t, PortableServer::POA_ptr poa) - : ptr_ (&t), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (0) -{} - -template <class T> ACE_INLINE -POA_Messaging::ReplyEndTimePolicy_tie<T>::ReplyEndTimePolicy_tie (T *tp, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_nil ()), - rel_ (release) -{} - -template <class T> ACE_INLINE -POA_Messaging::ReplyEndTimePolicy_tie<T>::ReplyEndTimePolicy_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_Messaging::ReplyEndTimePolicy_tie<T>::~ReplyEndTimePolicy_tie (void) -{ - if (this->rel_) delete this->ptr_; -} - -template <class T> ACE_INLINE T * -POA_Messaging::ReplyEndTimePolicy_tie<T>::_tied_object (void) -{ - return this->ptr_; -} - -template <class T> ACE_INLINE void -POA_Messaging::ReplyEndTimePolicy_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_Messaging::ReplyEndTimePolicy_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_Messaging::ReplyEndTimePolicy_tie<T>::_is_owner (void) -{ - return this->rel_; -} - -template <class T> ACE_INLINE void -POA_Messaging::ReplyEndTimePolicy_tie<T>::_is_owner (CORBA::Boolean b) -{ - this->rel_ = b; -} - -template <class T> ACE_INLINE -TimeBase::UtcT POA_Messaging::ReplyEndTimePolicy_tie<T>::end_time ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->end_time ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -CORBA::PolicyType POA_Messaging::ReplyEndTimePolicy_tie<T>::policy_type ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->policy_type ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -CORBA::Policy_ptr POA_Messaging::ReplyEndTimePolicy_tie<T>::copy ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->copy ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -void POA_Messaging::ReplyEndTimePolicy_tie<T>::destroy ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - this->ptr_->destroy ( - ACE_TRY_ENV - ); -} - -#endif /* ACE_HAS_USING_KEYWORD */ - -#if defined (ACE_HAS_USING_KEYWORD) -template <class T> ACE_INLINE -POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::RelativeRequestTimeoutPolicy_tie (T &t) - : ptr_ (&t), - poa_ (PortableServer::POA::_nil ()), - rel_ (0) -{} - -template <class T> ACE_INLINE -POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::RelativeRequestTimeoutPolicy_tie (T &t, PortableServer::POA_ptr poa) - : ptr_ (&t), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (0) -{} - -template <class T> ACE_INLINE -POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::RelativeRequestTimeoutPolicy_tie (T *tp, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_nil ()), - rel_ (release) -{} - -template <class T> ACE_INLINE -POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::RelativeRequestTimeoutPolicy_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_Messaging::RelativeRequestTimeoutPolicy_tie<T>::~RelativeRequestTimeoutPolicy_tie (void) -{ - if (this->rel_) delete this->ptr_; -} - -template <class T> ACE_INLINE T * -POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::_tied_object (void) -{ - return this->ptr_; -} - -template <class T> ACE_INLINE void -POA_Messaging::RelativeRequestTimeoutPolicy_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_Messaging::RelativeRequestTimeoutPolicy_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_Messaging::RelativeRequestTimeoutPolicy_tie<T>::_is_owner (void) -{ - return this->rel_; -} - -template <class T> ACE_INLINE void -POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::_is_owner (CORBA::Boolean b) -{ - this->rel_ = b; -} - -template <class T> ACE_INLINE -TimeBase::TimeT POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::relative_expiry ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->relative_expiry ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -CORBA::PolicyType POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::policy_type ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->policy_type ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -CORBA::Policy_ptr POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::copy ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->copy ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -void POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::destroy ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - this->ptr_->destroy ( - ACE_TRY_ENV - ); -} - -#endif /* ACE_HAS_USING_KEYWORD */ - -#if defined (ACE_HAS_USING_KEYWORD) -template <class T> ACE_INLINE -POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::RelativeRoundtripTimeoutPolicy_tie (T &t) - : ptr_ (&t), - poa_ (PortableServer::POA::_nil ()), - rel_ (0) -{} - -template <class T> ACE_INLINE -POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::RelativeRoundtripTimeoutPolicy_tie (T &t, PortableServer::POA_ptr poa) - : ptr_ (&t), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (0) -{} - -template <class T> ACE_INLINE -POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::RelativeRoundtripTimeoutPolicy_tie (T *tp, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_nil ()), - rel_ (release) -{} - -template <class T> ACE_INLINE -POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::RelativeRoundtripTimeoutPolicy_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_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::~RelativeRoundtripTimeoutPolicy_tie (void) -{ - if (this->rel_) delete this->ptr_; -} - -template <class T> ACE_INLINE T * -POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::_tied_object (void) -{ - return this->ptr_; -} - -template <class T> ACE_INLINE void -POA_Messaging::RelativeRoundtripTimeoutPolicy_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_Messaging::RelativeRoundtripTimeoutPolicy_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_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::_is_owner (void) -{ - return this->rel_; -} - -template <class T> ACE_INLINE void -POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::_is_owner (CORBA::Boolean b) -{ - this->rel_ = b; -} - -template <class T> ACE_INLINE -TimeBase::TimeT POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::relative_expiry ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->relative_expiry ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -CORBA::PolicyType POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::policy_type ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->policy_type ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -CORBA::Policy_ptr POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::copy ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->copy ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -void POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::destroy ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - this->ptr_->destroy ( - ACE_TRY_ENV - ); -} - -#endif /* ACE_HAS_USING_KEYWORD */ - -#if defined (ACE_HAS_USING_KEYWORD) -template <class T> ACE_INLINE -POA_Messaging::RoutingPolicy_tie<T>::RoutingPolicy_tie (T &t) - : ptr_ (&t), - poa_ (PortableServer::POA::_nil ()), - rel_ (0) -{} - -template <class T> ACE_INLINE -POA_Messaging::RoutingPolicy_tie<T>::RoutingPolicy_tie (T &t, PortableServer::POA_ptr poa) - : ptr_ (&t), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (0) -{} - -template <class T> ACE_INLINE -POA_Messaging::RoutingPolicy_tie<T>::RoutingPolicy_tie (T *tp, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_nil ()), - rel_ (release) -{} - -template <class T> ACE_INLINE -POA_Messaging::RoutingPolicy_tie<T>::RoutingPolicy_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_Messaging::RoutingPolicy_tie<T>::~RoutingPolicy_tie (void) -{ - if (this->rel_) delete this->ptr_; -} - -template <class T> ACE_INLINE T * -POA_Messaging::RoutingPolicy_tie<T>::_tied_object (void) -{ - return this->ptr_; -} - -template <class T> ACE_INLINE void -POA_Messaging::RoutingPolicy_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_Messaging::RoutingPolicy_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_Messaging::RoutingPolicy_tie<T>::_is_owner (void) -{ - return this->rel_; -} - -template <class T> ACE_INLINE void -POA_Messaging::RoutingPolicy_tie<T>::_is_owner (CORBA::Boolean b) -{ - this->rel_ = b; -} - -template <class T> ACE_INLINE -Messaging::RoutingTypeRange POA_Messaging::RoutingPolicy_tie<T>::routing_range ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->routing_range ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -CORBA::PolicyType POA_Messaging::RoutingPolicy_tie<T>::policy_type ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->policy_type ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -CORBA::Policy_ptr POA_Messaging::RoutingPolicy_tie<T>::copy ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->copy ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -void POA_Messaging::RoutingPolicy_tie<T>::destroy ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - this->ptr_->destroy ( - ACE_TRY_ENV - ); -} - -#endif /* ACE_HAS_USING_KEYWORD */ - -#if defined (ACE_HAS_USING_KEYWORD) -template <class T> ACE_INLINE -POA_Messaging::MaxHopsPolicy_tie<T>::MaxHopsPolicy_tie (T &t) - : ptr_ (&t), - poa_ (PortableServer::POA::_nil ()), - rel_ (0) -{} - -template <class T> ACE_INLINE -POA_Messaging::MaxHopsPolicy_tie<T>::MaxHopsPolicy_tie (T &t, PortableServer::POA_ptr poa) - : ptr_ (&t), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (0) -{} - -template <class T> ACE_INLINE -POA_Messaging::MaxHopsPolicy_tie<T>::MaxHopsPolicy_tie (T *tp, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_nil ()), - rel_ (release) -{} - -template <class T> ACE_INLINE -POA_Messaging::MaxHopsPolicy_tie<T>::MaxHopsPolicy_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_Messaging::MaxHopsPolicy_tie<T>::~MaxHopsPolicy_tie (void) -{ - if (this->rel_) delete this->ptr_; -} - -template <class T> ACE_INLINE T * -POA_Messaging::MaxHopsPolicy_tie<T>::_tied_object (void) -{ - return this->ptr_; -} - -template <class T> ACE_INLINE void -POA_Messaging::MaxHopsPolicy_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_Messaging::MaxHopsPolicy_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_Messaging::MaxHopsPolicy_tie<T>::_is_owner (void) -{ - return this->rel_; -} - -template <class T> ACE_INLINE void -POA_Messaging::MaxHopsPolicy_tie<T>::_is_owner (CORBA::Boolean b) -{ - this->rel_ = b; -} - -template <class T> ACE_INLINE -CORBA::UShort POA_Messaging::MaxHopsPolicy_tie<T>::max_hops ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->max_hops ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -CORBA::PolicyType POA_Messaging::MaxHopsPolicy_tie<T>::policy_type ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->policy_type ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -CORBA::Policy_ptr POA_Messaging::MaxHopsPolicy_tie<T>::copy ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->copy ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -void POA_Messaging::MaxHopsPolicy_tie<T>::destroy ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - this->ptr_->destroy ( - ACE_TRY_ENV - ); -} - -#endif /* ACE_HAS_USING_KEYWORD */ - -#if defined (ACE_HAS_USING_KEYWORD) -template <class T> ACE_INLINE -POA_Messaging::QueueOrderPolicy_tie<T>::QueueOrderPolicy_tie (T &t) - : ptr_ (&t), - poa_ (PortableServer::POA::_nil ()), - rel_ (0) -{} - -template <class T> ACE_INLINE -POA_Messaging::QueueOrderPolicy_tie<T>::QueueOrderPolicy_tie (T &t, PortableServer::POA_ptr poa) - : ptr_ (&t), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (0) -{} - -template <class T> ACE_INLINE -POA_Messaging::QueueOrderPolicy_tie<T>::QueueOrderPolicy_tie (T *tp, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_nil ()), - rel_ (release) -{} - -template <class T> ACE_INLINE -POA_Messaging::QueueOrderPolicy_tie<T>::QueueOrderPolicy_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_Messaging::QueueOrderPolicy_tie<T>::~QueueOrderPolicy_tie (void) -{ - if (this->rel_) delete this->ptr_; -} - -template <class T> ACE_INLINE T * -POA_Messaging::QueueOrderPolicy_tie<T>::_tied_object (void) -{ - return this->ptr_; -} - -template <class T> ACE_INLINE void -POA_Messaging::QueueOrderPolicy_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_Messaging::QueueOrderPolicy_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_Messaging::QueueOrderPolicy_tie<T>::_is_owner (void) -{ - return this->rel_; -} - -template <class T> ACE_INLINE void -POA_Messaging::QueueOrderPolicy_tie<T>::_is_owner (CORBA::Boolean b) -{ - this->rel_ = b; -} - -template <class T> ACE_INLINE -Messaging::Ordering POA_Messaging::QueueOrderPolicy_tie<T>::allowed_orders ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->allowed_orders ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -CORBA::PolicyType POA_Messaging::QueueOrderPolicy_tie<T>::policy_type ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->policy_type ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -CORBA::Policy_ptr POA_Messaging::QueueOrderPolicy_tie<T>::copy ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->copy ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -void POA_Messaging::QueueOrderPolicy_tie<T>::destroy ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - this->ptr_->destroy ( - ACE_TRY_ENV - ); -} - -#endif /* ACE_HAS_USING_KEYWORD */ - #if (TAO_HAS_AMI_POLLER == 1) #if defined (ACE_HAS_USING_KEYWORD) template <class T> ACE_INLINE POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T &t) - : ptr_ (&t), - poa_ (PortableServer::POA::_nil ()), - rel_ (0) + : ptr_ (&t), + poa_ (PortableServer::POA::_nil ()), + rel_ (0) {} template <class T> ACE_INLINE POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T &t, PortableServer::POA_ptr poa) - : ptr_ (&t), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (0) + : ptr_ (&t), + poa_ (PortableServer::POA::_duplicate (poa)), + rel_ (0) {} template <class T> ACE_INLINE POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T *tp, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_nil ()), - rel_ (release) + : ptr_ (tp), + poa_ (PortableServer::POA::_nil ()), + rel_ (release) {} template <class T> ACE_INLINE POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (release) + : ptr_ (tp), + poa_ (PortableServer::POA::_duplicate (poa)), + rel_ (release) {} template <class T> ACE_INLINE @@ -1528,169 +78,13 @@ POA_Messaging::ReplyHandler_tie<T>::_is_owner (CORBA::Boolean b) this->rel_ = b; } -#endif /* ACE_HAS_USING_KEYWORD */ - -#if defined (ACE_HAS_USING_KEYWORD) -template <class T> ACE_INLINE -POA_Messaging::Poller_tie<T>::Poller_tie (T &t) - : ptr_ (&t), - poa_ (PortableServer::POA::_nil ()), - rel_ (0) -{} - -template <class T> ACE_INLINE -POA_Messaging::Poller_tie<T>::Poller_tie (T &t, PortableServer::POA_ptr poa) - : ptr_ (&t), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (0) -{} - -template <class T> ACE_INLINE -POA_Messaging::Poller_tie<T>::Poller_tie (T *tp, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_nil ()), - rel_ (release) -{} - -template <class T> ACE_INLINE -POA_Messaging::Poller_tie<T>::Poller_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_Messaging::Poller_tie<T>::~Poller_tie (void) -{ - if (this->rel_) delete this->ptr_; -} - -template <class T> ACE_INLINE T * -POA_Messaging::Poller_tie<T>::_tied_object (void) -{ - return this->ptr_; -} - -template <class T> ACE_INLINE void -POA_Messaging::Poller_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_Messaging::Poller_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_Messaging::Poller_tie<T>::_is_owner (void) -{ - return this->rel_; -} - -template <class T> ACE_INLINE void -POA_Messaging::Poller_tie<T>::_is_owner (CORBA::Boolean b) -{ - this->rel_ = b; -} - -template <class T> ACE_INLINE -CORBA::Object_ptr POA_Messaging::Poller_tie<T>::operation_target ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->operation_target ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -char * POA_Messaging::Poller_tie<T>::operation_name ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->operation_name ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -Messaging::ReplyHandler_ptr POA_Messaging::Poller_tie<T>::associated_handler ( - CORBA::Environment &ACE_TRY_ENV - ) +template <class T> ACE_INLINE PortableServer::POA_ptr +POA_Messaging::ReplyHandler_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV) { - return this->ptr_->associated_handler ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -void POA_Messaging::Poller_tie<T>::associated_handler ( - Messaging::ReplyHandler_ptr associated_handler, - CORBA::Environment &ACE_TRY_ENV - ) -{ - this->ptr_->associated_handler ( - associated_handler, - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -CORBA::Boolean POA_Messaging::Poller_tie<T>::is_from_poller ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->is_from_poller ( - ACE_TRY_ENV - ); -} + if (!CORBA::is_nil (this->poa_.in ())) + return PortableServer::POA::_duplicate (this->poa_.in ()); -template <class T> ACE_INLINE -CORBA::Object_ptr POA_Messaging::Poller_tie<T>::target ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->target ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -char * POA_Messaging::Poller_tie<T>::op_name ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->op_name ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -CORBA::Boolean POA_Messaging::Poller_tie<T>::is_ready ( - CORBA::ULong timeout, - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->is_ready ( - timeout, - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -CORBA::PollableSet_ptr POA_Messaging::Poller_tie<T>::create_pollable_set ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->create_pollable_set ( - ACE_TRY_ENV - ); + return this->ReplyHandler::_default_POA (ACE_TRY_ENV); } #endif /* ACE_HAS_USING_KEYWORD */ diff --git a/TAO/tao/Messaging_Policy_i.cpp b/TAO/tao/Messaging_Policy_i.cpp index 4187ccf833a..aaaa1aa9792 100644 --- a/TAO/tao/Messaging_Policy_i.cpp +++ b/TAO/tao/Messaging_Policy_i.cpp @@ -11,17 +11,13 @@ ACE_RCSID(TAO, Messaging_Policy_i, "$Id$") #if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) -TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy (PortableServer::POA_ptr poa, - const TimeBase::TimeT& relative_expiry) - : poa_ (PortableServer::POA::_duplicate (poa)), - relative_expiry_ (relative_expiry) +TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy (const TimeBase::TimeT& relative_expiry) + : relative_expiry_ (relative_expiry) { } TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy (const TAO_RelativeRoundtripTimeoutPolicy &rhs) - : TAO_RefCountServantBase (rhs), - POA_Messaging::RelativeRoundtripTimeoutPolicy (rhs), - poa_ (rhs.poa_), + : Messaging::RelativeRoundtripTimeoutPolicy (), relative_expiry_ (rhs.relative_expiry_) { } @@ -47,8 +43,7 @@ TAO_RelativeRoundtripTimeoutPolicy::policy_type (CORBA_Environment &) } CORBA::Policy_ptr -TAO_RelativeRoundtripTimeoutPolicy::create (PortableServer::POA_ptr poa, - const CORBA::Any& val, +TAO_RelativeRoundtripTimeoutPolicy::create (const CORBA::Any& val, CORBA::Environment &ACE_TRY_ENV) { // Future policy implementors: notice how the following code is @@ -61,18 +56,12 @@ TAO_RelativeRoundtripTimeoutPolicy::create (PortableServer::POA_ptr poa, TAO_RelativeRoundtripTimeoutPolicy *tmp; ACE_NEW_THROW_EX (tmp, - TAO_RelativeRoundtripTimeoutPolicy (poa, - value), + TAO_RelativeRoundtripTimeoutPolicy (value), CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); - PortableServer::ServantBase_var clone (tmp); - - CORBA::Policy_var result = tmp->_this (ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); - - return result._retn (); + return tmp; } TAO_RelativeRoundtripTimeoutPolicy * @@ -97,28 +86,12 @@ TAO_RelativeRoundtripTimeoutPolicy::copy (CORBA_Environment &ACE_TRY_ENV) CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); - PortableServer::ServantBase_var clone (tmp); - - CORBA::Policy_var result = tmp->_this (ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); - - return result._retn (); + return tmp; } void -TAO_RelativeRoundtripTimeoutPolicy::destroy (CORBA_Environment &ACE_TRY_ENV) +TAO_RelativeRoundtripTimeoutPolicy::destroy (CORBA_Environment &) { - PortableServer::ObjectId_var id = - this->poa_->servant_to_id (this, ACE_TRY_ENV); - ACE_CHECK; - this->poa_->deactivate_object (id.in (), ACE_TRY_ENV); - ACE_CHECK; -} - -PortableServer::POA_ptr -TAO_RelativeRoundtripTimeoutPolicy::_default_POA (CORBA_Environment &) -{ - return PortableServer::POA::_duplicate (this->poa_.in ()); } void @@ -142,22 +115,18 @@ TAO_RelativeRoundtripTimeoutPolicy::set_time_value (ACE_Time_Value &time_value) #endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ -//////////////////////////////////////////////////////////////////////////////// +// **************************************************************** #if (TAO_HAS_SYNC_SCOPE_POLICY == 1) -TAO_Sync_Scope_Policy::TAO_Sync_Scope_Policy (Messaging::SyncScope synchronization, - PortableServer::POA_ptr poa) - : synchronization_ (synchronization), - poa_ (PortableServer::POA::_duplicate (poa)) +TAO_Sync_Scope_Policy::TAO_Sync_Scope_Policy (Messaging::SyncScope synchronization) + : synchronization_ (synchronization) { } TAO_Sync_Scope_Policy::TAO_Sync_Scope_Policy (const TAO_Sync_Scope_Policy &rhs) - : TAO_RefCountServantBase (rhs), - POA_Messaging::SyncScopePolicy (rhs), - synchronization_ (rhs.synchronization_), - poa_ (rhs.poa_) + : Messaging::SyncScopePolicy (), + synchronization_ (rhs.synchronization_) { } @@ -168,8 +137,7 @@ TAO_Sync_Scope_Policy::policy_type (CORBA_Environment &) } CORBA::Policy_ptr -TAO_Sync_Scope_Policy::create (PortableServer::POA_ptr poa, - const CORBA::Any& val, +TAO_Sync_Scope_Policy::create (const CORBA::Any& val, CORBA::Environment &ACE_TRY_ENV) { Messaging::SyncScope synchronization; @@ -179,17 +147,11 @@ TAO_Sync_Scope_Policy::create (PortableServer::POA_ptr poa, TAO_Sync_Scope_Policy *servant = 0; ACE_NEW_THROW_EX (servant, - TAO_Sync_Scope_Policy (synchronization, - poa), + TAO_Sync_Scope_Policy (synchronization), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); - PortableServer::ServantBase_var smart_servant (servant); - - CORBA::Policy_var result = servant->_this (ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); - - return result._retn (); + return servant; } TAO_Sync_Scope_Policy * @@ -211,31 +173,12 @@ TAO_Sync_Scope_Policy::copy (CORBA_Environment &ACE_TRY_ENV) CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); - PortableServer::ServantBase_var smart_servant (servant); - - CORBA::Policy_var result = servant->_this (ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); - - return result._retn (); + return servant; } void -TAO_Sync_Scope_Policy::destroy (CORBA_Environment &ACE_TRY_ENV) -{ - PortableServer::ObjectId_var id = - this->poa_->servant_to_id (this, - ACE_TRY_ENV); - ACE_CHECK; - - this->poa_->deactivate_object (id.in (), - ACE_TRY_ENV); - ACE_CHECK; -} - -PortableServer::POA_ptr -TAO_Sync_Scope_Policy::_default_POA (CORBA_Environment &) +TAO_Sync_Scope_Policy::destroy (CORBA_Environment &) { - return PortableServer::POA::_duplicate (this->poa_.in ()); } #endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ diff --git a/TAO/tao/Messaging_Policy_i.h b/TAO/tao/Messaging_Policy_i.h index 73f55b586ec..42c4fdd4e43 100644 --- a/TAO/tao/Messaging_Policy_i.h +++ b/TAO/tao/Messaging_Policy_i.h @@ -22,7 +22,7 @@ #include "ace/pre.h" #include "tao/orbconf.h" -#include "tao/MessagingS.h" +#include "tao/MessagingC.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) @@ -33,8 +33,7 @@ #if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) -class TAO_Export TAO_RelativeRoundtripTimeoutPolicy : public TAO_RefCountServantBase, - public POA_Messaging::RelativeRoundtripTimeoutPolicy +class TAO_Export TAO_RelativeRoundtripTimeoutPolicy : public Messaging::RelativeRoundtripTimeoutPolicy { // = TITLE // Messaging::RelativeRoundtripTimeoutPolicy implementation @@ -44,15 +43,13 @@ class TAO_Export TAO_RelativeRoundtripTimeoutPolicy : public TAO_RefCountServant // request. // public: - TAO_RelativeRoundtripTimeoutPolicy (PortableServer::POA_ptr poa, - const TimeBase::TimeT& relative_expiry); + TAO_RelativeRoundtripTimeoutPolicy (const TimeBase::TimeT& relative_expiry); // Constructor. TAO_RelativeRoundtripTimeoutPolicy (const TAO_RelativeRoundtripTimeoutPolicy &rhs); // Copy constructor. - static CORBA::Policy_ptr create (PortableServer::POA_ptr poa, - const CORBA::Any& val, + static CORBA::Policy_ptr create (const CORBA::Any& val, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); // Helper method for the implementation of // CORBA::ORB::create_policy. @@ -70,15 +67,10 @@ public: virtual void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - void set_time_value (ACE_Time_Value &time_value); // Change the CORBA representation to the ACE representation. private: - PortableServer::POA_var poa_; - // The default poa - TimeBase::TimeT relative_expiry_; // The attribute }; @@ -89,8 +81,7 @@ private: #if (TAO_HAS_SYNC_SCOPE_POLICY == 1) -class TAO_Export TAO_Sync_Scope_Policy : public TAO_RefCountServantBase, - public POA_Messaging::SyncScopePolicy +class TAO_Export TAO_Sync_Scope_Policy : public Messaging::SyncScopePolicy { // = TITLE @@ -101,15 +92,13 @@ class TAO_Export TAO_Sync_Scope_Policy : public TAO_RefCountServantBase, // transport requests. // public: - TAO_Sync_Scope_Policy (Messaging::SyncScope synchronization, - PortableServer::POA_ptr poa); + TAO_Sync_Scope_Policy (Messaging::SyncScope synchronization); // Constructor. TAO_Sync_Scope_Policy (const TAO_Sync_Scope_Policy &rhs); // Copy constructor. - static CORBA::Policy_ptr create (PortableServer::POA_ptr poa, - const CORBA::Any& val, + static CORBA::Policy_ptr create (const CORBA::Any& val, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); // Helper method for the implementation of // CORBA::ORB::create_policy. @@ -128,15 +117,10 @@ public: virtual void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - private: Messaging::SyncScope synchronization_; // The attribute - - PortableServer::POA_var poa_; - // The default poa. }; #if defined (__ACE_INLINE__) diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index ea3facaf09c..b6f92955feb 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -1553,8 +1553,7 @@ CORBA_ORB::create_policy (CORBA::PolicyType type, #if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) case TAO_MESSAGING_RELATIVE_RT_TIMEOUT_POLICY_TYPE: - return TAO_RelativeRoundtripTimeoutPolicy::create (root_poa.in (), - val, + return TAO_RelativeRoundtripTimeoutPolicy::create (val, ACE_TRY_ENV); #endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ @@ -1562,8 +1561,7 @@ CORBA_ORB::create_policy (CORBA::PolicyType type, #if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1) case TAO_CLIENT_PRIORITY_POLICY_TYPE: - return TAO_Client_Priority_Policy::create (root_poa.in (), - val, + return TAO_Client_Priority_Policy::create (val, ACE_TRY_ENV); #endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */ @@ -1571,8 +1569,7 @@ CORBA_ORB::create_policy (CORBA::PolicyType type, #if (TAO_HAS_SYNC_SCOPE_POLICY == 1) case TAO_MESSAGING_SYNC_SCOPE_POLICY_TYPE: - return TAO_Sync_Scope_Policy::create (root_poa.in (), - val, + return TAO_Sync_Scope_Policy::create (val, ACE_TRY_ENV); #endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ @@ -1580,8 +1577,7 @@ CORBA_ORB::create_policy (CORBA::PolicyType type, #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) case TAO_BUFFERING_CONSTRAINT_POLICY_TYPE: - return TAO_Buffering_Constraint_Policy::create (root_poa.in (), - val, + return TAO_Buffering_Constraint_Policy::create (val, ACE_TRY_ENV); #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ diff --git a/TAO/tao/Policy_Manager.cpp b/TAO/tao/Policy_Manager.cpp index 7ffcd91a393..88d8222d280 100644 --- a/TAO/tao/Policy_Manager.cpp +++ b/TAO/tao/Policy_Manager.cpp @@ -123,28 +123,28 @@ TAO_Policy_Manager_Impl::cleanup_i (CORBA::Environment &ACE_TRY_ENV) #if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) - delete this->relative_roundtrip_timeout_; + CORBA::release (this->relative_roundtrip_timeout_); this->relative_roundtrip_timeout_ = 0; #endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ #if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1) - delete this->client_priority_; + CORBA::release (this->client_priority_); this->client_priority_ = 0; #endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */ #if (TAO_HAS_SYNC_SCOPE_POLICY == 1) - delete this->sync_scope_; + CORBA::release (this->sync_scope_); this->sync_scope_ = 0; #endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) - delete this->buffering_constraint_; + CORBA::release (this->buffering_constraint_); this->buffering_constraint_ = 0; #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ @@ -186,25 +186,20 @@ TAO_Policy_Manager_Impl::set_policy_overrides ( case TAO_MESSAGING_RELATIVE_RT_TIMEOUT_POLICY_TYPE: { - TAO_ServantBase *servant = policy->_servant (); - if (servant == 0) - ACE_THROW (CORBA::INTERNAL ()); - - POA_Messaging::RelativeRoundtripTimeoutPolicy *tmp = - ACE_static_cast(POA_Messaging::RelativeRoundtripTimeoutPolicy*, - servant->_downcast ("IDL:Messaging/RelativeRoundtripTimeoutPolicy:1.0")); - if (tmp == 0) - ACE_THROW (CORBA::INTERNAL ()); - - TAO_RelativeRoundtripTimeoutPolicy *policy = - ACE_dynamic_cast (TAO_RelativeRoundtripTimeoutPolicy *, tmp); - - if (policy == 0) - ACE_THROW (CORBA::INTERNAL ()); - - delete this->relative_roundtrip_timeout_; - this->relative_roundtrip_timeout_ = policy->clone (); - + Messaging::RelativeRoundtripTimeoutPolicy_var p = + Messaging::RelativeRoundtripTimeoutPolicy::_narrow (policy); + + if (CORBA::is_nil (p.in ())) + ACE_THROW (CORBA::INTERNAL ( + CORBA_SystemException::_tao_minor_code ( + TAO_POLICY_NARROW_CODE, + 0), + CORBA::COMPLETED_NO)); + + CORBA::release (this->relative_roundtrip_timeout_); + this->relative_roundtrip_timeout_ = + ACE_dynamic_cast (TAO_RelativeRoundtripTimeoutPolicy*, + p._retn ()); this->count_++; } break; @@ -215,24 +210,20 @@ TAO_Policy_Manager_Impl::set_policy_overrides ( case TAO_CLIENT_PRIORITY_POLICY_TYPE: { - TAO_ServantBase *servant = policy->_servant (); - if (servant == 0) - ACE_THROW (CORBA::INTERNAL ()); - - POA_TAO::ClientPriorityPolicy *tmp = - ACE_static_cast(POA_TAO::ClientPriorityPolicy*, - servant->_downcast ("IDL:TAO/ClientPriorityPolicy:1.0")); - if (tmp == 0) - ACE_THROW (CORBA::INTERNAL ()); + TAO::ClientPriorityPolicy_var p = + TAO::ClientPriorityPolicy::_narrow (policy); - TAO_Client_Priority_Policy *policy = - ACE_dynamic_cast (TAO_Client_Priority_Policy *, tmp); + if (CORBA::is_nil (p.in ())) + ACE_THROW (CORBA::INTERNAL ( + CORBA_SystemException::_tao_minor_code ( + TAO_POLICY_NARROW_CODE, + 0), + CORBA::COMPLETED_NO)); - if (policy == 0) - ACE_THROW (CORBA::INTERNAL ()); - - delete this->client_priority_; - this->client_priority_ = policy->clone (); + CORBA::release (this->client_priority_); + this->client_priority_ = + ACE_dynamic_cast (TAO_Client_Priority_Policy *, + p._retn ()); this->count_++; } @@ -244,24 +235,20 @@ TAO_Policy_Manager_Impl::set_policy_overrides ( case TAO_MESSAGING_SYNC_SCOPE_POLICY_TYPE: { - TAO_ServantBase *servant = policy->_servant (); - if (servant == 0) - ACE_THROW (CORBA::INTERNAL ()); - - POA_Messaging::SyncScopePolicy *tmp = - ACE_static_cast(POA_Messaging::SyncScopePolicy*, - servant->_downcast ("IDL:Messaging/SyncScopePolicy:1.0")); - if (tmp == 0) - ACE_THROW (CORBA::INTERNAL ()); - - TAO_Sync_Scope_Policy *policy = - ACE_dynamic_cast (TAO_Sync_Scope_Policy *, tmp); + Messaging::SyncScopePolicy_var p = + Messaging::SyncScopePolicy::_narrow (policy); - if (policy == 0) - ACE_THROW (CORBA::INTERNAL ()); + if (CORBA::is_nil (p.in ())) + ACE_THROW (CORBA::INTERNAL ( + CORBA_SystemException::_tao_minor_code ( + TAO_POLICY_NARROW_CODE, + 0), + CORBA::COMPLETED_NO)); - delete this->sync_scope_; - this->sync_scope_ = policy->clone (); + CORBA::release (this->sync_scope_); + this->sync_scope_ = + ACE_dynamic_cast (TAO_Sync_Scope_Policy*, + p._retn ()); this->count_++; } @@ -273,24 +260,20 @@ TAO_Policy_Manager_Impl::set_policy_overrides ( case TAO_BUFFERING_CONSTRAINT_POLICY_TYPE: { - TAO_ServantBase *servant = policy->_servant (); - if (servant == 0) - ACE_THROW (CORBA::INTERNAL ()); - - POA_TAO::BufferingConstraintPolicy *tmp = - ACE_static_cast(POA_TAO::BufferingConstraintPolicy*, - servant->_downcast ("IDL:TAO/BufferingConstraintPolicy:1.0")); - if (tmp == 0) - ACE_THROW (CORBA::INTERNAL ()); - - TAO_Buffering_Constraint_Policy *policy = - ACE_dynamic_cast (TAO_Buffering_Constraint_Policy *, tmp); + TAO::BufferingConstraintPolicy_var p = + TAO::BufferingConstraintPolicy::_narrow (policy); - if (policy == 0) - ACE_THROW (CORBA::INTERNAL ()); + if (CORBA::is_nil (p.in ())) + ACE_THROW (CORBA::INTERNAL ( + CORBA_SystemException::_tao_minor_code ( + TAO_POLICY_NARROW_CODE, + 0), + CORBA::COMPLETED_NO)); - delete this->buffering_constraint_; - this->buffering_constraint_ = policy->clone (); + CORBA::release (this->buffering_constraint_); + this->buffering_constraint_ = + ACE_dynamic_cast (TAO_Buffering_Constraint_Policy *, + p._retn ()); this->count_++; } @@ -375,7 +358,7 @@ TAO_Policy_Manager_Impl::get_policy_overrides ( if (this->relative_roundtrip_timeout_ != 0) { policy_list[n++] = - relative_roundtrip_timeout_->_this (ACE_TRY_ENV); + CORBA::Policy::_duplicate (this->relative_roundtrip_timeout_); ACE_CHECK_RETURN (0); } @@ -386,7 +369,7 @@ TAO_Policy_Manager_Impl::get_policy_overrides ( if (this->client_priority_ != 0) { policy_list[n++] = - client_priority_->_this (ACE_TRY_ENV); + CORBA::Policy::_duplicate (this->client_priority_); ACE_CHECK_RETURN (0); } @@ -397,7 +380,7 @@ TAO_Policy_Manager_Impl::get_policy_overrides ( if (this->sync_scope_ != 0) { policy_list[n++] = - sync_scope_->_this (ACE_TRY_ENV); + CORBA::Policy::_duplicate (this->sync_scope_); ACE_CHECK_RETURN (0); } @@ -408,7 +391,7 @@ TAO_Policy_Manager_Impl::get_policy_overrides ( if (this->buffering_constraint_ != 0) { policy_list[n++] = - buffering_constraint_->_this (ACE_TRY_ENV); + CORBA::Policy::_duplicate (this->buffering_constraint_); ACE_CHECK_RETURN (0); } @@ -438,7 +421,7 @@ TAO_Policy_Manager_Impl::get_policy_overrides ( if (this->relative_roundtrip_timeout_ != 0) { policy_list[n++] = - relative_roundtrip_timeout_->_this (ACE_TRY_ENV); + CORBA::Policy::_duplicate (this->relative_roundtrip_timeout_); ACE_CHECK_RETURN (0); } break; @@ -451,7 +434,7 @@ TAO_Policy_Manager_Impl::get_policy_overrides ( if (this->client_priority_ != 0) { policy_list[n++] = - client_priority_->_this (ACE_TRY_ENV); + CORBA::Policy::_duplicate (this->client_priority_); ACE_CHECK_RETURN (0); } break; @@ -464,7 +447,7 @@ TAO_Policy_Manager_Impl::get_policy_overrides ( if (this->sync_scope_ != 0) { policy_list[n++] = - sync_scope_->_this (ACE_TRY_ENV); + CORBA::Policy::_duplicate (this->sync_scope_); ACE_CHECK_RETURN (0); } break; @@ -477,7 +460,7 @@ TAO_Policy_Manager_Impl::get_policy_overrides ( if (this->buffering_constraint_ != 0) { policy_list[n++] = - buffering_constraint_->_this (ACE_TRY_ENV); + CORBA::Policy::_duplicate (this->buffering_constraint_); ACE_CHECK_RETURN (0); } break; @@ -534,7 +517,7 @@ TAO_Policy_Manager_Impl::get_policy (CORBA::PolicyType type, case TAO_MESSAGING_RELATIVE_RT_TIMEOUT_POLICY_TYPE: if (this->relative_roundtrip_timeout_ != 0) { - return this->relative_roundtrip_timeout_->_this (ACE_TRY_ENV); + return CORBA::Policy::_duplicate (this->relative_roundtrip_timeout_); } return CORBA::Policy::_nil (); @@ -545,7 +528,7 @@ TAO_Policy_Manager_Impl::get_policy (CORBA::PolicyType type, case TAO_CLIENT_PRIORITY_POLICY_TYPE: if (this->client_priority_ != 0) { - return this->client_priority_->_this (ACE_TRY_ENV); + return CORBA::Policy::_duplicate (this->client_priority_); } return CORBA::Policy::_nil (); @@ -556,7 +539,7 @@ TAO_Policy_Manager_Impl::get_policy (CORBA::PolicyType type, case TAO_MESSAGING_SYNC_SCOPE_POLICY_TYPE: if (this->sync_scope_ != 0) { - return this->sync_scope_->_this (ACE_TRY_ENV); + return CORBA::Policy::_duplicate (this->sync_scope_); } return CORBA::Policy::_nil (); @@ -567,7 +550,7 @@ TAO_Policy_Manager_Impl::get_policy (CORBA::PolicyType type, case TAO_BUFFERING_CONSTRAINT_POLICY_TYPE: if (this->buffering_constraint_ != 0) { - return this->buffering_constraint_->_this (ACE_TRY_ENV); + return CORBA::Policy::_duplicate (this->buffering_constraint_); } return CORBA::Policy::_nil (); diff --git a/TAO/tao/Pollable.pidl b/TAO/tao/Pollable.pidl index 347aa4c9dfc..b70d3f561d7 100644 --- a/TAO/tao/Pollable.pidl +++ b/TAO/tao/Pollable.pidl @@ -11,44 +11,63 @@ // // = DESCRIPTION // This file was used to generate the code in Pollable{C,S,S_T}.{h,i,cpp} -// The code is then hand-crafted to compile it inside the ORB, avoid -// cyclic dependencies and enforce the locality constraints on -// certain objects. +// +// The command used to generate code from this file is: +// +// $ACE_ROOT/TAO/TAO_IDL/tao_idl -o tmp -Ge 1 -DNO_VALUE \ +// -Wb,export_macro=TAO_Export +// -Wb,export_include="tao/corbafwd.h" \ +// Pollable.pidl +// +// after the file is generated a patch must be applied. The patch +// fixes the interface repository IDs, disables the code under +// certain configurations, and eliminates cycles in the include +// dependencies. Those changes are required because the generated +// code is part of the TAO library, it hardly makes any sense to +// change the IDL compiler to support changes that are very +// occasional. // // ================================================================ #pragma prefix "omg.org" -module CORBA -{ - interface PollableSet; - interface Pollable { - boolean is_ready(in unsigned long timeout); +// We should declare this stuff in the CORBA module, but then we +// cannot support platforms that lack namespaces. +// Instead we prefix all the names with CORBA_, then we add a number +// of typedefs in corbafwd.h so it looks like they are in the CORBA +// module. Finally we modify the generated code to have all the right +// interface repository ids. +// +// @@ module CORBA +// { + +local interface CORBA_PollableSet; - PollableSet create_pollable_set( ); - }; +local interface CORBA_Pollable { + boolean is_ready(in unsigned long timeout); - interface DIIPollable : Pollable { }; + CORBA_PollableSet create_pollable_set( ); +}; - interface PollableSet { +local interface CORBA_DIIPollable : CORBA_Pollable { }; - exception NoPossiblePollable { }; - exception UnknownPollable { }; +local interface CORBA_PollableSet { - DIIPollable create_dii_pollable(); + exception NoPossiblePollable { }; + exception UnknownPollable { }; - void add_pollable(in Pollable potential ); + CORBA_DIIPollable create_dii_pollable(); - Pollable poll(in unsigned long timeout) - raises( NoPossiblePollable ); + void add_pollable(in CORBA_Pollable potential ); - void remove(in Pollable potential ) - raises( UnknownPollable ); + CORBA_Pollable poll(in unsigned long timeout) + raises( NoPossiblePollable ); - unsigned short number_left( ); - }; + void remove(in CORBA_Pollable potential ) + raises( UnknownPollable ); + unsigned short number_left( ); }; #pragma prefix "" diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp index 540c1130a8d..8bbf0e92125 100644 --- a/TAO/tao/PollableC.cpp +++ b/TAO/tao/PollableC.cpp @@ -1,23 +1,13 @@ -/* -*- C++ -*- */ -// -// $Id$ -// -// ================================================================ -// -// = LIBRARY -// TAO -// -// = FILENAME -// PollableC.cpp -// -// = DESCRIPTION -// Generated from Pollable.pidl -// The code was generated by the IDL compiler and then hand-crafted -// to reduce the includes interdependencies. +/* -*- C++ -*- $Id$ */ + +// ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* +// TAO and the TAO IDL Compiler have been developed by the Center for +// Distributed Object Computing at Washington University, St. Louis. // -// ================================================================ +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/PollableC.h" +#include "PollableC.h" #if (TAO_HAS_AMI_POLLER == 1) @@ -27,7 +17,7 @@ #include "tao/Any.h" #if !defined (__ACE_INLINE__) -#include "tao/PollableC.i" +#include "PollableC.i" #endif /* !defined INLINE */ ACE_RCSID(tao, PollableC, "$Id$") @@ -37,206 +27,53 @@ CORBA_Pollable_ptr CORBA_Pollable::_narrow ( CORBA::Environment &ACE_TRY_ENV ) { - if (CORBA::is_nil (obj)) - return CORBA_Pollable::_nil (); - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Pollable:1.0", ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA_Pollable::_nil ()); - if (is_a == 0) - return CORBA_Pollable::_nil (); - TAO_Stub* stub = obj->_stubobj (); - stub->_incr_refcnt (); - void* servant = 0; - if (obj->_is_collocated () && obj->_servant() != 0) - servant = obj->_servant()->_downcast ("IDL:omg.org/CORBA/Pollable:1.0"); - if (servant == 0) - { - CORBA_Pollable_ptr rval = CORBA_Pollable::_nil (); - - ACE_NEW_RETURN (rval, - CORBA_Pollable (stub), - CORBA_Pollable::_nil ()); - - return rval; - } - - CORBA_Pollable_ptr retval = CORBA_Pollable::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_CORBA::_tao_collocated_Pollable ( - ACE_reinterpret_cast (POA_CORBA::Pollable_ptr, - servant), - stub - ), - CORBA_Pollable::_nil () - ); - - return retval; + return CORBA_Pollable::_unchecked_narrow (obj, ACE_TRY_ENV); } CORBA_Pollable_ptr CORBA_Pollable::_unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment & /*env*/ + CORBA::Environment & ) { if (CORBA::is_nil (obj)) return CORBA_Pollable::_nil (); - TAO_Stub* stub = obj->_stubobj (); - stub->_incr_refcnt (); - void* servant = 0; - if (obj->_is_collocated () && obj->_servant() != 0) - servant = obj->_servant()->_downcast ("IDL:omg.org/CORBA/Pollable:1.0"); - if (servant == 0) - { - CORBA_Pollable_ptr rval = CORBA_Pollable::_nil (); - - ACE_NEW_RETURN (rval, - CORBA_Pollable (stub), - CORBA_Pollable::_nil ()); - - return rval; - } - - CORBA_Pollable_ptr retval = CORBA_Pollable::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_CORBA::_tao_collocated_Pollable ( - ACE_reinterpret_cast (POA_CORBA::Pollable_ptr, - servant), - stub - ), - CORBA_Pollable::_nil () - ); - - return retval; + return + ACE_reinterpret_cast + ( + CORBA_Pollable_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &CORBA_Pollable::_narrow + ) + ) + ); } -CORBA::Boolean CORBA_Pollable::is_ready ( - CORBA::ULong timeout, - CORBA::Environment &ACE_TRY_ENV - ) +CORBA_Pollable_ptr +CORBA_Pollable::_duplicate (CORBA_Pollable_ptr obj) { - CORBA::Boolean _tao_retval = 0; - - TAO_Stub *istub = this->_stubobj (); - if (istub == 0) - ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval); - - - TAO_GIOP_Twoway_Invocation _tao_call ( - istub, - "is_ready", - 8, - istub->orb_core () - ); - - - for (;;) - { - ACE_TRY_ENV.clear (); - _tao_call.start (ACE_TRY_ENV); - ACE_CHECK_RETURN (_tao_retval); - - CORBA::Short flag = 131; - - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), - ACE_TRY_ENV); - ACE_CHECK_RETURN (_tao_retval); - - TAO_OutputCDR &_tao_out = _tao_call.out_stream (); - if (!( - (_tao_out << timeout) - )) - ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval); - - int _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); - ACE_CHECK_RETURN (_tao_retval); - - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - // if (_invoke_status == TAO_INVOKE_EXCEPTION) - // cannot happen - if (_invoke_status != TAO_INVOKE_OK) - { - ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); - - } - break; - - } - TAO_InputCDR &_tao_in = _tao_call.inp_stream (); - if (!( - (_tao_in >> CORBA::Any::to_boolean (_tao_retval)) - )) - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); - return _tao_retval; + if (!CORBA::is_nil (obj)) + obj->_add_ref (); + return obj; } -CORBA_PollableSet_ptr CORBA_Pollable::create_pollable_set ( - CORBA::Environment &ACE_TRY_ENV - ) +void *CORBA_Pollable::_tao_QueryInterface (ptr_arith_t type) { - CORBA_PollableSet_ptr _tao_retval = CORBA_PollableSet::_nil (); - - TAO_Stub *istub = this->_stubobj (); - if (istub == 0) - ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval); + void *retv = 0; + if (type == ACE_reinterpret_cast + (ptr_arith_t, + &CORBA_Pollable::_narrow)) + retv = ACE_reinterpret_cast (void*, this); + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); - - TAO_GIOP_Twoway_Invocation _tao_call ( - istub, - "create_pollable_set", - 19, - istub->orb_core () - ); - - - for (;;) - { - ACE_TRY_ENV.clear (); - _tao_call.start (ACE_TRY_ENV); - ACE_CHECK_RETURN (_tao_retval); - - CORBA::Short flag = 131; - - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), - ACE_TRY_ENV); - ACE_CHECK_RETURN (_tao_retval); - - int _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); - ACE_CHECK_RETURN (_tao_retval); - - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - // if (_invoke_status == TAO_INVOKE_EXCEPTION) - // cannot happen - if (_invoke_status != TAO_INVOKE_OK) - { - ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); - - } - break; - - } - TAO_InputCDR &_tao_in = _tao_call.inp_stream (); - if (!( - (_tao_in >> _tao_retval) - )) - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); - return _tao_retval; -} - -CORBA::Boolean CORBA_Pollable::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Pollable:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) - return 1; // success using local knowledge - else - return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call + if (retv) + this->_add_ref (); + return retv; } const char* CORBA_Pollable::_interface_repository_id (void) const @@ -244,98 +81,73 @@ const char* CORBA_Pollable::_interface_repository_id (void) const return "IDL:omg.org/CORBA/Pollable:1.0"; } -CORBA::DIIPollable_ptr CORBA::DIIPollable::_narrow ( +CORBA_DIIPollable_ptr CORBA_DIIPollable::_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV ) { - if (CORBA::is_nil (obj)) - return CORBA::DIIPollable::_nil (); - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/DIIPollable:1.0", ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::DIIPollable::_nil ()); - if (is_a == 0) - return CORBA::DIIPollable::_nil (); - TAO_Stub* stub = obj->_stubobj (); - stub->_incr_refcnt (); - void* servant = 0; - if (obj->_is_collocated () && obj->_servant() != 0) - servant = obj->_servant()->_downcast ("IDL:omg.org/CORBA/DIIPollable:1.0"); - if (servant == 0) - { - CORBA::DIIPollable_ptr rval = CORBA::DIIPollable::_nil (); - - ACE_NEW_RETURN (rval, - CORBA::DIIPollable (stub), - CORBA::DIIPollable::_nil ()); - - return rval; - } - - CORBA::DIIPollable_ptr retval = CORBA::DIIPollable::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_CORBA::_tao_collocated_DIIPollable ( - ACE_reinterpret_cast (POA_CORBA::DIIPollable_ptr, - servant), - stub - ), - CORBA::DIIPollable::_nil () - ); - - return retval; + return CORBA_DIIPollable::_unchecked_narrow (obj, ACE_TRY_ENV); } -CORBA::DIIPollable_ptr CORBA::DIIPollable::_unchecked_narrow ( +CORBA_DIIPollable_ptr CORBA_DIIPollable::_unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment & /*env*/ + CORBA::Environment & ) { if (CORBA::is_nil (obj)) - return CORBA::DIIPollable::_nil (); - TAO_Stub* stub = obj->_stubobj (); - stub->_incr_refcnt (); - void* servant = 0; - if (obj->_is_collocated () && obj->_servant() != 0) - servant = obj->_servant()->_downcast ("IDL:omg.org/CORBA/DIIPollable:1.0"); - if (servant == 0) - { - CORBA::DIIPollable_ptr rval = CORBA::DIIPollable::_nil (); - - ACE_NEW_RETURN (rval, - CORBA::DIIPollable (stub), - CORBA::DIIPollable::_nil ()); - - return rval; - } - - CORBA::DIIPollable_ptr retval = CORBA::DIIPollable::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_CORBA::_tao_collocated_DIIPollable ( - ACE_reinterpret_cast (POA_CORBA::DIIPollable_ptr, - servant), - stub - ), - CORBA::DIIPollable::_nil () - ); - - return retval; + return CORBA_DIIPollable::_nil (); + return + ACE_reinterpret_cast + ( + CORBA_DIIPollable_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &CORBA_DIIPollable::_narrow + ) + ) + ); } -CORBA::Boolean CORBA::DIIPollable::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/DIIPollable:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Pollable:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) - return 1; // success using local knowledge - else - return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call +CORBA_DIIPollable_ptr +CORBA_DIIPollable::_duplicate (CORBA_DIIPollable_ptr obj) +{ + if (!CORBA::is_nil (obj)) + obj->_add_ref (); + return obj; +} + +void *CORBA_DIIPollable::_tao_QueryInterface (ptr_arith_t type) +{ + void *retv = 0; + if (type == ACE_reinterpret_cast + (ptr_arith_t, + &CORBA_DIIPollable::_narrow)) + retv = ACE_reinterpret_cast (void*, this); + else if (type == ACE_reinterpret_cast + (ptr_arith_t, + &CORBA_Pollable::_narrow)) + retv = ACE_reinterpret_cast + ( + void *, + ACE_static_cast + ( + CORBA_Pollable_ptr, + this + ) + ); + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); + + if (retv) + this->_add_ref (); + return retv; } -const char* CORBA::DIIPollable::_interface_repository_id (void) const +const char* CORBA_DIIPollable::_interface_repository_id (void) const { return "IDL:omg.org/CORBA/DIIPollable:1.0"; } @@ -345,84 +157,41 @@ CORBA_PollableSet_ptr CORBA_PollableSet::_narrow ( CORBA::Environment &ACE_TRY_ENV ) { - if (CORBA::is_nil (obj)) - return CORBA_PollableSet::_nil (); - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/PollableSet:1.0", ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA_PollableSet::_nil ()); - if (is_a == 0) - return CORBA_PollableSet::_nil (); - TAO_Stub* stub = obj->_stubobj (); - stub->_incr_refcnt (); - void* servant = 0; - if (obj->_is_collocated () && obj->_servant() != 0) - servant = obj->_servant()->_downcast ("IDL:omg.org/CORBA/PollableSet:1.0"); - if (servant == 0) - { - CORBA_PollableSet_ptr rval = CORBA_PollableSet::_nil (); - - ACE_NEW_RETURN (rval, - CORBA_PollableSet (stub), - CORBA_PollableSet::_nil ()); - - return rval; - } - - CORBA_PollableSet_ptr retval = CORBA_PollableSet::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_CORBA::_tao_collocated_PollableSet ( - ACE_reinterpret_cast (POA_CORBA::PollableSet_ptr, - servant), - stub - ), - CORBA_PollableSet::_nil () - ); - - return retval; + return CORBA_PollableSet::_unchecked_narrow (obj, ACE_TRY_ENV); } CORBA_PollableSet_ptr CORBA_PollableSet::_unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment & /*env*/ + CORBA::Environment & ) { if (CORBA::is_nil (obj)) return CORBA_PollableSet::_nil (); - TAO_Stub* stub = obj->_stubobj (); - stub->_incr_refcnt (); - void* servant = 0; - if (obj->_is_collocated () && obj->_servant() != 0) - servant = obj->_servant()->_downcast ("IDL:omg.org/CORBA/PollableSet:1.0"); - if (servant == 0) - { - CORBA_PollableSet_ptr rval = CORBA_PollableSet::_nil (); - - ACE_NEW_RETURN (rval, - CORBA_PollableSet (stub), - CORBA_PollableSet::_nil ()); - - return rval; - } - - CORBA_PollableSet_ptr retval = CORBA_PollableSet::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_CORBA::_tao_collocated_PollableSet ( - ACE_reinterpret_cast (POA_CORBA::PollableSet_ptr, - servant), - stub - ), - CORBA_PollableSet::_nil () - ); + return + ACE_reinterpret_cast + ( + CORBA_PollableSet_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &CORBA_PollableSet::_narrow + ) + ) + ); +} - return retval; +CORBA_PollableSet_ptr +CORBA_PollableSet::_duplicate (CORBA_PollableSet_ptr obj) +{ + if (!CORBA::is_nil (obj)) + obj->_add_ref (); + return obj; } // default constructor CORBA_PollableSet::NoPossiblePollable::NoPossiblePollable (void) - : CORBA_UserException (CORBA_PollableSet::_tc_NoPossiblePollable) { } @@ -432,14 +201,14 @@ CORBA_PollableSet::NoPossiblePollable::~NoPossiblePollable (void) } // copy constructor -CORBA_PollableSet::NoPossiblePollable::NoPossiblePollable (const CORBA_PollableSet::NoPossiblePollable &_tao_excp) +CORBA_PollableSet::NoPossiblePollable::NoPossiblePollable (const ::CORBA_PollableSet::NoPossiblePollable &_tao_excp) : CORBA_UserException (_tao_excp._type ()) { } // assignment operator CORBA_PollableSet::NoPossiblePollable& -CORBA_PollableSet::NoPossiblePollable::operator= (const CORBA_PollableSet::NoPossiblePollable &_tao_excp) +CORBA_PollableSet::NoPossiblePollable::operator= (const ::CORBA_PollableSet::NoPossiblePollable &_tao_excp) { this->CORBA_UserException::operator= (_tao_excp); @@ -447,34 +216,34 @@ CORBA_PollableSet::NoPossiblePollable::operator= (const CORBA_PollableSet::NoPos } // narrow -CORBA_PollableSet::NoPossiblePollable_ptr +CORBA_PollableSet::NoPossiblePollable * CORBA_PollableSet::NoPossiblePollable::_narrow (CORBA::Exception *exc) { if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PollableSet/NoPossiblePollable:1.0", exc->_id ())) // same type - return ACE_dynamic_cast (CORBA_PollableSet::NoPossiblePollable_ptr, exc); + return ACE_dynamic_cast (NoPossiblePollable *, exc); else return 0; } -void CORBA_PollableSet::NoPossiblePollable::_raise (void) +void CORBA_PollableSet::NoPossiblePollable::_raise () { TAO_RAISE(*this); } -void CORBA_PollableSet::NoPossiblePollable::_tao_encode (TAO_OutputCDR &cdr, - CORBA::Environment &ACE_TRY_ENV) const + +void CORBA_PollableSet::NoPossiblePollable::_tao_encode ( + TAO_OutputCDR &, + CORBA::Environment &ACE_TRY_ENV) const { - if (cdr << *this) - return; ACE_THROW (CORBA::MARSHAL ()); } -void CORBA_PollableSet::NoPossiblePollable::_tao_decode (TAO_InputCDR &cdr, - CORBA::Environment &ACE_TRY_ENV) + +void CORBA_PollableSet::NoPossiblePollable::_tao_decode ( + TAO_InputCDR &, + CORBA::Environment &ACE_TRY_ENV) { - if (cdr >> *this) - return; ACE_THROW (CORBA::MARSHAL ()); } @@ -482,27 +251,12 @@ void CORBA_PollableSet::NoPossiblePollable::_tao_decode (TAO_InputCDR &cdr, CORBA::Exception *CORBA_PollableSet::NoPossiblePollable::_alloc (void) { CORBA::Exception *retval = 0; - - ACE_NEW_RETURN (retval, - CORBA_PollableSet::NoPossiblePollable, - 0); - + ACE_NEW_RETURN (retval, ::CORBA_PollableSet::NoPossiblePollable, 0); return retval; } -static const CORBA::Long _oc_CORBA_PollableSet_NoPossiblePollable[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 53, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f506f), ACE_NTOHL (0x6c6c6162), ACE_NTOHL (0x6c655365), ACE_NTOHL (0x742f4e6f), ACE_NTOHL (0x506f7373), ACE_NTOHL (0x69626c65), ACE_NTOHL (0x506f6c6c), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/PollableSet/NoPossiblePollable:1.0 - 19, ACE_NTOHL (0x4e6f506f), ACE_NTOHL (0x73736962), ACE_NTOHL (0x6c65506f), ACE_NTOHL (0x6c6c6162), ACE_NTOHL (0x6c650000), // name = NoPossiblePollable - 0, // member count -}; -static CORBA::TypeCode _tc_TAO_tc_CORBA_PollableSet_NoPossiblePollable (CORBA::tk_except, sizeof (_oc_CORBA_PollableSet_NoPossiblePollable), (char *) &_oc_CORBA_PollableSet_NoPossiblePollable, 0, sizeof (CORBA_PollableSet::NoPossiblePollable)); -CORBA::TypeCode_ptr CORBA_PollableSet::_tc_NoPossiblePollable = &_tc_TAO_tc_CORBA_PollableSet_NoPossiblePollable; - // default constructor CORBA_PollableSet::UnknownPollable::UnknownPollable (void) - : CORBA_UserException (CORBA_PollableSet::_tc_UnknownPollable) { } @@ -512,14 +266,14 @@ CORBA_PollableSet::UnknownPollable::~UnknownPollable (void) } // copy constructor -CORBA_PollableSet::UnknownPollable::UnknownPollable (const CORBA_PollableSet::UnknownPollable &_tao_excp) +CORBA_PollableSet::UnknownPollable::UnknownPollable (const ::CORBA_PollableSet::UnknownPollable &_tao_excp) : CORBA_UserException (_tao_excp._type ()) { } // assignment operator CORBA_PollableSet::UnknownPollable& -CORBA_PollableSet::UnknownPollable::operator= (const CORBA_PollableSet::UnknownPollable &_tao_excp) +CORBA_PollableSet::UnknownPollable::operator= (const ::CORBA_PollableSet::UnknownPollable &_tao_excp) { this->CORBA_UserException::operator= (_tao_excp); @@ -527,34 +281,34 @@ CORBA_PollableSet::UnknownPollable::operator= (const CORBA_PollableSet::UnknownP } // narrow -CORBA_PollableSet::UnknownPollable_ptr +CORBA_PollableSet::UnknownPollable * CORBA_PollableSet::UnknownPollable::_narrow (CORBA::Exception *exc) { if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PollableSet/UnknownPollable:1.0", exc->_id ())) // same type - return ACE_dynamic_cast (CORBA_PollableSet::UnknownPollable_ptr, exc); + return ACE_dynamic_cast (UnknownPollable *, exc); else return 0; } -void CORBA_PollableSet::UnknownPollable::_raise (void) +void CORBA_PollableSet::UnknownPollable::_raise () { TAO_RAISE(*this); } -void CORBA_PollableSet::UnknownPollable::_tao_encode (TAO_OutputCDR &cdr, - CORBA::Environment &ACE_TRY_ENV) const + +void CORBA_PollableSet::UnknownPollable::_tao_encode ( + TAO_OutputCDR &, + CORBA::Environment &ACE_TRY_ENV) const { - if (cdr << *this) - return; ACE_THROW (CORBA::MARSHAL ()); } -void CORBA_PollableSet::UnknownPollable::_tao_decode (TAO_InputCDR &cdr, - CORBA::Environment &ACE_TRY_ENV) + +void CORBA_PollableSet::UnknownPollable::_tao_decode ( + TAO_InputCDR &, + CORBA::Environment &ACE_TRY_ENV) { - if (cdr >> *this) - return; ACE_THROW (CORBA::MARSHAL ()); } @@ -562,326 +316,24 @@ void CORBA_PollableSet::UnknownPollable::_tao_decode (TAO_InputCDR &cdr, CORBA::Exception *CORBA_PollableSet::UnknownPollable::_alloc (void) { CORBA::Exception *retval = 0; - - ACE_NEW_RETURN (retval, - CORBA_PollableSet::UnknownPollable, - 0); - + ACE_NEW_RETURN (retval, ::CORBA_PollableSet::UnknownPollable, 0); return retval; } -static const CORBA::Long _oc_CORBA_PollableSet_UnknownPollable[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 50, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f506f), ACE_NTOHL (0x6c6c6162), ACE_NTOHL (0x6c655365), ACE_NTOHL (0x742f556e), ACE_NTOHL (0x6b6e6f77), ACE_NTOHL (0x6e506f6c), ACE_NTOHL (0x6c61626c), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CORBA/PollableSet/UnknownPollable:1.0 - 16, ACE_NTOHL (0x556e6b6e), ACE_NTOHL (0x6f776e50), ACE_NTOHL (0x6f6c6c61), ACE_NTOHL (0x626c6500), // name = UnknownPollable - 0, // member count -}; -static CORBA::TypeCode _tc_TAO_tc_CORBA_PollableSet_UnknownPollable (CORBA::tk_except, sizeof (_oc_CORBA_PollableSet_UnknownPollable), (char *) &_oc_CORBA_PollableSet_UnknownPollable, 0, sizeof (CORBA_PollableSet::UnknownPollable)); -CORBA::TypeCode_ptr CORBA_PollableSet::_tc_UnknownPollable = &_tc_TAO_tc_CORBA_PollableSet_UnknownPollable; - -CORBA::DIIPollable_ptr CORBA_PollableSet::create_dii_pollable ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - CORBA::DIIPollable_ptr _tao_retval = CORBA::DIIPollable::_nil (); - - TAO_Stub *istub = this->_stubobj (); - if (istub == 0) - ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval); - - - TAO_GIOP_Twoway_Invocation _tao_call ( - istub, - "create_dii_pollable", - 19, - istub->orb_core () - ); - - - for (;;) - { - ACE_TRY_ENV.clear (); - _tao_call.start (ACE_TRY_ENV); - ACE_CHECK_RETURN (_tao_retval); - - CORBA::Short flag = 131; - - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), - ACE_TRY_ENV); - ACE_CHECK_RETURN (_tao_retval); - - int _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); - ACE_CHECK_RETURN (_tao_retval); - - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - // if (_invoke_status == TAO_INVOKE_EXCEPTION) - // cannot happen - if (_invoke_status != TAO_INVOKE_OK) - { - ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); - - } - break; - - } - TAO_InputCDR &_tao_in = _tao_call.inp_stream (); - if (!( - (_tao_in >> _tao_retval) - )) - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); - return _tao_retval; -} - -void CORBA_PollableSet::add_pollable ( - CORBA_Pollable_ptr potential, - CORBA::Environment &ACE_TRY_ENV - ) -{ - - TAO_Stub *istub = this->_stubobj (); - if (istub == 0) - ACE_THROW (CORBA::INTERNAL ()); - - - TAO_GIOP_Twoway_Invocation _tao_call ( - istub, - "add_pollable", - 12, - istub->orb_core () - ); - - - for (;;) - { - ACE_TRY_ENV.clear (); - _tao_call.start (ACE_TRY_ENV); - ACE_CHECK; - - CORBA::Short flag = 131; - - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), - ACE_TRY_ENV); - ACE_CHECK; - - TAO_OutputCDR &_tao_out = _tao_call.out_stream (); - if (!( - (_tao_out << potential) - )) - ACE_THROW (CORBA::MARSHAL ()); - - int _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); - ACE_CHECK; - - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - // if (_invoke_status == TAO_INVOKE_EXCEPTION) - // cannot happen - if (_invoke_status != TAO_INVOKE_OK) - { - ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); - - } - break; - - } - -} - -CORBA_Pollable_ptr CORBA_PollableSet::poll ( - CORBA::ULong timeout, - CORBA::Environment &ACE_TRY_ENV - ) +void *CORBA_PollableSet::_tao_QueryInterface (ptr_arith_t type) { - static TAO_Exception_Data _tao_CORBA_PollableSet_poll_exceptiondata [] = - { - {CORBA_PollableSet::_tc_NoPossiblePollable, CORBA_PollableSet::NoPossiblePollable::_alloc} - }; - - CORBA_Pollable_ptr _tao_retval = CORBA_Pollable::_nil (); + void *retv = 0; + if (type == ACE_reinterpret_cast + (ptr_arith_t, + &CORBA_PollableSet::_narrow)) + retv = ACE_reinterpret_cast (void*, this); + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); - TAO_Stub *istub = this->_stubobj (); - if (istub == 0) - ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval); - - - TAO_GIOP_Twoway_Invocation _tao_call ( - istub, - "poll", - 4, - istub->orb_core () - ); - - - for (;;) - { - ACE_TRY_ENV.clear (); - _tao_call.start (ACE_TRY_ENV); - ACE_CHECK_RETURN (_tao_retval); - - CORBA::Short flag = 131; - - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), - ACE_TRY_ENV); - ACE_CHECK_RETURN (_tao_retval); - - TAO_OutputCDR &_tao_out = _tao_call.out_stream (); - if (!( - (_tao_out << timeout) - )) - ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval); - - int _invoke_status = - _tao_call.invoke (_tao_CORBA_PollableSet_poll_exceptiondata, 1, ACE_TRY_ENV); - ACE_CHECK_RETURN (_tao_retval); - - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - // if (_invoke_status == TAO_INVOKE_EXCEPTION) - // cannot happen - if (_invoke_status != TAO_INVOKE_OK) - { - ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); - - } - break; - - } - TAO_InputCDR &_tao_in = _tao_call.inp_stream (); - if (!( - (_tao_in >> _tao_retval) - )) - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); - return _tao_retval; -} - -void CORBA_PollableSet::remove ( - CORBA_Pollable_ptr potential, - CORBA::Environment &ACE_TRY_ENV - ) -{ - static TAO_Exception_Data _tao_CORBA_PollableSet_remove_exceptiondata [] = - { - {CORBA_PollableSet::_tc_UnknownPollable, CORBA_PollableSet::UnknownPollable::_alloc} - }; - - - TAO_Stub *istub = this->_stubobj (); - if (istub == 0) - ACE_THROW (CORBA::INTERNAL ()); - - - TAO_GIOP_Twoway_Invocation _tao_call ( - istub, - "remove", - 6, - istub->orb_core () - ); - - - for (;;) - { - ACE_TRY_ENV.clear (); - _tao_call.start (ACE_TRY_ENV); - ACE_CHECK; - - CORBA::Short flag = 131; - - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), - ACE_TRY_ENV); - ACE_CHECK; - - TAO_OutputCDR &_tao_out = _tao_call.out_stream (); - if (!( - (_tao_out << potential) - )) - ACE_THROW (CORBA::MARSHAL ()); - - int _invoke_status = - _tao_call.invoke (_tao_CORBA_PollableSet_remove_exceptiondata, 1, ACE_TRY_ENV); - ACE_CHECK; - - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - // if (_invoke_status == TAO_INVOKE_EXCEPTION) - // cannot happen - if (_invoke_status != TAO_INVOKE_OK) - { - ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); - - } - break; - - } - -} - -CORBA::UShort CORBA_PollableSet::number_left ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - CORBA::UShort _tao_retval = 0; - - TAO_Stub *istub = this->_stubobj (); - if (istub == 0) - ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval); - - - TAO_GIOP_Twoway_Invocation _tao_call ( - istub, - "number_left", - 11, - istub->orb_core () - ); - - - for (;;) - { - ACE_TRY_ENV.clear (); - _tao_call.start (ACE_TRY_ENV); - ACE_CHECK_RETURN (_tao_retval); - - CORBA::Short flag = 131; - - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), - ACE_TRY_ENV); - ACE_CHECK_RETURN (_tao_retval); - - int _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); - ACE_CHECK_RETURN (_tao_retval); - - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - // if (_invoke_status == TAO_INVOKE_EXCEPTION) - // cannot happen - if (_invoke_status != TAO_INVOKE_OK) - { - ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); - - } - break; - - } - TAO_InputCDR &_tao_in = _tao_call.inp_stream (); - if (!( - (_tao_in >> _tao_retval) - )) - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); - return _tao_retval; -} - -CORBA::Boolean CORBA_PollableSet::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PollableSet:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) - return 1; // success using local knowledge - else - return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call + if (retv) + this->_add_ref (); + return retv; } const char* CORBA_PollableSet::_interface_repository_id (void) const @@ -889,504 +341,4 @@ const char* CORBA_PollableSet::_interface_repository_id (void) const return "IDL:omg.org/CORBA/PollableSet:1.0"; } -void CORBA::Pollable::_tao_any_destructor (void *x) -{ - CORBA::Pollable *tmp = ACE_static_cast(CORBA::Pollable*,x); - CORBA::release (tmp); -} - -void operator<<= (CORBA::Any &_tao_any, CORBA::Pollable_ptr _tao_elem) -{ - TAO_OutputCDR stream; - if (stream << _tao_elem) - { - _tao_any._tao_replace ( - CORBA::_tc_Pollable, - TAO_ENCAP_BYTE_ORDER, - stream.begin (), - 1, - _tao_elem, - CORBA::Pollable::_tao_any_destructor - ); - } -} - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::Pollable_ptr &_tao_elem) -{ - ACE_TRY_NEW_ENV - { - _tao_elem = CORBA::Pollable::_nil (); - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (CORBA::_tc_Pollable, ACE_TRY_ENV)) // not equal - { - return 0; - } - ACE_TRY_CHECK; - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - CORBA::Object_var _tao_obj_var; - if (stream >> _tao_obj_var.out ()) - { - _tao_elem = CORBA::Pollable::_narrow (_tao_obj_var.in (), ACE_TRY_ENV); - ACE_TRY_CHECK; - ((CORBA::Any *)&_tao_any)->_tao_replace ( - CORBA::_tc_Pollable, - 1, - _tao_elem, - CORBA::Pollable::_tao_any_destructor - ); - return 1; - } - } - ACE_CATCHANY - { - _tao_elem = CORBA::Pollable::_nil (); - return 0; - } - ACE_ENDTRY; - _tao_elem = CORBA::Pollable::_nil (); - return 0; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<CORBA::Pollable,CORBA::Pollable_var>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<CORBA::Pollable,CORBA::Pollable_var> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -CORBA::DIIPollable_ptr (*_TAO_collocation_CORBA_DIIPollable_Stub_Factory_function_pointer) ( - CORBA::Object_ptr obj - ) = 0; - -void CORBA::DIIPollable::_tao_any_destructor (void *x) -{ - CORBA::DIIPollable *tmp = ACE_static_cast(CORBA::DIIPollable*,x); - CORBA::release (tmp); -} - -void operator<<= (CORBA::Any &_tao_any, CORBA::DIIPollable_ptr _tao_elem) -{ - TAO_OutputCDR stream; - if (stream << _tao_elem) - { - _tao_any._tao_replace ( - CORBA::_tc_DIIPollable, - TAO_ENCAP_BYTE_ORDER, - stream.begin (), - 1, - _tao_elem, - CORBA::DIIPollable::_tao_any_destructor - ); - } -} - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::DIIPollable_ptr &_tao_elem) -{ - ACE_TRY_NEW_ENV - { - _tao_elem = CORBA::DIIPollable::_nil (); - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (CORBA::_tc_DIIPollable, ACE_TRY_ENV)) // not equal - { - return 0; - } - ACE_TRY_CHECK; - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - CORBA::Object_var _tao_obj_var; - if (stream >> _tao_obj_var.out ()) - { - _tao_elem = CORBA::DIIPollable::_narrow (_tao_obj_var.in (), ACE_TRY_ENV); - ACE_TRY_CHECK; - ((CORBA::Any *)&_tao_any)->_tao_replace ( - CORBA::_tc_DIIPollable, - 1, - _tao_elem, - CORBA::DIIPollable::_tao_any_destructor - ); - return 1; - } - } - ACE_CATCHANY - { - _tao_elem = CORBA::DIIPollable::_nil (); - return 0; - } - ACE_ENDTRY; - _tao_elem = CORBA::DIIPollable::_nil (); - return 0; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<CORBA::DIIPollable,CORBA::DIIPollable_var>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<CORBA::DIIPollable,CORBA::DIIPollable_var> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -CORBA::PollableSet_ptr (*_TAO_collocation_CORBA_PollableSet_Stub_Factory_function_pointer) ( - CORBA::Object_ptr obj - ) = 0; - -void CORBA::PollableSet::_tao_any_destructor (void *x) -{ - CORBA::PollableSet *tmp = ACE_static_cast(CORBA::PollableSet*,x); - CORBA::release (tmp); -} - -void operator<<= (CORBA::Any &_tao_any, CORBA::PollableSet_ptr _tao_elem) -{ - TAO_OutputCDR stream; - if (stream << _tao_elem) - { - _tao_any._tao_replace ( - CORBA::_tc_PollableSet, - TAO_ENCAP_BYTE_ORDER, - stream.begin (), - 1, - _tao_elem, - CORBA::PollableSet::_tao_any_destructor - ); - } -} - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PollableSet_ptr &_tao_elem) -{ - ACE_TRY_NEW_ENV - { - _tao_elem = CORBA::PollableSet::_nil (); - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (CORBA::_tc_PollableSet, ACE_TRY_ENV)) // not equal - { - return 0; - } - ACE_TRY_CHECK; - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - CORBA::Object_var _tao_obj_var; - if (stream >> _tao_obj_var.out ()) - { - _tao_elem = CORBA::PollableSet::_narrow (_tao_obj_var.in (), ACE_TRY_ENV); - ACE_TRY_CHECK; - ((CORBA::Any *)&_tao_any)->_tao_replace ( - CORBA::_tc_PollableSet, - 1, - _tao_elem, - CORBA::PollableSet::_tao_any_destructor - ); - return 1; - } - } - ACE_CATCHANY - { - _tao_elem = CORBA::PollableSet::_nil (); - return 0; - } - ACE_ENDTRY; - _tao_elem = CORBA::PollableSet::_nil (); - return 0; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<CORBA::PollableSet,CORBA::PollableSet_var>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<CORBA::PollableSet,CORBA::PollableSet_var> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -void operator<<= (CORBA::Any &_tao_any, const CORBA::PollableSet::NoPossiblePollable &_tao_elem) // copying -{ - TAO_OutputCDR stream; - stream << _tao_elem; - _tao_any._tao_replace ( - CORBA::PollableSet::_tc_NoPossiblePollable, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); -} - -void operator<<= (CORBA::Any &_tao_any, CORBA::PollableSet::NoPossiblePollable *_tao_elem) // non copying -{ - TAO_OutputCDR stream; - stream << *_tao_elem; - _tao_any._tao_replace ( - CORBA::PollableSet::_tc_NoPossiblePollable, - TAO_ENCAP_BYTE_ORDER, - stream.begin (), - 1, - _tao_elem, - CORBA::PollableSet::NoPossiblePollable::_tao_any_destructor - ); -} - -void CORBA::PollableSet::NoPossiblePollable::_tao_any_destructor (void *x) -{ - CORBA::PollableSet::NoPossiblePollable *tmp = ACE_static_cast(CORBA::PollableSet::NoPossiblePollable*,x); - delete tmp; -} - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PollableSet::NoPossiblePollable *&_tao_elem) -{ - ACE_TRY_NEW_ENV - { - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (CORBA::PollableSet::_tc_NoPossiblePollable, ACE_TRY_ENV)) // not equal - { - _tao_elem = 0; - return 0; - } - ACE_TRY_CHECK; - if (_tao_any.any_owns_data ()) - { - _tao_elem = (CORBA::PollableSet::NoPossiblePollable *)_tao_any.value (); - return 1; - } - else - { - ACE_NEW_RETURN (_tao_elem, CORBA::PollableSet::NoPossiblePollable, 0); - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - if (stream >> *_tao_elem) - { - ((CORBA::Any *)&_tao_any)->_tao_replace ( - CORBA::PollableSet::_tc_NoPossiblePollable, - 1, - ACE_reinterpret_cast (void *, _tao_elem), - CORBA::PollableSet::NoPossiblePollable::_tao_any_destructor - ); - return 1; - } - else - { - delete _tao_elem; - _tao_elem = 0; - } - } - } - ACE_CATCHANY - { - delete _tao_elem; - _tao_elem = 0; - return 0; - } - ACE_ENDTRY; - return 0; -} - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::PollableSet::NoPossiblePollable *&_tao_elem) -{ - return _tao_any >>= ACE_const_cast(CORBA::PollableSet::NoPossiblePollable *&,_tao_elem); -} - -void operator<<= (CORBA::Any &_tao_any, const CORBA::PollableSet::UnknownPollable &_tao_elem) // copying -{ - TAO_OutputCDR stream; - stream << _tao_elem; - _tao_any._tao_replace ( - CORBA::PollableSet::_tc_UnknownPollable, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); -} - -void CORBA::PollableSet::UnknownPollable::_tao_any_destructor (void *x) -{ - CORBA::PollableSet::UnknownPollable *tmp = ACE_static_cast(CORBA::PollableSet::UnknownPollable*,x); - delete tmp; -} - -void operator<<= (CORBA::Any &_tao_any, CORBA::PollableSet::UnknownPollable *_tao_elem) // non copying -{ - TAO_OutputCDR stream; - stream << *_tao_elem; - _tao_any._tao_replace ( - CORBA::PollableSet::_tc_UnknownPollable, - TAO_ENCAP_BYTE_ORDER, - stream.begin (), - 1, - _tao_elem, - CORBA::PollableSet::UnknownPollable::_tao_any_destructor - ); -} - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PollableSet::UnknownPollable *&_tao_elem) -{ - ACE_TRY_NEW_ENV - { - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (CORBA::PollableSet::_tc_UnknownPollable, ACE_TRY_ENV)) // not equal - { - _tao_elem = 0; - return 0; - } - ACE_TRY_CHECK; - if (_tao_any.any_owns_data ()) - { - _tao_elem = (CORBA::PollableSet::UnknownPollable *)_tao_any.value (); - return 1; - } - else - { - ACE_NEW_RETURN (_tao_elem, CORBA::PollableSet::UnknownPollable, 0); - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - if (stream >> *_tao_elem) - { - ((CORBA::Any *)&_tao_any)->_tao_replace ( - CORBA::PollableSet::_tc_UnknownPollable, - 1, - ACE_reinterpret_cast (void *, _tao_elem), - CORBA::PollableSet::UnknownPollable::_tao_any_destructor - ); - return 1; - } - else - { - delete _tao_elem; - _tao_elem = 0; - } - } - } - ACE_CATCHANY - { - delete _tao_elem; - _tao_elem = 0; - return 0; - } - ACE_ENDTRY; - return 0; -} - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::PollableSet::UnknownPollable *&_tao_elem) -{ - return _tao_any >>= ACE_const_cast(CORBA::PollableSet::UnknownPollable *&,_tao_elem); -} - -// **************************************************************** - -CORBA::Boolean -operator<< ( - TAO_OutputCDR &strm, - const CORBA_Pollable_ptr _tao_objref - ) -{ - CORBA::Object_ptr _tao_corba_obj = _tao_objref; - return (strm << _tao_corba_obj); -} - -CORBA::Boolean -operator>> ( - TAO_InputCDR &strm, - CORBA_Pollable_ptr &_tao_objref - ) -{ - ACE_TRY_NEW_ENV - { - CORBA::Object_var obj; - if ((strm >> obj.inout ()) == 0) - return 0; - // narrow to the right type - _tao_objref = - CORBA_Pollable::_narrow ( - obj.in (), - ACE_TRY_ENV - ); - ACE_TRY_CHECK; - return 1; - } - ACE_CATCHANY - { - // do nothing - } - ACE_ENDTRY; - return 0; -} - -CORBA::Boolean -operator<< ( - TAO_OutputCDR &strm, - const CORBA_DIIPollable_ptr _tao_objref - ) -{ - CORBA::Object_ptr _tao_corba_obj = _tao_objref; - return (strm << _tao_corba_obj); -} - -CORBA::Boolean -operator>> ( - TAO_InputCDR &strm, - CORBA_DIIPollable_ptr &_tao_objref - ) -{ - ACE_TRY_NEW_ENV - { - CORBA::Object_var obj; - if ((strm >> obj.inout ()) == 0) - return 0; - // narrow to the right type - _tao_objref = - CORBA_DIIPollable::_narrow ( - obj.in (), - ACE_TRY_ENV - ); - ACE_TRY_CHECK; - return 1; - } - ACE_CATCHANY - { - // do nothing - } - ACE_ENDTRY; - return 0; -} - -CORBA::Boolean -operator<< ( - TAO_OutputCDR &strm, - const CORBA_PollableSet_ptr _tao_objref - ) -{ - CORBA::Object_ptr _tao_corba_obj = _tao_objref; - return (strm << _tao_corba_obj); -} - -CORBA::Boolean -operator>> ( - TAO_InputCDR &strm, - CORBA_PollableSet_ptr &_tao_objref - ) -{ - ACE_TRY_NEW_ENV - { - CORBA::Object_var obj; - if ((strm >> obj.inout ()) == 0) - return 0; - // narrow to the right type - _tao_objref = - CORBA_PollableSet::_narrow ( - obj.in (), - ACE_TRY_ENV - ); - ACE_TRY_CHECK; - return 1; - } - ACE_CATCHANY - { - // do nothing - } - ACE_ENDTRY; - return 0; -} - #endif /* TAO_HAS_AMI_POLLER == 1 */ diff --git a/TAO/tao/PollableC.h b/TAO/tao/PollableC.h index a5a543c5465..9af51c1c1cc 100644 --- a/TAO/tao/PollableC.h +++ b/TAO/tao/PollableC.h @@ -1,24 +1,14 @@ -/* -*- C++ -*- */ -// -// $Id$ -// -// ================================================================ -// -// = LIBRARY -// TAO -// -// = FILENAME -// PollableC.h -// -// = DESCRIPTION -// Generated from Pollable.pidl -// The code was generated by the IDL compiler and then hand-crafted -// to reduce the includes interdependencies. +/* -*- C++ -*- $Id$ */ + +// ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* +// TAO and the TAO IDL Compiler have been developed by the Center for +// Distributed Object Computing at Washington University, St. Louis. // -// ================================================================ +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef TAO_IDL_POLLABLEC_H -#define TAO_IDL_POLLABLEC_H +#ifndef _TAO_IDL_TMP_POLLABLEC_H_ +#define _TAO_IDL_TMP_POLLABLEC_H_ #include "ace/pre.h" #include "tao/corbafwd.h" @@ -38,6 +28,14 @@ #undef TAO_EXPORT_MACRO #endif #define TAO_EXPORT_MACRO TAO_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_Export +#endif /* TAO_EXPORT_NESTED_CLASSES */ + #if defined(_MSC_VER) #if (_MSC_VER >= 1200) #pragma warning(push) @@ -46,8 +44,18 @@ #endif /* _MSC_VER */ class CORBA_PollableSet; + +#if !defined (_CORBA_POLLABLESET___PTR_CH_) +#define _CORBA_POLLABLESET___PTR_CH_ + typedef CORBA_PollableSet *CORBA_PollableSet_ptr; +#endif /* end #if !defined */ + + +#if !defined (_CORBA_POLLABLESET___VAR_CH_) +#define _CORBA_POLLABLESET___VAR_CH_ + class TAO_Export CORBA_PollableSet_var { public: @@ -73,6 +81,13 @@ private: CORBA_PollableSet_ptr ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_CORBA_POLLABLESET___OUT_CH_) +#define _CORBA_POLLABLESET___OUT_CH_ + class TAO_Export CORBA_PollableSet_out { public: @@ -90,9 +105,22 @@ private: CORBA_PollableSet_ptr &ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_CORBA_POLLABLE___PTR_CH_) +#define _CORBA_POLLABLE___PTR_CH_ + class CORBA_Pollable; typedef CORBA_Pollable *CORBA_Pollable_ptr; +#endif /* end #if !defined */ + + +#if !defined (_CORBA_POLLABLE___VAR_CH_) +#define _CORBA_POLLABLE___VAR_CH_ + class TAO_Export CORBA_Pollable_var { public: @@ -118,6 +146,13 @@ private: CORBA_Pollable_ptr ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_CORBA_POLLABLE___OUT_CH_) +#define _CORBA_POLLABLE___OUT_CH_ + class TAO_Export CORBA_Pollable_out { public: @@ -135,13 +170,20 @@ private: CORBA_Pollable_ptr &ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_CORBA_POLLABLE_CH_) +#define _CORBA_POLLABLE_CH_ + class TAO_Export CORBA_Pollable : public virtual CORBA_Object { - public: -#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 +public: +#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) typedef CORBA_Pollable_ptr _ptr_type; typedef CORBA_Pollable_var _var_type; -#endif /* __GNUC__ */ +#endif /* ! __GNUC__ || g++ >= 2.8 */ // the static operations static CORBA_Pollable_ptr _duplicate (CORBA_Pollable_ptr obj); @@ -155,39 +197,56 @@ class TAO_Export CORBA_Pollable : public virtual CORBA_Object CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); - static CORBA_Pollable_ptr _nil (void); - static void _tao_any_destructor (void*); + static CORBA_Pollable_ptr _nil (void) + { + return (CORBA_Pollable_ptr)0; + } virtual CORBA::Boolean is_ready ( CORBA::ULong timeout, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () - ); + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + virtual CORBA_PollableSet_ptr create_pollable_set ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () - ); - virtual CORBA::Boolean _is_a ( - const CORBA::Char *type_id, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual const char* _interface_repository_id (void) const; + protected: - CORBA_Pollable (void); // default constructor - CORBA_Pollable (TAO_Stub *objref, - TAO_ServantBase *_tao_servant = 0, - CORBA::Boolean _tao_collocated = 0 - ); + CORBA_Pollable (void); virtual ~CORBA_Pollable (void); private: CORBA_Pollable (const CORBA_Pollable &); void operator= (const CORBA_Pollable &); }; + +#endif /* end #if !defined */ + + +#if !defined (_CORBA_DIIPOLLABLE___PTR_CH_) +#define _CORBA_DIIPOLLABLE___PTR_CH_ + class CORBA_DIIPollable; typedef CORBA_DIIPollable *CORBA_DIIPollable_ptr; +#endif /* end #if !defined */ + + +#if !defined (_CORBA_DIIPOLLABLE___VAR_CH_) +#define _CORBA_DIIPOLLABLE___VAR_CH_ + class TAO_Export CORBA_DIIPollable_var { public: @@ -213,6 +272,13 @@ private: CORBA_DIIPollable_ptr ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_CORBA_DIIPOLLABLE___OUT_CH_) +#define _CORBA_DIIPOLLABLE___OUT_CH_ + class TAO_Export CORBA_DIIPollable_out { public: @@ -230,13 +296,20 @@ private: CORBA_DIIPollable_ptr &ptr_; }; + +#endif /* end #if !defined */ + + +#if !defined (_CORBA_DIIPOLLABLE_CH_) +#define _CORBA_DIIPOLLABLE_CH_ + class TAO_Export CORBA_DIIPollable: public virtual CORBA_Pollable { public: -#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 +#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) typedef CORBA_DIIPollable_ptr _ptr_type; typedef CORBA_DIIPollable_var _var_type; -#endif /* __GNUC__ */ +#endif /* ! __GNUC__ || g++ >= 2.8 */ // the static operations static CORBA_DIIPollable_ptr _duplicate (CORBA_DIIPollable_ptr obj); @@ -250,34 +323,102 @@ public: CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); - static CORBA_DIIPollable_ptr _nil (void); - static void _tao_any_destructor (void*); + static CORBA_DIIPollable_ptr _nil (void) + { + return (CORBA_DIIPollable_ptr)0; + } + + virtual void *_tao_QueryInterface (ptr_arith_t type); - virtual CORBA::Boolean _is_a ( - const CORBA::Char *type_id, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); virtual const char* _interface_repository_id (void) const; + protected: - CORBA_DIIPollable (void); // default constructor - CORBA_DIIPollable (TAO_Stub *objref, - TAO_ServantBase *_tao_servant = 0, - CORBA::Boolean _tao_collocated = 0 - ); + CORBA_DIIPollable (void); virtual ~CORBA_DIIPollable (void); private: CORBA_DIIPollable (const CORBA_DIIPollable &); void operator= (const CORBA_DIIPollable &); }; -class TAO_Export CORBA_PollableSet : public virtual ACE_CORBA_1 (Object) + +#endif /* end #if !defined */ + + +#if !defined (_CORBA_POLLABLESET___PTR_CH_) +#define _CORBA_POLLABLESET___PTR_CH_ + +class CORBA_PollableSet; +typedef CORBA_PollableSet *CORBA_PollableSet_ptr; + +#endif /* end #if !defined */ + + +#if !defined (_CORBA_POLLABLESET___VAR_CH_) +#define _CORBA_POLLABLESET___VAR_CH_ + +class TAO_Export CORBA_PollableSet_var { public: -#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 + CORBA_PollableSet_var (void); // default constructor + CORBA_PollableSet_var (CORBA_PollableSet_ptr); + CORBA_PollableSet_var (const CORBA_PollableSet_var &); // copy constructor + ~CORBA_PollableSet_var (void); // destructor + + CORBA_PollableSet_var &operator= (CORBA_PollableSet_ptr); + CORBA_PollableSet_var &operator= (const CORBA_PollableSet_var &); + CORBA_PollableSet_ptr operator-> (void) const; + + operator const CORBA_PollableSet_ptr &() const; + operator CORBA_PollableSet_ptr &(); + // in, inout, out, _retn + CORBA_PollableSet_ptr in (void) const; + CORBA_PollableSet_ptr &inout (void); + CORBA_PollableSet_ptr &out (void); + CORBA_PollableSet_ptr _retn (void); + CORBA_PollableSet_ptr ptr (void) const; + +private: + CORBA_PollableSet_ptr ptr_; +}; + + +#endif /* end #if !defined */ + + +#if !defined (_CORBA_POLLABLESET___OUT_CH_) +#define _CORBA_POLLABLESET___OUT_CH_ + +class TAO_Export CORBA_PollableSet_out +{ +public: + CORBA_PollableSet_out (CORBA_PollableSet_ptr &); + CORBA_PollableSet_out (CORBA_PollableSet_var &); + CORBA_PollableSet_out (const CORBA_PollableSet_out &); + CORBA_PollableSet_out &operator= (const CORBA_PollableSet_out &); + CORBA_PollableSet_out &operator= (const CORBA_PollableSet_var &); + CORBA_PollableSet_out &operator= (CORBA_PollableSet_ptr); + operator CORBA_PollableSet_ptr &(); + CORBA_PollableSet_ptr &ptr (void); + CORBA_PollableSet_ptr operator-> (void); + +private: + CORBA_PollableSet_ptr &ptr_; +}; + + +#endif /* end #if !defined */ + + +#if !defined (_CORBA_POLLABLESET_CH_) +#define _CORBA_POLLABLESET_CH_ + +class TAO_Export CORBA_PollableSet : public virtual CORBA_Object +{ +public: +#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) typedef CORBA_PollableSet_ptr _ptr_type; typedef CORBA_PollableSet_var _var_type; -#endif /* __GNUC__ */ +#endif /* ! __GNUC__ || g++ >= 2.8 */ // the static operations static CORBA_PollableSet_ptr _duplicate (CORBA_PollableSet_ptr obj); @@ -291,183 +432,150 @@ public: CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); - static CORBA_PollableSet_ptr _nil (void); - static void _tao_any_destructor (void*); + static CORBA_PollableSet_ptr _nil (void) + { + return (CORBA_PollableSet_ptr)0; + } + - class NoPossiblePollable; - typedef NoPossiblePollable *NoPossiblePollable_ptr; +#if !defined (_CORBA_POLLABLESET_NOPOSSIBLEPOLLABLE_CH_) +#define _CORBA_POLLABLESET_NOPOSSIBLEPOLLABLE_CH_ class TAO_Export NoPossiblePollable : public CORBA::UserException { public: - // **************** - // The fields (and their helper classes) - // End of implicit types for the fields - // **************** + NoPossiblePollable (void); // default ctor + NoPossiblePollable (const NoPossiblePollable &); // copy ctor + ~NoPossiblePollable (void); + NoPossiblePollable &operator= (const NoPossiblePollable &); - NoPossiblePollable (void); // default ctor - NoPossiblePollable (const NoPossiblePollable &); // copy ctor - ~NoPossiblePollable (void); // dtor - NoPossiblePollable &operator= (const NoPossiblePollable &); + virtual void _raise (void); - virtual void _raise (void); + virtual void _tao_encode ( + TAO_OutputCDR &, + CORBA::Environment &) const; + virtual void _tao_decode ( + TAO_InputCDR &, + CORBA::Environment &); - virtual void _tao_encode (TAO_OutputCDR &cdr, - CORBA::Environment &) const; - virtual void _tao_decode (TAO_InputCDR &cdr, - CORBA::Environment &); + static NoPossiblePollable *_narrow (CORBA::Exception *); - static NoPossiblePollable *_narrow (CORBA::Exception *); - static void _tao_any_destructor (void*); + // = TAO extension + static CORBA::Exception *_alloc (void); - // = TAO extension - static CORBA::Exception *_alloc (void); +}; // exception CORBA_PollableSet::NoPossiblePollable - }; // exception CORBA::PollableSet::NoPossiblePollable - static CORBA::TypeCode_ptr _tc_NoPossiblePollable; +#endif /* end #if !defined */ - class UnknownPollable; - typedef UnknownPollable *UnknownPollable_ptr; - class TAO_Export UnknownPollable : public CORBA::UserException - { - public: - // **************** - // The fields (and their helper classes) +#if !defined (_CORBA_POLLABLESET_UNKNOWNPOLLABLE_CH_) +#define _CORBA_POLLABLESET_UNKNOWNPOLLABLE_CH_ +class TAO_Export UnknownPollable : public CORBA::UserException +{ +public: - // End of implicit types for the fields - // **************** - UnknownPollable (void); // default ctor - UnknownPollable (const UnknownPollable &); // copy ctor - ~UnknownPollable (void); // dtor - UnknownPollable &operator= (const UnknownPollable &); +UnknownPollable (void); // default ctor +UnknownPollable (const UnknownPollable &); // copy ctor +~UnknownPollable (void); +UnknownPollable &operator= (const UnknownPollable &); - virtual void _raise (void); +virtual void _raise (void); - virtual void _tao_encode (TAO_OutputCDR &cdr, - CORBA::Environment &) const; - virtual void _tao_decode (TAO_InputCDR &cdr, - CORBA::Environment &); +virtual void _tao_encode ( + TAO_OutputCDR &, + CORBA::Environment &) const; +virtual void _tao_decode ( + TAO_InputCDR &, + CORBA::Environment &); - static UnknownPollable *_narrow (CORBA::Exception *); - static void _tao_any_destructor (void*); +static UnknownPollable *_narrow (CORBA::Exception *); - // = TAO extension - static CORBA::Exception *_alloc (void); +// = TAO extension +static CORBA::Exception *_alloc (void); - }; // exception CORBA::PollableSet::UnknownPollable +}; // exception CORBA_PollableSet::UnknownPollable - static CORBA::TypeCode_ptr _tc_UnknownPollable; +#endif /* end #if !defined */ + +virtual CORBA_DIIPollable_ptr create_dii_pollable ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + +virtual void add_pollable ( + CORBA_Pollable_ptr potential, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + +virtual CORBA_Pollable_ptr poll ( + CORBA::ULong timeout, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + CORBA_PollableSet::NoPossiblePollable + )) = 0; + +virtual void remove ( + CORBA_Pollable_ptr potential, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + CORBA_PollableSet::UnknownPollable + )) = 0; + +virtual CORBA::UShort number_left ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + +virtual void *_tao_QueryInterface (ptr_arith_t type); + +virtual const char* _interface_repository_id (void) const; - virtual CORBA_DIIPollable_ptr create_dii_pollable ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - virtual void add_pollable ( - CORBA_Pollable_ptr potential, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - virtual CORBA_Pollable_ptr poll ( - CORBA::ULong timeout, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - virtual void remove ( - CORBA_Pollable_ptr potential, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - virtual CORBA::UShort number_left ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - virtual CORBA::Boolean _is_a ( - const CORBA::Char *type_id, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - virtual const char* _interface_repository_id (void) const; protected: - CORBA_PollableSet (void); // default constructor - CORBA_PollableSet (TAO_Stub *objref, - TAO_ServantBase *_tao_servant = 0, - CORBA::Boolean _tao_collocated = 0 - ); + CORBA_PollableSet (void); virtual ~CORBA_PollableSet (void); private: CORBA_PollableSet (const CORBA_PollableSet &); void operator= (const CORBA_PollableSet &); }; -// Any operators for interface CORBA_Pollable -TAO_Export void operator<<= (CORBA::Any &, - CORBA_Pollable_ptr); -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, - CORBA_Pollable *&); - -// Any operators for interface CORBA::DIIPollable -TAO_Export void operator<<= (CORBA::Any &, - CORBA::DIIPollable_ptr); -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, - CORBA::DIIPollable *&); - -// Any operators for interface CORBA_PollableSet -TAO_Export void operator<<= (CORBA::Any &, - CORBA_PollableSet_ptr); -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, - CORBA_PollableSet *&); -TAO_Export void operator<<= (CORBA::Any &, - const CORBA_PollableSet::NoPossiblePollable &); // copying version -TAO_Export void operator<<= (CORBA::Any &, - CORBA_PollableSet::NoPossiblePollable*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, - CORBA_PollableSet::NoPossiblePollable *&); -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, - const CORBA::PollableSet::NoPossiblePollable *&); -TAO_Export void operator<<= (CORBA::Any &, - const CORBA_PollableSet::UnknownPollable &); // copying version -TAO_Export void operator<<= (CORBA::Any &, - CORBA_PollableSet::UnknownPollable*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, - CORBA_PollableSet::UnknownPollable *&); -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, - const CORBA::PollableSet::UnknownPollable *&); + +#endif /* end #if !defined */ + #ifndef __ACE_INLINE__ -TAO_Export CORBA::Boolean -operator<< (TAO_OutputCDR &, const CORBA_Pollable_ptr ); -TAO_Export CORBA::Boolean -operator>> (TAO_InputCDR &, CORBA_Pollable_ptr &); -TAO_Export CORBA::Boolean -operator<< (TAO_OutputCDR &, const CORBA::DIIPollable_ptr ); -TAO_Export CORBA::Boolean -operator>> (TAO_InputCDR &, CORBA::DIIPollable_ptr &); -TAO_Export CORBA::Boolean -operator<< (TAO_OutputCDR &, const CORBA_PollableSet_ptr ); -TAO_Export CORBA::Boolean -operator>> (TAO_InputCDR &, CORBA_PollableSet_ptr &); -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_PollableSet::NoPossiblePollable &); // -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_PollableSet::NoPossiblePollable &); -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_PollableSet::UnknownPollable &); // -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_PollableSet::UnknownPollable &); #endif /* __ACE_INLINE__ */ #if defined (__ACE_INLINE__) -#include "tao/PollableC.i" +#include "PollableC.i" #endif /* defined INLINE */ #if defined(_MSC_VER) && (_MSC_VER >= 1200) @@ -477,4 +585,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_PollableSet::Unknown #endif /* TAO_HAS_AMI_POLLER == 1 */ #include "ace/post.h" -#endif /* TAO_IDL_POLLABLEC_H */ +#endif /* ifndef */ diff --git a/TAO/tao/PollableC.i b/TAO/tao/PollableC.i index aff7bf0f492..3a67d2abcb0 100644 --- a/TAO/tao/PollableC.i +++ b/TAO/tao/PollableC.i @@ -1,31 +1,23 @@ -// $Id$ +/* -*- C++ -*- $Id$ */ -ACE_INLINE -CORBA_Pollable::CORBA_Pollable (void) // default constructor -{} +// ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* +// TAO and the TAO IDL Compiler have been developed by the Center for +// Distributed Object Computing at Washington University, St. Louis. +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html ACE_INLINE -CORBA_Pollable::CORBA_Pollable (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor - : CORBA_Object (objref, _tao_servant, _tao_collocated) +CORBA_Pollable::CORBA_Pollable (void) // default constructor {} ACE_INLINE CORBA_Pollable::~CORBA_Pollable (void) // destructor {} -ACE_INLINE CORBA_Pollable_ptr -CORBA_Pollable::_duplicate (CORBA_Pollable_ptr obj) -{ - if (!CORBA::is_nil (obj)) - obj->_add_ref (); - return obj; -} -ACE_INLINE CORBA_Pollable_ptr -CORBA_Pollable::_nil (void) -{ - return (CORBA_Pollable_ptr)0; -} +#if !defined (_CORBA_POLLABLE___VAR_CI_) +#define _CORBA_POLLABLE___VAR_CI_ // ************************************************************* // Inline operations for class CORBA_Pollable_var @@ -41,14 +33,14 @@ CORBA_Pollable_var::CORBA_Pollable_var (CORBA_Pollable_ptr p) : ptr_ (p) {} -ACE_INLINE CORBA_Pollable_ptr +ACE_INLINE ::CORBA_Pollable_ptr CORBA_Pollable_var::ptr (void) const { return this->ptr_; } ACE_INLINE -CORBA_Pollable_var::CORBA_Pollable_var (const CORBA_Pollable_var &p) // copy constructor +CORBA_Pollable_var::CORBA_Pollable_var (const ::CORBA_Pollable_var &p) // copy constructor : ptr_ (CORBA_Pollable::_duplicate (p.ptr ())) {} @@ -67,63 +59,70 @@ CORBA_Pollable_var::operator= (CORBA_Pollable_ptr p) } ACE_INLINE CORBA_Pollable_var & -CORBA_Pollable_var::operator= (const CORBA_Pollable_var &p) +CORBA_Pollable_var::operator= (const ::CORBA_Pollable_var &p) { if (this != &p) { CORBA::release (this->ptr_); - this->ptr_ = CORBA_Pollable::_duplicate (p.ptr ()); + this->ptr_ = ::CORBA_Pollable::_duplicate (p.ptr ()); } return *this; } ACE_INLINE -CORBA_Pollable_var::operator const CORBA_Pollable_ptr &() const // cast +CORBA_Pollable_var::operator const ::CORBA_Pollable_ptr &() const // cast { return this->ptr_; } ACE_INLINE -CORBA_Pollable_var::operator CORBA_Pollable_ptr &() // cast +CORBA_Pollable_var::operator ::CORBA_Pollable_ptr &() // cast { return this->ptr_; } -ACE_INLINE CORBA_Pollable_ptr +ACE_INLINE ::CORBA_Pollable_ptr CORBA_Pollable_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE CORBA_Pollable_ptr +ACE_INLINE ::CORBA_Pollable_ptr CORBA_Pollable_var::in (void) const { return this->ptr_; } -ACE_INLINE CORBA_Pollable_ptr & +ACE_INLINE ::CORBA_Pollable_ptr & CORBA_Pollable_var::inout (void) { return this->ptr_; } -ACE_INLINE CORBA_Pollable_ptr & +ACE_INLINE ::CORBA_Pollable_ptr & CORBA_Pollable_var::out (void) { CORBA::release (this->ptr_); - this->ptr_ = CORBA_Pollable::_nil (); + this->ptr_ = ::CORBA_Pollable::_nil (); return this->ptr_; } -ACE_INLINE CORBA_Pollable_ptr +ACE_INLINE ::CORBA_Pollable_ptr CORBA_Pollable_var::_retn (void) { // yield ownership of managed obj reference - CORBA_Pollable_ptr val = this->ptr_; - this->ptr_ = CORBA_Pollable::_nil (); + ::CORBA_Pollable_ptr val = this->ptr_; + this->ptr_ = ::CORBA_Pollable::_nil (); return val; } + +#endif /* end #if !defined */ + + +#if !defined (_CORBA_POLLABLE___OUT_CI_) +#define _CORBA_POLLABLE___OUT_CI_ + // ************************************************************* // Inline operations for class CORBA_Pollable_out // ************************************************************* @@ -132,7 +131,7 @@ ACE_INLINE CORBA_Pollable_out::CORBA_Pollable_out (CORBA_Pollable_ptr &p) : ptr_ (p) { - this->ptr_ = CORBA_Pollable::_nil (); + this->ptr_ = ::CORBA_Pollable::_nil (); } ACE_INLINE @@ -140,25 +139,25 @@ CORBA_Pollable_out::CORBA_Pollable_out (CORBA_Pollable_var &p) // constructor fr : ptr_ (p.out ()) { CORBA::release (this->ptr_); - this->ptr_ = CORBA_Pollable::_nil (); + this->ptr_ = ::CORBA_Pollable::_nil (); } ACE_INLINE -CORBA_Pollable_out::CORBA_Pollable_out (const CORBA_Pollable_out &p) // copy constructor - : ptr_ (ACE_const_cast (CORBA_Pollable_out&,p).ptr_) +CORBA_Pollable_out::CORBA_Pollable_out (const ::CORBA_Pollable_out &p) // copy constructor + : ptr_ (ACE_const_cast (CORBA_Pollable_out &, p).ptr_) {} -ACE_INLINE CORBA_Pollable_out & -CORBA_Pollable_out::operator= (const CORBA_Pollable_out &p) +ACE_INLINE ::CORBA_Pollable_out & +CORBA_Pollable_out::operator= (const ::CORBA_Pollable_out &p) { - this->ptr_ = ACE_const_cast (CORBA_Pollable_out&,p).ptr_; + this->ptr_ = ACE_const_cast (CORBA_Pollable_out&, p).ptr_; return *this; } ACE_INLINE CORBA_Pollable_out & -CORBA_Pollable_out::operator= (const CORBA_Pollable_var &p) +CORBA_Pollable_out::operator= (const ::CORBA_Pollable_var &p) { - this->ptr_ = CORBA_Pollable::_duplicate (p.ptr ()); + this->ptr_ = ::CORBA_Pollable::_duplicate (p.ptr ()); return *this; } @@ -170,50 +169,37 @@ CORBA_Pollable_out::operator= (CORBA_Pollable_ptr p) } ACE_INLINE -CORBA_Pollable_out::operator CORBA_Pollable_ptr &() // cast +CORBA_Pollable_out::operator ::CORBA_Pollable_ptr &() // cast { return this->ptr_; } -ACE_INLINE CORBA_Pollable_ptr & +ACE_INLINE ::CORBA_Pollable_ptr & CORBA_Pollable_out::ptr (void) // ptr { return this->ptr_; } -ACE_INLINE CORBA_Pollable_ptr +ACE_INLINE ::CORBA_Pollable_ptr CORBA_Pollable_out::operator-> (void) { return this->ptr_; } -ACE_INLINE -CORBA_DIIPollable::CORBA_DIIPollable (void) // default constructor -{} + +#endif /* end #if !defined */ ACE_INLINE -CORBA_DIIPollable::CORBA_DIIPollable (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor - : CORBA_Object (objref, _tao_servant, _tao_collocated) +CORBA_DIIPollable::CORBA_DIIPollable (void) // default constructor {} ACE_INLINE CORBA_DIIPollable::~CORBA_DIIPollable (void) // destructor {} -ACE_INLINE CORBA_DIIPollable_ptr -CORBA_DIIPollable::_duplicate (CORBA_DIIPollable_ptr obj) -{ - if (!CORBA::is_nil (obj)) - obj->_add_ref (); - return obj; -} - -ACE_INLINE CORBA_DIIPollable_ptr -CORBA_DIIPollable::_nil (void) -{ - return (CORBA_DIIPollable_ptr)0; -} +#if !defined (_CORBA_DIIPOLLABLE___VAR_CI_) +#define _CORBA_DIIPOLLABLE___VAR_CI_ // ************************************************************* // Inline operations for class CORBA_DIIPollable_var @@ -229,14 +215,14 @@ CORBA_DIIPollable_var::CORBA_DIIPollable_var (CORBA_DIIPollable_ptr p) : ptr_ (p) {} -ACE_INLINE CORBA_DIIPollable_ptr +ACE_INLINE ::CORBA_DIIPollable_ptr CORBA_DIIPollable_var::ptr (void) const { return this->ptr_; } ACE_INLINE -CORBA_DIIPollable_var::CORBA_DIIPollable_var (const CORBA_DIIPollable_var &p) // copy constructor +CORBA_DIIPollable_var::CORBA_DIIPollable_var (const ::CORBA_DIIPollable_var &p) // copy constructor : ptr_ (CORBA_DIIPollable::_duplicate (p.ptr ())) {} @@ -255,63 +241,70 @@ CORBA_DIIPollable_var::operator= (CORBA_DIIPollable_ptr p) } ACE_INLINE CORBA_DIIPollable_var & -CORBA_DIIPollable_var::operator= (const CORBA_DIIPollable_var &p) +CORBA_DIIPollable_var::operator= (const ::CORBA_DIIPollable_var &p) { if (this != &p) { CORBA::release (this->ptr_); - this->ptr_ = CORBA_DIIPollable::_duplicate (p.ptr ()); + this->ptr_ = ::CORBA_DIIPollable::_duplicate (p.ptr ()); } return *this; } ACE_INLINE -CORBA_DIIPollable_var::operator const CORBA_DIIPollable_ptr &() const // cast +CORBA_DIIPollable_var::operator const ::CORBA_DIIPollable_ptr &() const // cast { return this->ptr_; } ACE_INLINE -CORBA_DIIPollable_var::operator CORBA_DIIPollable_ptr &() // cast +CORBA_DIIPollable_var::operator ::CORBA_DIIPollable_ptr &() // cast { return this->ptr_; } -ACE_INLINE CORBA_DIIPollable_ptr +ACE_INLINE ::CORBA_DIIPollable_ptr CORBA_DIIPollable_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE CORBA_DIIPollable_ptr +ACE_INLINE ::CORBA_DIIPollable_ptr CORBA_DIIPollable_var::in (void) const { return this->ptr_; } -ACE_INLINE CORBA_DIIPollable_ptr & +ACE_INLINE ::CORBA_DIIPollable_ptr & CORBA_DIIPollable_var::inout (void) { return this->ptr_; } -ACE_INLINE CORBA_DIIPollable_ptr & +ACE_INLINE ::CORBA_DIIPollable_ptr & CORBA_DIIPollable_var::out (void) { CORBA::release (this->ptr_); - this->ptr_ = CORBA_DIIPollable::_nil (); + this->ptr_ = ::CORBA_DIIPollable::_nil (); return this->ptr_; } -ACE_INLINE CORBA_DIIPollable_ptr +ACE_INLINE ::CORBA_DIIPollable_ptr CORBA_DIIPollable_var::_retn (void) { // yield ownership of managed obj reference - CORBA_DIIPollable_ptr val = this->ptr_; - this->ptr_ = CORBA_DIIPollable::_nil (); + ::CORBA_DIIPollable_ptr val = this->ptr_; + this->ptr_ = ::CORBA_DIIPollable::_nil (); return val; } + +#endif /* end #if !defined */ + + +#if !defined (_CORBA_DIIPOLLABLE___OUT_CI_) +#define _CORBA_DIIPOLLABLE___OUT_CI_ + // ************************************************************* // Inline operations for class CORBA_DIIPollable_out // ************************************************************* @@ -320,7 +313,7 @@ ACE_INLINE CORBA_DIIPollable_out::CORBA_DIIPollable_out (CORBA_DIIPollable_ptr &p) : ptr_ (p) { - this->ptr_ = CORBA_DIIPollable::_nil (); + this->ptr_ = ::CORBA_DIIPollable::_nil (); } ACE_INLINE @@ -328,25 +321,25 @@ CORBA_DIIPollable_out::CORBA_DIIPollable_out (CORBA_DIIPollable_var &p) // const : ptr_ (p.out ()) { CORBA::release (this->ptr_); - this->ptr_ = CORBA_DIIPollable::_nil (); + this->ptr_ = ::CORBA_DIIPollable::_nil (); } ACE_INLINE -CORBA_DIIPollable_out::CORBA_DIIPollable_out (const CORBA_DIIPollable_out &p) // copy constructor - : ptr_ (ACE_const_cast (CORBA_DIIPollable_out&,p).ptr_) +CORBA_DIIPollable_out::CORBA_DIIPollable_out (const ::CORBA_DIIPollable_out &p) // copy constructor + : ptr_ (ACE_const_cast (CORBA_DIIPollable_out &, p).ptr_) {} -ACE_INLINE CORBA_DIIPollable_out & -CORBA_DIIPollable_out::operator= (const CORBA_DIIPollable_out &p) +ACE_INLINE ::CORBA_DIIPollable_out & +CORBA_DIIPollable_out::operator= (const ::CORBA_DIIPollable_out &p) { - this->ptr_ = ACE_const_cast (CORBA_DIIPollable_out&,p).ptr_; + this->ptr_ = ACE_const_cast (CORBA_DIIPollable_out&, p).ptr_; return *this; } ACE_INLINE CORBA_DIIPollable_out & -CORBA_DIIPollable_out::operator= (const CORBA_DIIPollable_var &p) +CORBA_DIIPollable_out::operator= (const ::CORBA_DIIPollable_var &p) { - this->ptr_ = CORBA_DIIPollable::_duplicate (p.ptr ()); + this->ptr_ = ::CORBA_DIIPollable::_duplicate (p.ptr ()); return *this; } @@ -358,49 +351,37 @@ CORBA_DIIPollable_out::operator= (CORBA_DIIPollable_ptr p) } ACE_INLINE -CORBA_DIIPollable_out::operator CORBA_DIIPollable_ptr &() // cast +CORBA_DIIPollable_out::operator ::CORBA_DIIPollable_ptr &() // cast { return this->ptr_; } -ACE_INLINE CORBA_DIIPollable_ptr & +ACE_INLINE ::CORBA_DIIPollable_ptr & CORBA_DIIPollable_out::ptr (void) // ptr { return this->ptr_; } -ACE_INLINE CORBA_DIIPollable_ptr +ACE_INLINE ::CORBA_DIIPollable_ptr CORBA_DIIPollable_out::operator-> (void) { return this->ptr_; } -ACE_INLINE -CORBA_PollableSet::CORBA_PollableSet (void) // default constructor -{} + +#endif /* end #if !defined */ ACE_INLINE -CORBA_PollableSet::CORBA_PollableSet (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor - : CORBA_Object (objref, _tao_servant, _tao_collocated) +CORBA_PollableSet::CORBA_PollableSet (void) // default constructor {} ACE_INLINE CORBA_PollableSet::~CORBA_PollableSet (void) // destructor {} -ACE_INLINE CORBA_PollableSet_ptr -CORBA_PollableSet::_duplicate (CORBA_PollableSet_ptr obj) -{ - if (!CORBA::is_nil (obj)) - obj->_add_ref (); - return obj; -} -ACE_INLINE CORBA_PollableSet_ptr -CORBA_PollableSet::_nil (void) -{ - return (CORBA_PollableSet_ptr)0; -} +#if !defined (_CORBA_POLLABLESET___VAR_CI_) +#define _CORBA_POLLABLESET___VAR_CI_ // ************************************************************* // Inline operations for class CORBA_PollableSet_var @@ -416,14 +397,14 @@ CORBA_PollableSet_var::CORBA_PollableSet_var (CORBA_PollableSet_ptr p) : ptr_ (p) {} -ACE_INLINE CORBA_PollableSet_ptr +ACE_INLINE ::CORBA_PollableSet_ptr CORBA_PollableSet_var::ptr (void) const { return this->ptr_; } ACE_INLINE -CORBA_PollableSet_var::CORBA_PollableSet_var (const CORBA_PollableSet_var &p) // copy constructor +CORBA_PollableSet_var::CORBA_PollableSet_var (const ::CORBA_PollableSet_var &p) // copy constructor : ptr_ (CORBA_PollableSet::_duplicate (p.ptr ())) {} @@ -442,63 +423,70 @@ CORBA_PollableSet_var::operator= (CORBA_PollableSet_ptr p) } ACE_INLINE CORBA_PollableSet_var & -CORBA_PollableSet_var::operator= (const CORBA_PollableSet_var &p) +CORBA_PollableSet_var::operator= (const ::CORBA_PollableSet_var &p) { if (this != &p) { CORBA::release (this->ptr_); - this->ptr_ = CORBA_PollableSet::_duplicate (p.ptr ()); + this->ptr_ = ::CORBA_PollableSet::_duplicate (p.ptr ()); } return *this; } ACE_INLINE -CORBA_PollableSet_var::operator const CORBA_PollableSet_ptr &() const // cast +CORBA_PollableSet_var::operator const ::CORBA_PollableSet_ptr &() const // cast { return this->ptr_; } ACE_INLINE -CORBA_PollableSet_var::operator CORBA_PollableSet_ptr &() // cast +CORBA_PollableSet_var::operator ::CORBA_PollableSet_ptr &() // cast { return this->ptr_; } -ACE_INLINE CORBA_PollableSet_ptr +ACE_INLINE ::CORBA_PollableSet_ptr CORBA_PollableSet_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE CORBA_PollableSet_ptr +ACE_INLINE ::CORBA_PollableSet_ptr CORBA_PollableSet_var::in (void) const { return this->ptr_; } -ACE_INLINE CORBA_PollableSet_ptr & +ACE_INLINE ::CORBA_PollableSet_ptr & CORBA_PollableSet_var::inout (void) { return this->ptr_; } -ACE_INLINE CORBA_PollableSet_ptr & +ACE_INLINE ::CORBA_PollableSet_ptr & CORBA_PollableSet_var::out (void) { CORBA::release (this->ptr_); - this->ptr_ = CORBA_PollableSet::_nil (); + this->ptr_ = ::CORBA_PollableSet::_nil (); return this->ptr_; } -ACE_INLINE CORBA_PollableSet_ptr +ACE_INLINE ::CORBA_PollableSet_ptr CORBA_PollableSet_var::_retn (void) { // yield ownership of managed obj reference - CORBA_PollableSet_ptr val = this->ptr_; - this->ptr_ = CORBA_PollableSet::_nil (); + ::CORBA_PollableSet_ptr val = this->ptr_; + this->ptr_ = ::CORBA_PollableSet::_nil (); return val; } + +#endif /* end #if !defined */ + + +#if !defined (_CORBA_POLLABLESET___OUT_CI_) +#define _CORBA_POLLABLESET___OUT_CI_ + // ************************************************************* // Inline operations for class CORBA_PollableSet_out // ************************************************************* @@ -507,7 +495,7 @@ ACE_INLINE CORBA_PollableSet_out::CORBA_PollableSet_out (CORBA_PollableSet_ptr &p) : ptr_ (p) { - this->ptr_ = CORBA_PollableSet::_nil (); + this->ptr_ = ::CORBA_PollableSet::_nil (); } ACE_INLINE @@ -515,25 +503,25 @@ CORBA_PollableSet_out::CORBA_PollableSet_out (CORBA_PollableSet_var &p) // const : ptr_ (p.out ()) { CORBA::release (this->ptr_); - this->ptr_ = CORBA_PollableSet::_nil (); + this->ptr_ = ::CORBA_PollableSet::_nil (); } ACE_INLINE -CORBA_PollableSet_out::CORBA_PollableSet_out (const CORBA_PollableSet_out &p) // copy constructor - : ptr_ (ACE_const_cast (CORBA_PollableSet_out&,p).ptr_) +CORBA_PollableSet_out::CORBA_PollableSet_out (const ::CORBA_PollableSet_out &p) // copy constructor + : ptr_ (ACE_const_cast (CORBA_PollableSet_out &, p).ptr_) {} -ACE_INLINE CORBA_PollableSet_out & -CORBA_PollableSet_out::operator= (const CORBA_PollableSet_out &p) +ACE_INLINE ::CORBA_PollableSet_out & +CORBA_PollableSet_out::operator= (const ::CORBA_PollableSet_out &p) { - this->ptr_ = ACE_const_cast (CORBA_PollableSet_out&,p).ptr_; + this->ptr_ = ACE_const_cast (CORBA_PollableSet_out&, p).ptr_; return *this; } ACE_INLINE CORBA_PollableSet_out & -CORBA_PollableSet_out::operator= (const CORBA_PollableSet_var &p) +CORBA_PollableSet_out::operator= (const ::CORBA_PollableSet_var &p) { - this->ptr_ = CORBA_PollableSet::_duplicate (p.ptr ()); + this->ptr_ = ::CORBA_PollableSet::_duplicate (p.ptr ()); return *this; } @@ -545,23 +533,26 @@ CORBA_PollableSet_out::operator= (CORBA_PollableSet_ptr p) } ACE_INLINE -CORBA_PollableSet_out::operator CORBA_PollableSet_ptr &() // cast +CORBA_PollableSet_out::operator ::CORBA_PollableSet_ptr &() // cast { return this->ptr_; } -ACE_INLINE CORBA_PollableSet_ptr & +ACE_INLINE ::CORBA_PollableSet_ptr & CORBA_PollableSet_out::ptr (void) // ptr { return this->ptr_; } -ACE_INLINE CORBA_PollableSet_ptr +ACE_INLINE ::CORBA_PollableSet_ptr CORBA_PollableSet_out::operator-> (void) { return this->ptr_; } + +#endif /* end #if !defined */ + // ************************************************************* // Inline operations for exception CORBA_PollableSet::NoPossiblePollable // ************************************************************* @@ -570,63 +561,13 @@ CORBA_PollableSet_out::operator-> (void) // Inline operations for exception CORBA_PollableSet::UnknownPollable // ************************************************************* -CORBA::Boolean TAO_Export +ACE_INLINE CORBA::Boolean operator<< ( TAO_OutputCDR &, const CORBA_PollableSet_ptr ); -CORBA::Boolean TAO_Export +ACE_INLINE CORBA::Boolean operator>> ( TAO_InputCDR &, CORBA_PollableSet_ptr & ); - -CORBA::Boolean TAO_Export -operator<< ( - TAO_OutputCDR &, - const CORBA_Pollable_ptr - ); -CORBA::Boolean TAO_Export -operator>> ( - TAO_InputCDR &, - CORBA_Pollable_ptr & - ); - -CORBA::Boolean TAO_Export -operator<< ( - TAO_OutputCDR &, - const CORBA_DIIPollable_ptr - ); -CORBA::Boolean TAO_Export -operator>> ( - TAO_InputCDR &, - CORBA_DIIPollable_ptr & - ); - -ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA_PollableSet::NoPossiblePollable &_tao_aggregate) -{ - // first marshal the repository ID - if (strm << _tao_aggregate._id ()) - return 1; - else - return 0; -} - -ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_PollableSet::NoPossiblePollable &) -{ - return 1; -} - -ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA_PollableSet::UnknownPollable &_tao_aggregate) -{ - // first marshal the repository ID - if (strm << _tao_aggregate._id ()) - return 1; - else - return 0; -} - -ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_PollableSet::UnknownPollable &) -{ - return 1; -} diff --git a/TAO/tao/PollableS.cpp b/TAO/tao/PollableS.cpp index 071aa8605c8..5a1966ffab7 100644 --- a/TAO/tao/PollableS.cpp +++ b/TAO/tao/PollableS.cpp @@ -1,937 +1,15 @@ -/* -*- C++ -*- */ -// -// $Id$ -// -// ================================================================ -// -// = LIBRARY -// TAO -// -// = FILENAME -// PollableS.cpp -// -// = DESCRIPTION -// Generated from Pollable.pidl -// The code was generated by the IDL compiler and then hand-crafted -// to reduce the includes interdependencies. -// -// ================================================================ - -#include "tao/PollableS.h" +/* -*- C++ -*- $Id$ */ -#if (TAO_HAS_AMI_POLLER == 1) +// ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* +// TAO and the TAO IDL Compiler have been developed by the Center for +// Distributed Object Computing at Washington University, St. Louis. +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/Operation_Table.h" -#include "tao/Server_Request.h" -#include "tao/ORB.h" -#include "tao/Typecode.h" +#include "PollableS.h" #if !defined (__ACE_INLINE__) -#include "tao/PollableS.i" +#include "PollableS.i" #endif /* !defined INLINE */ -ACE_RCSID(tao, PollableS, "$Id$") - -class TAO_CORBA_Pollable_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable -{ -private: - unsigned int hash (const char *str, unsigned int len); -public: - const TAO_operation_db_entry * lookup (const char *str, unsigned int len); -}; -/* starting time is 15:37:47 */ -/* C++ code produced by gperf version 2.7 (GNU C++ version) */ -/* Command-line: /project/macarena/coryan/head/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Pollable_Perfect_Hash_OpTable -N lookup */ -unsigned int -TAO_CORBA_Pollable_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) -{ - static const unsigned char asso_values[] = - { - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 0, 20, 0, 20, 0, - 20, 20, 20, 20, 20, 0, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 0, 20, 20, 20, - 20, 0, 20, 20, 20, 20, 20, 20, - }; - return len + asso_values[str[len - 1]] + asso_values[str[0]]; -} - -const class TAO_operation_db_entry * -TAO_CORBA_Pollable_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len) -{ - enum - { - TOTAL_KEYWORDS = 4, - MIN_WORD_LENGTH = 5, - MAX_WORD_LENGTH = 19, - MIN_HASH_VALUE = 5, - MAX_HASH_VALUE = 19, - HASH_VALUE_RANGE = 15, - DUPLICATES = 0 - }; - - static const class TAO_operation_db_entry wordlist[] = - { - {"",0}, {"",0}, {"",0}, {"",0}, {"",0}, - {"_is_a", &POA_CORBA::Pollable::_is_a_skel}, - {"",0}, {"",0}, - {"is_ready", &POA_CORBA::Pollable::is_ready_skel}, - {"",0}, {"",0}, {"",0}, {"",0}, - {"_non_existent", &POA_CORBA::Pollable::_non_existent_skel}, - {"",0}, {"",0}, {"",0}, {"",0}, {"",0}, - {"create_pollable_set", &POA_CORBA::Pollable::create_pollable_set_skel}, - }; - - if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) - { - unsigned int key = hash (str, len); - - if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE) - { - const char *s = wordlist[key].opname_; - - if (*str == *s && !strncmp (str + 1, s + 1, len - 1)) - return &wordlist[key]; - } - } - return 0; -} -/* ending time is 15:37:47 */ -TAO_CORBA_Pollable_Perfect_Hash_OpTable tao_CORBA_Pollable_optable; -// skeleton constructor -POA_CORBA::Pollable::Pollable (void) -{ - this->optable_ = &tao_CORBA_Pollable_optable; -} - -// copy ctor -POA_CORBA::Pollable::Pollable (const Pollable& rhs) - : TAO_ServantBase (rhs) -{} -// skeleton destructor -POA_CORBA::Pollable::~Pollable (void) -{ -} -void POA_CORBA::Pollable::is_ready_skel ( - CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, - CORBA::Environment &ACE_TRY_ENV -) -{ - TAO_InputCDR &_tao_in = _tao_server_request.incoming (); - POA_CORBA::Pollable *_tao_impl = (POA_CORBA::Pollable *)_tao_object_reference; - CORBA::Boolean _tao_retval = 0; - CORBA::ULong timeout; - if (!( - (_tao_in >> timeout) - )) - ACE_THROW (CORBA::MARSHAL () ); - - _tao_retval = _tao_impl->is_ready ( - timeout, - ACE_TRY_ENV - ); - ACE_CHECK; - _tao_server_request.init_reply (ACE_TRY_ENV); - ACE_CHECK; - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!( - (_tao_out << CORBA::Any::from_boolean (_tao_retval)) - )) - ACE_THROW (CORBA::MARSHAL () ); - -} - -void POA_CORBA::Pollable::create_pollable_set_skel ( - CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, - CORBA::Environment &ACE_TRY_ENV -) -{ - POA_CORBA::Pollable *_tao_impl = (POA_CORBA::Pollable *)_tao_object_reference; - CORBA::PollableSet_var _tao_retval; - _tao_retval = _tao_impl->create_pollable_set ( - ACE_TRY_ENV - ); - ACE_CHECK; - _tao_server_request.init_reply (ACE_TRY_ENV); - ACE_CHECK; - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!( - (_tao_out << _tao_retval.in ()) - )) - ACE_THROW (CORBA::MARSHAL () ); - -} - -void POA_CORBA::Pollable::_is_a_skel ( - CORBA::ServerRequest &_tao_server_request, - void * _tao_object_reference, - void * /*context*/, - CORBA::Environment &ACE_TRY_ENV - ) -{ - TAO_InputCDR &_tao_in = _tao_server_request.incoming (); - POA_CORBA::Pollable *_tao_impl = (POA_CORBA::Pollable *) _tao_object_reference; - CORBA::Boolean _tao_retval = 0; - CORBA::String_var value; - if (!((_tao_in >> value.out ()))) - ACE_THROW (CORBA::MARSHAL ()); - - _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); - ACE_CHECK; - - _tao_server_request.init_reply (ACE_TRY_ENV); - ACE_CHECK; - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval)))) - ACE_THROW (CORBA::MARSHAL ()); -} - -CORBA::Boolean POA_CORBA::Pollable::_is_a ( - const char* value, - CORBA::Environment &ACE_TRY_ENV - ) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Pollable:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) - return 1; - else - return 0; -} - -void POA_CORBA::Pollable::_non_existent_skel ( - CORBA::ServerRequest &_tao_server_request, - void * _tao_object_reference, - void * /*context*/, - CORBA::Environment &ACE_TRY_ENV - ) -{ - POA_CORBA::Pollable *_tao_impl = (POA_CORBA::Pollable *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); - ACE_CHECK; - - _tao_server_request.init_reply (ACE_TRY_ENV); - ACE_CHECK; - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval)))) - ACE_THROW (CORBA::MARSHAL ()); -} - -void* POA_CORBA::Pollable::_downcast ( - const char* logical_type_id - ) -{ - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Pollable:1.0") == 0) - return ACE_static_cast (POA_CORBA::Pollable_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) - return ACE_static_cast(PortableServer::Servant, this); - return 0; -} - -void POA_CORBA::Pollable::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) -{ - TAO_Skeleton skel; // pointer to skeleton for operation - const char *opname = req.operation (); // retrieve operation name - // find the skeleton corresponding to this opname - if (this->_find (opname, skel) == -1) - { - ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION ()); - } - else - skel (req, this, context, ACE_TRY_ENV); -} - -const char* POA_CORBA::Pollable::_interface_repository_id (void) const -{ - return "IDL:omg.org/CORBA/Pollable:1.0"; -} - -POA_CORBA::_tao_collocated_Pollable::_tao_collocated_Pollable ( - POA_CORBA::Pollable_ptr servant, - TAO_Stub *stub - ) - : ACE_CORBA_1 (Pollable) (), - CORBA_Object (stub, servant, 1), - servant_ (servant) -{ -} - -POA_CORBA::Pollable_ptr POA_CORBA::_tao_collocated_Pollable::_get_servant (void) const -{ - return this->servant_; -} - -CORBA::Boolean POA_CORBA::_tao_collocated_Pollable::_is_a ( - const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->_is_a ( - logical_type_id, - ACE_TRY_ENV - ); -} - -CORBA::Boolean POA_CORBA::_tao_collocated_Pollable::is_ready ( - CORBA::ULong timeout, - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->is_ready ( - timeout, - ACE_TRY_ENV - ); -} - -CORBA::PollableSet_ptr POA_CORBA::_tao_collocated_Pollable::create_pollable_set ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->create_pollable_set ( - ACE_TRY_ENV - ); -} - - -CORBA::Pollable* -POA_CORBA::Pollable::_this (CORBA_Environment &ACE_TRY_ENV) -{ - TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); - - CORBA::Pollable *retval = CORBA::Pollable::_nil (); - - ACE_NEW_RETURN (retval, - POA_CORBA::_tao_collocated_Pollable (this, - stub), - CORBA::Pollable::_nil ()); - - return retval; -} - -class TAO_CORBA_DIIPollable_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable -{ -private: - unsigned int hash (const char *str, unsigned int len); -public: - const TAO_operation_db_entry * lookup (const char *str, unsigned int len); -}; -/* starting time is 15:37:47 */ -/* C++ code produced by gperf version 2.7 (GNU C++ version) */ -/* Command-line: /project/macarena/coryan/head/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_DIIPollable_Perfect_Hash_OpTable -N lookup */ -unsigned int -TAO_CORBA_DIIPollable_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) -{ - static const unsigned char asso_values[] = - { - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 0, 20, 0, 20, 0, - 20, 20, 20, 20, 20, 0, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 0, 20, 20, 20, - 20, 0, 20, 20, 20, 20, 20, 20, - }; - return len + asso_values[str[len - 1]] + asso_values[str[0]]; -} - -const class TAO_operation_db_entry * -TAO_CORBA_DIIPollable_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len) -{ - enum - { - TOTAL_KEYWORDS = 4, - MIN_WORD_LENGTH = 5, - MAX_WORD_LENGTH = 19, - MIN_HASH_VALUE = 5, - MAX_HASH_VALUE = 19, - HASH_VALUE_RANGE = 15, - DUPLICATES = 0 - }; - - static const class TAO_operation_db_entry wordlist[] = - { - {"",0}, {"",0}, {"",0}, {"",0}, {"",0}, - {"_is_a", &POA_CORBA::DIIPollable::_is_a_skel}, - {"",0}, {"",0}, - {"is_ready", &POA_CORBA::DIIPollable::is_ready_skel}, - {"",0}, {"",0}, {"",0}, {"",0}, - {"_non_existent", &POA_CORBA::DIIPollable::_non_existent_skel}, - {"",0}, {"",0}, {"",0}, {"",0}, {"",0}, - {"create_pollable_set", &POA_CORBA::DIIPollable::create_pollable_set_skel}, - }; - - if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) - { - unsigned int key = hash (str, len); - - if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE) - { - const char *s = wordlist[key].opname_; - - if (*str == *s && !strncmp (str + 1, s + 1, len - 1)) - return &wordlist[key]; - } - } - return 0; -} -/* ending time is 15:37:47 */ -TAO_CORBA_DIIPollable_Perfect_Hash_OpTable tao_CORBA_DIIPollable_optable; -// skeleton constructor -POA_CORBA::DIIPollable::DIIPollable (void) -{ - this->optable_ = &tao_CORBA_DIIPollable_optable; -} - -// copy ctor -POA_CORBA::DIIPollable::DIIPollable (const DIIPollable& rhs) - : ACE_NESTED_CLASS (POA_CORBA,Pollable) (rhs), - TAO_ServantBase (rhs) -{} -// skeleton destructor -POA_CORBA::DIIPollable::~DIIPollable (void) -{ -} -void POA_CORBA::DIIPollable::_is_a_skel ( - CORBA::ServerRequest &_tao_server_request, - void * _tao_object_reference, - void * /*context*/, - CORBA::Environment &ACE_TRY_ENV - ) -{ - TAO_InputCDR &_tao_in = _tao_server_request.incoming (); - POA_CORBA::DIIPollable *_tao_impl = (POA_CORBA::DIIPollable *) _tao_object_reference; - CORBA::Boolean _tao_retval = 0; - CORBA::String_var value; - if (!((_tao_in >> value.out ()))) - ACE_THROW (CORBA::MARSHAL ()); - - _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); - ACE_CHECK; - - _tao_server_request.init_reply (ACE_TRY_ENV); - ACE_CHECK; - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval)))) - ACE_THROW (CORBA::MARSHAL ()); -} - -CORBA::Boolean POA_CORBA::DIIPollable::_is_a ( - const char* value, - CORBA::Environment &ACE_TRY_ENV - ) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/DIIPollable:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Pollable:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) - return 1; - else - return 0; -} - -void POA_CORBA::DIIPollable::_non_existent_skel ( - CORBA::ServerRequest &_tao_server_request, - void * _tao_object_reference , - void * /*context*/, - CORBA::Environment &ACE_TRY_ENV - ) -{ - POA_CORBA::DIIPollable *_tao_impl = (POA_CORBA::DIIPollable *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); - ACE_CHECK; - - _tao_server_request.init_reply (ACE_TRY_ENV); - ACE_CHECK; - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval)))) - ACE_THROW (CORBA::MARSHAL ()); -} - -void* POA_CORBA::DIIPollable::_downcast ( - const char* logical_type_id - ) -{ - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/DIIPollable:1.0") == 0) - return ACE_static_cast (POA_CORBA::DIIPollable_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Pollable:1.0") == 0) - return ACE_static_cast (POA_CORBA::Pollable_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) - return ACE_static_cast(PortableServer::Servant, this); - return 0; -} - -void POA_CORBA::DIIPollable::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) -{ - TAO_Skeleton skel; // pointer to skeleton for operation - const char *opname = req.operation (); // retrieve operation name - // find the skeleton corresponding to this opname - if (this->_find (opname, skel) == -1) - { - ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION ()); - } - else - skel (req, this, context, ACE_TRY_ENV); -} - -const char* POA_CORBA::DIIPollable::_interface_repository_id (void) const -{ - return "IDL:omg.org/CORBA/DIIPollable:1.0"; -} - -POA_CORBA::_tao_collocated_DIIPollable::_tao_collocated_DIIPollable ( - POA_CORBA::DIIPollable_ptr servant, - TAO_Stub *stub - ) - : ACE_CORBA_1 (DIIPollable) (), - ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Pollable) (servant, stub), - CORBA_Object (stub, servant, 1), - servant_ (servant) -{ -} - -POA_CORBA::DIIPollable_ptr POA_CORBA::_tao_collocated_DIIPollable::_get_servant (void) const -{ - return this->servant_; -} - -CORBA::Boolean POA_CORBA::_tao_collocated_DIIPollable::_is_a ( - const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->_is_a ( - logical_type_id, - ACE_TRY_ENV - ); -} - - -CORBA::DIIPollable* -POA_CORBA::DIIPollable::_this (CORBA_Environment &ACE_TRY_ENV) -{ - TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); - - CORBA::DIIPollable *retval = CORBA::DIIPollable::_nil (); - - ACE_NEW_RETURN (retval, - POA_CORBA::_tao_collocated_DIIPollable (this, - stub), - CORBA::DIIPollable::_nil ()); - - return retval; -} - -class TAO_CORBA_PollableSet_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable -{ -private: - unsigned int hash (const char *str, unsigned int len); -public: - const TAO_operation_db_entry * lookup (const char *str, unsigned int len); -}; -/* starting time is 15:37:47 */ -/* C++ code produced by gperf version 2.7 (GNU C++ version) */ -/* Command-line: /project/macarena/coryan/head/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_PollableSet_Perfect_Hash_OpTable -N lookup */ -unsigned int -TAO_CORBA_PollableSet_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) -{ - static const unsigned char asso_values[] = - { - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 0, 20, 0, 20, 0, - 20, 0, 20, 20, 20, 20, 20, 20, 0, 20, - 0, 20, 0, 20, 0, 20, 0, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, - }; - return len + asso_values[str[len - 1]] + asso_values[str[0]]; -} - -const class TAO_operation_db_entry * -TAO_CORBA_PollableSet_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len) -{ - enum - { - TOTAL_KEYWORDS = 7, - MIN_WORD_LENGTH = 4, - MAX_WORD_LENGTH = 19, - MIN_HASH_VALUE = 4, - MAX_HASH_VALUE = 19, - HASH_VALUE_RANGE = 16, - DUPLICATES = 0 - }; - - static const class TAO_operation_db_entry wordlist[] = - { - {"",0}, {"",0}, {"",0}, {"",0}, - {"poll", &POA_CORBA::PollableSet::poll_skel}, - {"_is_a", &POA_CORBA::PollableSet::_is_a_skel}, - {"remove", &POA_CORBA::PollableSet::remove_skel}, - {"",0}, {"",0}, {"",0}, {"",0}, - {"number_left", &POA_CORBA::PollableSet::number_left_skel}, - {"add_pollable", &POA_CORBA::PollableSet::add_pollable_skel}, - {"_non_existent", &POA_CORBA::PollableSet::_non_existent_skel}, - {"",0}, {"",0}, {"",0}, {"",0}, {"",0}, - {"create_dii_pollable", &POA_CORBA::PollableSet::create_dii_pollable_skel}, - }; - - if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) - { - unsigned int key = hash (str, len); - - if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE) - { - const char *s = wordlist[key].opname_; - - if (*str == *s && !strncmp (str + 1, s + 1, len - 1)) - return &wordlist[key]; - } - } - return 0; -} -/* ending time is 15:37:47 */ -TAO_CORBA_PollableSet_Perfect_Hash_OpTable tao_CORBA_PollableSet_optable; -// skeleton constructor -POA_CORBA::PollableSet::PollableSet (void) -{ - this->optable_ = &tao_CORBA_PollableSet_optable; -} - -// copy ctor -POA_CORBA::PollableSet::PollableSet (const PollableSet& rhs) - : TAO_ServantBase (rhs) -{} -// skeleton destructor -POA_CORBA::PollableSet::~PollableSet (void) -{ -} -void POA_CORBA::PollableSet::create_dii_pollable_skel ( - CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, - CORBA::Environment &ACE_TRY_ENV -) -{ - POA_CORBA::PollableSet *_tao_impl = (POA_CORBA::PollableSet *)_tao_object_reference; - CORBA::DIIPollable_var _tao_retval; - _tao_retval = _tao_impl->create_dii_pollable ( - ACE_TRY_ENV - ); - ACE_CHECK; - _tao_server_request.init_reply (ACE_TRY_ENV); - ACE_CHECK; - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!( - (_tao_out << _tao_retval.in ()) - )) - ACE_THROW (CORBA::MARSHAL () ); - -} - -void POA_CORBA::PollableSet::add_pollable_skel ( - CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, - CORBA::Environment &ACE_TRY_ENV -) -{ - TAO_InputCDR &_tao_in = _tao_server_request.incoming (); - POA_CORBA::PollableSet *_tao_impl = (POA_CORBA::PollableSet *)_tao_object_reference; - CORBA::Pollable_var potential; - if (!( - (_tao_in >> potential.out ()) - )) - ACE_THROW (CORBA::MARSHAL () ); - - _tao_impl->add_pollable ( - potential.in (), - ACE_TRY_ENV - ); - ACE_CHECK; - _tao_server_request.init_reply (ACE_TRY_ENV); -} - -void POA_CORBA::PollableSet::poll_skel ( - CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, - CORBA::Environment &ACE_TRY_ENV -) -{ - TAO_InputCDR &_tao_in = _tao_server_request.incoming (); - POA_CORBA::PollableSet *_tao_impl = (POA_CORBA::PollableSet *)_tao_object_reference; - CORBA::Pollable_var _tao_retval; - CORBA::ULong timeout; - if (!( - (_tao_in >> timeout) - )) - ACE_THROW (CORBA::MARSHAL () ); - - _tao_retval = _tao_impl->poll ( - timeout, - ACE_TRY_ENV - ); - ACE_CHECK; - _tao_server_request.init_reply (ACE_TRY_ENV); - ACE_CHECK; - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!( - (_tao_out << _tao_retval.in ()) - )) - ACE_THROW (CORBA::MARSHAL () ); - -} - -void POA_CORBA::PollableSet::remove_skel ( - CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, - CORBA::Environment &ACE_TRY_ENV -) -{ - TAO_InputCDR &_tao_in = _tao_server_request.incoming (); - POA_CORBA::PollableSet *_tao_impl = (POA_CORBA::PollableSet *)_tao_object_reference; - CORBA::Pollable_var potential; - if (!( - (_tao_in >> potential.out ()) - )) - ACE_THROW (CORBA::MARSHAL () ); - - _tao_impl->remove ( - potential.in (), - ACE_TRY_ENV - ); - ACE_CHECK; - _tao_server_request.init_reply (ACE_TRY_ENV); -} - -void POA_CORBA::PollableSet::number_left_skel ( - CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, - CORBA::Environment &ACE_TRY_ENV -) -{ - POA_CORBA::PollableSet *_tao_impl = (POA_CORBA::PollableSet *)_tao_object_reference; - CORBA::UShort _tao_retval = 0; - _tao_retval = _tao_impl->number_left ( - ACE_TRY_ENV - ); - ACE_CHECK; - _tao_server_request.init_reply (ACE_TRY_ENV); - ACE_CHECK; - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!( - (_tao_out << _tao_retval) - )) - ACE_THROW (CORBA::MARSHAL () ); - -} - -void POA_CORBA::PollableSet::_is_a_skel ( - CORBA::ServerRequest &_tao_server_request, - void * _tao_object_reference, - void * /*context*/, - CORBA::Environment &ACE_TRY_ENV - ) -{ - TAO_InputCDR &_tao_in = _tao_server_request.incoming (); - POA_CORBA::PollableSet *_tao_impl = (POA_CORBA::PollableSet *) _tao_object_reference; - CORBA::Boolean _tao_retval = 0; - CORBA::String_var value; - if (!((_tao_in >> value.out ()))) - ACE_THROW (CORBA::MARSHAL ()); - - _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); - ACE_CHECK; - - _tao_server_request.init_reply (ACE_TRY_ENV); - ACE_CHECK; - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval)))) - ACE_THROW (CORBA::MARSHAL ()); -} - -CORBA::Boolean POA_CORBA::PollableSet::_is_a ( - const char* value, - CORBA::Environment &ACE_TRY_ENV - ) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PollableSet:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) - return 1; - else - return 0; -} - -void POA_CORBA::PollableSet::_non_existent_skel ( - CORBA::ServerRequest &_tao_server_request, - void * _tao_object_reference , - void * /*context*/, - CORBA::Environment &ACE_TRY_ENV - ) -{ - POA_CORBA::PollableSet *_tao_impl = (POA_CORBA::PollableSet *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); - ACE_CHECK; - - _tao_server_request.init_reply (ACE_TRY_ENV); - ACE_CHECK; - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval)))) - ACE_THROW (CORBA::MARSHAL ()); -} - -void* POA_CORBA::PollableSet::_downcast ( - const char* logical_type_id - ) -{ - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/PollableSet:1.0") == 0) - return ACE_static_cast (POA_CORBA::PollableSet_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) - return ACE_static_cast(PortableServer::Servant, this); - return 0; -} - -void POA_CORBA::PollableSet::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) -{ - TAO_Skeleton skel; // pointer to skeleton for operation - const char *opname = req.operation (); // retrieve operation name - // find the skeleton corresponding to this opname - if (this->_find (opname, skel) == -1) - { - ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION ()); - } - else - skel (req, this, context, ACE_TRY_ENV); -} - -const char* POA_CORBA::PollableSet::_interface_repository_id (void) const -{ - return "IDL:omg.org/CORBA/PollableSet:1.0"; -} - -POA_CORBA::_tao_collocated_PollableSet::_tao_collocated_PollableSet ( - POA_CORBA::PollableSet_ptr servant, - TAO_Stub *stub - ) - : ACE_CORBA_1 (PollableSet) (), - CORBA_Object (stub, servant, 1), - servant_ (servant) -{ -} - -POA_CORBA::PollableSet_ptr POA_CORBA::_tao_collocated_PollableSet::_get_servant (void) const -{ - return this->servant_; -} - -CORBA::Boolean POA_CORBA::_tao_collocated_PollableSet::_is_a ( - const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->_is_a ( - logical_type_id, - ACE_TRY_ENV - ); -} - -CORBA::DIIPollable_ptr POA_CORBA::_tao_collocated_PollableSet::create_dii_pollable ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->create_dii_pollable ( - ACE_TRY_ENV - ); -} - -void POA_CORBA::_tao_collocated_PollableSet::add_pollable ( - CORBA::Pollable_ptr potential, - CORBA::Environment &ACE_TRY_ENV - ) -{ - this->servant_->add_pollable ( - potential, - ACE_TRY_ENV - ); -} - -CORBA::Pollable_ptr POA_CORBA::_tao_collocated_PollableSet::poll ( - CORBA::ULong timeout, - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->poll ( - timeout, - ACE_TRY_ENV - ); -} - -void POA_CORBA::_tao_collocated_PollableSet::remove ( - CORBA::Pollable_ptr potential, - CORBA::Environment &ACE_TRY_ENV - ) -{ - this->servant_->remove ( - potential, - ACE_TRY_ENV - ); -} - -CORBA::UShort POA_CORBA::_tao_collocated_PollableSet::number_left ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->number_left ( - ACE_TRY_ENV - ); -} - - -CORBA::PollableSet* -POA_CORBA::PollableSet::_this (CORBA_Environment &ACE_TRY_ENV) -{ - TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); - - CORBA::PollableSet *retval = CORBA::PollableSet::_nil (); - - ACE_NEW_RETURN (retval, - POA_CORBA::_tao_collocated_PollableSet (this, - stub), - CORBA::PollableSet::_nil ()); - - return retval; -} -#endif /* TAO_HAS_AMI_POLLER == 1 */ diff --git a/TAO/tao/PollableS.h b/TAO/tao/PollableS.h index 48df3c4066d..4ac1bfc2025 100644 --- a/TAO/tao/PollableS.h +++ b/TAO/tao/PollableS.h @@ -1,31 +1,17 @@ -/* -*- C++ -*- */ -// -// $Id$ -// -// ================================================================ -// -// = LIBRARY -// TAO -// -// = FILENAME -// PollableC.h -// -// = DESCRIPTION -// Generated from Pollable.pidl -// The code was generated by the IDL compiler and then hand-crafted -// to reduce the includes interdependencies. -// -// ================================================================ +/* -*- C++ -*- $Id$ */ -#ifndef TAO_IDL_POLLABLES_H -#define TAO_IDL_POLLABLES_H -#include "ace/pre.h" +// ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* +// TAO and the TAO IDL Compiler have been developed by the Center for +// Distributed Object Computing at Washington University, St. Louis. +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/PollableC.h" +#ifndef _TAO_IDL_ORIG_POLLABLES_H_ +#define _TAO_IDL_ORIG_POLLABLES_H_ -#if (TAO_HAS_AMI_POLLER == 1) +#include "PollableC.h" -#include "tao/POA_CORBA.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -38,206 +24,14 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -#if 0 -TAO_NAMESPACE POA_CORBA -{ - -#if defined (ACE_HAS_USING_KEYWORD) - // TIE class: Refer to CORBA v2.2, Section 20.34.4 - template <class T> - class TAO_Export Pollable_tie : public Pollable - { - public: - Pollable_tie (T &t); - // the T& ctor - Pollable_tie (T &t, PortableServer::POA_ptr poa); - // ctor taking a POA - Pollable_tie (T *tp, CORBA::Boolean release=1); - // ctor taking pointer and an ownership flag - Pollable_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1); - // ctor with T*, ownership flag and a POA - ~Pollable_tie (void); - // dtor - - // TIE specific functions - T *_tied_object (void); - // return the underlying object - void _tied_object (T &obj); - // set the underlying object - void _tied_object (T *obj, CORBA::Boolean release=1); - // set the underlying object and the ownership flag - CORBA::Boolean _is_owner (void); - // do we own it - void _is_owner (CORBA::Boolean b); - // set the ownership - - // overridden ServantBase operations - PortableServer::POA_ptr _default_POA ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - CORBA::Boolean is_ready ( - CORBA::ULong timeout, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - CORBA::PollableSet_ptr create_pollable_set ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); -private: - T *ptr_; - PortableServer::POA_var poa_; - CORBA::Boolean rel_; - - // copy and assignment are not allowed - Pollable_tie (const Pollable_tie &); - void operator= (const Pollable_tie &); - }; - -#endif /* ACE_HAS_USING_KEYWORD */ - - -#if defined (ACE_HAS_USING_KEYWORD) - // TIE class: Refer to CORBA v2.2, Section 20.34.4 - template <class T> - class TAO_Export DIIPollable_tie : public DIIPollable - { - public: - DIIPollable_tie (T &t); - // the T& ctor - DIIPollable_tie (T &t, PortableServer::POA_ptr poa); - // ctor taking a POA - DIIPollable_tie (T *tp, CORBA::Boolean release=1); - // ctor taking pointer and an ownership flag - DIIPollable_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1); - // ctor with T*, ownership flag and a POA - ~DIIPollable_tie (void); - // dtor - - // TIE specific functions - T *_tied_object (void); - // return the underlying object - void _tied_object (T &obj); - // set the underlying object - void _tied_object (T *obj, CORBA::Boolean release=1); - // set the underlying object and the ownership flag - CORBA::Boolean _is_owner (void); - // do we own it - void _is_owner (CORBA::Boolean b); - // set the ownership - - // overridden ServantBase operations - PortableServer::POA_ptr _default_POA ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - CORBA::Boolean is_ready ( - CORBA::ULong timeout, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - CORBA::PollableSet_ptr create_pollable_set ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); -private: - T *ptr_; - PortableServer::POA_var poa_; - CORBA::Boolean rel_; - - // copy and assignment are not allowed - DIIPollable_tie (const DIIPollable_tie &); - void operator= (const DIIPollable_tie &); - }; - -#endif /* ACE_HAS_USING_KEYWORD */ - - -#if defined (ACE_HAS_USING_KEYWORD) - // TIE class: Refer to CORBA v2.2, Section 20.34.4 - template <class T> - class TAO_Export PollableSet_tie : public PollableSet - { - public: - PollableSet_tie (T &t); - // the T& ctor - PollableSet_tie (T &t, PortableServer::POA_ptr poa); - // ctor taking a POA - PollableSet_tie (T *tp, CORBA::Boolean release=1); - // ctor taking pointer and an ownership flag - PollableSet_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1); - // ctor with T*, ownership flag and a POA - ~PollableSet_tie (void); - // dtor - - // TIE specific functions - T *_tied_object (void); - // return the underlying object - void _tied_object (T &obj); - // set the underlying object - void _tied_object (T *obj, CORBA::Boolean release=1); - // set the underlying object and the ownership flag - CORBA::Boolean _is_owner (void); - // do we own it - void _is_owner (CORBA::Boolean b); - // set the ownership - - // overridden ServantBase operations - PortableServer::POA_ptr _default_POA ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - CORBA::DIIPollable_ptr create_dii_pollable ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - void add_pollable ( - CORBA::Pollable_ptr potential, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - CORBA::Pollable_ptr poll ( - CORBA::ULong timeout, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - void remove ( - CORBA::Pollable_ptr potential, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - CORBA::UShort number_left ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); -private: - T *ptr_; - PortableServer::POA_var poa_; - CORBA::Boolean rel_; - - // copy and assignment are not allowed - PollableSet_tie (const PollableSet_tie &); - void operator= (const PollableSet_tie &); - }; - -#endif /* ACE_HAS_USING_KEYWORD */ - -} -TAO_NAMESPACE_CLOSE - -#include "tao/PollableS_T.h" -#endif /* 0 */ +#include "PollableS_T.h" #if defined (__ACE_INLINE__) -#include "tao/PollableS.i" +#include "PollableS.i" #endif /* defined INLINE */ #if defined(_MSC_VER) && (_MSC_VER >= 1200) #pragma warning(pop) #endif /* _MSC_VER */ -#endif /* TAO_HAS_AMI_POLLER == 1 */ - -#include "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PollableS.i b/TAO/tao/PollableS.i index 4356126e508..d41d475fa1a 100644 --- a/TAO/tao/PollableS.i +++ b/TAO/tao/PollableS.i @@ -1,33 +1,9 @@ -// $Id$ +/* -*- C++ -*- $Id$ */ -ACE_INLINE void POA_CORBA::DIIPollable::is_ready_skel ( - CORBA::ServerRequest &req, - void *obj, - void *context, - CORBA::Environment &env - ) -{ - POA_CORBA::Pollable_ptr impl = (POA_CORBA::DIIPollable_ptr) obj; - POA_CORBA::Pollable::is_ready_skel ( - req, - (POA_CORBA::Pollable_ptr) impl, - context, - env - ); -} +// ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* +// TAO and the TAO IDL Compiler have been developed by the Center for +// Distributed Object Computing at Washington University, St. Louis. +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html -ACE_INLINE void POA_CORBA::DIIPollable::create_pollable_set_skel ( - CORBA::ServerRequest &req, - void *obj, - void *context, - CORBA::Environment &env - ) -{ - POA_CORBA::Pollable_ptr impl = (POA_CORBA::DIIPollable_ptr) obj; - POA_CORBA::Pollable::create_pollable_set_skel ( - req, - (POA_CORBA::Pollable_ptr) impl, - context, - env - ); -} diff --git a/TAO/tao/PollableS_T.cpp b/TAO/tao/PollableS_T.cpp index e9b28528416..327232a8c0e 100644 --- a/TAO/tao/PollableS_T.cpp +++ b/TAO/tao/PollableS_T.cpp @@ -1,5 +1,4 @@ -/* -*- C++ -*- */ -// $Id$ +/* -*- C++ -*- $Id$ */ // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* // TAO and the TAO IDL Compiler have been developed by the Center for @@ -8,13 +7,13 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef _TAO_IDL_POLLABLES_T_CPP_ -#define _TAO_IDL_POLLABLES_T_CPP_ +#ifndef _TAO_IDL_ORIG_POLLABLES_T_CPP_ +#define _TAO_IDL_ORIG_POLLABLES_T_CPP_ -#include "tao/PollableS_T.h" +#include "PollableS_T.h" #if !defined (__ACE_INLINE__) -#include "tao/PollableS_T.i" +#include "PollableS_T.i" #endif /* !defined INLINE */ diff --git a/TAO/tao/PollableS_T.h b/TAO/tao/PollableS_T.h index 5f13cc5168b..74c5ed64307 100644 --- a/TAO/tao/PollableS_T.h +++ b/TAO/tao/PollableS_T.h @@ -1,5 +1,4 @@ -/* -*- C++ -*- */ -// $Id$ +/* -*- C++ -*- $Id$ */ // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* // TAO and the TAO IDL Compiler have been developed by the Center for @@ -8,9 +7,8 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef _TAO_IDL_POLLABLES_T_H_ -#define _TAO_IDL_POLLABLES_T_H_ -#include "ace/pre.h" +#ifndef _TAO_IDL_ORIG_POLLABLES_T_H_ +#define _TAO_IDL_ORIG_POLLABLES_T_H_ #if defined(_MSC_VER) #if (_MSC_VER >= 1200) @@ -21,12 +19,12 @@ #if defined (__ACE_INLINE__) -#include "tao/PollableS_T.i" +#include "PollableS_T.i" #endif /* defined INLINE */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "tao/PollableS_T.cpp" +#include "PollableS_T.cpp" #endif /* defined REQUIRED SOURCE */ @@ -38,5 +36,4 @@ #pragma warning(pop) #endif /* _MSC_VER */ -#include "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PollableS_T.i b/TAO/tao/PollableS_T.i index dc79b5284eb..d41d475fa1a 100644 --- a/TAO/tao/PollableS_T.i +++ b/TAO/tao/PollableS_T.i @@ -1,5 +1,4 @@ -/* -*- C++ -*- */ -// $Id$ +/* -*- C++ -*- $Id$ */ // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* // TAO and the TAO IDL Compiler have been developed by the Center for @@ -8,343 +7,3 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html - -#if defined (ACE_HAS_USING_KEYWORD) -template <class T> ACE_INLINE -POA_CORBA::Pollable_tie<T>::Pollable_tie (T &t) - : ptr_ (&t), - poa_ (PortableServer::POA::_nil ()), - rel_ (0) -{} - -template <class T> ACE_INLINE -POA_CORBA::Pollable_tie<T>::Pollable_tie (T &t, PortableServer::POA_ptr poa) - : ptr_ (&t), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (0) -{} - -template <class T> ACE_INLINE -POA_CORBA::Pollable_tie<T>::Pollable_tie (T *tp, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_nil ()), - rel_ (release) -{} - -template <class T> ACE_INLINE -POA_CORBA::Pollable_tie<T>::Pollable_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::Pollable_tie<T>::~Pollable_tie (void) -{ - if (this->rel_) delete this->ptr_; -} - -template <class T> ACE_INLINE T * -POA_CORBA::Pollable_tie<T>::_tied_object (void) -{ - return this->ptr_; -} - -template <class T> ACE_INLINE void -POA_CORBA::Pollable_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::Pollable_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::Pollable_tie<T>::_is_owner (void) -{ - return this->rel_; -} - -template <class T> ACE_INLINE void -POA_CORBA::Pollable_tie<T>::_is_owner (CORBA::Boolean b) -{ - this->rel_ = b; -} - -template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA::Pollable_tie<T>::_default_POA (CORBA::Environment &env) -{ - if (!CORBA::is_nil (this->poa_.in ())) - return PortableServer::POA::_duplicate (this->poa_.in ()); - - return this->Pollabe::_default_POA (env); -} - -template <class T> ACE_INLINE -CORBA::Boolean POA_CORBA::Pollable_tie<T>::is_ready ( - CORBA::ULong timeout, - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->is_ready ( - timeout, - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -CORBA::PollableSet_ptr POA_CORBA::Pollable_tie<T>::create_pollable_set ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->create_pollable_set ( - ACE_TRY_ENV - ); -} - -#endif /* ACE_HAS_USING_KEYWORD */ - -#if defined (ACE_HAS_USING_KEYWORD) -template <class T> ACE_INLINE -POA_CORBA::DIIPollable_tie<T>::DIIPollable_tie (T &t) - : ptr_ (&t), - poa_ (PortableServer::POA::_nil ()), - rel_ (0) -{} - -template <class T> ACE_INLINE -POA_CORBA::DIIPollable_tie<T>::DIIPollable_tie (T &t, PortableServer::POA_ptr poa) - : ptr_ (&t), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (0) -{} - -template <class T> ACE_INLINE -POA_CORBA::DIIPollable_tie<T>::DIIPollable_tie (T *tp, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_nil ()), - rel_ (release) -{} - -template <class T> ACE_INLINE -POA_CORBA::DIIPollable_tie<T>::DIIPollable_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::DIIPollable_tie<T>::~DIIPollable_tie (void) -{ - if (this->rel_) delete this->ptr_; -} - -template <class T> ACE_INLINE T * -POA_CORBA::DIIPollable_tie<T>::_tied_object (void) -{ - return this->ptr_; -} - -template <class T> ACE_INLINE void -POA_CORBA::DIIPollable_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::DIIPollable_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::DIIPollable_tie<T>::_is_owner (void) -{ - return this->rel_; -} - -template <class T> ACE_INLINE void -POA_CORBA::DIIPollable_tie<T>::_is_owner (CORBA::Boolean b) -{ - this->rel_ = b; -} - -template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA::DIIPollable_tie<T>::_default_POA (CORBA::Environment &env) -{ - if (!CORBA::is_nil (this->poa_.in ())) - return PortableServer::POA::_duplicate (this->poa_.in ()); - - return this->DIIPollabe::_default_POA (env); -} - -template <class T> ACE_INLINE -CORBA::Boolean POA_CORBA::DIIPollable_tie<T>::is_ready ( - CORBA::ULong timeout, - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->is_ready ( - timeout, - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -CORBA::PollableSet_ptr POA_CORBA::DIIPollable_tie<T>::create_pollable_set ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->create_pollable_set ( - ACE_TRY_ENV - ); -} - -#endif /* ACE_HAS_USING_KEYWORD */ - -#if defined (ACE_HAS_USING_KEYWORD) -template <class T> ACE_INLINE -POA_CORBA::PollableSet_tie<T>::PollableSet_tie (T &t) - : ptr_ (&t), - poa_ (PortableServer::POA::_nil ()), - rel_ (0) -{} - -template <class T> ACE_INLINE -POA_CORBA::PollableSet_tie<T>::PollableSet_tie (T &t, PortableServer::POA_ptr poa) - : ptr_ (&t), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (0) -{} - -template <class T> ACE_INLINE -POA_CORBA::PollableSet_tie<T>::PollableSet_tie (T *tp, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_nil ()), - rel_ (release) -{} - -template <class T> ACE_INLINE -POA_CORBA::PollableSet_tie<T>::PollableSet_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::PollableSet_tie<T>::~PollableSet_tie (void) -{ - if (this->rel_) delete this->ptr_; -} - -template <class T> ACE_INLINE T * -POA_CORBA::PollableSet_tie<T>::_tied_object (void) -{ - return this->ptr_; -} - -template <class T> ACE_INLINE void -POA_CORBA::PollableSet_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::PollableSet_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::PollableSet_tie<T>::_is_owner (void) -{ - return this->rel_; -} - -template <class T> ACE_INLINE void -POA_CORBA::PollableSet_tie<T>::_is_owner (CORBA::Boolean b) -{ - this->rel_ = b; -} - -template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA::PollableSet_tie<T>::_default_POA (CORBA::Environment &env) -{ - if (!CORBA::is_nil (this->poa_.in ())) - return PortableServer::POA::_duplicate (this->poa_.in ()); - - return this->PollabeSet::_default_POA (env); -} - -template <class T> ACE_INLINE -CORBA::DIIPollable_ptr POA_CORBA::PollableSet_tie<T>::create_dii_pollable ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->create_dii_pollable ( - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -void POA_CORBA::PollableSet_tie<T>::add_pollable ( - CORBA::Pollable_ptr potential, - CORBA::Environment &ACE_TRY_ENV - ) -{ - this->ptr_->add_pollable ( - potential, - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -CORBA::Pollable_ptr POA_CORBA::PollableSet_tie<T>::poll ( - CORBA::ULong timeout, - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->poll ( - timeout, - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -void POA_CORBA::PollableSet_tie<T>::remove ( - CORBA::Pollable_ptr potential, - CORBA::Environment &ACE_TRY_ENV - ) -{ - this->ptr_->remove ( - potential, - ACE_TRY_ENV - ); -} - -template <class T> ACE_INLINE -CORBA::UShort POA_CORBA::PollableSet_tie<T>::number_left ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->ptr_->number_left ( - ACE_TRY_ENV - ); -} - -#endif /* ACE_HAS_USING_KEYWORD */ diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp index d8f9bb5d5cc..70e445cab89 100644 --- a/TAO/tao/Stub.cpp +++ b/TAO/tao/Stub.cpp @@ -634,7 +634,7 @@ TAO_Stub::validate_connection (CORBA::PolicyList_out inconsistent_policies, // Check if we care about Client Priority policy, and store the // result in the variable called <set>. int set = 1; - POA_TAO::ClientPriorityPolicy *policy = + TAO::ClientPriorityPolicy *policy = this->client_priority (); if (policy == 0) set = 0; @@ -705,7 +705,7 @@ TAO_Stub::sync_strategy (void) #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 && \ TAO_HAS_SYNC_SCOPE_POLICY == 1) - POA_Messaging::SyncScopePolicy *policy = + Messaging::SyncScopePolicy *policy = this->sync_scope (); if (policy != 0) diff --git a/TAO/tao/TAO.pidl b/TAO/tao/TAO.pidl index 19e879f81c4..c9b10ad2dd1 100644 --- a/TAO/tao/TAO.pidl +++ b/TAO/tao/TAO.pidl @@ -13,10 +13,19 @@ // This file contains TAO-specific idl interfaces (not part of CORBA // 2.3). // -// This file was used to generate the code in TAO{C,S,S_T}.{h,i,cpp} -// The code is then hand-crafted to compile it inside the ORB, avoid -// cyclic dependencies and enforce the locality constraints on -// certain objects. +// The command used to generate code from this file is: +// +// tao_idl -o orig -Gp -Gd -Ge 1 -Gv \ +// -Wb,export_macro=TAO_Export \ +// -Wb,export_include="tao/corbafwd.h" Messaging.pidl +// +// after the file is generated a patch must be applied. The patch +// fixes the interface repository IDs, disables the code under +// certain configurations, and eliminates cycles in the include +// dependencies. Those changes are required because the generated +// code is part of the TAO library, it hardly makes any sense to +// change the IDL compiler to support changes that are very +// occasional. // // ================================================================ @@ -26,6 +35,8 @@ #include "Policy.pidl" #include "TimeBase.pidl" +#pragma prefix "" + module TAO { // @@ -44,12 +55,12 @@ module TAO }; const CORBA::PolicyType CLIENT_PRIORITY_POLICY_TYPE = 0x54410000; - interface ClientPriorityPolicy : CORBA::Policy + local interface ClientPriorityPolicy : CORBA::Policy { readonly attribute PrioritySpecification priority_specification; }; - //////////////////////////////////////////////////////////////////////////////// + // **************************************************************** // // Buffering constraint. @@ -71,11 +82,29 @@ module TAO }; const CORBA::PolicyType BUFFERING_CONSTRAINT_POLICY_TYPE = 0x54410001; - interface BufferingConstraintPolicy : CORBA::Policy + local interface BufferingConstraintPolicy : CORBA::Policy { readonly attribute BufferingConstraint buffering_constraint; }; + // @@ I (coryan) found the following comment on the generated code: + // + // It seems easier to have copies of these here than to use + // #if (TAO_HAS_CORBA_MESSAGING == 1) everywhere or to define + // a new class TAO_GIOP_Reliable_Oneway_Invocation + // + // I don't agree, but this is not the time to fix this stuff, + // instead I added the code to the .pidl file so at least it is + // automatically generated. + // + typedef short SyncScope; + const SyncScope SYNC_NONE = 0; + const SyncScope SYNC_WITH_TRANSPORT = 1; + const SyncScope SYNC_WITH_SERVER = 2; + const SyncScope SYNC_WITH_TARGET = 3; + // = TAO specific. + const SyncScope SYNC_EAGER_BUFFERING = SYNC_NONE; + const SyncScope SYNC_DELAYED_BUFFERING = -1; }; #pragma prefix "" diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp index 01e15270a69..1c1a85cbbb2 100644 --- a/TAO/tao/TAOC.cpp +++ b/TAO/tao/TAOC.cpp @@ -7,13 +7,13 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/TAOC.h" +#include "TAOC.h" #include "tao/TAOS.h" #include "tao/Typecode.h" #if !defined (__ACE_INLINE__) -#include "tao/TAOC.i" +#include "TAOC.i" #endif /* !defined INLINE */ #if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1) @@ -70,6 +70,12 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (TAO) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PrioritySpecification, &_tc_TAO_tc_TAO_PrioritySpecification) TAO_NAMESPACE_END +void TAO::PrioritySpecification::_tao_any_destructor (void *x) +{ + PrioritySpecification *tmp = ACE_static_cast (PrioritySpecification*,x); + delete tmp; +} + TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (TAO) TAO_NAMESPACE_DEFINE (const CORBA::ULong, CLIENT_PRIORITY_POLICY_TYPE, 1413545984U) @@ -79,273 +85,72 @@ TAO::ClientPriorityPolicy_ptr TAO::ClientPriorityPolicy::_narrow ( CORBA::Environment &ACE_TRY_ENV ) { - if (CORBA::is_nil (obj)) - return TAO::ClientPriorityPolicy::_nil (); - CORBA::Boolean is_a = obj->_is_a ("IDL:TAO/ClientPriorityPolicy:1.0", ACE_TRY_ENV); - ACE_CHECK_RETURN (TAO::ClientPriorityPolicy::_nil ()); - if (is_a == 0) - return TAO::ClientPriorityPolicy::_nil (); - return TAO::ClientPriorityPolicy::_unchecked_narrow (obj, ACE_TRY_ENV); + return ClientPriorityPolicy::_unchecked_narrow (obj, ACE_TRY_ENV); } TAO::ClientPriorityPolicy_ptr TAO::ClientPriorityPolicy::_unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment & ACE_TRY_ENV + CORBA::Environment & ) { - void *servant = 0; - if (!obj->_is_collocated () - || !obj->_servant () - || (servant = obj->_servant()->_downcast ("IDL:TAO/ClientPriorityPolicy:1.0")) == 0 - ) - ACE_THROW_RETURN (CORBA::MARSHAL (), TAO::ClientPriorityPolicy::_nil ()); - TAO::ClientPriorityPolicy_ptr retval = 0; - ACE_NEW_RETURN ( - retval, - POA_TAO::_tao_direct_collocated_ClientPriorityPolicy (ACE_reinterpret_cast (POA_TAO::ClientPriorityPolicy_ptr, servant), 0), - 0 - ); - return retval; + if (CORBA::is_nil (obj)) + return ClientPriorityPolicy::_nil (); + return + ACE_reinterpret_cast + ( + ClientPriorityPolicy_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &ClientPriorityPolicy::_narrow + ) + ) + ); } TAO::ClientPriorityPolicy_ptr -TAO::ClientPriorityPolicy::_duplicate (TAO::ClientPriorityPolicy_ptr obj) +TAO::ClientPriorityPolicy::_duplicate (ClientPriorityPolicy_ptr obj) { if (!CORBA::is_nil (obj)) obj->_add_ref (); return obj; } -CORBA::Boolean TAO::ClientPriorityPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:TAO/ClientPriorityPolicy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) - return 1; // success using local knowledge - else - return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); -} - -const char* TAO::ClientPriorityPolicy::_interface_repository_id (void) const -{ - return "IDL:TAO/ClientPriorityPolicy:1.0"; -} - -static const CORBA::Long _oc_TAO_ClientPriorityPolicy[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x54414f2f), ACE_NTOHL (0x436c6965), ACE_NTOHL (0x6e745072), ACE_NTOHL (0x696f7269), ACE_NTOHL (0x7479506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:TAO/ClientPriorityPolicy:1.0 - 21, ACE_NTOHL (0x436c6965), ACE_NTOHL (0x6e745072), ACE_NTOHL (0x696f7269), ACE_NTOHL (0x7479506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x0), // name = ClientPriorityPolicy -}; -static CORBA::TypeCode _tc_TAO_tc_TAO_ClientPriorityPolicy (CORBA::tk_objref, sizeof (_oc_TAO_ClientPriorityPolicy), (char *) &_oc_TAO_ClientPriorityPolicy, 0, sizeof (TAO::ClientPriorityPolicy)); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (TAO) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ClientPriorityPolicy, &_tc_TAO_tc_TAO_ClientPriorityPolicy) -TAO_NAMESPACE_END - -void operator<<= (CORBA::Any &_tao_any, const TAO::PrioritySpecification &_tao_elem) // copying -{ - TAO_OutputCDR stream; - stream << _tao_elem; - _tao_any._tao_replace ( - TAO::_tc_PrioritySpecification, - TAO_ENCAP_BYTE_ORDER, - stream.begin () +void *TAO::ClientPriorityPolicy::_tao_QueryInterface (ptr_arith_t type) +{ + void *retv = 0; + if (type == ACE_reinterpret_cast + (ptr_arith_t, + &ClientPriorityPolicy::_narrow)) + retv = ACE_reinterpret_cast (void*, this); + else if (type == ACE_reinterpret_cast + (ptr_arith_t, + &CORBA::Policy::_narrow)) + retv = ACE_reinterpret_cast + ( + void *, + ACE_static_cast + ( + CORBA::Policy_ptr, + this + ) ); -} + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); -void TAO::PrioritySpecification::_tao_any_destructor (void *x) -{ - TAO::PrioritySpecification *tmp = ACE_static_cast(TAO::PrioritySpecification*,x); - delete tmp; -} - -void operator<<= (CORBA::Any &_tao_any, TAO::PrioritySpecification *_tao_elem) // non copying -{ - TAO_OutputCDR stream; - stream << *_tao_elem; - _tao_any._tao_replace ( - TAO::_tc_PrioritySpecification, - TAO_ENCAP_BYTE_ORDER, - stream.begin (), - 1, - _tao_elem, - TAO::PrioritySpecification::_tao_any_destructor - ); + if (retv) + this->_add_ref (); + return retv; } -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO::PrioritySpecification *&_tao_elem) -{ - ACE_TRY_NEW_ENV - { - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (TAO::_tc_PrioritySpecification, ACE_TRY_ENV)) // not equal - { - _tao_elem = 0; - return 0; - } - ACE_TRY_CHECK; - if (_tao_any.any_owns_data ()) - { - _tao_elem = (TAO::PrioritySpecification *)_tao_any.value (); - return 1; - } - else - { - ACE_NEW_RETURN (_tao_elem, TAO::PrioritySpecification, 0); - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - if (stream >> *_tao_elem) - { - ((CORBA::Any *)&_tao_any)->_tao_replace ( - TAO::_tc_PrioritySpecification, - 1, - ACE_reinterpret_cast (void *, _tao_elem), - TAO::PrioritySpecification::_tao_any_destructor - ); - return 1; - } - else - { - delete _tao_elem; - _tao_elem = 0; - } - } - } - ACE_CATCHANY - { - delete _tao_elem; - _tao_elem = 0; - return 0; - } - ACE_ENDTRY; - return 0; -} - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO::PrioritySpecification *&_tao_elem) -{ - ACE_TRY_NEW_ENV - { - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (TAO::_tc_PrioritySpecification, ACE_TRY_ENV)) // not equal - { - _tao_elem = 0; - return 0; - } - ACE_TRY_CHECK; - if (_tao_any.any_owns_data ()) - { - _tao_elem = (TAO::PrioritySpecification *)_tao_any.value (); - return 1; - } - else - { - ACE_NEW_RETURN (_tao_elem, TAO::PrioritySpecification, 0); - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - if (stream >> *(TAO::PrioritySpecification *)_tao_elem) - { - ((CORBA::Any *)&_tao_any)->_tao_replace ( - TAO::_tc_PrioritySpecification, - 1, - ACE_reinterpret_cast (void *, ACE_const_cast (TAO::PrioritySpecification *&, _tao_elem)), - TAO::PrioritySpecification::_tao_any_destructor - ); - return 1; - } - else - { - delete ACE_const_cast (TAO::PrioritySpecification *&, _tao_elem); - _tao_elem = 0; - } - } - } - ACE_CATCHANY - { - delete ACE_const_cast (TAO::PrioritySpecification *&, _tao_elem); - _tao_elem = 0; - return 0; - } - ACE_ENDTRY; - return 0; -} - -void TAO::ClientPriorityPolicy::_tao_any_destructor (void *x) -{ - TAO::ClientPriorityPolicy *tmp = ACE_static_cast(TAO::ClientPriorityPolicy*,x); - CORBA::release (tmp); -} - -TAO::ClientPriorityPolicy_ptr (*_TAO_collocation_TAO_ClientPriorityPolicy_Stub_Factory_function_pointer) ( - CORBA::Object_ptr obj - ) = 0; -void operator<<= (CORBA::Any &_tao_any, TAO::ClientPriorityPolicy_ptr _tao_elem) -{ - TAO_OutputCDR stream; - if (stream << _tao_elem) - { - _tao_any._tao_replace ( - TAO::_tc_ClientPriorityPolicy, - TAO_ENCAP_BYTE_ORDER, - stream.begin (), - 1, - _tao_elem, - TAO::ClientPriorityPolicy::_tao_any_destructor - ); - } -} - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO::ClientPriorityPolicy_ptr &_tao_elem) +const char* TAO::ClientPriorityPolicy::_interface_repository_id (void) const { - ACE_TRY_NEW_ENV - { - _tao_elem = TAO::ClientPriorityPolicy::_nil (); - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (TAO::_tc_ClientPriorityPolicy, ACE_TRY_ENV)) // not equal - { - return 0; - } - ACE_TRY_CHECK; - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - CORBA::Object_var _tao_obj_var; - if (stream >> _tao_obj_var.out ()) - { - _tao_elem = TAO::ClientPriorityPolicy::_narrow (_tao_obj_var.in (), ACE_TRY_ENV); - ACE_TRY_CHECK; - ((CORBA::Any *)&_tao_any)->_tao_replace ( - TAO::_tc_ClientPriorityPolicy, - 1, - _tao_elem, - TAO::ClientPriorityPolicy::_tao_any_destructor - ); - return 1; - } - } - ACE_CATCHANY - { - _tao_elem = TAO::ClientPriorityPolicy::_nil (); - return 0; - } - ACE_ENDTRY; - _tao_elem = TAO::ClientPriorityPolicy::_nil (); - return 0; + return "IDL:TAO/ClientPriorityPolicy:1.0"; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<TAO::ClientPriorityPolicy,TAO::ClientPriorityPolicy_var>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<TAO::ClientPriorityPolicy,TAO::ClientPriorityPolicy_var> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - #endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */ #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) @@ -415,6 +220,12 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (TAO) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_BufferingConstraint, &_tc_TAO_tc_TAO_BufferingConstraint) TAO_NAMESPACE_END +void TAO::BufferingConstraint::_tao_any_destructor (void *x) +{ + BufferingConstraint *tmp = ACE_static_cast (BufferingConstraint*,x); + delete tmp; +} + TAO_NAMESPACE_TYPE (const CORBA::ULong) TAO_NAMESPACE_BEGIN (TAO) TAO_NAMESPACE_DEFINE (const CORBA::ULong, BUFFERING_CONSTRAINT_POLICY_TYPE, 1413545985U) @@ -424,52 +235,65 @@ TAO::BufferingConstraintPolicy_ptr TAO::BufferingConstraintPolicy::_narrow ( CORBA::Environment &ACE_TRY_ENV ) { - if (CORBA::is_nil (obj)) - return TAO::BufferingConstraintPolicy::_nil (); - CORBA::Boolean is_a = obj->_is_a ("IDL:TAO/BufferingConstraintPolicy:1.0", ACE_TRY_ENV); - ACE_CHECK_RETURN (TAO::BufferingConstraintPolicy::_nil ()); - if (is_a == 0) - return TAO::BufferingConstraintPolicy::_nil (); - return TAO::BufferingConstraintPolicy::_unchecked_narrow (obj, ACE_TRY_ENV); + return BufferingConstraintPolicy::_unchecked_narrow (obj, ACE_TRY_ENV); } TAO::BufferingConstraintPolicy_ptr TAO::BufferingConstraintPolicy::_unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment & ACE_TRY_ENV + CORBA::Environment & ) { - void *servant = 0; - if (!obj->_is_collocated () - || !obj->_servant () - || (servant = obj->_servant()->_downcast ("IDL:TAO/BufferingConstraintPolicy:1.0")) == 0 - ) - ACE_THROW_RETURN (CORBA::MARSHAL (), TAO::BufferingConstraintPolicy::_nil ()); - TAO::BufferingConstraintPolicy_ptr retval = 0; - ACE_NEW_RETURN ( - retval, - POA_TAO::_tao_direct_collocated_BufferingConstraintPolicy (ACE_reinterpret_cast (POA_TAO::BufferingConstraintPolicy_ptr, servant), 0), - 0 - ); - return retval; + if (CORBA::is_nil (obj)) + return BufferingConstraintPolicy::_nil (); + return + ACE_reinterpret_cast + ( + BufferingConstraintPolicy_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &BufferingConstraintPolicy::_narrow + ) + ) + ); } TAO::BufferingConstraintPolicy_ptr -TAO::BufferingConstraintPolicy::_duplicate (TAO::BufferingConstraintPolicy_ptr obj) +TAO::BufferingConstraintPolicy::_duplicate (BufferingConstraintPolicy_ptr obj) { if (!CORBA::is_nil (obj)) obj->_add_ref (); return obj; } -CORBA::Boolean TAO::BufferingConstraintPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:TAO/BufferingConstraintPolicy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) - return 1; // success using local knowledge - else - return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); +void *TAO::BufferingConstraintPolicy::_tao_QueryInterface (ptr_arith_t type) +{ + void *retv = 0; + if (type == ACE_reinterpret_cast + (ptr_arith_t, + &BufferingConstraintPolicy::_narrow)) + retv = ACE_reinterpret_cast (void*, this); + else if (type == ACE_reinterpret_cast + (ptr_arith_t, + &CORBA::Policy::_narrow)) + retv = ACE_reinterpret_cast + ( + void *, + ACE_static_cast + ( + CORBA::Policy_ptr, + this + ) + ); + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); + + if (retv) + this->_add_ref (); + return retv; } const char* TAO::BufferingConstraintPolicy::_interface_repository_id (void) const @@ -477,243 +301,203 @@ const char* TAO::BufferingConstraintPolicy::_interface_repository_id (void) cons return "IDL:TAO/BufferingConstraintPolicy:1.0"; } -static const CORBA::Long _oc_TAO_BufferingConstraintPolicy[] = +static const CORBA::Long _oc_TAO_SyncScope[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x54414f2f), ACE_NTOHL (0x42756666), ACE_NTOHL (0x6572696e), ACE_NTOHL (0x67436f6e), ACE_NTOHL (0x73747261), ACE_NTOHL (0x696e7450), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x793a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:TAO/BufferingConstraintPolicy:1.0 - 26, ACE_NTOHL (0x42756666), ACE_NTOHL (0x6572696e), ACE_NTOHL (0x67436f6e), ACE_NTOHL (0x73747261), ACE_NTOHL (0x696e7450), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x79000000), // name = BufferingConstraintPolicy + 22, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x54414f2f), ACE_NTOHL (0x53796e63), ACE_NTOHL (0x53636f70), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:TAO/SyncScope:1.0 + 10, ACE_NTOHL (0x53796e63), ACE_NTOHL (0x53636f70), ACE_NTOHL (0x65000000), // name = SyncScope + CORBA::tk_short, + }; -static CORBA::TypeCode _tc_TAO_tc_TAO_BufferingConstraintPolicy (CORBA::tk_objref, sizeof (_oc_TAO_BufferingConstraintPolicy), (char *) &_oc_TAO_BufferingConstraintPolicy, 0, sizeof (TAO::BufferingConstraintPolicy)); +static CORBA::TypeCode _tc_TAO_tc_TAO_SyncScope (CORBA::tk_alias, sizeof (_oc_TAO_SyncScope), (char *) &_oc_TAO_SyncScope, 0, sizeof (TAO::SyncScope)); TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (TAO) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_BufferingConstraintPolicy, &_tc_TAO_tc_TAO_BufferingConstraintPolicy) +TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_SyncScope, &_tc_TAO_tc_TAO_SyncScope) TAO_NAMESPACE_END - -void operator<<= (CORBA::Any &_tao_any, const TAO::BufferingConstraint &_tao_elem) // copying +TAO_NAMESPACE_TYPE (const CORBA::Short) +TAO_NAMESPACE_BEGIN (TAO) +TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_NONE, 0) +TAO_NAMESPACE_END +TAO_NAMESPACE_TYPE (const CORBA::Short) +TAO_NAMESPACE_BEGIN (TAO) +TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_WITH_TRANSPORT, 1) +TAO_NAMESPACE_END +TAO_NAMESPACE_TYPE (const CORBA::Short) +TAO_NAMESPACE_BEGIN (TAO) +TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_WITH_SERVER, 2) +TAO_NAMESPACE_END +TAO_NAMESPACE_TYPE (const CORBA::Short) +TAO_NAMESPACE_BEGIN (TAO) +TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_WITH_TARGET, 3) +TAO_NAMESPACE_END +TAO_NAMESPACE_TYPE (const CORBA::Short) +TAO_NAMESPACE_BEGIN (TAO) +TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_EAGER_BUFFERING, 0) +TAO_NAMESPACE_END +TAO_NAMESPACE_TYPE (const CORBA::Short) +TAO_NAMESPACE_BEGIN (TAO) +TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_DELAYED_BUFFERING, -1) +TAO_NAMESPACE_END +void operator<<= (CORBA::Any &_tao_any, const TAO::PrioritySpecification &_tao_elem) // copying { - TAO_OutputCDR stream; - stream << _tao_elem; - _tao_any._tao_replace ( - TAO::_tc_BufferingConstraint, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); + TAO_OutputCDR stream; + stream << _tao_elem; + _tao_any._tao_replace ( + TAO::_tc_PrioritySpecification, + TAO_ENCAP_BYTE_ORDER, + stream.begin () + ); } -void TAO::BufferingConstraint::_tao_any_destructor (void *x) +void operator<<= (CORBA::Any &_tao_any, TAO::PrioritySpecification *_tao_elem) // non copying { - TAO::BufferingConstraint *tmp = ACE_static_cast(TAO::BufferingConstraint*,x); - delete tmp; + TAO_OutputCDR stream; + stream << *_tao_elem; + _tao_any._tao_replace ( + TAO::_tc_PrioritySpecification, + TAO_ENCAP_BYTE_ORDER, + stream.begin (), + 1, + _tao_elem, + TAO::PrioritySpecification::_tao_any_destructor + ); } -void operator<<= (CORBA::Any &_tao_any, TAO::BufferingConstraint *_tao_elem) // non copying +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO::PrioritySpecification *&_tao_elem) { - TAO_OutputCDR stream; - stream << *_tao_elem; - _tao_any._tao_replace ( - TAO::_tc_BufferingConstraint, - TAO_ENCAP_BYTE_ORDER, - stream.begin (), - 1, - _tao_elem, - TAO::BufferingConstraint::_tao_any_destructor - ); + return _tao_any >>= ACE_const_cast(const TAO::PrioritySpecification*&,_tao_elem); } -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO::BufferingConstraint *&_tao_elem) +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO::PrioritySpecification *&_tao_elem) { + _tao_elem = 0; ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (TAO::_tc_BufferingConstraint, ACE_TRY_ENV)) // not equal + if (!type->equivalent (TAO::_tc_PrioritySpecification, ACE_TRY_ENV)) // not equal { - _tao_elem = 0; return 0; } ACE_TRY_CHECK; if (_tao_any.any_owns_data ()) { - _tao_elem = (TAO::BufferingConstraint *)_tao_any.value (); + _tao_elem = ACE_static_cast( + const TAO::PrioritySpecification*, + _tao_any.value () + ); return 1; } else { - ACE_NEW_RETURN (_tao_elem, TAO::BufferingConstraint, 0); + TAO::PrioritySpecification *tmp; + ACE_NEW_RETURN (tmp, TAO::PrioritySpecification, 0); TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () ); - if (stream >> *_tao_elem) + if (stream >> *tmp) { ((CORBA::Any *)&_tao_any)->_tao_replace ( - TAO::_tc_BufferingConstraint, + TAO::_tc_PrioritySpecification, 1, - ACE_reinterpret_cast (void *, _tao_elem), - TAO::BufferingConstraint::_tao_any_destructor + ACE_static_cast (void *, tmp), + TAO::PrioritySpecification::_tao_any_destructor ); + _tao_elem = tmp; return 1; } else { - delete _tao_elem; - _tao_elem = 0; + delete tmp; } } } ACE_CATCHANY { - delete _tao_elem; - _tao_elem = 0; - return 0; } ACE_ENDTRY; return 0; } +void operator<<= (CORBA::Any &_tao_any, const TAO::BufferingConstraint &_tao_elem) // copying +{ + TAO_OutputCDR stream; + stream << _tao_elem; + _tao_any._tao_replace ( + TAO::_tc_BufferingConstraint, + TAO_ENCAP_BYTE_ORDER, + stream.begin () + ); +} + +void operator<<= (CORBA::Any &_tao_any, TAO::BufferingConstraint *_tao_elem) // non copying +{ + TAO_OutputCDR stream; + stream << *_tao_elem; + _tao_any._tao_replace ( + TAO::_tc_BufferingConstraint, + TAO_ENCAP_BYTE_ORDER, + stream.begin (), + 1, + _tao_elem, + TAO::BufferingConstraint::_tao_any_destructor + ); +} + +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO::BufferingConstraint *&_tao_elem) +{ + return _tao_any >>= ACE_const_cast(const TAO::BufferingConstraint*&,_tao_elem); +} + CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO::BufferingConstraint *&_tao_elem) { + _tao_elem = 0; ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); if (!type->equivalent (TAO::_tc_BufferingConstraint, ACE_TRY_ENV)) // not equal { - _tao_elem = 0; return 0; } ACE_TRY_CHECK; if (_tao_any.any_owns_data ()) { - _tao_elem = (TAO::BufferingConstraint *)_tao_any.value (); + _tao_elem = ACE_static_cast( + const TAO::BufferingConstraint*, + _tao_any.value () + ); return 1; - } + } else { - ACE_NEW_RETURN (_tao_elem, TAO::BufferingConstraint, 0); + TAO::BufferingConstraint *tmp; + ACE_NEW_RETURN (tmp, TAO::BufferingConstraint, 0); TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () ); - if (stream >> *(TAO::BufferingConstraint *)_tao_elem) + if (stream >> *tmp) { ((CORBA::Any *)&_tao_any)->_tao_replace ( TAO::_tc_BufferingConstraint, 1, - ACE_reinterpret_cast (void *, ACE_const_cast (TAO::BufferingConstraint *&, _tao_elem)), + ACE_static_cast (void *, tmp), TAO::BufferingConstraint::_tao_any_destructor ); + _tao_elem = tmp; return 1; } else { - delete ACE_const_cast (TAO::BufferingConstraint *&, _tao_elem); - _tao_elem = 0; + delete tmp; } } } ACE_CATCHANY { - delete ACE_const_cast (TAO::BufferingConstraint *&, _tao_elem); - _tao_elem = 0; - return 0; } ACE_ENDTRY; return 0; } -void TAO::BufferingConstraintPolicy::_tao_any_destructor (void *x) -{ - TAO::BufferingConstraintPolicy *tmp = ACE_static_cast(TAO::BufferingConstraintPolicy*,x); - CORBA::release (tmp); -} - -TAO::BufferingConstraintPolicy_ptr (*_TAO_collocation_TAO_BufferingConstraintPolicy_Stub_Factory_function_pointer) ( - CORBA::Object_ptr obj - ) = 0; -void operator<<= (CORBA::Any &_tao_any, TAO::BufferingConstraintPolicy_ptr _tao_elem) -{ - TAO_OutputCDR stream; - if (stream << _tao_elem) - { - _tao_any._tao_replace ( - TAO::_tc_BufferingConstraintPolicy, - TAO_ENCAP_BYTE_ORDER, - stream.begin (), - 1, - _tao_elem, - TAO::BufferingConstraintPolicy::_tao_any_destructor - ); - } -} - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO::BufferingConstraintPolicy_ptr &_tao_elem) -{ - ACE_TRY_NEW_ENV - { - _tao_elem = TAO::BufferingConstraintPolicy::_nil (); - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (TAO::_tc_BufferingConstraintPolicy, ACE_TRY_ENV)) // not equal - { - return 0; - } - ACE_TRY_CHECK; - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - CORBA::Object_var _tao_obj_var; - if (stream >> _tao_obj_var.out ()) - { - _tao_elem = TAO::BufferingConstraintPolicy::_narrow (_tao_obj_var.in (), ACE_TRY_ENV); - ACE_TRY_CHECK; - ((CORBA::Any *)&_tao_any)->_tao_replace ( - TAO::_tc_BufferingConstraintPolicy, - 1, - _tao_elem, - TAO::BufferingConstraintPolicy::_tao_any_destructor - ); - return 1; - } - } - ACE_CATCHANY - { - _tao_elem = TAO::BufferingConstraintPolicy::_nil (); - return 0; - } - ACE_ENDTRY; - _tao_elem = TAO::BufferingConstraintPolicy::_nil (); - return 0; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<TAO::BufferingConstraintPolicy,TAO::BufferingConstraintPolicy_var>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<TAO::BufferingConstraintPolicy,TAO::BufferingConstraintPolicy_var> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ - -TAO_NAMESPACE_TYPE (const CORBA::Short) -TAO_NAMESPACE_BEGIN (TAO) -TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_NONE, 0) -TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (const CORBA::Short) -TAO_NAMESPACE_BEGIN (TAO) -TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_WITH_TRANSPORT, 1) -TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (const CORBA::Short) -TAO_NAMESPACE_BEGIN (TAO) -TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_WITH_SERVER, 2) -TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (const CORBA::Short) -TAO_NAMESPACE_BEGIN (TAO) -TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_WITH_TARGET, 3) -TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (const CORBA::Short) -TAO_NAMESPACE_BEGIN (TAO) -TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_EAGER_BUFFERING, 0) -TAO_NAMESPACE_END -TAO_NAMESPACE_TYPE (const CORBA::Short) -TAO_NAMESPACE_BEGIN (TAO) -TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_DELAYED_BUFFERING, -1) -TAO_NAMESPACE_END diff --git a/TAO/tao/TAOC.h b/TAO/tao/TAOC.h index d92ce81ecc5..44dea01d4a3 100644 --- a/TAO/tao/TAOC.h +++ b/TAO/tao/TAOC.h @@ -7,8 +7,8 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef _TAO_IDL_TAOC_H_ -#define _TAO_IDL_TAOC_H_ +#ifndef _TAO_IDL_TMP_TAOC_H_ +#define _TAO_IDL_TMP_TAOC_H_ #include "ace/pre.h" #include "tao/corbafwd.h" @@ -30,12 +30,14 @@ #undef TAO_EXPORT_MACRO #endif #define TAO_EXPORT_MACRO TAO_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_Export #endif /* TAO_EXPORT_NESTED_CLASSES */ + #if defined(_MSC_VER) #if (_MSC_VER >= 1200) #pragma warning(push) @@ -58,8 +60,16 @@ TAO_NAMESPACE TAO TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short USE_PRIORITY_RANGE; + struct PrioritySpecification; + class PrioritySpecification_var; + struct TAO_Export PrioritySpecification { + +#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef PrioritySpecification_var _var_type; +#endif /* ! __GNUC__ || g++ >= 2.8 */ + static void _tao_any_destructor (void*); ACE_NESTED_CLASS (TAO, PrioritySelectionMode) mode; @@ -73,16 +83,19 @@ TAO_NAMESPACE TAO PrioritySpecification_var (void); // default constructor PrioritySpecification_var (PrioritySpecification *); PrioritySpecification_var (const PrioritySpecification_var &); // copy constructor + PrioritySpecification_var (const PrioritySpecification &); // fixed-size types only ~PrioritySpecification_var (void); // destructor PrioritySpecification_var &operator= (PrioritySpecification *); PrioritySpecification_var &operator= (const PrioritySpecification_var &); + PrioritySpecification_var &operator= (const PrioritySpecification &); // fixed-size types only PrioritySpecification *operator-> (void); const PrioritySpecification *operator-> (void) const; operator const PrioritySpecification &() const; operator PrioritySpecification &(); operator PrioritySpecification &() const; + // in, inout, out, _retn const PrioritySpecification &in (void) const; PrioritySpecification &inout (void); @@ -181,38 +194,33 @@ class TAO_Export ClientPriorityPolicy: public virtual CORBA::Policy static ClientPriorityPolicy_ptr _duplicate (ClientPriorityPolicy_ptr obj); static ClientPriorityPolicy_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static ClientPriorityPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static ClientPriorityPolicy_ptr _nil (void) { - return (TAO::ClientPriorityPolicy_ptr)0; + return (ClientPriorityPolicy_ptr)0; } - static void _tao_any_destructor (void*); - virtual ACE_NESTED_CLASS (TAO, PrioritySpecification) priority_specification ( + virtual TAO::PrioritySpecification priority_specification ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () - ) = 0; + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); - virtual CORBA::Boolean _is_a ( - const CORBA::Char *type_id, - CORBA::Environment &env = - TAO_default_environment () - ); virtual const char* _interface_repository_id (void) const; protected: ClientPriorityPolicy (void); - ClientPriorityPolicy (TAO_Stub *objref, - TAO_ServantBase *_tao_servant = 0, - CORBA::Boolean _tao_collocated = 0 - ); virtual ~ClientPriorityPolicy (void); private: ClientPriorityPolicy (const ClientPriorityPolicy &); @@ -222,8 +230,6 @@ class TAO_Export ClientPriorityPolicy: public virtual CORBA::Policy #endif /* end #if !defined */ - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ClientPriorityPolicy; - #endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */ #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) @@ -240,8 +246,16 @@ class TAO_Export ClientPriorityPolicy: public virtual CORBA::Policy TAO_NAMESPACE_STORAGE_CLASS const CORBA::UShort BUFFER_MESSAGE_BYTES; + struct BufferingConstraint; + class BufferingConstraint_var; + struct TAO_Export BufferingConstraint { + +#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef BufferingConstraint_var _var_type; +#endif /* ! __GNUC__ || g++ >= 2.8 */ + static void _tao_any_destructor (void*); ACE_NESTED_CLASS (TAO, BufferingConstraintMode) mode; @@ -256,16 +270,19 @@ class TAO_Export ClientPriorityPolicy: public virtual CORBA::Policy BufferingConstraint_var (void); // default constructor BufferingConstraint_var (BufferingConstraint *); BufferingConstraint_var (const BufferingConstraint_var &); // copy constructor + BufferingConstraint_var (const BufferingConstraint &); // fixed-size types only ~BufferingConstraint_var (void); // destructor BufferingConstraint_var &operator= (BufferingConstraint *); BufferingConstraint_var &operator= (const BufferingConstraint_var &); + BufferingConstraint_var &operator= (const BufferingConstraint &); // fixed-size types only BufferingConstraint *operator-> (void); const BufferingConstraint *operator-> (void) const; operator const BufferingConstraint &() const; operator BufferingConstraint &(); operator BufferingConstraint &() const; + // in, inout, out, _retn const BufferingConstraint &in (void) const; BufferingConstraint &inout (void); @@ -364,38 +381,33 @@ class TAO_Export BufferingConstraintPolicy: public virtual CORBA::Policy static BufferingConstraintPolicy_ptr _duplicate (BufferingConstraintPolicy_ptr obj); static BufferingConstraintPolicy_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static BufferingConstraintPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static BufferingConstraintPolicy_ptr _nil (void) { - return (TAO::BufferingConstraintPolicy_ptr)0; + return (BufferingConstraintPolicy_ptr)0; } - static void _tao_any_destructor (void*); - virtual ACE_NESTED_CLASS (TAO, BufferingConstraint) buffering_constraint ( + virtual TAO::BufferingConstraint buffering_constraint ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () - ) = 0; + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); - virtual CORBA::Boolean _is_a ( - const CORBA::Char *type_id, - CORBA::Environment &env = - TAO_default_environment () - ); virtual const char* _interface_repository_id (void) const; protected: BufferingConstraintPolicy (void); - BufferingConstraintPolicy (TAO_Stub *objref, - TAO_ServantBase *_tao_servant = 0, - CORBA::Boolean _tao_collocated = 0 - ); virtual ~BufferingConstraintPolicy (void); private: BufferingConstraintPolicy (const BufferingConstraintPolicy &); @@ -405,14 +417,9 @@ class TAO_Export BufferingConstraintPolicy: public virtual CORBA::Policy #endif /* end #if !defined */ - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_BufferingConstraintPolicy; - -#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ - - // It seems easier to have copies of these here than to use - // #if (TAO_HAS_CORBA_MESSAGING == 1) everywhere or to - // define a new class TAO_GIOP_Reliable_Oneway_Invocation typedef CORBA::Short SyncScope; + typedef CORBA::Short_out SyncScope_out; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_SyncScope; TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_NONE; @@ -422,49 +429,29 @@ class TAO_Export BufferingConstraintPolicy: public virtual CORBA::Policy TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_WITH_TARGET; - // = TAO specific. TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_EAGER_BUFFERING; TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_DELAYED_BUFFERING; +#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ + } TAO_NAMESPACE_CLOSE // module TAO #if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1) -TAO_Export void operator<<= (CORBA::Any &, - const TAO::PrioritySpecification &); // copying version -TAO_Export void operator<<= (CORBA::Any &, - TAO::PrioritySpecification*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, - TAO::PrioritySpecification *&); -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, - const TAO::PrioritySpecification *&); - -// Any operators for interface TAO::ClientPriorityPolicy -TAO_Export void operator<<= (CORBA::Any &, - TAO::ClientPriorityPolicy_ptr); -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, - TAO::ClientPriorityPolicy *&); - +TAO_Export void operator<<= (CORBA::Any &, const TAO::PrioritySpecification &); // copying version +TAO_Export void operator<<= (CORBA::Any &, TAO::PrioritySpecification*); // noncopying version +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::PrioritySpecification *&); // deprecated +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO::PrioritySpecification *&); #endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */ #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) -TAO_Export void operator<<= (CORBA::Any &, - const TAO::BufferingConstraint &); // copying version -TAO_Export void operator<<= (CORBA::Any &, - TAO::BufferingConstraint*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, - TAO::BufferingConstraint *&); -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, - const TAO::BufferingConstraint *&); - -// Any operators for interface TAO::BufferingConstraintPolicy -TAO_Export void operator<<= (CORBA::Any &, - TAO::BufferingConstraintPolicy_ptr); -CORBA::Boolean operator>>= (const CORBA::Any &, - TAO::BufferingConstraintPolicy *&); +TAO_Export void operator<<= (CORBA::Any &, const TAO::BufferingConstraint &); // copying version +TAO_Export void operator<<= (CORBA::Any &, TAO::BufferingConstraint*); // noncopying version +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::BufferingConstraint *&); // deprecated +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO::BufferingConstraint *&); #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ @@ -488,7 +475,7 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::BufferingConstraint & #if defined (__ACE_INLINE__) -#include "tao/TAOC.i" +#include "TAOC.i" #endif /* defined INLINE */ #if defined(_MSC_VER) && (_MSC_VER >= 1200) diff --git a/TAO/tao/TAOC.i b/TAO/tao/TAOC.i index 558c634ce81..8d3d4543bc7 100644 --- a/TAO/tao/TAOC.i +++ b/TAO/tao/TAOC.i @@ -19,19 +19,26 @@ TAO::PrioritySpecification_var::PrioritySpecification_var (void) // default cons {} ACE_INLINE -TAO::PrioritySpecification_var::PrioritySpecification_var (TAO::PrioritySpecification *p) +TAO::PrioritySpecification_var::PrioritySpecification_var (PrioritySpecification *p) : ptr_ (p) {} ACE_INLINE -TAO::PrioritySpecification_var::PrioritySpecification_var (const TAO::PrioritySpecification_var &p) // copy constructor +TAO::PrioritySpecification_var::PrioritySpecification_var (const ::TAO::PrioritySpecification_var &p) // copy constructor { if (p.ptr_) - ACE_NEW (this->ptr_, TAO::PrioritySpecification (*p.ptr_)); + ACE_NEW (this->ptr_, ::TAO::PrioritySpecification (*p.ptr_)); else this->ptr_ = 0; } +// fixed-size types only +ACE_INLINE +TAO::PrioritySpecification_var::PrioritySpecification_var (const ::TAO::PrioritySpecification &p) +{ + ACE_NEW (this->ptr_, ::TAO::PrioritySpecification (p)); +} + ACE_INLINE TAO::PrioritySpecification_var::~PrioritySpecification_var (void) // destructor { @@ -39,80 +46,92 @@ TAO::PrioritySpecification_var::~PrioritySpecification_var (void) // destructor } ACE_INLINE TAO::PrioritySpecification_var & -TAO::PrioritySpecification_var::operator= (TAO::PrioritySpecification *p) +TAO::PrioritySpecification_var::operator= (PrioritySpecification *p) { delete this->ptr_; this->ptr_ = p; return *this; } -ACE_INLINE TAO::PrioritySpecification_var & -TAO::PrioritySpecification_var::operator= (const TAO::PrioritySpecification_var &p) +ACE_INLINE ::TAO::PrioritySpecification_var & +TAO::PrioritySpecification_var::operator= (const ::TAO::PrioritySpecification_var &p) { if (this != &p) { delete this->ptr_; - ACE_NEW_RETURN (this->ptr_, TAO::PrioritySpecification (*p.ptr_), *this); + ACE_NEW_RETURN (this->ptr_, ::TAO::PrioritySpecification (*p.ptr_), *this); + } + return *this; +} + +// fixed-size types only +ACE_INLINE TAO::PrioritySpecification_var & +TAO::PrioritySpecification_var::operator= (const ::TAO::PrioritySpecification &p) +{ + if (this->ptr_ != &p) + { + delete this->ptr_; + ACE_NEW_RETURN (this->ptr_, ::TAO::PrioritySpecification (p), *this); } return *this; } -ACE_INLINE const TAO::PrioritySpecification * +ACE_INLINE const ::TAO::PrioritySpecification * TAO::PrioritySpecification_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE TAO::PrioritySpecification * +ACE_INLINE ::TAO::PrioritySpecification * TAO::PrioritySpecification_var::operator-> (void) { return this->ptr_; } ACE_INLINE -TAO::PrioritySpecification_var::operator const TAO::PrioritySpecification &() const // cast +TAO::PrioritySpecification_var::operator const ::TAO::PrioritySpecification &() const // cast { return *this->ptr_; } ACE_INLINE -TAO::PrioritySpecification_var::operator TAO::PrioritySpecification &() // cast +TAO::PrioritySpecification_var::operator ::TAO::PrioritySpecification &() // cast { return *this->ptr_; } ACE_INLINE -TAO::PrioritySpecification_var::operator TAO::PrioritySpecification &() const// cast +TAO::PrioritySpecification_var::operator ::TAO::PrioritySpecification &() const // cast { return *this->ptr_; } -ACE_INLINE const TAO::PrioritySpecification & +ACE_INLINE const ::TAO::PrioritySpecification & TAO::PrioritySpecification_var::in (void) const { return *this->ptr_; } -ACE_INLINE TAO::PrioritySpecification & +ACE_INLINE ::TAO::PrioritySpecification & TAO::PrioritySpecification_var::inout (void) { return *this->ptr_; } // mapping for fixed size -ACE_INLINE TAO::PrioritySpecification & +ACE_INLINE ::TAO::PrioritySpecification & TAO::PrioritySpecification_var::out (void) { return *this->ptr_; } -ACE_INLINE TAO::PrioritySpecification +ACE_INLINE ::TAO::PrioritySpecification TAO::PrioritySpecification_var::_retn (void) { return *this->ptr_; } -ACE_INLINE TAO::PrioritySpecification * +ACE_INLINE ::TAO::PrioritySpecification * TAO::PrioritySpecification_var::ptr (void) const { return this->ptr_; @@ -123,11 +142,6 @@ TAO::ClientPriorityPolicy::ClientPriorityPolicy (void) // default constructor {} ACE_INLINE -TAO::ClientPriorityPolicy::ClientPriorityPolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor - : CORBA_Object (objref, _tao_servant, _tao_collocated) -{} - -ACE_INLINE TAO::ClientPriorityPolicy::~ClientPriorityPolicy (void) // destructor {} @@ -141,23 +155,23 @@ TAO::ClientPriorityPolicy::~ClientPriorityPolicy (void) // destructor ACE_INLINE TAO::ClientPriorityPolicy_var::ClientPriorityPolicy_var (void) // default constructor - : ptr_ (TAO::ClientPriorityPolicy::_nil ()) + : ptr_ (ClientPriorityPolicy::_nil ()) {} ACE_INLINE -TAO::ClientPriorityPolicy_var::ClientPriorityPolicy_var (TAO::ClientPriorityPolicy_ptr p) +TAO::ClientPriorityPolicy_var::ClientPriorityPolicy_var (ClientPriorityPolicy_ptr p) : ptr_ (p) {} -ACE_INLINE TAO::ClientPriorityPolicy_ptr +ACE_INLINE ::TAO::ClientPriorityPolicy_ptr TAO::ClientPriorityPolicy_var::ptr (void) const { return this->ptr_; } ACE_INLINE -TAO::ClientPriorityPolicy_var::ClientPriorityPolicy_var (const TAO::ClientPriorityPolicy_var &p) // copy constructor - : ptr_ (TAO::ClientPriorityPolicy::_duplicate (p.ptr ())) +TAO::ClientPriorityPolicy_var::ClientPriorityPolicy_var (const ::TAO::ClientPriorityPolicy_var &p) // copy constructor + : ptr_ (ClientPriorityPolicy::_duplicate (p.ptr ())) {} ACE_INLINE @@ -167,7 +181,7 @@ TAO::ClientPriorityPolicy_var::~ClientPriorityPolicy_var (void) // destructor } ACE_INLINE TAO::ClientPriorityPolicy_var & -TAO::ClientPriorityPolicy_var::operator= (TAO::ClientPriorityPolicy_ptr p) +TAO::ClientPriorityPolicy_var::operator= (ClientPriorityPolicy_ptr p) { CORBA::release (this->ptr_); this->ptr_ = p; @@ -175,60 +189,60 @@ TAO::ClientPriorityPolicy_var::operator= (TAO::ClientPriorityPolicy_ptr p) } ACE_INLINE TAO::ClientPriorityPolicy_var & -TAO::ClientPriorityPolicy_var::operator= (const TAO::ClientPriorityPolicy_var &p) +TAO::ClientPriorityPolicy_var::operator= (const ::TAO::ClientPriorityPolicy_var &p) { if (this != &p) { CORBA::release (this->ptr_); - this->ptr_ = TAO::ClientPriorityPolicy::_duplicate (p.ptr ()); + this->ptr_ = ::TAO::ClientPriorityPolicy::_duplicate (p.ptr ()); } return *this; } ACE_INLINE -TAO::ClientPriorityPolicy_var::operator const TAO::ClientPriorityPolicy_ptr &() const // cast +TAO::ClientPriorityPolicy_var::operator const ::TAO::ClientPriorityPolicy_ptr &() const // cast { return this->ptr_; } ACE_INLINE -TAO::ClientPriorityPolicy_var::operator TAO::ClientPriorityPolicy_ptr &() // cast +TAO::ClientPriorityPolicy_var::operator ::TAO::ClientPriorityPolicy_ptr &() // cast { return this->ptr_; } -ACE_INLINE TAO::ClientPriorityPolicy_ptr +ACE_INLINE ::TAO::ClientPriorityPolicy_ptr TAO::ClientPriorityPolicy_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE TAO::ClientPriorityPolicy_ptr +ACE_INLINE ::TAO::ClientPriorityPolicy_ptr TAO::ClientPriorityPolicy_var::in (void) const { return this->ptr_; } -ACE_INLINE TAO::ClientPriorityPolicy_ptr & +ACE_INLINE ::TAO::ClientPriorityPolicy_ptr & TAO::ClientPriorityPolicy_var::inout (void) { return this->ptr_; } -ACE_INLINE TAO::ClientPriorityPolicy_ptr & +ACE_INLINE ::TAO::ClientPriorityPolicy_ptr & TAO::ClientPriorityPolicy_var::out (void) { CORBA::release (this->ptr_); - this->ptr_ = TAO::ClientPriorityPolicy::_nil (); + this->ptr_ = ::TAO::ClientPriorityPolicy::_nil (); return this->ptr_; } -ACE_INLINE TAO::ClientPriorityPolicy_ptr +ACE_INLINE ::TAO::ClientPriorityPolicy_ptr TAO::ClientPriorityPolicy_var::_retn (void) { // yield ownership of managed obj reference - TAO::ClientPriorityPolicy_ptr val = this->ptr_; - this->ptr_ = TAO::ClientPriorityPolicy::_nil (); + ::TAO::ClientPriorityPolicy_ptr val = this->ptr_; + this->ptr_ = ::TAO::ClientPriorityPolicy::_nil (); return val; } @@ -244,59 +258,59 @@ TAO::ClientPriorityPolicy_var::_retn (void) // ************************************************************* ACE_INLINE -TAO::ClientPriorityPolicy_out::ClientPriorityPolicy_out (TAO::ClientPriorityPolicy_ptr &p) +TAO::ClientPriorityPolicy_out::ClientPriorityPolicy_out (ClientPriorityPolicy_ptr &p) : ptr_ (p) { - this->ptr_ = TAO::ClientPriorityPolicy::_nil (); + this->ptr_ = ::TAO::ClientPriorityPolicy::_nil (); } ACE_INLINE -TAO::ClientPriorityPolicy_out::ClientPriorityPolicy_out (TAO::ClientPriorityPolicy_var &p) // constructor from _var +TAO::ClientPriorityPolicy_out::ClientPriorityPolicy_out (ClientPriorityPolicy_var &p) // constructor from _var : ptr_ (p.out ()) { CORBA::release (this->ptr_); - this->ptr_ = TAO::ClientPriorityPolicy::_nil (); + this->ptr_ = ::TAO::ClientPriorityPolicy::_nil (); } ACE_INLINE -TAO::ClientPriorityPolicy_out::ClientPriorityPolicy_out (const TAO::ClientPriorityPolicy_out &p) // copy constructor - : ptr_ (ACE_const_cast (TAO::ClientPriorityPolicy_out&,p).ptr_) +TAO::ClientPriorityPolicy_out::ClientPriorityPolicy_out (const ::TAO::ClientPriorityPolicy_out &p) // copy constructor + : ptr_ (ACE_const_cast (ClientPriorityPolicy_out &, p).ptr_) {} -ACE_INLINE TAO::ClientPriorityPolicy_out & -TAO::ClientPriorityPolicy_out::operator= (const TAO::ClientPriorityPolicy_out &p) +ACE_INLINE ::TAO::ClientPriorityPolicy_out & +TAO::ClientPriorityPolicy_out::operator= (const ::TAO::ClientPriorityPolicy_out &p) { - this->ptr_ = ACE_const_cast (TAO::ClientPriorityPolicy_out&,p).ptr_; + this->ptr_ = ACE_const_cast (ClientPriorityPolicy_out&, p).ptr_; return *this; } ACE_INLINE TAO::ClientPriorityPolicy_out & -TAO::ClientPriorityPolicy_out::operator= (const TAO::ClientPriorityPolicy_var &p) +TAO::ClientPriorityPolicy_out::operator= (const ::TAO::ClientPriorityPolicy_var &p) { - this->ptr_ = TAO::ClientPriorityPolicy::_duplicate (p.ptr ()); + this->ptr_ = ::TAO::ClientPriorityPolicy::_duplicate (p.ptr ()); return *this; } ACE_INLINE TAO::ClientPriorityPolicy_out & -TAO::ClientPriorityPolicy_out::operator= (TAO::ClientPriorityPolicy_ptr p) +TAO::ClientPriorityPolicy_out::operator= (ClientPriorityPolicy_ptr p) { this->ptr_ = p; return *this; } ACE_INLINE -TAO::ClientPriorityPolicy_out::operator TAO::ClientPriorityPolicy_ptr &() // cast +TAO::ClientPriorityPolicy_out::operator ::TAO::ClientPriorityPolicy_ptr &() // cast { return this->ptr_; } -ACE_INLINE TAO::ClientPriorityPolicy_ptr & +ACE_INLINE ::TAO::ClientPriorityPolicy_ptr & TAO::ClientPriorityPolicy_out::ptr (void) // ptr { return this->ptr_; } -ACE_INLINE TAO::ClientPriorityPolicy_ptr +ACE_INLINE ::TAO::ClientPriorityPolicy_ptr TAO::ClientPriorityPolicy_out::operator-> (void) { return this->ptr_; @@ -305,32 +319,6 @@ TAO::ClientPriorityPolicy_out::operator-> (void) #endif /* end #if !defined */ -ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO::PrioritySpecification &_tao_aggregate) -{ - if ( - (strm << _tao_aggregate.mode) && - (strm << _tao_aggregate.min_priority) && - (strm << _tao_aggregate.max_priority) - ) - return 1; - else - return 0; - -} - -ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, TAO::PrioritySpecification &_tao_aggregate) -{ - if ( - (strm >> _tao_aggregate.mode) && - (strm >> _tao_aggregate.min_priority) && - (strm >> _tao_aggregate.max_priority) - ) - return 1; - else - return 0; - -} - #endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */ #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) @@ -345,19 +333,26 @@ TAO::BufferingConstraint_var::BufferingConstraint_var (void) // default construc {} ACE_INLINE -TAO::BufferingConstraint_var::BufferingConstraint_var (TAO::BufferingConstraint *p) +TAO::BufferingConstraint_var::BufferingConstraint_var (BufferingConstraint *p) : ptr_ (p) {} ACE_INLINE -TAO::BufferingConstraint_var::BufferingConstraint_var (const TAO::BufferingConstraint_var &p) // copy constructor +TAO::BufferingConstraint_var::BufferingConstraint_var (const ::TAO::BufferingConstraint_var &p) // copy constructor { if (p.ptr_) - ACE_NEW (this->ptr_, TAO::BufferingConstraint (*p.ptr_)); + ACE_NEW (this->ptr_, ::TAO::BufferingConstraint (*p.ptr_)); else this->ptr_ = 0; } +// fixed-size types only +ACE_INLINE +TAO::BufferingConstraint_var::BufferingConstraint_var (const ::TAO::BufferingConstraint &p) +{ + ACE_NEW (this->ptr_, ::TAO::BufferingConstraint (p)); +} + ACE_INLINE TAO::BufferingConstraint_var::~BufferingConstraint_var (void) // destructor { @@ -365,80 +360,92 @@ TAO::BufferingConstraint_var::~BufferingConstraint_var (void) // destructor } ACE_INLINE TAO::BufferingConstraint_var & -TAO::BufferingConstraint_var::operator= (TAO::BufferingConstraint *p) +TAO::BufferingConstraint_var::operator= (BufferingConstraint *p) { delete this->ptr_; this->ptr_ = p; return *this; } -ACE_INLINE TAO::BufferingConstraint_var & -TAO::BufferingConstraint_var::operator= (const TAO::BufferingConstraint_var &p) +ACE_INLINE ::TAO::BufferingConstraint_var & +TAO::BufferingConstraint_var::operator= (const ::TAO::BufferingConstraint_var &p) { if (this != &p) { delete this->ptr_; - ACE_NEW_RETURN (this->ptr_, TAO::BufferingConstraint (*p.ptr_), *this); + ACE_NEW_RETURN (this->ptr_, ::TAO::BufferingConstraint (*p.ptr_), *this); + } + return *this; +} + +// fixed-size types only +ACE_INLINE TAO::BufferingConstraint_var & +TAO::BufferingConstraint_var::operator= (const ::TAO::BufferingConstraint &p) +{ + if (this->ptr_ != &p) + { + delete this->ptr_; + ACE_NEW_RETURN (this->ptr_, ::TAO::BufferingConstraint (p), *this); } return *this; } -ACE_INLINE const TAO::BufferingConstraint * +ACE_INLINE const ::TAO::BufferingConstraint * TAO::BufferingConstraint_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE TAO::BufferingConstraint * +ACE_INLINE ::TAO::BufferingConstraint * TAO::BufferingConstraint_var::operator-> (void) { return this->ptr_; } ACE_INLINE -TAO::BufferingConstraint_var::operator const TAO::BufferingConstraint &() const // cast +TAO::BufferingConstraint_var::operator const ::TAO::BufferingConstraint &() const // cast { return *this->ptr_; } ACE_INLINE -TAO::BufferingConstraint_var::operator TAO::BufferingConstraint &() // cast +TAO::BufferingConstraint_var::operator ::TAO::BufferingConstraint &() // cast { return *this->ptr_; } ACE_INLINE -TAO::BufferingConstraint_var::operator TAO::BufferingConstraint &() const// cast +TAO::BufferingConstraint_var::operator ::TAO::BufferingConstraint &() const // cast { return *this->ptr_; } -ACE_INLINE const TAO::BufferingConstraint & +ACE_INLINE const ::TAO::BufferingConstraint & TAO::BufferingConstraint_var::in (void) const { return *this->ptr_; } -ACE_INLINE TAO::BufferingConstraint & +ACE_INLINE ::TAO::BufferingConstraint & TAO::BufferingConstraint_var::inout (void) { return *this->ptr_; } // mapping for fixed size -ACE_INLINE TAO::BufferingConstraint & +ACE_INLINE ::TAO::BufferingConstraint & TAO::BufferingConstraint_var::out (void) { return *this->ptr_; } -ACE_INLINE TAO::BufferingConstraint +ACE_INLINE ::TAO::BufferingConstraint TAO::BufferingConstraint_var::_retn (void) { return *this->ptr_; } -ACE_INLINE TAO::BufferingConstraint * +ACE_INLINE ::TAO::BufferingConstraint * TAO::BufferingConstraint_var::ptr (void) const { return this->ptr_; @@ -449,11 +456,6 @@ TAO::BufferingConstraintPolicy::BufferingConstraintPolicy (void) // default cons {} ACE_INLINE -TAO::BufferingConstraintPolicy::BufferingConstraintPolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor - : CORBA_Object (objref, _tao_servant, _tao_collocated) -{} - -ACE_INLINE TAO::BufferingConstraintPolicy::~BufferingConstraintPolicy (void) // destructor {} @@ -467,23 +469,23 @@ TAO::BufferingConstraintPolicy::~BufferingConstraintPolicy (void) // destructor ACE_INLINE TAO::BufferingConstraintPolicy_var::BufferingConstraintPolicy_var (void) // default constructor - : ptr_ (TAO::BufferingConstraintPolicy::_nil ()) + : ptr_ (BufferingConstraintPolicy::_nil ()) {} ACE_INLINE -TAO::BufferingConstraintPolicy_var::BufferingConstraintPolicy_var (TAO::BufferingConstraintPolicy_ptr p) +TAO::BufferingConstraintPolicy_var::BufferingConstraintPolicy_var (BufferingConstraintPolicy_ptr p) : ptr_ (p) {} -ACE_INLINE TAO::BufferingConstraintPolicy_ptr +ACE_INLINE ::TAO::BufferingConstraintPolicy_ptr TAO::BufferingConstraintPolicy_var::ptr (void) const { return this->ptr_; } ACE_INLINE -TAO::BufferingConstraintPolicy_var::BufferingConstraintPolicy_var (const TAO::BufferingConstraintPolicy_var &p) // copy constructor - : ptr_ (TAO::BufferingConstraintPolicy::_duplicate (p.ptr ())) +TAO::BufferingConstraintPolicy_var::BufferingConstraintPolicy_var (const ::TAO::BufferingConstraintPolicy_var &p) // copy constructor + : ptr_ (BufferingConstraintPolicy::_duplicate (p.ptr ())) {} ACE_INLINE @@ -493,7 +495,7 @@ TAO::BufferingConstraintPolicy_var::~BufferingConstraintPolicy_var (void) // des } ACE_INLINE TAO::BufferingConstraintPolicy_var & -TAO::BufferingConstraintPolicy_var::operator= (TAO::BufferingConstraintPolicy_ptr p) +TAO::BufferingConstraintPolicy_var::operator= (BufferingConstraintPolicy_ptr p) { CORBA::release (this->ptr_); this->ptr_ = p; @@ -501,60 +503,60 @@ TAO::BufferingConstraintPolicy_var::operator= (TAO::BufferingConstraintPolicy_pt } ACE_INLINE TAO::BufferingConstraintPolicy_var & -TAO::BufferingConstraintPolicy_var::operator= (const TAO::BufferingConstraintPolicy_var &p) +TAO::BufferingConstraintPolicy_var::operator= (const ::TAO::BufferingConstraintPolicy_var &p) { if (this != &p) { CORBA::release (this->ptr_); - this->ptr_ = TAO::BufferingConstraintPolicy::_duplicate (p.ptr ()); + this->ptr_ = ::TAO::BufferingConstraintPolicy::_duplicate (p.ptr ()); } return *this; } ACE_INLINE -TAO::BufferingConstraintPolicy_var::operator const TAO::BufferingConstraintPolicy_ptr &() const // cast +TAO::BufferingConstraintPolicy_var::operator const ::TAO::BufferingConstraintPolicy_ptr &() const // cast { return this->ptr_; } ACE_INLINE -TAO::BufferingConstraintPolicy_var::operator TAO::BufferingConstraintPolicy_ptr &() // cast +TAO::BufferingConstraintPolicy_var::operator ::TAO::BufferingConstraintPolicy_ptr &() // cast { return this->ptr_; } -ACE_INLINE TAO::BufferingConstraintPolicy_ptr +ACE_INLINE ::TAO::BufferingConstraintPolicy_ptr TAO::BufferingConstraintPolicy_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE TAO::BufferingConstraintPolicy_ptr +ACE_INLINE ::TAO::BufferingConstraintPolicy_ptr TAO::BufferingConstraintPolicy_var::in (void) const { return this->ptr_; } -ACE_INLINE TAO::BufferingConstraintPolicy_ptr & +ACE_INLINE ::TAO::BufferingConstraintPolicy_ptr & TAO::BufferingConstraintPolicy_var::inout (void) { return this->ptr_; } -ACE_INLINE TAO::BufferingConstraintPolicy_ptr & +ACE_INLINE ::TAO::BufferingConstraintPolicy_ptr & TAO::BufferingConstraintPolicy_var::out (void) { CORBA::release (this->ptr_); - this->ptr_ = TAO::BufferingConstraintPolicy::_nil (); + this->ptr_ = ::TAO::BufferingConstraintPolicy::_nil (); return this->ptr_; } -ACE_INLINE TAO::BufferingConstraintPolicy_ptr +ACE_INLINE ::TAO::BufferingConstraintPolicy_ptr TAO::BufferingConstraintPolicy_var::_retn (void) { // yield ownership of managed obj reference - TAO::BufferingConstraintPolicy_ptr val = this->ptr_; - this->ptr_ = TAO::BufferingConstraintPolicy::_nil (); + ::TAO::BufferingConstraintPolicy_ptr val = this->ptr_; + this->ptr_ = ::TAO::BufferingConstraintPolicy::_nil (); return val; } @@ -570,59 +572,59 @@ TAO::BufferingConstraintPolicy_var::_retn (void) // ************************************************************* ACE_INLINE -TAO::BufferingConstraintPolicy_out::BufferingConstraintPolicy_out (TAO::BufferingConstraintPolicy_ptr &p) +TAO::BufferingConstraintPolicy_out::BufferingConstraintPolicy_out (BufferingConstraintPolicy_ptr &p) : ptr_ (p) { - this->ptr_ = TAO::BufferingConstraintPolicy::_nil (); + this->ptr_ = ::TAO::BufferingConstraintPolicy::_nil (); } ACE_INLINE -TAO::BufferingConstraintPolicy_out::BufferingConstraintPolicy_out (TAO::BufferingConstraintPolicy_var &p) // constructor from _var +TAO::BufferingConstraintPolicy_out::BufferingConstraintPolicy_out (BufferingConstraintPolicy_var &p) // constructor from _var : ptr_ (p.out ()) { CORBA::release (this->ptr_); - this->ptr_ = TAO::BufferingConstraintPolicy::_nil (); + this->ptr_ = ::TAO::BufferingConstraintPolicy::_nil (); } ACE_INLINE -TAO::BufferingConstraintPolicy_out::BufferingConstraintPolicy_out (const TAO::BufferingConstraintPolicy_out &p) // copy constructor - : ptr_ (ACE_const_cast (TAO::BufferingConstraintPolicy_out&,p).ptr_) +TAO::BufferingConstraintPolicy_out::BufferingConstraintPolicy_out (const ::TAO::BufferingConstraintPolicy_out &p) // copy constructor + : ptr_ (ACE_const_cast (BufferingConstraintPolicy_out &, p).ptr_) {} -ACE_INLINE TAO::BufferingConstraintPolicy_out & -TAO::BufferingConstraintPolicy_out::operator= (const TAO::BufferingConstraintPolicy_out &p) +ACE_INLINE ::TAO::BufferingConstraintPolicy_out & +TAO::BufferingConstraintPolicy_out::operator= (const ::TAO::BufferingConstraintPolicy_out &p) { - this->ptr_ = ACE_const_cast (TAO::BufferingConstraintPolicy_out&,p).ptr_; + this->ptr_ = ACE_const_cast (BufferingConstraintPolicy_out&, p).ptr_; return *this; } ACE_INLINE TAO::BufferingConstraintPolicy_out & -TAO::BufferingConstraintPolicy_out::operator= (const TAO::BufferingConstraintPolicy_var &p) +TAO::BufferingConstraintPolicy_out::operator= (const ::TAO::BufferingConstraintPolicy_var &p) { - this->ptr_ = TAO::BufferingConstraintPolicy::_duplicate (p.ptr ()); + this->ptr_ = ::TAO::BufferingConstraintPolicy::_duplicate (p.ptr ()); return *this; } ACE_INLINE TAO::BufferingConstraintPolicy_out & -TAO::BufferingConstraintPolicy_out::operator= (TAO::BufferingConstraintPolicy_ptr p) +TAO::BufferingConstraintPolicy_out::operator= (BufferingConstraintPolicy_ptr p) { this->ptr_ = p; return *this; } ACE_INLINE -TAO::BufferingConstraintPolicy_out::operator TAO::BufferingConstraintPolicy_ptr &() // cast +TAO::BufferingConstraintPolicy_out::operator ::TAO::BufferingConstraintPolicy_ptr &() // cast { return this->ptr_; } -ACE_INLINE TAO::BufferingConstraintPolicy_ptr & +ACE_INLINE ::TAO::BufferingConstraintPolicy_ptr & TAO::BufferingConstraintPolicy_out::ptr (void) // ptr { return this->ptr_; } -ACE_INLINE TAO::BufferingConstraintPolicy_ptr +ACE_INLINE ::TAO::BufferingConstraintPolicy_ptr TAO::BufferingConstraintPolicy_out::operator-> (void) { return this->ptr_; @@ -631,6 +633,32 @@ TAO::BufferingConstraintPolicy_out::operator-> (void) #endif /* end #if !defined */ +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO::PrioritySpecification &_tao_aggregate) +{ + if ( + (strm << _tao_aggregate.mode) && + (strm << _tao_aggregate.min_priority) && + (strm << _tao_aggregate.max_priority) + ) + return 1; + else + return 0; + +} + +ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, TAO::PrioritySpecification &_tao_aggregate) +{ + if ( + (strm >> _tao_aggregate.mode) && + (strm >> _tao_aggregate.min_priority) && + (strm >> _tao_aggregate.max_priority) + ) + return 1; + else + return 0; + +} + ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO::BufferingConstraint &_tao_aggregate) { if ( diff --git a/TAO/tao/TAOS.cpp b/TAO/tao/TAOS.cpp index d35515048fb..57f12c82b72 100644 --- a/TAO/tao/TAOS.cpp +++ b/TAO/tao/TAOS.cpp @@ -7,227 +7,9 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/TAOS.h" -#include "tao/Typecode.h" +#include "TAOS.h" #if !defined (__ACE_INLINE__) -#include "tao/TAOS.i" +#include "TAOS.i" #endif /* !defined INLINE */ -#if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1) - -// skeleton constructor -POA_TAO::ClientPriorityPolicy::ClientPriorityPolicy (void) -{ - -} - -// skeleton destructor -POA_TAO::ClientPriorityPolicy::~ClientPriorityPolicy (void) -{ -} - -CORBA::Boolean POA_TAO::ClientPriorityPolicy::_is_a ( - const char* value, - CORBA::Environment &ACE_TRY_ENV - ) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:TAO/ClientPriorityPolicy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) - return 1; - else - return 0; -} - -void* POA_TAO::ClientPriorityPolicy::_downcast ( - const char* logical_type_id - ) -{ -if (ACE_OS::strcmp (logical_type_id, "IDL:TAO/ClientPriorityPolicy:1.0") == 0) - return ACE_static_cast (POA_TAO::ClientPriorityPolicy_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0) - return ACE_static_cast (POA_CORBA::Policy_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) - return ACE_static_cast(PortableServer::Servant, this); - return 0; -} - -const char* POA_TAO::ClientPriorityPolicy::_interface_repository_id (void) const -{ - return "IDL:TAO/ClientPriorityPolicy:1.0"; -} - -TAO::ClientPriorityPolicy* -POA_TAO::ClientPriorityPolicy::_this (CORBA_Environment &ACE_TRY_ENV) -{ - TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); - TAO::ClientPriorityPolicy *retval = 0; - ACE_NEW_RETURN ( - retval, - POA_TAO::_tao_direct_collocated_ClientPriorityPolicy (this, stub), - 0 - ); - return retval; -} - -POA_TAO::_tao_direct_collocated_ClientPriorityPolicy::_tao_direct_collocated_ClientPriorityPolicy ( - POA_TAO::ClientPriorityPolicy_ptr servant, - TAO_Stub *stub - ) - : ACE_NESTED_CLASS (TAO,ClientPriorityPolicy) (), - ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub), - CORBA_Object (stub, servant, 1), - servant_ (servant) -{ -} - -CORBA::Boolean POA_TAO::_tao_direct_collocated_ClientPriorityPolicy::_is_a( - const CORBA::Char *logical_type_id, - CORBA_Environment &ACE_TRY_ENV - ) - -{ - return this->servant_->_is_a (logical_type_id, ACE_TRY_ENV); -} - - -POA_TAO::ClientPriorityPolicy_ptr POA_TAO::_tao_direct_collocated_ClientPriorityPolicy::_get_servant (void) const -{ - return this->servant_; -} - -CORBA::Boolean POA_TAO::_tao_direct_collocated_ClientPriorityPolicy::_non_existent( - CORBA_Environment &ACE_TRY_ENV - ) - -{ - return this->servant_->_non_existent (ACE_TRY_ENV); -} - - -TAO::PrioritySpecification POA_TAO::_tao_direct_collocated_ClientPriorityPolicy::priority_specification ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->priority_specification ( - ACE_TRY_ENV - ); - -} - -#endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */ - -#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) - -// skeleton constructor -POA_TAO::BufferingConstraintPolicy::BufferingConstraintPolicy (void) -{ - -} - -// skeleton destructor -POA_TAO::BufferingConstraintPolicy::~BufferingConstraintPolicy (void) -{ -} - -CORBA::Boolean POA_TAO::BufferingConstraintPolicy::_is_a ( - const char* value, - CORBA::Environment &ACE_TRY_ENV - ) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:TAO/BufferingConstraintPolicy:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) - return 1; - else - return 0; -} - -void* POA_TAO::BufferingConstraintPolicy::_downcast ( - const char* logical_type_id - ) -{ -if (ACE_OS::strcmp (logical_type_id, "IDL:TAO/BufferingConstraintPolicy:1.0") == 0) - return ACE_static_cast (POA_TAO::BufferingConstraintPolicy_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0) - return ACE_static_cast (POA_CORBA::Policy_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) - return ACE_static_cast(PortableServer::Servant, this); - return 0; -} - -const char* POA_TAO::BufferingConstraintPolicy::_interface_repository_id (void) const -{ - return "IDL:TAO/BufferingConstraintPolicy:1.0"; -} - -TAO::BufferingConstraintPolicy* -POA_TAO::BufferingConstraintPolicy::_this (CORBA_Environment &ACE_TRY_ENV) -{ - TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); - TAO::BufferingConstraintPolicy *retval = 0; - ACE_NEW_RETURN ( - retval, - POA_TAO::_tao_direct_collocated_BufferingConstraintPolicy (this, stub), - 0 - ); - return retval; -} - -POA_TAO::_tao_direct_collocated_BufferingConstraintPolicy::_tao_direct_collocated_BufferingConstraintPolicy ( - POA_TAO::BufferingConstraintPolicy_ptr servant, - TAO_Stub *stub - ) - : ACE_NESTED_CLASS (TAO,BufferingConstraintPolicy) (), - ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub), - CORBA_Object (stub, servant, 1), - servant_ (servant) -{ -} - -CORBA::Boolean POA_TAO::_tao_direct_collocated_BufferingConstraintPolicy::_is_a( - const CORBA::Char *logical_type_id, - CORBA_Environment &ACE_TRY_ENV - ) - -{ - return this->servant_->_is_a (logical_type_id, ACE_TRY_ENV); -} - - -POA_TAO::BufferingConstraintPolicy_ptr POA_TAO::_tao_direct_collocated_BufferingConstraintPolicy::_get_servant (void) const -{ - return this->servant_; -} - -CORBA::Boolean POA_TAO::_tao_direct_collocated_BufferingConstraintPolicy::_non_existent( - CORBA_Environment &ACE_TRY_ENV - ) - -{ - return this->servant_->_non_existent (ACE_TRY_ENV); -} - - -TAO::BufferingConstraint POA_TAO::_tao_direct_collocated_BufferingConstraintPolicy::buffering_constraint ( - CORBA::Environment &ACE_TRY_ENV - ) -{ - return this->servant_->buffering_constraint ( - ACE_TRY_ENV - ); - -} - -TAO::BufferingConstraint POA_TAO::_tao_direct_collocated_BufferingConstraintPolicy::buffering_constraint (void) -{ - return this->servant_->buffering_constraint (); - -} - -#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ diff --git a/TAO/tao/TAOS.h b/TAO/tao/TAOS.h index e7da3e3b3e5..f3c404973cf 100644 --- a/TAO/tao/TAOS.h +++ b/TAO/tao/TAOS.h @@ -7,19 +7,10 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef _TAO_IDL_TAOS_H_ -#define _TAO_IDL_TAOS_H_ -#include "ace/pre.h" +#ifndef _TAO_IDL_TMP_TAOS_H_ +#define _TAO_IDL_TMP_TAOS_H_ -#include "tao/TAOC.h" - -#if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1 || \ - TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) - -#include "tao/POA_CORBA.h" - -#endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 || - TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ +#include "tao/corbafwd.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -34,170 +25,17 @@ TAO_NAMESPACE POA_TAO { - -#if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1) - - class ClientPriorityPolicy; - typedef ClientPriorityPolicy *ClientPriorityPolicy_ptr; - class TAO_Export ClientPriorityPolicy : public virtual POA_CORBA::Policy - { - protected: - ClientPriorityPolicy (void); - - public: - virtual ~ClientPriorityPolicy (void); - - - virtual CORBA::Boolean _is_a ( - const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - - virtual void* _downcast ( - const char* logical_type_id - ); - - TAO::ClientPriorityPolicy *_this ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - - virtual const char* _interface_repository_id (void) const; - - virtual TAO::PrioritySpecification priority_specification ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) = 0; - - - }; - - -#if !defined (_TAO_CLIENTPRIORITYPOLICY___DIRECT_COLLOCATED_SH_) -#define _TAO_CLIENTPRIORITYPOLICY___DIRECT_COLLOCATED_SH_ - - class TAO_Export _tao_direct_collocated_ClientPriorityPolicy : public virtual TAO::ClientPriorityPolicy, - public virtual POA_CORBA::_tao_collocated_Policy - { - public: - _tao_direct_collocated_ClientPriorityPolicy ( - ClientPriorityPolicy_ptr servant, - TAO_Stub *stub - ); - virtual CORBA::Boolean _is_a( - const CORBA::Char *logical_type_id, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () - ); - - ClientPriorityPolicy_ptr _get_servant (void) const; - - virtual CORBA::Boolean _non_existent( - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () - ); - - virtual TAO::PrioritySpecification priority_specification ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - - - private: - ClientPriorityPolicy_ptr servant_; - }; - - -#endif /* end #if !defined */ - -#endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */ - -#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) - - class BufferingConstraintPolicy; - typedef BufferingConstraintPolicy *BufferingConstraintPolicy_ptr; - class TAO_Export BufferingConstraintPolicy : public virtual POA_CORBA::Policy - { - protected: - BufferingConstraintPolicy (void); - - public: - virtual ~BufferingConstraintPolicy (void); - - - virtual CORBA::Boolean _is_a ( - const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - - virtual void* _downcast ( - const char* logical_type_id - ); - - TAO::BufferingConstraintPolicy *_this ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - - virtual const char* _interface_repository_id (void) const; - - virtual TAO::BufferingConstraint buffering_constraint (CORBA::Environment &ACE_TRY_ENV) = 0; - // Hacky TAO extension to reduce call to - // CORBA::Environment::default_environment () since this method - // will never raise exceptions. - virtual TAO::BufferingConstraint buffering_constraint (void) = 0; - - }; - - -#if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY___DIRECT_COLLOCATED_SH_) -#define _TAO_BUFFERINGCONSTRAINTPOLICY___DIRECT_COLLOCATED_SH_ - - class TAO_Export _tao_direct_collocated_BufferingConstraintPolicy : public virtual TAO::BufferingConstraintPolicy, - public virtual POA_CORBA::_tao_collocated_Policy - { - public: - _tao_direct_collocated_BufferingConstraintPolicy ( - BufferingConstraintPolicy_ptr servant, - TAO_Stub *stub - ); - virtual CORBA::Boolean _is_a( - const CORBA::Char *logical_type_id, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () - ); - - BufferingConstraintPolicy_ptr _get_servant (void) const; - - virtual CORBA::Boolean _non_existent( - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () - ); - - virtual TAO::BufferingConstraint buffering_constraint (CORBA::Environment &ACE_TRY_ENV); - virtual TAO::BufferingConstraint buffering_constraint (void); - - - private: - BufferingConstraintPolicy_ptr servant_; - }; - - -#endif /* end #if !defined */ - - -#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ - } TAO_NAMESPACE_CLOSE -#include "tao/TAOS_T.h" +#include "TAOS_T.h" #if defined (__ACE_INLINE__) -#include "tao/TAOS.i" +#include "TAOS.i" #endif /* defined INLINE */ #if defined(_MSC_VER) && (_MSC_VER >= 1200) #pragma warning(pop) #endif /* _MSC_VER */ -#include "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/TAOS_T.cpp b/TAO/tao/TAOS_T.cpp index ce78efe1912..e72a85dc605 100644 --- a/TAO/tao/TAOS_T.cpp +++ b/TAO/tao/TAOS_T.cpp @@ -7,13 +7,13 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef _TAO_IDL__PROJECT_DOC_MARINA_ACE_WRAPPERS_TAO_TAO_TAOS_T_CPP_ -#define _TAO_IDL__PROJECT_DOC_MARINA_ACE_WRAPPERS_TAO_TAO_TAOS_T_CPP_ +#ifndef _TAO_IDL_TMP_TAOS_T_CPP_ +#define _TAO_IDL_TMP_TAOS_T_CPP_ -#include "tao/TAOS_T.h" +#include "TAOS_T.h" #if !defined (__ACE_INLINE__) -#include "tao/TAOS_T.i" +#include "TAOS_T.i" #endif /* !defined INLINE */ diff --git a/TAO/tao/TAOS_T.h b/TAO/tao/TAOS_T.h index ab7cabb42cf..a866e7ce751 100644 --- a/TAO/tao/TAOS_T.h +++ b/TAO/tao/TAOS_T.h @@ -7,9 +7,8 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef _TAO_IDL__PROJECT_DOC_MARINA_ACE_WRAPPERS_TAO_TAO_TAOS_T_H_ -#define _TAO_IDL__PROJECT_DOC_MARINA_ACE_WRAPPERS_TAO_TAO_TAOS_T_H_ -#include "ace/pre.h" +#ifndef _TAO_IDL_TMP_TAOS_T_H_ +#define _TAO_IDL_TMP_TAOS_T_H_ #if defined(_MSC_VER) #if (_MSC_VER >= 1200) @@ -20,12 +19,12 @@ #if defined (__ACE_INLINE__) -#include "tao/TAOS_T.i" +#include "TAOS_T.i" #endif /* defined INLINE */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "tao/TAOS_T.cpp" +#include "TAOS_T.cpp" #endif /* defined REQUIRED SOURCE */ @@ -37,5 +36,4 @@ #pragma warning(pop) #endif /* _MSC_VER */ -#include "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h index 793576468d0..a521fb18fbc 100644 --- a/TAO/tao/corbafwd.h +++ b/TAO/tao/corbafwd.h @@ -1103,6 +1103,7 @@ TAO_NAMESPACE_CLOSE // end of class (namespace) CORBA #define TAO_IMPLREPO_SERVER_MANUAL_ACTIVATION (0x0DU << 7) #define TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE (0x0EU << 7) #define TAO_ORB_CORE_INIT_LOCATION_CODE (0x0FU << 7) +#define TAO_POLICY_NARROW_CODE (0x10U << 7) // *Don't* use TAO_<location>_MINOR_CODE greater than 0x1FU! // errno encoding: bottom 7 bits. diff --git a/TAO/tao/diffs/MessagingC.cpp.diff b/TAO/tao/diffs/MessagingC.cpp.diff new file mode 100644 index 00000000000..9fccd9aedd0 --- /dev/null +++ b/TAO/tao/diffs/MessagingC.cpp.diff @@ -0,0 +1,2074 @@ +--- orig/MessagingC.cpp Fri Apr 28 16:44:03 2000 ++++ MessagingC.cpp Fri Apr 28 17:26:33 2000 +@@ -9,10 +9,19 @@ + + #include "MessagingC.h" + ++#if (TAO_HAS_CORBA_MESSAGING == 1) ++ ++#include "tao/MessagingS.h" ++#include "tao/POA_CORBA.h" ++#include "tao/Stub.h" ++#include "tao/Invocation.h" ++ + #if !defined (__ACE_INLINE__) + #include "MessagingC.i" + #endif /* !defined INLINE */ + ++ACE_RCSID(tao, MessagingC, "$Id$") ++ + static const CORBA::Long _oc_Messaging_RebindMode[] = + { + TAO_ENCAP_BYTE_ORDER, // byte order +@@ -161,6 +170,9 @@ + TAO_NAMESPACE_BEGIN (Messaging) + TAO_NAMESPACE_DEFINE (const CORBA::UShort, ORDER_DEADLINE, 8U) + TAO_NAMESPACE_END ++ ++#if (TAO_HAS_REBIND_POLICY == 1) ++ + TAO_NAMESPACE_TYPE (const CORBA::ULong) + TAO_NAMESPACE_BEGIN (Messaging) + TAO_NAMESPACE_DEFINE (const CORBA::ULong, REBIND_POLICY_TYPE, 23U) +@@ -212,7 +224,7 @@ + retv = ACE_reinterpret_cast (void*, this); + else if (type == ACE_reinterpret_cast + (ptr_arith_t, +- &Policy::_narrow)) ++ &CORBA::Policy::_narrow)) + retv = ACE_reinterpret_cast + ( + void *, +@@ -225,7 +237,7 @@ + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); +- ++ + if (retv) + this->_add_ref (); + return retv; +@@ -236,6 +248,10 @@ + return "IDL:omg.org/Messaging/RebindPolicy:1.0"; + } + ++#endif /* TAO_HAS_REBIND_POLICY == 1 */ ++ ++#if (TAO_HAS_SYNC_SCOPE_POLICY == 1) ++ + TAO_NAMESPACE_TYPE (const CORBA::ULong) + TAO_NAMESPACE_BEGIN (Messaging) + TAO_NAMESPACE_DEFINE (const CORBA::ULong, SYNC_SCOPE_POLICY_TYPE, 24U) +@@ -287,7 +303,7 @@ + retv = ACE_reinterpret_cast (void*, this); + else if (type == ACE_reinterpret_cast + (ptr_arith_t, +- &Policy::_narrow)) ++ &CORBA::Policy::_narrow)) + retv = ACE_reinterpret_cast + ( + void *, +@@ -300,7 +316,7 @@ + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); +- ++ + if (retv) + this->_add_ref (); + return retv; +@@ -311,6 +327,10 @@ + return "IDL:omg.org/Messaging/SyncScopePolicy:1.0"; + } + ++#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ ++ ++#if (TAO_HAS_PRIORITY_POLICIES == 1) ++ + TAO_NAMESPACE_TYPE (const CORBA::ULong) + TAO_NAMESPACE_BEGIN (Messaging) + TAO_NAMESPACE_DEFINE (const CORBA::ULong, REQUEST_PRIORITY_POLICY_TYPE, 25U) +@@ -398,7 +418,7 @@ + retv = ACE_reinterpret_cast (void*, this); + else if (type == ACE_reinterpret_cast + (ptr_arith_t, +- &Policy::_narrow)) ++ &CORBA::Policy::_narrow)) + retv = ACE_reinterpret_cast + ( + void *, +@@ -411,7 +431,7 @@ + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); +- ++ + if (retv) + this->_add_ref (); + return retv; +@@ -422,6 +442,10 @@ + return "IDL:omg.org/Messaging/RequestPriorityPolicy:1.0"; + } + ++#endif /* TAO_HAS_PRIORITY_POLICIES == 1 */ ++ ++#if (TAO_HAS_REQUEST_START_TIME_POLICY == 1) ++ + TAO_NAMESPACE_TYPE (const CORBA::ULong) + TAO_NAMESPACE_BEGIN (Messaging) + TAO_NAMESPACE_DEFINE (const CORBA::ULong, REPLY_PRIORITY_POLICY_TYPE, 26U) +@@ -473,7 +497,7 @@ + retv = ACE_reinterpret_cast (void*, this); + else if (type == ACE_reinterpret_cast + (ptr_arith_t, +- &Policy::_narrow)) ++ &CORBA::Policy::_narrow)) + retv = ACE_reinterpret_cast + ( + void *, +@@ -486,7 +510,7 @@ + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); +- ++ + if (retv) + this->_add_ref (); + return retv; +@@ -497,6 +521,10 @@ + return "IDL:omg.org/Messaging/ReplyPriorityPolicy:1.0"; + } + ++#endif /* TAO_HAS_PRIORITY_POLICIES == 1 */ ++ ++#if (TAO_HAS_REQUEST_START_TIME_POLICY == 1) ++ + TAO_NAMESPACE_TYPE (const CORBA::ULong) + TAO_NAMESPACE_BEGIN (Messaging) + TAO_NAMESPACE_DEFINE (const CORBA::ULong, REQUEST_START_TIME_POLICY_TYPE, 27U) +@@ -548,7 +576,7 @@ + retv = ACE_reinterpret_cast (void*, this); + else if (type == ACE_reinterpret_cast + (ptr_arith_t, +- &Policy::_narrow)) ++ &CORBA::Policy::_narrow)) + retv = ACE_reinterpret_cast + ( + void *, +@@ -561,7 +589,7 @@ + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); +- ++ + if (retv) + this->_add_ref (); + return retv; +@@ -572,6 +600,10 @@ + return "IDL:omg.org/Messaging/RequestStartTimePolicy:1.0"; + } + ++#endif /* TAO_HAS_REQUEST_START_TIME_POLICY == 1 */ ++ ++#if (TAO_HAS_REQUEST_END_TIME_POLICY == 1) ++ + TAO_NAMESPACE_TYPE (const CORBA::ULong) + TAO_NAMESPACE_BEGIN (Messaging) + TAO_NAMESPACE_DEFINE (const CORBA::ULong, REQUEST_END_TIME_POLICY_TYPE, 28U) +@@ -623,7 +655,7 @@ + retv = ACE_reinterpret_cast (void*, this); + else if (type == ACE_reinterpret_cast + (ptr_arith_t, +- &Policy::_narrow)) ++ &CORBA::Policy::_narrow)) + retv = ACE_reinterpret_cast + ( + void *, +@@ -636,7 +668,7 @@ + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); +- ++ + if (retv) + this->_add_ref (); + return retv; +@@ -647,6 +679,10 @@ + return "IDL:omg.org/Messaging/RequestEndTimePolicy:1.0"; + } + ++#endif /* TAO_HAS_REQUEST_END_TIME_POLICY == 1 */ ++ ++#if (TAO_HAS_REPLY_START_TIME_POLICY == 1) ++ + TAO_NAMESPACE_TYPE (const CORBA::ULong) + TAO_NAMESPACE_BEGIN (Messaging) + TAO_NAMESPACE_DEFINE (const CORBA::ULong, REPLY_START_TIME_POLICY_TYPE, 29U) +@@ -698,7 +734,7 @@ + retv = ACE_reinterpret_cast (void*, this); + else if (type == ACE_reinterpret_cast + (ptr_arith_t, +- &Policy::_narrow)) ++ &CORBA::Policy::_narrow)) + retv = ACE_reinterpret_cast + ( + void *, +@@ -711,7 +747,7 @@ + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); +- ++ + if (retv) + this->_add_ref (); + return retv; +@@ -722,6 +758,10 @@ + return "IDL:omg.org/Messaging/ReplyStartTimePolicy:1.0"; + } + ++#endif /* TAO_HAS_REPLY_START_TIME_POLICY == 1 */ ++ ++#if (TAO_HAS_REPLY_END_TIME_POLICY == 1) ++ + TAO_NAMESPACE_TYPE (const CORBA::ULong) + TAO_NAMESPACE_BEGIN (Messaging) + TAO_NAMESPACE_DEFINE (const CORBA::ULong, REPLY_END_TIME_POLICY_TYPE, 30U) +@@ -773,7 +813,7 @@ + retv = ACE_reinterpret_cast (void*, this); + else if (type == ACE_reinterpret_cast + (ptr_arith_t, +- &Policy::_narrow)) ++ &CORBA::Policy::_narrow)) + retv = ACE_reinterpret_cast + ( + void *, +@@ -786,7 +826,7 @@ + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); +- ++ + if (retv) + this->_add_ref (); + return retv; +@@ -797,6 +837,10 @@ + return "IDL:omg.org/Messaging/ReplyEndTimePolicy:1.0"; + } + ++#endif /* TAO_HAS_REPLY_END_TIME_POLICY == 1 */ ++ ++#if (TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1) ++ + TAO_NAMESPACE_TYPE (const CORBA::ULong) + TAO_NAMESPACE_BEGIN (Messaging) + TAO_NAMESPACE_DEFINE (const CORBA::ULong, RELATIVE_REQ_TIMEOUT_POLICY_TYPE, 31U) +@@ -848,7 +892,7 @@ + retv = ACE_reinterpret_cast (void*, this); + else if (type == ACE_reinterpret_cast + (ptr_arith_t, +- &Policy::_narrow)) ++ &CORBA::Policy::_narrow)) + retv = ACE_reinterpret_cast + ( + void *, +@@ -861,7 +905,7 @@ + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); +- ++ + if (retv) + this->_add_ref (); + return retv; +@@ -872,6 +916,10 @@ + return "IDL:omg.org/Messaging/RelativeRequestTimeoutPolicy:1.0"; + } + ++#endif /* TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1 */ ++ ++#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) ++ + TAO_NAMESPACE_TYPE (const CORBA::ULong) + TAO_NAMESPACE_BEGIN (Messaging) + TAO_NAMESPACE_DEFINE (const CORBA::ULong, RELATIVE_RT_TIMEOUT_POLICY_TYPE, 32U) +@@ -923,7 +971,7 @@ + retv = ACE_reinterpret_cast (void*, this); + else if (type == ACE_reinterpret_cast + (ptr_arith_t, +- &Policy::_narrow)) ++ &CORBA::Policy::_narrow)) + retv = ACE_reinterpret_cast + ( + void *, +@@ -936,7 +984,7 @@ + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); +- ++ + if (retv) + this->_add_ref (); + return retv; +@@ -947,6 +995,10 @@ + return "IDL:omg.org/Messaging/RelativeRoundtripTimeoutPolicy:1.0"; + } + ++#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ ++ ++#if (TAO_HAS_ROUTING_POLICY == 1) ++ + TAO_NAMESPACE_TYPE (const CORBA::ULong) + TAO_NAMESPACE_BEGIN (Messaging) + TAO_NAMESPACE_DEFINE (const CORBA::ULong, ROUTING_POLICY_TYPE, 33U) +@@ -1034,7 +1086,7 @@ + retv = ACE_reinterpret_cast (void*, this); + else if (type == ACE_reinterpret_cast + (ptr_arith_t, +- &Policy::_narrow)) ++ &CORBA::Policy::_narrow)) + retv = ACE_reinterpret_cast + ( + void *, +@@ -1047,7 +1099,7 @@ + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); +- ++ + if (retv) + this->_add_ref (); + return retv; +@@ -1058,6 +1110,10 @@ + return "IDL:omg.org/Messaging/RoutingPolicy:1.0"; + } + ++#endif /* TAO_HAS_ROUTING_POLICY == 1 */ ++ ++#if (TAO_HAS_MAX_HOPS_POLICY == 1) ++ + TAO_NAMESPACE_TYPE (const CORBA::ULong) + TAO_NAMESPACE_BEGIN (Messaging) + TAO_NAMESPACE_DEFINE (const CORBA::ULong, MAX_HOPS_POLICY_TYPE, 34U) +@@ -1109,7 +1165,7 @@ + retv = ACE_reinterpret_cast (void*, this); + else if (type == ACE_reinterpret_cast + (ptr_arith_t, +- &Policy::_narrow)) ++ &CORBA::Policy::_narrow)) + retv = ACE_reinterpret_cast + ( + void *, +@@ -1122,7 +1178,7 @@ + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); +- ++ + if (retv) + this->_add_ref (); + return retv; +@@ -1133,6 +1189,10 @@ + return "IDL:omg.org/Messaging/MaxHopsPolicy:1.0"; + } + ++#endif /* TAO_HAS_MAX_HOPS_POLICY == 1 */ ++ ++#if (TAO_HAS_QUEUE_ORDER_POLICY == 1) ++ + TAO_NAMESPACE_TYPE (const CORBA::ULong) + TAO_NAMESPACE_BEGIN (Messaging) + TAO_NAMESPACE_DEFINE (const CORBA::ULong, QUEUE_ORDER_POLICY_TYPE, 35U) +@@ -1184,7 +1244,7 @@ + retv = ACE_reinterpret_cast (void*, this); + else if (type == ACE_reinterpret_cast + (ptr_arith_t, +- &Policy::_narrow)) ++ &CORBA::Policy::_narrow)) + retv = ACE_reinterpret_cast + ( + void *, +@@ -1197,7 +1257,7 @@ + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); +- ++ + if (retv) + this->_add_ref (); + return retv; +@@ -1208,6 +1268,8 @@ + return "IDL:omg.org/Messaging/QueueOrderPolicy:1.0"; + } + ++#endif /* TAO_HAS_QUEUE_ORDER_POLICY == 1 */ ++ + static const CORBA::Long _oc_Messaging_PolicyValue[] = + { + TAO_ENCAP_BYTE_ORDER, // byte order +@@ -1254,30 +1316,30 @@ + Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (void) + {} + Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size +- : ++ : + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) + TAO_Unbounded_Sequence<CORBA::Octet> + #else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<CORBA::Octet> +-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ ++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (max) + {} + Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release) +- : ++ : + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) + TAO_Unbounded_Sequence<CORBA::Octet> + #else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<CORBA::Octet> +-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ ++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (max, length, buffer, release) + {} + Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor +- : ++ : + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) + TAO_Unbounded_Sequence<CORBA::Octet> + #else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<CORBA::Octet> +-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ ++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (seq) + {} + Messaging::PolicyValue::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor +@@ -1293,7 +1355,7 @@ + + + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) +- ++ + #if !defined (__TAO_UNBOUNDED_SEQUENCE_MESSAGING_POLICYVALUESEQ_CS_) + #define __TAO_UNBOUNDED_SEQUENCE_MESSAGING_POLICYVALUESEQ_CS_ + +@@ -1302,43 +1364,43 @@ + { + Messaging::PolicyValue* tmp = 0; + tmp = _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (length); +- ++ + if (this->buffer_ != 0) + { + Messaging::PolicyValue *old = ACE_reinterpret_cast (Messaging::PolicyValue *,this->buffer_); +- ++ + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp[i] = old[i]; +- ++ + if (this->release_) + _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (old); +- ++ + } + this->buffer_ = tmp; + } +- ++ + void + Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_deallocate_buffer (void) + { + if (this->buffer_ == 0 || this->release_ == 0) + return; +- ++ + Messaging::PolicyValue *tmp = ACE_reinterpret_cast (Messaging::PolicyValue *,this->buffer_); +- ++ + _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (tmp); + this->buffer_ = 0; +- } +- ++ } ++ + Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::~_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (void) // Dtor. + { + this->_deallocate_buffer (); + } +- +- ++ ++ + #endif /* end #if !defined */ + + +-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ ++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + + #if !defined (_MESSAGING_POLICYVALUESEQ_CS_) + #define _MESSAGING_POLICYVALUESEQ_CS_ +@@ -1350,30 +1412,30 @@ + Messaging::PolicyValueSeq::PolicyValueSeq (void) + {} + Messaging::PolicyValueSeq::PolicyValueSeq (CORBA::ULong max) // uses max size +- : ++ : + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) + _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq + #else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<Messaging::PolicyValue> +-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ ++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (max) + {} + Messaging::PolicyValueSeq::PolicyValueSeq (CORBA::ULong max, CORBA::ULong length, Messaging::PolicyValue *buffer, CORBA::Boolean release) +- : ++ : + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) + _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq + #else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<Messaging::PolicyValue> +-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ ++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (max, length, buffer, release) + {} + Messaging::PolicyValueSeq::PolicyValueSeq (const PolicyValueSeq &seq) // copy ctor +- : ++ : + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) + _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq + #else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<Messaging::PolicyValue> +-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ ++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (seq) + {} + Messaging::PolicyValueSeq::~PolicyValueSeq (void) // dtor +@@ -1435,74 +1497,75 @@ + TAO_NAMESPACE_BEGIN (Messaging) + TAO_NAMESPACE_DEFINE (const CORBA::ULong, INVOCATION_POLICIES, 2U) + TAO_NAMESPACE_END +-Messaging::ExceptionHolder* Messaging::ExceptionHolder::_downcast (CORBA::ValueBase* v) +-{ +- if (v == 0) return 0; +- return (ExceptionHolder* ) v->_tao_obv_narrow ((ptr_arith_t) &_downcast); +-} +- +-const char* Messaging::ExceptionHolder::_tao_obv_repository_id () const +-{ +- return this->_tao_obv_static_repository_id (); +-} +- +-void* Messaging::ExceptionHolder::_tao_obv_narrow (ptr_arith_t type_id) ++static const CORBA::Long _oc_Messaging_ExceptionHolder[] = + { +- if (type_id == (ptr_arith_t) &_downcast) +- return this; +- void *rval = 0; +- return rval; +-} ++ TAO_ENCAP_BYTE_ORDER, // byte order ++ 34, ACE_NTOHL (0x49444c3a), 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:Messaging/ExceptionHolder:1.0 ++ 16, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e486f6c), ACE_NTOHL (0x64657200), // name = ExceptionHolder ++ 3, // member count ++ 20, ACE_NTOHL (0x69735f73), ACE_NTOHL (0x79737465), ACE_NTOHL (0x6d5f6578), ACE_NTOHL (0x63657074), ACE_NTOHL (0x696f6e00), // name = is_system_exception ++ CORBA::tk_boolean, + +-CORBA::Boolean Messaging::ExceptionHolder::_tao_marshal_v (TAO_OutputCDR & strm) +-{ +- return this->_tao_marshal__Messaging_ExceptionHolder (strm); +-} ++ 11, ACE_NTOHL (0x62797465), ACE_NTOHL (0x5f6f7264), ACE_NTOHL (0x65720000), // name = byte_order ++ CORBA::tk_boolean, + +-CORBA::Boolean Messaging::ExceptionHolder::_tao_unmarshal_v (TAO_InputCDR & strm) +-{ +- return this->_tao_unmarshal__Messaging_ExceptionHolder (strm); +-} ++ 20, ACE_NTOHL (0x6d617273), ACE_NTOHL (0x68616c65), ACE_NTOHL (0x645f6578), ACE_NTOHL (0x63657074), ACE_NTOHL (0x696f6e00), // name = marshaled_exception ++ CORBA::tk_sequence, // typecode kind ++ 12, // encapsulation length ++ TAO_ENCAP_BYTE_ORDER, // byte order ++ CORBA::tk_octet, + +-CORBA::Boolean Messaging::ExceptionHolder::_tao_unmarshal (TAO_InputCDR &strm, Messaging::ExceptionHolder *&new_object) +-{ +- CORBA::Boolean retval = 1; +- CORBA::ValueBase *base; // %! should be a _var +- CORBA::ValueFactory_ptr factory; // %! should be a _var +- if (!CORBA::ValueBase::_tao_unmarshal_pre (strm, factory, base, +- Messaging::ExceptionHolder::_tao_obv_static_repository_id ()) ) +- { +- return 0; +- } +- if (factory != 0) +- { +- base = factory->create_for_unmarshal (); +- factory->_remove_ref (); +- if (base == 0) return 0; // %! except.? +- //%! ACE_DEBUG ((LM_DEBUG, "Messaging::ExceptionHolder::_tao_unmarshal %s\n", base->_tao_obv_repository_id () )); +- retval = base->_tao_unmarshal_v (strm); +- //%! ACE_DEBUG ((LM_DEBUG, "Messaging::ExceptionHolder::_tao_unmarshal retval unmarshal_v is %d\n", retval)); +- if (!retval) return 0; +- } +- // Now base must be null or point to the unmarshaled object. +- // Align the pointer to the right subobject. +- new_object = Messaging::ExceptionHolder::_downcast (base); +- // %! unmarshal_post +- return 1; +-} ++ 0U, + ++}; ++static CORBA::TypeCode _tc_TAO_tc_Messaging_ExceptionHolder (CORBA::tk_struct, sizeof (_oc_Messaging_ExceptionHolder), (char *) &_oc_Messaging_ExceptionHolder, 0, sizeof (Messaging::ExceptionHolder)); ++TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) ++TAO_NAMESPACE_BEGIN (Messaging) ++TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ExceptionHolder, &_tc_TAO_tc_Messaging_ExceptionHolder) ++TAO_NAMESPACE_END + +-#if !defined (_MESSAGING_EXCEPTIONHOLDER___INIT_CS_) +-#define _MESSAGING_EXCEPTIONHOLDER___INIT_CS_ ++#if !defined (_MESSAGING_EXCEPTIONHOLDER__TAO_SEQ_OCTET_CS_) ++#define _MESSAGING_EXCEPTIONHOLDER__TAO_SEQ_OCTET_CS_ + +-Messaging::ExceptionHolder_init::~ExceptionHolder_init () +-{ +-} ++// ************************************************************* ++// Messaging::ExceptionHolder::_tao_seq_Octet ++// ************************************************************* + +-const char* +-Messaging::ExceptionHolder_init::tao_repository_id () ++Messaging::ExceptionHolder::_tao_seq_Octet::_tao_seq_Octet (void) ++{} ++Messaging::ExceptionHolder::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size ++ : ++#if !defined (TAO_USE_SEQUENCE_TEMPLATES) ++ TAO_Unbounded_Sequence<CORBA::Octet> ++#else /* TAO_USE_SEQUENCE_TEMPLATES */ ++ TAO_Unbounded_Sequence<CORBA::Octet> ++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ ++ (max) ++{} ++Messaging::ExceptionHolder::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release) ++ : ++#if !defined (TAO_USE_SEQUENCE_TEMPLATES) ++ TAO_Unbounded_Sequence<CORBA::Octet> ++#else /* TAO_USE_SEQUENCE_TEMPLATES */ ++ TAO_Unbounded_Sequence<CORBA::Octet> ++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ ++ (max, length, buffer, release) ++{} ++Messaging::ExceptionHolder::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor ++ : ++#if !defined (TAO_USE_SEQUENCE_TEMPLATES) ++ TAO_Unbounded_Sequence<CORBA::Octet> ++#else /* TAO_USE_SEQUENCE_TEMPLATES */ ++ TAO_Unbounded_Sequence<CORBA::Octet> ++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ ++ (seq) ++{} ++Messaging::ExceptionHolder::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor ++{} ++void Messaging::ExceptionHolder::_tao_seq_Octet::_tao_any_destructor (void *x) + { +- return Messaging::ExceptionHolder::_tao_obv_static_repository_id (); ++ _tao_seq_Octet *tmp = ACE_static_cast (_tao_seq_Octet*,x); ++ delete tmp; + } + + +@@ -1553,11 +1616,11 @@ + ACE_NEW_RETURN (default_proxy, ReplyHandler (stub), ReplyHandler::_nil ()); + #if (TAO_HAS_SMART_PROXIES == 1) + return TAO_Messaging_ReplyHandler_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy); +- #else ++ #else + return default_proxy; + #endif /*TAO_HAS_SMART_PROXIES == 1*/ + } +- else ++ else + return + ACE_reinterpret_cast + ( +@@ -1601,7 +1664,7 @@ + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); +- ++ + if (retv) + this->_add_ref (); + return retv; +@@ -1671,7 +1734,7 @@ + if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0) + { + // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it +- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is ++ // doesnt get into an infinite loop in <unregister_proxy_factory> as it is + // invoked in the destructor of the class too. + this->delete_proxy_factory_ = 1; + delete this->proxy_factory_; +@@ -1691,10 +1754,10 @@ + // Verify that an <proxy_factory_> is available else make one. + if (this->proxy_factory_ == 0) + ACE_NEW_RETURN (this->proxy_factory_, +- TAO_Messaging_ReplyHandler_Default_Proxy_Factory (1), ++ TAO_Messaging_ReplyHandler_Default_Proxy_Factory (1), + 0); +- +- ++ ++ + return this->proxy_factory_->create_proxy (proxy); + } + +@@ -1714,7 +1777,7 @@ + + Messaging::ReplyHandler_ptr + Messaging::TAO_Messaging_ReplyHandler_Smart_Proxy_Base::get_proxy (void) +- ++ + { + // Obtain the real proxy stored in <base_proxy_> + if (CORBA::is_nil (this->proxy_.in ())) +@@ -1724,17 +1787,17 @@ + TAO_Messaging_ReplyHandler_PROXY_FACTORY_ADAPTER::instance ()->unregister_proxy_factory (); + this->proxy_ = ::Messaging::ReplyHandler::_unchecked_narrow (this->base_proxy_.in ()); + } +- ++ + return this->proxy_.in (); + } +- ++ + #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ + defined (ACE_HAS_GNU_REPO) + template class ACE_Singleton<Messaging::TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >; + #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + #pragma instantiate ACE_Singleton<Messaging::TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> + #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +- ++ + static const CORBA::Long _oc_Messaging_ReplyHandler[] = + { + TAO_ENCAP_BYTE_ORDER, // byte order +@@ -1746,859 +1809,471 @@ + TAO_NAMESPACE_BEGIN (Messaging) + TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ReplyHandler, &_tc_TAO_tc_Messaging_ReplyHandler) + TAO_NAMESPACE_END +- Messaging::Poller* Messaging::Poller::_downcast (CORBA::ValueBase* v) +- { +- if (v == 0) return 0; +- return (Poller* ) v->_tao_obv_narrow ((ptr_arith_t) &_downcast); +- } + +- const char* Messaging::Poller::_tao_obv_repository_id () const +- { +- return this->_tao_obv_static_repository_id (); +- } +- +- void* Messaging::Poller::_tao_obv_narrow (ptr_arith_t type_id) +- { +- if (type_id == (ptr_arith_t) &_downcast) +- return this; +- void *rval = 0; +- return rval; +- } +- +-CORBA::Boolean Messaging::Poller::_tao_marshal_v (TAO_OutputCDR & strm) +- { +- return this->_tao_marshal__Messaging_Poller (strm); +- } ++void operator<<= (CORBA::Any &_tao_any, const Messaging::PriorityRange &_tao_elem) // copying ++{ ++ TAO_OutputCDR stream; ++ stream << _tao_elem; ++ _tao_any._tao_replace ( ++ Messaging::_tc_PriorityRange, ++ TAO_ENCAP_BYTE_ORDER, ++ stream.begin () ++ ); ++} ++ ++void operator<<= (CORBA::Any &_tao_any, Messaging::PriorityRange *_tao_elem) // non copying ++{ ++ TAO_OutputCDR stream; ++ stream << *_tao_elem; ++ _tao_any._tao_replace ( ++ Messaging::_tc_PriorityRange, ++ TAO_ENCAP_BYTE_ORDER, ++ stream.begin (), ++ 1, ++ _tao_elem, ++ Messaging::PriorityRange::_tao_any_destructor ++ ); ++} + +- CORBA::Boolean Messaging::Poller::_tao_unmarshal_v (TAO_InputCDR & strm) +- { +- return this->_tao_unmarshal__Messaging_Poller (strm); +- } ++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::PriorityRange *&_tao_elem) ++{ ++ return _tao_any >>= ACE_const_cast(const Messaging::PriorityRange*&,_tao_elem); ++} + +- CORBA::Boolean Messaging::Poller::_tao_unmarshal (TAO_InputCDR &strm, Messaging::Poller *&new_object) ++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Messaging::PriorityRange *&_tao_elem) ++{ ++ _tao_elem = 0; ++ ACE_TRY_NEW_ENV + { +- CORBA::Boolean retval = 1; +- CORBA::ValueBase *base; // %! should be a _var +- CORBA::ValueFactory_ptr factory; // %! should be a _var +- if (!CORBA::ValueBase::_tao_unmarshal_pre (strm, factory, base, +- Messaging::Poller::_tao_obv_static_repository_id ()) ) ++ CORBA::TypeCode_var type = _tao_any.type (); ++ if (!type->equivalent (Messaging::_tc_PriorityRange, ACE_TRY_ENV)) // not equal + { + return 0; + } +- if (factory != 0) ++ ACE_TRY_CHECK; ++ if (_tao_any.any_owns_data ()) ++ { ++ _tao_elem = ACE_static_cast( ++ const Messaging::PriorityRange*, ++ _tao_any.value () ++ ); ++ return 1; ++ } ++ else ++ { ++ Messaging::PriorityRange *tmp; ++ ACE_NEW_RETURN (tmp, Messaging::PriorityRange, 0); ++ TAO_InputCDR stream ( ++ _tao_any._tao_get_cdr (), ++ _tao_any._tao_byte_order () ++ ); ++ if (stream >> *tmp) ++ { ++ ((CORBA::Any *)&_tao_any)->_tao_replace ( ++ Messaging::_tc_PriorityRange, ++ 1, ++ ACE_static_cast (void *, tmp), ++ Messaging::PriorityRange::_tao_any_destructor ++ ); ++ _tao_elem = tmp; ++ return 1; ++ } ++ else + { +- base = factory->create_for_unmarshal (); +- factory->_remove_ref (); +- if (base == 0) return 0; // %! except.? +- //%! ACE_DEBUG ((LM_DEBUG, "Messaging::Poller::_tao_unmarshal %s\n", base->_tao_obv_repository_id () )); +- retval = base->_tao_unmarshal_v (strm); +- //%! ACE_DEBUG ((LM_DEBUG, "Messaging::Poller::_tao_unmarshal retval unmarshal_v is %d\n", retval)); +- if (!retval) return 0; ++ delete tmp; + } +- // Now base must be null or point to the unmarshaled object. +- // Align the pointer to the right subobject. +- new_object = Messaging::Poller::_downcast (base); +- // %! unmarshal_post +- return 1; +- } +- +- +-#if !defined (_MESSAGING_POLLER___INIT_CS_) +-#define _MESSAGING_POLLER___INIT_CS_ +- +- Messaging::Poller_init::~Poller_init () +- { ++ } + } +- +-const char* +- Messaging::Poller_init::tao_repository_id () ++ ACE_CATCHANY + { +- return Messaging::Poller::_tao_obv_static_repository_id (); + } ++ ACE_ENDTRY; ++ return 0; ++} + ++void operator<<= (CORBA::Any &_tao_any, const Messaging::RoutingTypeRange &_tao_elem) // copying ++{ ++ TAO_OutputCDR stream; ++ stream << _tao_elem; ++ _tao_any._tao_replace ( ++ Messaging::_tc_RoutingTypeRange, ++ TAO_ENCAP_BYTE_ORDER, ++ stream.begin () ++ ); ++} + +-#endif /* end #if !defined */ ++void operator<<= (CORBA::Any &_tao_any, Messaging::RoutingTypeRange *_tao_elem) // non copying ++{ ++ TAO_OutputCDR stream; ++ stream << *_tao_elem; ++ _tao_any._tao_replace ( ++ Messaging::_tc_RoutingTypeRange, ++ TAO_ENCAP_BYTE_ORDER, ++ stream.begin (), ++ 1, ++ _tao_elem, ++ Messaging::RoutingTypeRange::_tao_any_destructor ++ ); ++} + +- CORBA::Boolean +- OBV_Messaging::ExceptionHolder::_tao_marshal__Messaging_ExceptionHolder (TAO_OutputCDR &strm){ +- return _tao_marshal_state (strm); +- +- } +-CORBA::Boolean OBV_Messaging::ExceptionHolder::_tao_unmarshal__Messaging_ExceptionHolder (TAO_InputCDR &strm){ +- return _tao_unmarshal_state (strm); +- +- } +- // accessor to set the member +- void +- OBV_Messaging::ExceptionHolder::is_system_exception (CORBA::Boolean val) // set +- { +- // set the value +- this->_pd_is_system_exception = val; +- } +- // retrieve the member +- CORBA::Boolean +- OBV_Messaging::ExceptionHolder::is_system_exception (void) const +- { +- return this->_pd_is_system_exception; +- } ++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::RoutingTypeRange *&_tao_elem) ++{ ++ return _tao_any >>= ACE_const_cast(const Messaging::RoutingTypeRange*&,_tao_elem); ++} + +- // accessor to set the member +- void +- OBV_Messaging::ExceptionHolder::byte_order (CORBA::Boolean val) // set ++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Messaging::RoutingTypeRange *&_tao_elem) ++{ ++ _tao_elem = 0; ++ ACE_TRY_NEW_ENV + { +- // set the value +- this->_pd_byte_order = val; ++ CORBA::TypeCode_var type = _tao_any.type (); ++ if (!type->equivalent (Messaging::_tc_RoutingTypeRange, ACE_TRY_ENV)) // not equal ++ { ++ return 0; ++ } ++ ACE_TRY_CHECK; ++ if (_tao_any.any_owns_data ()) ++ { ++ _tao_elem = ACE_static_cast( ++ const Messaging::RoutingTypeRange*, ++ _tao_any.value () ++ ); ++ return 1; ++ } ++ else ++ { ++ Messaging::RoutingTypeRange *tmp; ++ ACE_NEW_RETURN (tmp, Messaging::RoutingTypeRange, 0); ++ TAO_InputCDR stream ( ++ _tao_any._tao_get_cdr (), ++ _tao_any._tao_byte_order () ++ ); ++ if (stream >> *tmp) ++ { ++ ((CORBA::Any *)&_tao_any)->_tao_replace ( ++ Messaging::_tc_RoutingTypeRange, ++ 1, ++ ACE_static_cast (void *, tmp), ++ Messaging::RoutingTypeRange::_tao_any_destructor ++ ); ++ _tao_elem = tmp; ++ return 1; ++ } ++ else ++ { ++ delete tmp; ++ } ++ } + } +- // retrieve the member +- CORBA::Boolean +- OBV_Messaging::ExceptionHolder::byte_order (void) const ++ ACE_CATCHANY + { +- return this->_pd_byte_order; + } ++ ACE_ENDTRY; ++ return 0; ++} + ++void operator<<= (CORBA::Any &_tao_any, const Messaging::PolicyValue &_tao_elem) // copying ++{ ++ TAO_OutputCDR stream; ++ stream << _tao_elem; ++ _tao_any._tao_replace ( ++ Messaging::_tc_PolicyValue, ++ TAO_ENCAP_BYTE_ORDER, ++ stream.begin () ++ ); ++} + +-#if !defined (_MESSAGING_EXCEPTIONHOLDER__TAO_SEQ_OCTET_CS_) +-#define _MESSAGING_EXCEPTIONHOLDER__TAO_SEQ_OCTET_CS_ ++void operator<<= (CORBA::Any &_tao_any, Messaging::PolicyValue *_tao_elem) // non copying ++{ ++ TAO_OutputCDR stream; ++ stream << *_tao_elem; ++ _tao_any._tao_replace ( ++ Messaging::_tc_PolicyValue, ++ TAO_ENCAP_BYTE_ORDER, ++ stream.begin (), ++ 1, ++ _tao_elem, ++ Messaging::PolicyValue::_tao_any_destructor ++ ); ++} + +- // ************************************************************* +- // Inline operations for class Messaging::ExceptionHolder::_tao_seq_Octet_var +- // ************************************************************* +- +-ACE_INLINE +- Messaging::ExceptionHolder::_tao_seq_Octet_var::_tao_seq_Octet_var (void) // default constructor +- : ptr_ (0) +- {} +- +- ACE_INLINE +- Messaging::ExceptionHolder::_tao_seq_Octet_var::_tao_seq_Octet_var (_tao_seq_Octet *p) +- : ptr_ (p) +- {} ++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::PolicyValue *&_tao_elem) ++{ ++ return _tao_any >>= ACE_const_cast(const Messaging::PolicyValue*&,_tao_elem); ++} + +- ACE_INLINE +- Messaging::ExceptionHolder::_tao_seq_Octet_var::_tao_seq_Octet_var (const ::Messaging::ExceptionHolder::_tao_seq_Octet_var &p) // copy constructor ++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Messaging::PolicyValue *&_tao_elem) ++{ ++ _tao_elem = 0; ++ ACE_TRY_NEW_ENV + { +- if (p.ptr_) +- ACE_NEW (this->ptr_, ::Messaging::ExceptionHolder::_tao_seq_Octet (*p.ptr_)); ++ CORBA::TypeCode_var type = _tao_any.type (); ++ if (!type->equivalent (Messaging::_tc_PolicyValue, ACE_TRY_ENV)) // not equal ++ { ++ return 0; ++ } ++ ACE_TRY_CHECK; ++ if (_tao_any.any_owns_data ()) ++ { ++ _tao_elem = ACE_static_cast( ++ const Messaging::PolicyValue*, ++ _tao_any.value () ++ ); ++ return 1; ++ } + else +- this->ptr_ = 0; ++ { ++ Messaging::PolicyValue *tmp; ++ ACE_NEW_RETURN (tmp, Messaging::PolicyValue, 0); ++ TAO_InputCDR stream ( ++ _tao_any._tao_get_cdr (), ++ _tao_any._tao_byte_order () ++ ); ++ if (stream >> *tmp) ++ { ++ ((CORBA::Any *)&_tao_any)->_tao_replace ( ++ Messaging::_tc_PolicyValue, ++ 1, ++ ACE_static_cast (void *, tmp), ++ Messaging::PolicyValue::_tao_any_destructor ++ ); ++ _tao_elem = tmp; ++ return 1; ++ } ++ else ++ { ++ delete tmp; ++ } ++ } + } +- +-// fixed-size base types only +- ACE_INLINE +- Messaging::ExceptionHolder::_tao_seq_Octet_var::_tao_seq_Octet_var (const ::Messaging::ExceptionHolder::_tao_seq_Octet &p) ++ ACE_CATCHANY + { +- ACE_NEW (this->ptr_, ::Messaging::ExceptionHolder::_tao_seq_Octet (p)); + } ++ ACE_ENDTRY; ++ return 0; ++} + +- ACE_INLINE +- Messaging::ExceptionHolder::_tao_seq_Octet_var::~_tao_seq_Octet_var (void) // destructor ++void operator<<= ( ++ CORBA::Any &_tao_any, ++ const Messaging::PolicyValueSeq &_tao_elem ++ ) // copying ++{ ++ TAO_OutputCDR stream; ++ if (stream << _tao_elem) + { +- delete this->ptr_; ++ _tao_any._tao_replace ( ++ Messaging::_tc_PolicyValueSeq, ++ TAO_ENCAP_BYTE_ORDER, ++ stream.begin () ++ ); + } ++} + +- ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet_var & +- Messaging::ExceptionHolder::_tao_seq_Octet_var::operator= (_tao_seq_Octet *p) +- { +- delete this->ptr_; +- this->ptr_ = p; +- return *this; +- } ++void operator<<= (CORBA::Any &_tao_any, Messaging::PolicyValueSeq *_tao_elem) // non copying ++{ ++ TAO_OutputCDR stream; ++ stream << *_tao_elem; ++ _tao_any._tao_replace ( ++ Messaging::_tc_PolicyValueSeq, ++ TAO_ENCAP_BYTE_ORDER, ++ stream.begin (), ++ 1, ++ _tao_elem, ++ Messaging::PolicyValueSeq::_tao_any_destructor ++ ); ++} ++ ++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::PolicyValueSeq *&_tao_elem) ++{ ++ return _tao_any >>= ACE_const_cast( ++ const Messaging::PolicyValueSeq*&, ++ _tao_elem ++ ); ++} + +- ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet_var & +- Messaging::ExceptionHolder::_tao_seq_Octet_var::operator= (const ::Messaging::ExceptionHolder::_tao_seq_Octet_var &p) // deep copy ++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Messaging::PolicyValueSeq *&_tao_elem) ++{ ++ _tao_elem = 0; ++ ACE_TRY_NEW_ENV + { +- if (this != &p) ++ CORBA::TypeCode_var type = _tao_any.type (); ++ if (!type->equivalent (Messaging::_tc_PolicyValueSeq, ACE_TRY_ENV)) // not equal ++ { ++ return 0; ++ } ++ ACE_TRY_CHECK; ++ if (_tao_any.any_owns_data ()) + { +- delete this->ptr_; +- ACE_NEW_RETURN (this->ptr_, ::Messaging::ExceptionHolder::_tao_seq_Octet (*p.ptr_), *this); ++ _tao_elem = ACE_static_cast( ++ const Messaging::PolicyValueSeq*, ++ _tao_any.value () ++ ); ++ return 1; + } +- return *this; +- } +- +- // fixed-size types only +- ACE_INLINE ::Messaging::ExceptionHolder::_tao_seq_Octet_var & +- Messaging::ExceptionHolder::_tao_seq_Octet_var::operator= (const ::Messaging::ExceptionHolder::_tao_seq_Octet &p) +- { +- if (this->ptr_ != &p) ++ else + { +- delete this->ptr_; +- ACE_NEW_RETURN (this->ptr_, ::Messaging::ExceptionHolder::_tao_seq_Octet (p), *this); +- } +- return *this; +- } +- +- ACE_INLINE const ::Messaging::ExceptionHolder::_tao_seq_Octet * +- Messaging::ExceptionHolder::_tao_seq_Octet_var::operator-> (void) const +- { +- return this->ptr_; +- } +- +- ACE_INLINE ::Messaging::ExceptionHolder::_tao_seq_Octet * +- Messaging::ExceptionHolder::_tao_seq_Octet_var::operator-> (void) +- { +- return this->ptr_; +- } +- +- ACE_INLINE +- Messaging::ExceptionHolder::_tao_seq_Octet_var::operator const ::Messaging::ExceptionHolder::_tao_seq_Octet &() const // cast +- { +- return *this->ptr_; +- } +- +- ACE_INLINE +- Messaging::ExceptionHolder::_tao_seq_Octet_var::operator ::Messaging::ExceptionHolder::_tao_seq_Octet &() // cast +- { +- return *this->ptr_; +- } +- +- ACE_INLINE +- Messaging::ExceptionHolder::_tao_seq_Octet_var::operator ::Messaging::ExceptionHolder::_tao_seq_Octet &() const // cast +- { +- return *this->ptr_; +- } +- +- ACE_INLINE CORBA::Octet & +- Messaging::ExceptionHolder::_tao_seq_Octet_var::operator[] (CORBA::ULong index) +- { +- return this->ptr_->operator[] (index); +- } +- +- ACE_INLINE const ::Messaging::ExceptionHolder::_tao_seq_Octet & +- Messaging::ExceptionHolder::_tao_seq_Octet_var::in (void) const +- { +- return *this->ptr_; +- } +- +- ACE_INLINE ::Messaging::ExceptionHolder::_tao_seq_Octet & +- Messaging::ExceptionHolder::_tao_seq_Octet_var::inout (void) +- { +- return *this->ptr_; +- } +- +- // mapping for variable size +- ACE_INLINE ::Messaging::ExceptionHolder::_tao_seq_Octet *& +- Messaging::ExceptionHolder::_tao_seq_Octet_var::out (void) +- { +- delete this->ptr_; +- this->ptr_ = 0; +- return this->ptr_; +- } +- +- ACE_INLINE ::Messaging::ExceptionHolder::_tao_seq_Octet * +- Messaging::ExceptionHolder::_tao_seq_Octet_var::_retn (void) +- { +- ::Messaging::ExceptionHolder::_tao_seq_Octet *tmp = this->ptr_; +- this->ptr_ = 0; +- return tmp; +- } +- +- ACE_INLINE ::Messaging::ExceptionHolder::_tao_seq_Octet * +- Messaging::ExceptionHolder::_tao_seq_Octet_var::ptr (void) const +- { +- return this->ptr_; +- } +- +- // ************************************************************* +- // Inline operations for class Messaging::ExceptionHolder::_tao_seq_Octet_out +- // ************************************************************* +- +- ACE_INLINE +- Messaging::ExceptionHolder::_tao_seq_Octet_out::_tao_seq_Octet_out (_tao_seq_Octet *&p) +- : ptr_ (p) +- { +- this->ptr_ = 0; +- } +- +- ACE_INLINE +- Messaging::ExceptionHolder::_tao_seq_Octet_out::_tao_seq_Octet_out (_tao_seq_Octet_var &p) // constructor from _var +- : ptr_ (p.out ()) +- { +- delete this->ptr_; +- this->ptr_ = 0; +- } +- +- ACE_INLINE +- Messaging::ExceptionHolder::_tao_seq_Octet_out::_tao_seq_Octet_out (const ::Messaging::ExceptionHolder::_tao_seq_Octet_out &p) // copy constructor +- : ptr_ (ACE_const_cast (_tao_seq_Octet_out&, p).ptr_) +- {} +- +- ACE_INLINE ::Messaging::ExceptionHolder::_tao_seq_Octet_out & +- Messaging::ExceptionHolder::_tao_seq_Octet_out::operator= (const ::Messaging::ExceptionHolder::_tao_seq_Octet_out &p) +- { +- this->ptr_ = ACE_const_cast (_tao_seq_Octet_out&, p).ptr_; +- return *this; +- } +- +- ACE_INLINE ::Messaging::ExceptionHolder::_tao_seq_Octet_out & +- Messaging::ExceptionHolder::_tao_seq_Octet_out::operator= (_tao_seq_Octet *p) +- { +- this->ptr_ = p; +- return *this; +- } +- +- ACE_INLINE +- Messaging::ExceptionHolder::_tao_seq_Octet_out::operator ::Messaging::ExceptionHolder::_tao_seq_Octet *&() // cast +- { +- return this->ptr_; +- } +- +- ACE_INLINE ::Messaging::ExceptionHolder::_tao_seq_Octet *& +- Messaging::ExceptionHolder::_tao_seq_Octet_out::ptr (void) // ptr +- { +- return this->ptr_; +- } +- +- ACE_INLINE ::Messaging::ExceptionHolder::_tao_seq_Octet * +- Messaging::ExceptionHolder::_tao_seq_Octet_out::operator-> (void) +- { +- return this->ptr_; +- } +- +- ACE_INLINE CORBA::Octet & +- Messaging::ExceptionHolder::_tao_seq_Octet_out::operator[] (CORBA::ULong index) +- { +- return this->ptr_->operator[] (index); +- } +- +- +-#endif /* end #if !defined */ +- +-// accessor to set the member +- void +- OBV_Messaging::ExceptionHolder::marshaled_exception (const Messaging::ExceptionHolder::_tao_seq_Octet &val) +- { +- this->_pd_marshaled_exception = val; +- } +- +- // readonly get method +- const Messaging::ExceptionHolder::_tao_seq_Octet & +- OBV_Messaging::ExceptionHolder::marshaled_exception (void) const +- { +- return this->_pd_marshaled_exception; +- } +- +- // read/write get method +- Messaging::ExceptionHolder::_tao_seq_Octet & +- OBV_Messaging::ExceptionHolder::marshaled_exception (void) +- { +- return this->_pd_marshaled_exception; +- } +- +- CORBA::Boolean +- OBV_Messaging::Poller::_tao_marshal__Messaging_Poller (TAO_OutputCDR &strm){ +- return _tao_marshal_state (strm); +- +- } +-CORBA::Boolean OBV_Messaging::Poller::_tao_unmarshal__Messaging_Poller (TAO_InputCDR &strm){ +- return _tao_unmarshal_state (strm); +- +- } +- // accessor to set the member +- void +- OBV_Messaging::Poller::target (CORBA::Object_ptr val) // set +- { +- this->_pd_target = CORBA::Object::_duplicate (val); +- } +- // retrieve the member +- CORBA::Object_ptr +- OBV_Messaging::Poller::target (void) const +- { +- return this->_pd_target; +- } +- +- // accessor to set the member +- void +- OBV_Messaging::Poller::op_name (char *val) +- { +- // set the value +- this->_pd_op_name = val; +- } +- // accessor to set the member +- void +- OBV_Messaging::Poller::op_name (const char *val) +- { +- // set the value +- this->_pd_op_name = CORBA::string_dup (val); +- } +- // accessor to set the member +- void +- OBV_Messaging::Poller::op_name (const CORBA::String_var &val) +- { +- ; +- // set the value +- CORBA::String_var op_name_var = val; +- this->_pd_op_name = op_name_var._retn (); +- } +- const char * +- OBV_Messaging::Poller::op_name (void) const // get method +- { +- return this->_pd_op_name; +- } +- +- void operator<<= (CORBA::Any &_tao_any, const Messaging::PriorityRange &_tao_elem) // copying +- { +- TAO_OutputCDR stream; +- stream << _tao_elem; +- _tao_any._tao_replace ( +- Messaging::_tc_PriorityRange, +- TAO_ENCAP_BYTE_ORDER, +- stream.begin () +- ); +- } +- +- void operator<<= (CORBA::Any &_tao_any, Messaging::PriorityRange *_tao_elem) // non copying +- { +- TAO_OutputCDR stream; +- stream << *_tao_elem; +- _tao_any._tao_replace ( +- Messaging::_tc_PriorityRange, +- TAO_ENCAP_BYTE_ORDER, +- stream.begin (), +- 1, +- _tao_elem, +- Messaging::PriorityRange::_tao_any_destructor +- ); +- } +- +- CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::PriorityRange *&_tao_elem) +- { +- return _tao_any >>= ACE_const_cast(const Messaging::PriorityRange*&,_tao_elem); +- } +- +-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Messaging::PriorityRange *&_tao_elem) +- { +- _tao_elem = 0; +- ACE_TRY_NEW_ENV +- { +- CORBA::TypeCode_var type = _tao_any.type (); +- if (!type->equivalent (Messaging::_tc_PriorityRange, ACE_TRY_ENV)) // not equal +- { +- return 0; +- } +- ACE_TRY_CHECK; +- if (_tao_any.any_owns_data ()) +- { +- _tao_elem = ACE_static_cast( +- const Messaging::PriorityRange*, +- _tao_any.value () +- ); +- return 1; +- } +- else +- { +- Messaging::PriorityRange *tmp; +- ACE_NEW_RETURN (tmp, Messaging::PriorityRange, 0); +- TAO_InputCDR stream ( +- _tao_any._tao_get_cdr (), +- _tao_any._tao_byte_order () +- ); +- if (stream >> *tmp) +- { +- ((CORBA::Any *)&_tao_any)->_tao_replace ( +- Messaging::_tc_PriorityRange, +- 1, +- ACE_static_cast (void *, tmp), +- Messaging::PriorityRange::_tao_any_destructor +- ); +- _tao_elem = tmp; +- return 1; +- } +- else +- { +- delete tmp; +- } +- } +- } +- ACE_CATCHANY +- { +- } +- ACE_ENDTRY; +- return 0; +- } +- +- void operator<<= (CORBA::Any &_tao_any, const Messaging::RoutingTypeRange &_tao_elem) // copying +- { +- TAO_OutputCDR stream; +- stream << _tao_elem; +- _tao_any._tao_replace ( +- Messaging::_tc_RoutingTypeRange, +- TAO_ENCAP_BYTE_ORDER, +- stream.begin () +- ); +- } +- +- void operator<<= (CORBA::Any &_tao_any, Messaging::RoutingTypeRange *_tao_elem) // non copying +- { +- TAO_OutputCDR stream; +- stream << *_tao_elem; +- _tao_any._tao_replace ( +- Messaging::_tc_RoutingTypeRange, +- TAO_ENCAP_BYTE_ORDER, +- stream.begin (), +- 1, +- _tao_elem, +- Messaging::RoutingTypeRange::_tao_any_destructor +- ); +- } +- +- CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::RoutingTypeRange *&_tao_elem) +- { +- return _tao_any >>= ACE_const_cast(const Messaging::RoutingTypeRange*&,_tao_elem); +- } +- +-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Messaging::RoutingTypeRange *&_tao_elem) +- { +- _tao_elem = 0; +- ACE_TRY_NEW_ENV +- { +- CORBA::TypeCode_var type = _tao_any.type (); +- if (!type->equivalent (Messaging::_tc_RoutingTypeRange, ACE_TRY_ENV)) // not equal +- { +- return 0; +- } +- ACE_TRY_CHECK; +- if (_tao_any.any_owns_data ()) ++ Messaging::PolicyValueSeq *tmp; ++ ACE_NEW_RETURN (tmp, Messaging::PolicyValueSeq, 0); ++ TAO_InputCDR stream ( ++ _tao_any._tao_get_cdr (), ++ _tao_any._tao_byte_order () ++ ); ++ if (stream >> *tmp) + { +- _tao_elem = ACE_static_cast( +- const Messaging::RoutingTypeRange*, +- _tao_any.value () ++ ((CORBA::Any *)&_tao_any)->_tao_replace ( ++ Messaging::_tc_PolicyValueSeq, ++ 1, ++ ACE_static_cast (void *, tmp), ++ Messaging::PolicyValueSeq::_tao_any_destructor + ); ++ _tao_elem = tmp; + return 1; + } + else + { +- Messaging::RoutingTypeRange *tmp; +- ACE_NEW_RETURN (tmp, Messaging::RoutingTypeRange, 0); +- TAO_InputCDR stream ( +- _tao_any._tao_get_cdr (), +- _tao_any._tao_byte_order () +- ); +- if (stream >> *tmp) +- { +- ((CORBA::Any *)&_tao_any)->_tao_replace ( +- Messaging::_tc_RoutingTypeRange, +- 1, +- ACE_static_cast (void *, tmp), +- Messaging::RoutingTypeRange::_tao_any_destructor +- ); +- _tao_elem = tmp; +- return 1; +- } +- else +- { +- delete tmp; +- } ++ delete tmp; + } + } +- ACE_CATCHANY +- { +- } +- ACE_ENDTRY; +- return 0; + } +- +- void operator<<= (CORBA::Any &_tao_any, const Messaging::PolicyValue &_tao_elem) // copying ++ ACE_CATCHANY + { +- TAO_OutputCDR stream; +- stream << _tao_elem; +- _tao_any._tao_replace ( +- Messaging::_tc_PolicyValue, +- TAO_ENCAP_BYTE_ORDER, +- stream.begin () +- ); + } ++ ACE_ENDTRY; ++ return 0; ++} + +- void operator<<= (CORBA::Any &_tao_any, Messaging::PolicyValue *_tao_elem) // non copying ++Messaging::ReplyHandler_ptr (*_TAO_collocation_Messaging_ReplyHandler_Stub_Factory_function_pointer) ( ++ CORBA::Object_ptr obj ++ ) = 0; ++void operator<<= (CORBA::Any &_tao_any, Messaging::ReplyHandler_ptr _tao_elem) ++{ ++ TAO_OutputCDR stream; ++ if (stream << _tao_elem) + { +- TAO_OutputCDR stream; +- stream << *_tao_elem; + _tao_any._tao_replace ( +- Messaging::_tc_PolicyValue, ++ Messaging::_tc_ReplyHandler, + TAO_ENCAP_BYTE_ORDER, + stream.begin (), + 1, +- _tao_elem, +- Messaging::PolicyValue::_tao_any_destructor ++ Messaging::ReplyHandler::_duplicate (_tao_elem), ++ Messaging::ReplyHandler::_tao_any_destructor + ); + } ++} + +- CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::PolicyValue *&_tao_elem) +- { +- return _tao_any >>= ACE_const_cast(const Messaging::PolicyValue*&,_tao_elem); +- } +- +-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Messaging::PolicyValue *&_tao_elem) ++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::ReplyHandler_ptr &_tao_elem) ++{ ++ ACE_TRY_NEW_ENV + { +- _tao_elem = 0; +- ACE_TRY_NEW_ENV +- { +- CORBA::TypeCode_var type = _tao_any.type (); +- if (!type->equivalent (Messaging::_tc_PolicyValue, ACE_TRY_ENV)) // not equal +- { +- return 0; +- } +- ACE_TRY_CHECK; +- if (_tao_any.any_owns_data ()) +- { +- _tao_elem = ACE_static_cast( +- const Messaging::PolicyValue*, +- _tao_any.value () +- ); +- return 1; +- } +- else ++ _tao_elem = Messaging::ReplyHandler::_nil (); ++ CORBA::TypeCode_var type = _tao_any.type (); ++ if (!type->equivalent (Messaging::_tc_ReplyHandler, ACE_TRY_ENV)) // not equal + { +- Messaging::PolicyValue *tmp; +- ACE_NEW_RETURN (tmp, Messaging::PolicyValue, 0); +- TAO_InputCDR stream ( +- _tao_any._tao_get_cdr (), +- _tao_any._tao_byte_order () +- ); +- if (stream >> *tmp) +- { +- ((CORBA::Any *)&_tao_any)->_tao_replace ( +- Messaging::_tc_PolicyValue, +- 1, +- ACE_static_cast (void *, tmp), +- Messaging::PolicyValue::_tao_any_destructor +- ); +- _tao_elem = tmp; +- return 1; +- } +- else +- { +- delete tmp; +- } ++ return 0; + } +- } +- ACE_CATCHANY +- { +- } +- ACE_ENDTRY; +- return 0; +- } +- +- void operator<<= ( +- CORBA::Any &_tao_any, +- const Messaging::PolicyValueSeq &_tao_elem +- ) // copying +- { +- TAO_OutputCDR stream; +- if (stream << _tao_elem) +- { +- _tao_any._tao_replace ( +- Messaging::_tc_PolicyValueSeq, +- TAO_ENCAP_BYTE_ORDER, +- stream.begin () +- ); +- } +- } +- +- void operator<<= (CORBA::Any &_tao_any, Messaging::PolicyValueSeq *_tao_elem) // non copying +- { +- TAO_OutputCDR stream; +- stream << *_tao_elem; +- _tao_any._tao_replace ( +- Messaging::_tc_PolicyValueSeq, +- TAO_ENCAP_BYTE_ORDER, +- stream.begin (), +- 1, +- _tao_elem, +- Messaging::PolicyValueSeq::_tao_any_destructor +- ); +- } +- +- CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::PolicyValueSeq *&_tao_elem) +- { +- return _tao_any >>= ACE_const_cast( +- const Messaging::PolicyValueSeq*&, +- _tao_elem ++ ACE_TRY_CHECK; ++ TAO_InputCDR stream ( ++ _tao_any._tao_get_cdr (), ++ _tao_any._tao_byte_order () + ); +- } +- +-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Messaging::PolicyValueSeq *&_tao_elem) +- { +- _tao_elem = 0; +- ACE_TRY_NEW_ENV ++ CORBA::Object_var _tao_obj_var; ++ if (stream >> _tao_obj_var.out ()) + { +- CORBA::TypeCode_var type = _tao_any.type (); +- if (!type->equivalent (Messaging::_tc_PolicyValueSeq, ACE_TRY_ENV)) // not equal +- { +- return 0; +- } ++ _tao_elem = Messaging::ReplyHandler::_narrow (_tao_obj_var.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; +- if (_tao_any.any_owns_data ()) +- { +- _tao_elem = ACE_static_cast( +- const Messaging::PolicyValueSeq*, +- _tao_any.value () +- ); +- return 1; +- } +- else +- { +- Messaging::PolicyValueSeq *tmp; +- ACE_NEW_RETURN (tmp, Messaging::PolicyValueSeq, 0); +- TAO_InputCDR stream ( +- _tao_any._tao_get_cdr (), +- _tao_any._tao_byte_order () +- ); +- if (stream >> *tmp) +- { +- ((CORBA::Any *)&_tao_any)->_tao_replace ( +- Messaging::_tc_PolicyValueSeq, +- 1, +- ACE_static_cast (void *, tmp), +- Messaging::PolicyValueSeq::_tao_any_destructor +- ); +- _tao_elem = tmp; +- return 1; +- } +- else +- { +- delete tmp; +- } +- } +- } +- ACE_CATCHANY +- { +- } +- ACE_ENDTRY; +- return 0; +- } + +- Messaging::ReplyHandler_ptr (*_TAO_collocation_Messaging_ReplyHandler_Stub_Factory_function_pointer) ( +- CORBA::Object_ptr obj +- ) = 0; +- void operator<<= (CORBA::Any &_tao_any, Messaging::ReplyHandler_ptr _tao_elem) +- { +- TAO_OutputCDR stream; +- if (stream << _tao_elem) +- { +- _tao_any._tao_replace ( +- Messaging::_tc_ReplyHandler, +- TAO_ENCAP_BYTE_ORDER, +- stream.begin (), ++ ((CORBA::Any *)&_tao_any)->_tao_replace ( ++ Messaging::_tc_ReplyHandler, + 1, +- Messaging::ReplyHandler::_duplicate (_tao_elem), ++ _tao_elem, + Messaging::ReplyHandler::_tao_any_destructor + ); ++ return 1; + } + } +- +- CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::ReplyHandler_ptr &_tao_elem) ++ ACE_CATCHANY + { +- ACE_TRY_NEW_ENV +- { +- _tao_elem = Messaging::ReplyHandler::_nil (); +- CORBA::TypeCode_var type = _tao_any.type (); +- if (!type->equivalent (Messaging::_tc_ReplyHandler, ACE_TRY_ENV)) // not equal +- { +- return 0; +- } +- ACE_TRY_CHECK; +- TAO_InputCDR stream ( +- _tao_any._tao_get_cdr (), +- _tao_any._tao_byte_order () +- ); +- CORBA::Object_var _tao_obj_var; +- if (stream >> _tao_obj_var.out ()) +- { +- _tao_elem = Messaging::ReplyHandler::_narrow (_tao_obj_var.in (), ACE_TRY_ENV); +- ACE_TRY_CHECK; +- +- ((CORBA::Any *)&_tao_any)->_tao_replace ( +- Messaging::_tc_ReplyHandler, +- 1, +- _tao_elem, +- Messaging::ReplyHandler::_tao_any_destructor +- ); +- return 1; +- } +- } +- ACE_CATCHANY +- { +- _tao_elem = Messaging::ReplyHandler::_nil (); +- return 0; +- } +- ACE_ENDTRY; + _tao_elem = Messaging::ReplyHandler::_nil (); + return 0; + } ++ ACE_ENDTRY; ++ _tao_elem = Messaging::ReplyHandler::_nil (); ++ return 0; ++} + + #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ +- defined (ACE_HAS_GNU_REPO) +- template class TAO_Object_Manager<Messaging::ReplyHandler,Messaging::ReplyHandler_var>; +- #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +- # pragma instantiate TAO_Object_Manager<Messaging::ReplyHandler,Messaging::ReplyHandler_var> +- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ ++ defined (ACE_HAS_GNU_REPO) ++ template class TAO_Object_Manager<Messaging::ReplyHandler,Messaging::ReplyHandler_var>; ++ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) ++ # pragma instantiate TAO_Object_Manager<Messaging::ReplyHandler,Messaging::ReplyHandler_var> ++#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ ++ + +- + #if !defined _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_CPP_ +- #define _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_CPP_ ++#define _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_CPP_ + + CORBA::Boolean operator<< ( +- TAO_OutputCDR &strm, +- const Messaging::PolicyValue::_tao_seq_Octet &_tao_sequence +- ) ++ TAO_OutputCDR &strm, ++ const Messaging::PolicyValue::_tao_seq_Octet &_tao_sequence ++ ) ++{ ++ if (strm << _tao_sequence.length ()) + { +- if (strm << _tao_sequence.length ()) +- { +- // encode all elements +- ++ // encode all elements ++ + #if defined (TAO_NO_COPY_OCTET_SEQUENCES) +- { +- TAO_Unbounded_Sequence<CORBA::Octet> *oseq = +- ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (Messaging::PolicyValue::_tao_seq_Octet *)&_tao_sequence); +- if (oseq->mb ()) +- return strm.write_octet_array_mb (oseq->mb ()); +- else +- return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); +- } +- ++ { ++ TAO_Unbounded_Sequence<CORBA::Octet> *oseq = ++ ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (Messaging::PolicyValue::_tao_seq_Octet *)&_tao_sequence); ++ if (oseq->mb ()) ++ return strm.write_octet_array_mb (oseq->mb ()); ++ else ++ return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); ++ } ++ + #else /* TAO_NO_COPY_OCTET_SEQUENCES */ +- return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); +- ++ return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); ++ + #endif /* TAO_NO_COPY_OCTET_SEQUENCES */ +- } +- return 0; // error + } ++ return 0; // error ++} + +- CORBA::Boolean operator>> ( +- TAO_InputCDR &strm, +- Messaging::PolicyValue::_tao_seq_Octet &_tao_sequence +- ) ++CORBA::Boolean operator>> ( ++ TAO_InputCDR &strm, ++ Messaging::PolicyValue::_tao_seq_Octet &_tao_sequence ++ ) ++{ ++ CORBA::ULong _tao_seq_len; ++ if (strm >> _tao_seq_len) + { +- CORBA::ULong _tao_seq_len; +- if (strm >> _tao_seq_len) +- { +- // set the length of the sequence +- _tao_sequence.length (_tao_seq_len); +- // If length is 0 we return true. +- if (0 >= _tao_seq_len) +- return 1; +- // retrieve all the elements +- ++ // set the length of the sequence ++ _tao_sequence.length (_tao_seq_len); ++ // If length is 0 we return true. ++ if (0 >= _tao_seq_len) ++ return 1; ++ // retrieve all the elements ++ + #if defined (TAO_NO_COPY_OCTET_SEQUENCES) +- if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE)) +- { +- TAO_Unbounded_Sequence<CORBA::Octet> *oseq = +- ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence); +- oseq->replace (_tao_seq_len, strm.start ()); +- oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len); +- strm.skip_bytes (_tao_seq_len); +- return 1; +- } +- else +- return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len); +- ++ if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE)) ++ { ++ TAO_Unbounded_Sequence<CORBA::Octet> *oseq = ++ ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence); ++ oseq->replace (_tao_seq_len, strm.start ()); ++ oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len); ++ strm.skip_bytes (_tao_seq_len); ++ return 1; ++ } ++ else ++ return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len); ++ + #else /* TAO_NO_COPY_OCTET_SEQUENCES */ +- return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); +- ++ return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); ++ + #endif /* TAO_NO_COPY_OCTET_SEQUENCES */ +- } +- return 0; // error + } ++ return 0; // error ++} + + #endif /* _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_CPP_ */ + +@@ -2631,7 +2306,7 @@ + // 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; +@@ -2644,3 +2319,73 @@ + return 0; // error + } + ++ ++#if !defined _TAO_CDR_OP_Messaging_ExceptionHolder__tao_seq_Octet_CPP_ ++#define _TAO_CDR_OP_Messaging_ExceptionHolder__tao_seq_Octet_CPP_ ++ ++CORBA::Boolean operator<< ( ++ TAO_OutputCDR &strm, ++ const Messaging::ExceptionHolder::_tao_seq_Octet &_tao_sequence ++ ) ++{ ++ if (strm << _tao_sequence.length ()) ++ { ++ // encode all elements ++ ++#if defined (TAO_NO_COPY_OCTET_SEQUENCES) ++ { ++ TAO_Unbounded_Sequence<CORBA::Octet> *oseq = ++ ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (Messaging::ExceptionHolder::_tao_seq_Octet *)&_tao_sequence); ++ if (oseq->mb ()) ++ return strm.write_octet_array_mb (oseq->mb ()); ++ else ++ return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); ++ } ++ ++#else /* TAO_NO_COPY_OCTET_SEQUENCES */ ++ return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); ++ ++#endif /* TAO_NO_COPY_OCTET_SEQUENCES */ ++ } ++ return 0; // error ++} ++ ++CORBA::Boolean operator>> ( ++ TAO_InputCDR &strm, ++ Messaging::ExceptionHolder::_tao_seq_Octet &_tao_sequence ++ ) ++{ ++ CORBA::ULong _tao_seq_len; ++ if (strm >> _tao_seq_len) ++ { ++ // set the length of the sequence ++ _tao_sequence.length (_tao_seq_len); ++ // If length is 0 we return true. ++ if (0 >= _tao_seq_len) ++ return 1; ++ // retrieve all the elements ++ ++#if defined (TAO_NO_COPY_OCTET_SEQUENCES) ++ if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE)) ++ { ++ TAO_Unbounded_Sequence<CORBA::Octet> *oseq = ++ ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence); ++ oseq->replace (_tao_seq_len, strm.start ()); ++ oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len); ++ strm.skip_bytes (_tao_seq_len); ++ return 1; ++ } ++ else ++ return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len); ++ ++#else /* TAO_NO_COPY_OCTET_SEQUENCES */ ++ return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); ++ ++#endif /* TAO_NO_COPY_OCTET_SEQUENCES */ ++ } ++ return 0; // error ++} ++ ++#endif /* _TAO_CDR_OP_Messaging_ExceptionHolder__tao_seq_Octet_CPP_ */ ++ ++#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ diff --git a/TAO/tao/diffs/MessagingC.h.diff b/TAO/tao/diffs/MessagingC.h.diff new file mode 100644 index 00000000000..8931ac1aba0 --- /dev/null +++ b/TAO/tao/diffs/MessagingC.h.diff @@ -0,0 +1,2047 @@ +--- orig/MessagingC.h Fri Apr 28 16:44:03 2000 ++++ MessagingC.h Fri Apr 28 16:58:27 2000 +@@ -7,24 +7,36 @@ + // Information about TAO is available at: + // http://www.cs.wustl.edu/~schmidt/TAO.html + +-#ifndef _TAO_IDL_ORIG_MESSAGINGC_H_ +-#define _TAO_IDL_ORIG_MESSAGINGC_H_ ++#ifndef _TAO_IDL_MESSAGINGC_H_ ++#define _TAO_IDL_MESSAGINGC_H_ ++#include "ace/pre.h" ++ ++#include "tao/orbconf.h" ++ ++#if (TAO_HAS_CORBA_MESSAGING == 1) ++ ++#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) ++#include "tao/ValueBase.h" ++#include "tao/ValueFactory.h" ++#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */ + +-#include "tao/corba.h" +- +-#if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION) +-#include "ace/streams.h" +-#endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */ ++#include "tao/corbafwd.h" + + #if !defined (ACE_LACKS_PRAGMA_ONCE) + # pragma once + #endif /* ACE_LACKS_PRAGMA_ONCE */ + +-#include "tao/corbafwd.h" +-#include "TimeBaseC.h" +-#include "IOPC.h" +-#include "PolicyC.h" +-#include "PollableC.h" ++#include "tao/Any.h" ++#include "tao/CDR.h" ++#include "tao/TimeBaseC.h" ++#include "tao/PolicyC.h" ++#include "tao/IOPC.h" ++#include "tao/PollableC.h" ++ ++#if (TAO_HAS_SMART_PROXIES == 1) ++#include "tao/Smart_Proxies.h" ++#include "ace/Singleton.h" ++#endif /*TAO_HAS_SMART_PROXIES == 1*/ + + #if defined (TAO_EXPORT_MACRO) + #undef TAO_EXPORT_MACRO +@@ -45,6 +57,11 @@ + #pragma warning(disable:4250) + #endif /* _MSC_VER */ + ++#if defined(TRANSPARENT) ++// Some platforms define this macro for ioctl() ++#undef TRANSPARENT ++#endif ++ + TAO_NAMESPACE Messaging + { + typedef CORBA::Short RebindMode; +@@ -103,6 +120,8 @@ + + TAO_NAMESPACE_STORAGE_CLASS const CORBA::UShort ORDER_DEADLINE; + ++#if (TAO_HAS_REBIND_POLICY == 1) ++ + TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REBIND_POLICY_TYPE; + + +@@ -111,7 +130,7 @@ + + class RebindPolicy; + typedef RebindPolicy *RebindPolicy_ptr; +- ++ + #endif /* end #if !defined */ + + +@@ -125,14 +144,14 @@ + RebindPolicy_var (RebindPolicy_ptr); + RebindPolicy_var (const RebindPolicy_var &); // copy constructor + ~RebindPolicy_var (void); // destructor +- ++ + RebindPolicy_var &operator= (RebindPolicy_ptr); + RebindPolicy_var &operator= (const RebindPolicy_var &); + RebindPolicy_ptr operator-> (void) const; +- ++ + operator const RebindPolicy_ptr &() const; + operator RebindPolicy_ptr &(); +- // in, inout, out, _retn ++ // in, inout, out, _retn + RebindPolicy_ptr in (void) const; + RebindPolicy_ptr &inout (void); + RebindPolicy_ptr &out (void); +@@ -162,7 +181,7 @@ + operator RebindPolicy_ptr &(); + RebindPolicy_ptr &ptr (void); + RebindPolicy_ptr operator-> (void); +- ++ + private: + RebindPolicy_ptr &ptr_; + }; +@@ -174,7 +193,7 @@ + #if !defined (_MESSAGING_REBINDPOLICY_CH_) + #define _MESSAGING_REBINDPOLICY_CH_ + +-class TAO_Export RebindPolicy: public virtual CORBA::Policy ++ class TAO_Export RebindPolicy: public virtual CORBA::Policy + { + public: + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) +@@ -186,12 +205,12 @@ + static RebindPolicy_ptr _duplicate (RebindPolicy_ptr obj); + static RebindPolicy_ptr _narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static RebindPolicy_ptr _unchecked_narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static RebindPolicy_ptr _nil (void) +@@ -200,7 +219,7 @@ + } + + virtual Messaging::RebindMode rebind_mode ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -208,7 +227,7 @@ + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); +- ++ + virtual const char* _interface_repository_id (void) const; + + protected: +@@ -222,6 +241,10 @@ + + #endif /* end #if !defined */ + ++#endif /* TAO_HAS_REBIND_POLICY == 1 */ ++ ++#if (TAO_HAS_SYNC_SCOPE_POLICY == 1) ++ + TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong SYNC_SCOPE_POLICY_TYPE; + + +@@ -230,7 +253,7 @@ + + class SyncScopePolicy; + typedef SyncScopePolicy *SyncScopePolicy_ptr; +- ++ + #endif /* end #if !defined */ + + +@@ -244,14 +267,14 @@ + SyncScopePolicy_var (SyncScopePolicy_ptr); + SyncScopePolicy_var (const SyncScopePolicy_var &); // copy constructor + ~SyncScopePolicy_var (void); // destructor +- ++ + SyncScopePolicy_var &operator= (SyncScopePolicy_ptr); + SyncScopePolicy_var &operator= (const SyncScopePolicy_var &); + SyncScopePolicy_ptr operator-> (void) const; +- ++ + operator const SyncScopePolicy_ptr &() const; + operator SyncScopePolicy_ptr &(); +- // in, inout, out, _retn ++ // in, inout, out, _retn + SyncScopePolicy_ptr in (void) const; + SyncScopePolicy_ptr &inout (void); + SyncScopePolicy_ptr &out (void); +@@ -281,7 +304,7 @@ + operator SyncScopePolicy_ptr &(); + SyncScopePolicy_ptr &ptr (void); + SyncScopePolicy_ptr operator-> (void); +- ++ + private: + SyncScopePolicy_ptr &ptr_; + }; +@@ -293,7 +316,7 @@ + #if !defined (_MESSAGING_SYNCSCOPEPOLICY_CH_) + #define _MESSAGING_SYNCSCOPEPOLICY_CH_ + +-class TAO_Export SyncScopePolicy: public virtual CORBA::Policy ++ class TAO_Export SyncScopePolicy: public virtual CORBA::Policy + { + public: + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) +@@ -305,12 +328,12 @@ + static SyncScopePolicy_ptr _duplicate (SyncScopePolicy_ptr obj); + static SyncScopePolicy_ptr _narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static SyncScopePolicy_ptr _unchecked_narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static SyncScopePolicy_ptr _nil (void) +@@ -319,7 +342,7 @@ + } + + virtual Messaging::SyncScope synchronization ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -327,7 +350,7 @@ + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); +- ++ + virtual const char* _interface_repository_id (void) const; + + protected: +@@ -341,11 +364,15 @@ + + #endif /* end #if !defined */ + ++#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ ++ ++#if (TAO_HAS_PRIORITY_POLICIES == 1) ++ + TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REQUEST_PRIORITY_POLICY_TYPE; + + struct PriorityRange; + class PriorityRange_var; +- ++ + struct TAO_Export PriorityRange + { + +@@ -367,18 +394,18 @@ + PriorityRange_var (const PriorityRange_var &); // copy constructor + PriorityRange_var (const PriorityRange &); // fixed-size types only + ~PriorityRange_var (void); // destructor +- ++ + PriorityRange_var &operator= (PriorityRange *); + PriorityRange_var &operator= (const PriorityRange_var &); + PriorityRange_var &operator= (const PriorityRange &); // fixed-size types only + PriorityRange *operator-> (void); + const PriorityRange *operator-> (void) const; +- ++ + operator const PriorityRange &() const; + operator PriorityRange &(); + operator PriorityRange &() const; +- +- // in, inout, out, _retn ++ ++ // in, inout, out, _retn + const PriorityRange &in (void) const; + PriorityRange &inout (void); + PriorityRange &out (void); +@@ -399,7 +426,7 @@ + + class RequestPriorityPolicy; + typedef RequestPriorityPolicy *RequestPriorityPolicy_ptr; +- ++ + #endif /* end #if !defined */ + + +@@ -413,14 +440,14 @@ + RequestPriorityPolicy_var (RequestPriorityPolicy_ptr); + RequestPriorityPolicy_var (const RequestPriorityPolicy_var &); // copy constructor + ~RequestPriorityPolicy_var (void); // destructor +- ++ + RequestPriorityPolicy_var &operator= (RequestPriorityPolicy_ptr); + RequestPriorityPolicy_var &operator= (const RequestPriorityPolicy_var &); + RequestPriorityPolicy_ptr operator-> (void) const; +- ++ + operator const RequestPriorityPolicy_ptr &() const; + operator RequestPriorityPolicy_ptr &(); +- // in, inout, out, _retn ++ // in, inout, out, _retn + RequestPriorityPolicy_ptr in (void) const; + RequestPriorityPolicy_ptr &inout (void); + RequestPriorityPolicy_ptr &out (void); +@@ -450,7 +477,7 @@ + operator RequestPriorityPolicy_ptr &(); + RequestPriorityPolicy_ptr &ptr (void); + RequestPriorityPolicy_ptr operator-> (void); +- ++ + private: + RequestPriorityPolicy_ptr &ptr_; + }; +@@ -462,7 +489,7 @@ + #if !defined (_MESSAGING_REQUESTPRIORITYPOLICY_CH_) + #define _MESSAGING_REQUESTPRIORITYPOLICY_CH_ + +-class TAO_Export RequestPriorityPolicy: public virtual CORBA::Policy ++ class TAO_Export RequestPriorityPolicy: public virtual CORBA::Policy + { + public: + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) +@@ -474,12 +501,12 @@ + static RequestPriorityPolicy_ptr _duplicate (RequestPriorityPolicy_ptr obj); + static RequestPriorityPolicy_ptr _narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static RequestPriorityPolicy_ptr _unchecked_narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static RequestPriorityPolicy_ptr _nil (void) +@@ -488,7 +515,7 @@ + } + + virtual Messaging::PriorityRange priority_range ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -496,7 +523,7 @@ + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); +- ++ + virtual const char* _interface_repository_id (void) const; + + protected: +@@ -518,7 +545,7 @@ + + class ReplyPriorityPolicy; + typedef ReplyPriorityPolicy *ReplyPriorityPolicy_ptr; +- ++ + #endif /* end #if !defined */ + + +@@ -532,14 +559,14 @@ + ReplyPriorityPolicy_var (ReplyPriorityPolicy_ptr); + ReplyPriorityPolicy_var (const ReplyPriorityPolicy_var &); // copy constructor + ~ReplyPriorityPolicy_var (void); // destructor +- ++ + ReplyPriorityPolicy_var &operator= (ReplyPriorityPolicy_ptr); + ReplyPriorityPolicy_var &operator= (const ReplyPriorityPolicy_var &); + ReplyPriorityPolicy_ptr operator-> (void) const; +- ++ + operator const ReplyPriorityPolicy_ptr &() const; + operator ReplyPriorityPolicy_ptr &(); +- // in, inout, out, _retn ++ // in, inout, out, _retn + ReplyPriorityPolicy_ptr in (void) const; + ReplyPriorityPolicy_ptr &inout (void); + ReplyPriorityPolicy_ptr &out (void); +@@ -569,7 +596,7 @@ + operator ReplyPriorityPolicy_ptr &(); + ReplyPriorityPolicy_ptr &ptr (void); + ReplyPriorityPolicy_ptr operator-> (void); +- ++ + private: + ReplyPriorityPolicy_ptr &ptr_; + }; +@@ -581,7 +608,7 @@ + #if !defined (_MESSAGING_REPLYPRIORITYPOLICY_CH_) + #define _MESSAGING_REPLYPRIORITYPOLICY_CH_ + +-class TAO_Export ReplyPriorityPolicy: public virtual CORBA::Policy ++ class TAO_Export ReplyPriorityPolicy: public virtual CORBA::Policy + { + public: + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) +@@ -593,12 +620,12 @@ + static ReplyPriorityPolicy_ptr _duplicate (ReplyPriorityPolicy_ptr obj); + static ReplyPriorityPolicy_ptr _narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static ReplyPriorityPolicy_ptr _unchecked_narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static ReplyPriorityPolicy_ptr _nil (void) +@@ -607,7 +634,7 @@ + } + + virtual Messaging::PriorityRange priority_range ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -615,7 +642,7 @@ + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); +- ++ + virtual const char* _interface_repository_id (void) const; + + protected: +@@ -629,6 +656,10 @@ + + #endif /* end #if !defined */ + ++#endif /* TAO_HAS_PRIORITY_POLICIES == 1 */ ++ ++#if (TAO_HAS_REQUEST_START_TIME_POLICY == 1) ++ + TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REQUEST_START_TIME_POLICY_TYPE; + + +@@ -637,7 +668,7 @@ + + class RequestStartTimePolicy; + typedef RequestStartTimePolicy *RequestStartTimePolicy_ptr; +- ++ + #endif /* end #if !defined */ + + +@@ -651,14 +682,14 @@ + RequestStartTimePolicy_var (RequestStartTimePolicy_ptr); + RequestStartTimePolicy_var (const RequestStartTimePolicy_var &); // copy constructor + ~RequestStartTimePolicy_var (void); // destructor +- ++ + RequestStartTimePolicy_var &operator= (RequestStartTimePolicy_ptr); + RequestStartTimePolicy_var &operator= (const RequestStartTimePolicy_var &); + RequestStartTimePolicy_ptr operator-> (void) const; +- ++ + operator const RequestStartTimePolicy_ptr &() const; + operator RequestStartTimePolicy_ptr &(); +- // in, inout, out, _retn ++ // in, inout, out, _retn + RequestStartTimePolicy_ptr in (void) const; + RequestStartTimePolicy_ptr &inout (void); + RequestStartTimePolicy_ptr &out (void); +@@ -688,7 +719,7 @@ + operator RequestStartTimePolicy_ptr &(); + RequestStartTimePolicy_ptr &ptr (void); + RequestStartTimePolicy_ptr operator-> (void); +- ++ + private: + RequestStartTimePolicy_ptr &ptr_; + }; +@@ -700,7 +731,7 @@ + #if !defined (_MESSAGING_REQUESTSTARTTIMEPOLICY_CH_) + #define _MESSAGING_REQUESTSTARTTIMEPOLICY_CH_ + +-class TAO_Export RequestStartTimePolicy: public virtual CORBA::Policy ++ class TAO_Export RequestStartTimePolicy: public virtual CORBA::Policy + { + public: + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) +@@ -712,12 +743,12 @@ + static RequestStartTimePolicy_ptr _duplicate (RequestStartTimePolicy_ptr obj); + static RequestStartTimePolicy_ptr _narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static RequestStartTimePolicy_ptr _unchecked_narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static RequestStartTimePolicy_ptr _nil (void) +@@ -726,7 +757,7 @@ + } + + virtual TimeBase::UtcT start_time ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -734,7 +765,7 @@ + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); +- ++ + virtual const char* _interface_repository_id (void) const; + + protected: +@@ -748,6 +779,10 @@ + + #endif /* end #if !defined */ + ++#endif /* TAO_HAS_REQUEST_START_TIME_POLICY == 1 */ ++ ++#if (TAO_HAS_REQUEST_END_TIME_POLICY == 1) ++ + TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REQUEST_END_TIME_POLICY_TYPE; + + +@@ -756,7 +791,7 @@ + + class RequestEndTimePolicy; + typedef RequestEndTimePolicy *RequestEndTimePolicy_ptr; +- ++ + #endif /* end #if !defined */ + + +@@ -770,14 +805,14 @@ + RequestEndTimePolicy_var (RequestEndTimePolicy_ptr); + RequestEndTimePolicy_var (const RequestEndTimePolicy_var &); // copy constructor + ~RequestEndTimePolicy_var (void); // destructor +- ++ + RequestEndTimePolicy_var &operator= (RequestEndTimePolicy_ptr); + RequestEndTimePolicy_var &operator= (const RequestEndTimePolicy_var &); + RequestEndTimePolicy_ptr operator-> (void) const; +- ++ + operator const RequestEndTimePolicy_ptr &() const; + operator RequestEndTimePolicy_ptr &(); +- // in, inout, out, _retn ++ // in, inout, out, _retn + RequestEndTimePolicy_ptr in (void) const; + RequestEndTimePolicy_ptr &inout (void); + RequestEndTimePolicy_ptr &out (void); +@@ -807,7 +842,7 @@ + operator RequestEndTimePolicy_ptr &(); + RequestEndTimePolicy_ptr &ptr (void); + RequestEndTimePolicy_ptr operator-> (void); +- ++ + private: + RequestEndTimePolicy_ptr &ptr_; + }; +@@ -819,7 +854,7 @@ + #if !defined (_MESSAGING_REQUESTENDTIMEPOLICY_CH_) + #define _MESSAGING_REQUESTENDTIMEPOLICY_CH_ + +-class TAO_Export RequestEndTimePolicy: public virtual CORBA::Policy ++ class TAO_Export RequestEndTimePolicy: public virtual CORBA::Policy + { + public: + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) +@@ -831,12 +866,12 @@ + static RequestEndTimePolicy_ptr _duplicate (RequestEndTimePolicy_ptr obj); + static RequestEndTimePolicy_ptr _narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static RequestEndTimePolicy_ptr _unchecked_narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static RequestEndTimePolicy_ptr _nil (void) +@@ -845,7 +880,7 @@ + } + + virtual TimeBase::UtcT end_time ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -853,7 +888,7 @@ + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); +- ++ + virtual const char* _interface_repository_id (void) const; + + protected: +@@ -867,6 +902,10 @@ + + #endif /* end #if !defined */ + ++#endif /* TAO_HAS_REQUEST_END_TIME_POLICY == 1 */ ++ ++#if (TAO_HAS_REPLY_START_TIME_POLICY == 1) ++ + TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REPLY_START_TIME_POLICY_TYPE; + + +@@ -875,7 +914,7 @@ + + class ReplyStartTimePolicy; + typedef ReplyStartTimePolicy *ReplyStartTimePolicy_ptr; +- ++ + #endif /* end #if !defined */ + + +@@ -889,14 +928,14 @@ + ReplyStartTimePolicy_var (ReplyStartTimePolicy_ptr); + ReplyStartTimePolicy_var (const ReplyStartTimePolicy_var &); // copy constructor + ~ReplyStartTimePolicy_var (void); // destructor +- ++ + ReplyStartTimePolicy_var &operator= (ReplyStartTimePolicy_ptr); + ReplyStartTimePolicy_var &operator= (const ReplyStartTimePolicy_var &); + ReplyStartTimePolicy_ptr operator-> (void) const; +- ++ + operator const ReplyStartTimePolicy_ptr &() const; + operator ReplyStartTimePolicy_ptr &(); +- // in, inout, out, _retn ++ // in, inout, out, _retn + ReplyStartTimePolicy_ptr in (void) const; + ReplyStartTimePolicy_ptr &inout (void); + ReplyStartTimePolicy_ptr &out (void); +@@ -926,7 +965,7 @@ + operator ReplyStartTimePolicy_ptr &(); + ReplyStartTimePolicy_ptr &ptr (void); + ReplyStartTimePolicy_ptr operator-> (void); +- ++ + private: + ReplyStartTimePolicy_ptr &ptr_; + }; +@@ -938,7 +977,7 @@ + #if !defined (_MESSAGING_REPLYSTARTTIMEPOLICY_CH_) + #define _MESSAGING_REPLYSTARTTIMEPOLICY_CH_ + +-class TAO_Export ReplyStartTimePolicy: public virtual CORBA::Policy ++ class TAO_Export ReplyStartTimePolicy: public virtual CORBA::Policy + { + public: + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) +@@ -950,12 +989,12 @@ + static ReplyStartTimePolicy_ptr _duplicate (ReplyStartTimePolicy_ptr obj); + static ReplyStartTimePolicy_ptr _narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static ReplyStartTimePolicy_ptr _unchecked_narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static ReplyStartTimePolicy_ptr _nil (void) +@@ -964,7 +1003,7 @@ + } + + virtual TimeBase::UtcT start_time ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -972,7 +1011,7 @@ + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); +- ++ + virtual const char* _interface_repository_id (void) const; + + protected: +@@ -986,6 +1025,10 @@ + + #endif /* end #if !defined */ + ++#endif /* TAO_HAS_REPLY_START_TIME_POLICY == 1 */ ++ ++#if (TAO_HAS_REPLY_END_TIME_POLICY == 1) ++ + TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REPLY_END_TIME_POLICY_TYPE; + + +@@ -994,7 +1037,7 @@ + + class ReplyEndTimePolicy; + typedef ReplyEndTimePolicy *ReplyEndTimePolicy_ptr; +- ++ + #endif /* end #if !defined */ + + +@@ -1008,14 +1051,14 @@ + ReplyEndTimePolicy_var (ReplyEndTimePolicy_ptr); + ReplyEndTimePolicy_var (const ReplyEndTimePolicy_var &); // copy constructor + ~ReplyEndTimePolicy_var (void); // destructor +- ++ + ReplyEndTimePolicy_var &operator= (ReplyEndTimePolicy_ptr); + ReplyEndTimePolicy_var &operator= (const ReplyEndTimePolicy_var &); + ReplyEndTimePolicy_ptr operator-> (void) const; +- ++ + operator const ReplyEndTimePolicy_ptr &() const; + operator ReplyEndTimePolicy_ptr &(); +- // in, inout, out, _retn ++ // in, inout, out, _retn + ReplyEndTimePolicy_ptr in (void) const; + ReplyEndTimePolicy_ptr &inout (void); + ReplyEndTimePolicy_ptr &out (void); +@@ -1045,7 +1088,7 @@ + operator ReplyEndTimePolicy_ptr &(); + ReplyEndTimePolicy_ptr &ptr (void); + ReplyEndTimePolicy_ptr operator-> (void); +- ++ + private: + ReplyEndTimePolicy_ptr &ptr_; + }; +@@ -1057,7 +1100,7 @@ + #if !defined (_MESSAGING_REPLYENDTIMEPOLICY_CH_) + #define _MESSAGING_REPLYENDTIMEPOLICY_CH_ + +-class TAO_Export ReplyEndTimePolicy: public virtual CORBA::Policy ++ class TAO_Export ReplyEndTimePolicy: public virtual CORBA::Policy + { + public: + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) +@@ -1069,12 +1112,12 @@ + static ReplyEndTimePolicy_ptr _duplicate (ReplyEndTimePolicy_ptr obj); + static ReplyEndTimePolicy_ptr _narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static ReplyEndTimePolicy_ptr _unchecked_narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static ReplyEndTimePolicy_ptr _nil (void) +@@ -1083,7 +1126,7 @@ + } + + virtual TimeBase::UtcT end_time ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -1091,7 +1134,7 @@ + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); +- ++ + virtual const char* _interface_repository_id (void) const; + + protected: +@@ -1105,6 +1148,10 @@ + + #endif /* end #if !defined */ + ++#endif /* TAO_HAS_REPLY_END_TIME_POLICY == 1 */ ++ ++#if (TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1) ++ + TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong RELATIVE_REQ_TIMEOUT_POLICY_TYPE; + + +@@ -1113,7 +1160,7 @@ + + class RelativeRequestTimeoutPolicy; + typedef RelativeRequestTimeoutPolicy *RelativeRequestTimeoutPolicy_ptr; +- ++ + #endif /* end #if !defined */ + + +@@ -1127,14 +1174,14 @@ + RelativeRequestTimeoutPolicy_var (RelativeRequestTimeoutPolicy_ptr); + RelativeRequestTimeoutPolicy_var (const RelativeRequestTimeoutPolicy_var &); // copy constructor + ~RelativeRequestTimeoutPolicy_var (void); // destructor +- ++ + RelativeRequestTimeoutPolicy_var &operator= (RelativeRequestTimeoutPolicy_ptr); + RelativeRequestTimeoutPolicy_var &operator= (const RelativeRequestTimeoutPolicy_var &); + RelativeRequestTimeoutPolicy_ptr operator-> (void) const; +- ++ + operator const RelativeRequestTimeoutPolicy_ptr &() const; + operator RelativeRequestTimeoutPolicy_ptr &(); +- // in, inout, out, _retn ++ // in, inout, out, _retn + RelativeRequestTimeoutPolicy_ptr in (void) const; + RelativeRequestTimeoutPolicy_ptr &inout (void); + RelativeRequestTimeoutPolicy_ptr &out (void); +@@ -1164,7 +1211,7 @@ + operator RelativeRequestTimeoutPolicy_ptr &(); + RelativeRequestTimeoutPolicy_ptr &ptr (void); + RelativeRequestTimeoutPolicy_ptr operator-> (void); +- ++ + private: + RelativeRequestTimeoutPolicy_ptr &ptr_; + }; +@@ -1176,7 +1223,7 @@ + #if !defined (_MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY_CH_) + #define _MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY_CH_ + +-class TAO_Export RelativeRequestTimeoutPolicy: public virtual CORBA::Policy ++ class TAO_Export RelativeRequestTimeoutPolicy: public virtual CORBA::Policy + { + public: + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) +@@ -1188,12 +1235,12 @@ + static RelativeRequestTimeoutPolicy_ptr _duplicate (RelativeRequestTimeoutPolicy_ptr obj); + static RelativeRequestTimeoutPolicy_ptr _narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static RelativeRequestTimeoutPolicy_ptr _unchecked_narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static RelativeRequestTimeoutPolicy_ptr _nil (void) +@@ -1202,7 +1249,7 @@ + } + + virtual TimeBase::TimeT relative_expiry ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -1210,7 +1257,7 @@ + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); +- ++ + virtual const char* _interface_repository_id (void) const; + + protected: +@@ -1224,6 +1271,10 @@ + + #endif /* end #if !defined */ + ++#endif /* TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1 */ ++ ++#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) ++ + TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong RELATIVE_RT_TIMEOUT_POLICY_TYPE; + + +@@ -1232,7 +1283,7 @@ + + class RelativeRoundtripTimeoutPolicy; + typedef RelativeRoundtripTimeoutPolicy *RelativeRoundtripTimeoutPolicy_ptr; +- ++ + #endif /* end #if !defined */ + + +@@ -1246,14 +1297,14 @@ + RelativeRoundtripTimeoutPolicy_var (RelativeRoundtripTimeoutPolicy_ptr); + RelativeRoundtripTimeoutPolicy_var (const RelativeRoundtripTimeoutPolicy_var &); // copy constructor + ~RelativeRoundtripTimeoutPolicy_var (void); // destructor +- ++ + RelativeRoundtripTimeoutPolicy_var &operator= (RelativeRoundtripTimeoutPolicy_ptr); + RelativeRoundtripTimeoutPolicy_var &operator= (const RelativeRoundtripTimeoutPolicy_var &); + RelativeRoundtripTimeoutPolicy_ptr operator-> (void) const; +- ++ + operator const RelativeRoundtripTimeoutPolicy_ptr &() const; + operator RelativeRoundtripTimeoutPolicy_ptr &(); +- // in, inout, out, _retn ++ // in, inout, out, _retn + RelativeRoundtripTimeoutPolicy_ptr in (void) const; + RelativeRoundtripTimeoutPolicy_ptr &inout (void); + RelativeRoundtripTimeoutPolicy_ptr &out (void); +@@ -1283,7 +1334,7 @@ + operator RelativeRoundtripTimeoutPolicy_ptr &(); + RelativeRoundtripTimeoutPolicy_ptr &ptr (void); + RelativeRoundtripTimeoutPolicy_ptr operator-> (void); +- ++ + private: + RelativeRoundtripTimeoutPolicy_ptr &ptr_; + }; +@@ -1295,7 +1346,7 @@ + #if !defined (_MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY_CH_) + #define _MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY_CH_ + +-class TAO_Export RelativeRoundtripTimeoutPolicy: public virtual CORBA::Policy ++ class TAO_Export RelativeRoundtripTimeoutPolicy: public virtual CORBA::Policy + { + public: + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) +@@ -1307,12 +1358,12 @@ + static RelativeRoundtripTimeoutPolicy_ptr _duplicate (RelativeRoundtripTimeoutPolicy_ptr obj); + static RelativeRoundtripTimeoutPolicy_ptr _narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static RelativeRoundtripTimeoutPolicy_ptr _unchecked_narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static RelativeRoundtripTimeoutPolicy_ptr _nil (void) +@@ -1321,7 +1372,7 @@ + } + + virtual TimeBase::TimeT relative_expiry ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -1329,7 +1380,7 @@ + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); +- ++ + virtual const char* _interface_repository_id (void) const; + + protected: +@@ -1343,11 +1394,15 @@ + + #endif /* end #if !defined */ + ++#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ ++ ++#if (TAO_HAS_ROUTING_POLICY == 1) ++ + TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong ROUTING_POLICY_TYPE; + + struct RoutingTypeRange; + class RoutingTypeRange_var; +- ++ + struct TAO_Export RoutingTypeRange + { + +@@ -1369,18 +1424,18 @@ + RoutingTypeRange_var (const RoutingTypeRange_var &); // copy constructor + RoutingTypeRange_var (const RoutingTypeRange &); // fixed-size types only + ~RoutingTypeRange_var (void); // destructor +- ++ + RoutingTypeRange_var &operator= (RoutingTypeRange *); + RoutingTypeRange_var &operator= (const RoutingTypeRange_var &); + RoutingTypeRange_var &operator= (const RoutingTypeRange &); // fixed-size types only + RoutingTypeRange *operator-> (void); + const RoutingTypeRange *operator-> (void) const; +- ++ + operator const RoutingTypeRange &() const; + operator RoutingTypeRange &(); + operator RoutingTypeRange &() const; +- +- // in, inout, out, _retn ++ ++ // in, inout, out, _retn + const RoutingTypeRange &in (void) const; + RoutingTypeRange &inout (void); + RoutingTypeRange &out (void); +@@ -1401,7 +1456,7 @@ + + class RoutingPolicy; + typedef RoutingPolicy *RoutingPolicy_ptr; +- ++ + #endif /* end #if !defined */ + + +@@ -1415,14 +1470,14 @@ + RoutingPolicy_var (RoutingPolicy_ptr); + RoutingPolicy_var (const RoutingPolicy_var &); // copy constructor + ~RoutingPolicy_var (void); // destructor +- ++ + RoutingPolicy_var &operator= (RoutingPolicy_ptr); + RoutingPolicy_var &operator= (const RoutingPolicy_var &); + RoutingPolicy_ptr operator-> (void) const; +- ++ + operator const RoutingPolicy_ptr &() const; + operator RoutingPolicy_ptr &(); +- // in, inout, out, _retn ++ // in, inout, out, _retn + RoutingPolicy_ptr in (void) const; + RoutingPolicy_ptr &inout (void); + RoutingPolicy_ptr &out (void); +@@ -1452,7 +1507,7 @@ + operator RoutingPolicy_ptr &(); + RoutingPolicy_ptr &ptr (void); + RoutingPolicy_ptr operator-> (void); +- ++ + private: + RoutingPolicy_ptr &ptr_; + }; +@@ -1464,7 +1519,7 @@ + #if !defined (_MESSAGING_ROUTINGPOLICY_CH_) + #define _MESSAGING_ROUTINGPOLICY_CH_ + +-class TAO_Export RoutingPolicy: public virtual CORBA::Policy ++ class TAO_Export RoutingPolicy: public virtual CORBA::Policy + { + public: + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) +@@ -1476,12 +1531,12 @@ + static RoutingPolicy_ptr _duplicate (RoutingPolicy_ptr obj); + static RoutingPolicy_ptr _narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static RoutingPolicy_ptr _unchecked_narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static RoutingPolicy_ptr _nil (void) +@@ -1490,7 +1545,7 @@ + } + + virtual Messaging::RoutingTypeRange routing_range ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -1498,7 +1553,7 @@ + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); +- ++ + virtual const char* _interface_repository_id (void) const; + + protected: +@@ -1512,6 +1567,10 @@ + + #endif /* end #if !defined */ + ++#endif /* TAO_HAS_ROUTING_POLICY == 1 */ ++ ++#if (TAO_HAS_MAX_HOPS_POLICY == 1) ++ + TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong MAX_HOPS_POLICY_TYPE; + + +@@ -1520,7 +1579,7 @@ + + class MaxHopsPolicy; + typedef MaxHopsPolicy *MaxHopsPolicy_ptr; +- ++ + #endif /* end #if !defined */ + + +@@ -1534,14 +1593,14 @@ + MaxHopsPolicy_var (MaxHopsPolicy_ptr); + MaxHopsPolicy_var (const MaxHopsPolicy_var &); // copy constructor + ~MaxHopsPolicy_var (void); // destructor +- ++ + MaxHopsPolicy_var &operator= (MaxHopsPolicy_ptr); + MaxHopsPolicy_var &operator= (const MaxHopsPolicy_var &); + MaxHopsPolicy_ptr operator-> (void) const; +- ++ + operator const MaxHopsPolicy_ptr &() const; + operator MaxHopsPolicy_ptr &(); +- // in, inout, out, _retn ++ // in, inout, out, _retn + MaxHopsPolicy_ptr in (void) const; + MaxHopsPolicy_ptr &inout (void); + MaxHopsPolicy_ptr &out (void); +@@ -1571,7 +1630,7 @@ + operator MaxHopsPolicy_ptr &(); + MaxHopsPolicy_ptr &ptr (void); + MaxHopsPolicy_ptr operator-> (void); +- ++ + private: + MaxHopsPolicy_ptr &ptr_; + }; +@@ -1583,7 +1642,7 @@ + #if !defined (_MESSAGING_MAXHOPSPOLICY_CH_) + #define _MESSAGING_MAXHOPSPOLICY_CH_ + +-class TAO_Export MaxHopsPolicy: public virtual CORBA::Policy ++ class TAO_Export MaxHopsPolicy: public virtual CORBA::Policy + { + public: + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) +@@ -1595,12 +1654,12 @@ + static MaxHopsPolicy_ptr _duplicate (MaxHopsPolicy_ptr obj); + static MaxHopsPolicy_ptr _narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static MaxHopsPolicy_ptr _unchecked_narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static MaxHopsPolicy_ptr _nil (void) +@@ -1609,7 +1668,7 @@ + } + + virtual CORBA::UShort max_hops ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -1617,7 +1676,7 @@ + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); +- ++ + virtual const char* _interface_repository_id (void) const; + + protected: +@@ -1631,6 +1690,10 @@ + + #endif /* end #if !defined */ + ++#endif /* TAO_HAS_MAX_HOPS_POLICY == 1 */ ++ ++#if (TAO_HAS_QUEUE_ORDER_POLICY == 1) ++ + TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong QUEUE_ORDER_POLICY_TYPE; + + +@@ -1639,7 +1702,7 @@ + + class QueueOrderPolicy; + typedef QueueOrderPolicy *QueueOrderPolicy_ptr; +- ++ + #endif /* end #if !defined */ + + +@@ -1653,14 +1716,14 @@ + QueueOrderPolicy_var (QueueOrderPolicy_ptr); + QueueOrderPolicy_var (const QueueOrderPolicy_var &); // copy constructor + ~QueueOrderPolicy_var (void); // destructor +- ++ + QueueOrderPolicy_var &operator= (QueueOrderPolicy_ptr); + QueueOrderPolicy_var &operator= (const QueueOrderPolicy_var &); + QueueOrderPolicy_ptr operator-> (void) const; +- ++ + operator const QueueOrderPolicy_ptr &() const; + operator QueueOrderPolicy_ptr &(); +- // in, inout, out, _retn ++ // in, inout, out, _retn + QueueOrderPolicy_ptr in (void) const; + QueueOrderPolicy_ptr &inout (void); + QueueOrderPolicy_ptr &out (void); +@@ -1690,7 +1753,7 @@ + operator QueueOrderPolicy_ptr &(); + QueueOrderPolicy_ptr &ptr (void); + QueueOrderPolicy_ptr operator-> (void); +- ++ + private: + QueueOrderPolicy_ptr &ptr_; + }; +@@ -1702,7 +1765,7 @@ + #if !defined (_MESSAGING_QUEUEORDERPOLICY_CH_) + #define _MESSAGING_QUEUEORDERPOLICY_CH_ + +-class TAO_Export QueueOrderPolicy: public virtual CORBA::Policy ++ class TAO_Export QueueOrderPolicy: public virtual CORBA::Policy + { + public: + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) +@@ -1714,12 +1777,12 @@ + static QueueOrderPolicy_ptr _duplicate (QueueOrderPolicy_ptr obj); + static QueueOrderPolicy_ptr _narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static QueueOrderPolicy_ptr _unchecked_narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static QueueOrderPolicy_ptr _nil (void) +@@ -1728,7 +1791,7 @@ + } + + virtual Messaging::Ordering allowed_orders ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -1736,7 +1799,7 @@ + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); +- ++ + virtual const char* _interface_repository_id (void) const; + + protected: +@@ -1750,9 +1813,11 @@ + + #endif /* end #if !defined */ + ++#endif /* TAO_HAS_QUEUE_ORDER_POLICY == 1 */ ++ + struct PolicyValue; + class PolicyValue_var; +- ++ + struct TAO_Export PolicyValue + { + +@@ -1769,25 +1834,25 @@ + + class _tao_seq_Octet; + class _tao_seq_Octet_var; +- ++ + // ************************************************************* + // _tao_seq_Octet + // ************************************************************* +- +- class TAO_Export _tao_seq_Octet : public ++ ++ class TAO_Export _tao_seq_Octet : public + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) + TAO_Unbounded_Sequence<CORBA::Octet> + #else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<CORBA::Octet> +-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ ++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + { + public: + _tao_seq_Octet (void); // default ctor + _tao_seq_Octet (CORBA::ULong max); // uses max size + _tao_seq_Octet ( +- CORBA::ULong max, +- CORBA::ULong length, +- CORBA::Octet *buffer, ++ CORBA::ULong max, ++ CORBA::ULong length, ++ CORBA::Octet *buffer, + CORBA::Boolean release=0 + ); + _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor +@@ -1808,7 +1873,7 @@ + #endif /* TAO_NO_COPY_OCTET_SEQUENCE */ + + }; +- ++ + #endif /* end #if !defined */ + + +@@ -1827,19 +1892,19 @@ + _tao_seq_Octet_var (const _tao_seq_Octet_var &); // copy constructor + _tao_seq_Octet_var (const _tao_seq_Octet &); // fixed-size base types only + ~_tao_seq_Octet_var (void); // destructor +- ++ + _tao_seq_Octet_var &operator= (_tao_seq_Octet *); + _tao_seq_Octet_var &operator= (const _tao_seq_Octet_var &); + _tao_seq_Octet_var &operator= (const _tao_seq_Octet &); // fixed-size base types only + _tao_seq_Octet *operator-> (void); + const _tao_seq_Octet *operator-> (void) const; +- ++ + operator const _tao_seq_Octet &() const; + operator _tao_seq_Octet &(); + operator _tao_seq_Octet &() const; +- ++ + CORBA::Octet &operator[] (CORBA::ULong index); +- // in, inout, out, _retn ++ // in, inout, out, _retn + const _tao_seq_Octet &in (void) const; + _tao_seq_Octet &inout (void); + _tao_seq_Octet *&out (void); +@@ -1869,7 +1934,7 @@ + _tao_seq_Octet *&ptr (void); + _tao_seq_Octet *operator-> (void); + CORBA::Octet &operator[] (CORBA::ULong index); +- ++ + private: + _tao_seq_Octet *&ptr_; + // assignment from T_var not allowed +@@ -1893,18 +1958,18 @@ + PolicyValue_var (PolicyValue *); + PolicyValue_var (const PolicyValue_var &); // copy constructor + ~PolicyValue_var (void); // destructor +- ++ + PolicyValue_var &operator= (PolicyValue *); + PolicyValue_var &operator= (const PolicyValue_var &); + PolicyValue *operator-> (void); + const PolicyValue *operator-> (void) const; +- ++ + operator const PolicyValue &() const; + operator PolicyValue &(); + operator PolicyValue &() const; + operator PolicyValue *&(); // variable-size types only +- +- // in, inout, out, _retn ++ ++ // in, inout, out, _retn + const PolicyValue &in (void) const; + PolicyValue &inout (void); + PolicyValue *&out (void); +@@ -1926,7 +1991,7 @@ + operator PolicyValue *&(); + PolicyValue *&ptr (void); + PolicyValue *operator-> (void); +- ++ + private: + PolicyValue *&ptr_; + // assignment from T_var not allowed +@@ -1937,7 +2002,7 @@ + + + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) +- ++ + #if !defined (__TAO_UNBOUNDED_SEQUENCE_MESSAGING_POLICYVALUESEQ_CH_) + #define __TAO_UNBOUNDED_SEQUENCE_MESSAGING_POLICYVALUESEQ_CH_ + +@@ -1945,9 +2010,9 @@ + { + public: + // = Initialization and termination methods. +- ++ + _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (void); // Default constructor. +- _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (CORBA::ULong maximum); ++ _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (CORBA::ULong maximum); + _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (CORBA::ULong maximum, + CORBA::ULong length, + PolicyValue *data, +@@ -1964,7 +2029,7 @@ + virtual void _allocate_buffer (CORBA::ULong length); + virtual void _deallocate_buffer (void); + // Implement the TAO_Base_Sequence methods (see Sequence.h) +- ++ + PolicyValue *get_buffer (CORBA::Boolean orphan = 0); + const PolicyValue *get_buffer (void) const; + void replace (CORBA::ULong max, +@@ -1976,32 +2041,32 @@ + #endif /* end #if !defined */ + + +-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +- ++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ ++ + #if !defined (_MESSAGING_POLICYVALUESEQ_CH_) + #define _MESSAGING_POLICYVALUESEQ_CH_ + + class PolicyValueSeq; + class PolicyValueSeq_var; +- ++ + // ************************************************************* + // PolicyValueSeq + // ************************************************************* +- +- class TAO_Export PolicyValueSeq : public ++ ++ class TAO_Export PolicyValueSeq : public + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) + _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq + #else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<PolicyValue> +-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ ++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + { + public: + PolicyValueSeq (void); // default ctor + PolicyValueSeq (CORBA::ULong max); // uses max size + PolicyValueSeq ( +- CORBA::ULong max, +- CORBA::ULong length, +- PolicyValue *buffer, ++ CORBA::ULong max, ++ CORBA::ULong length, ++ PolicyValue *buffer, + CORBA::Boolean release=0 + ); + PolicyValueSeq (const PolicyValueSeq &); // copy ctor +@@ -2013,7 +2078,7 @@ + #endif /* ! __GNUC__ || g++ >= 2.8 */ + + }; +- ++ + #endif /* end #if !defined */ + + +@@ -2031,19 +2096,19 @@ + PolicyValueSeq_var (PolicyValueSeq *); + PolicyValueSeq_var (const PolicyValueSeq_var &); // copy constructor + ~PolicyValueSeq_var (void); // destructor +- ++ + PolicyValueSeq_var &operator= (PolicyValueSeq *); + PolicyValueSeq_var &operator= (const PolicyValueSeq_var &); + PolicyValueSeq *operator-> (void); + const PolicyValueSeq *operator-> (void) const; +- ++ + operator const PolicyValueSeq &() const; + operator PolicyValueSeq &(); + operator PolicyValueSeq &() const; + operator PolicyValueSeq *&(); // variable-size base types only +- ++ + PolicyValue &operator[] (CORBA::ULong index); +- // in, inout, out, _retn ++ // in, inout, out, _retn + const PolicyValueSeq &in (void) const; + PolicyValueSeq &inout (void); + PolicyValueSeq *&out (void); +@@ -2073,7 +2138,7 @@ + PolicyValueSeq *&ptr (void); + PolicyValueSeq *operator-> (void); + PolicyValue &operator[] (CORBA::ULong index); +- ++ + private: + PolicyValueSeq *&ptr_; + // assignment from T_var not allowed +@@ -2089,10 +2154,12 @@ + + TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong INVOCATION_POLICIES; + +-// valuetype class ++#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) ++ ++ // valuetype class + class ExceptionHolder; + typedef ExceptionHolder *ExceptionHolder_ptr; +- ++ + #if !defined (_MESSAGING_EXCEPTIONHOLDER___VAR_CH_) + #define _MESSAGING_EXCEPTIONHOLDER___VAR_CH_ + +@@ -2104,14 +2171,14 @@ + ExceptionHolder_var (const ExceptionHolder*); // (TAO extension) + ExceptionHolder_var (const ExceptionHolder_var &); // copy constructor + ~ExceptionHolder_var (void); // destructor +- ++ + ExceptionHolder_var &operator= (ExceptionHolder*); + ExceptionHolder_var &operator= (const ExceptionHolder_var &); + ExceptionHolder* operator-> (void) const; +- ++ + operator const ExceptionHolder* () const; + operator ExceptionHolder* (); +- // in, inout, out, _retn ++ // in, inout, out, _retn + ExceptionHolder* in (void) const; + ExceptionHolder* &inout (void); + ExceptionHolder* &out (void); +@@ -2141,7 +2208,7 @@ + operator ExceptionHolder* &(); + ExceptionHolder* &ptr (void); + ExceptionHolder* operator-> (void); +- ++ + private: + ExceptionHolder* &ptr_; + }; +@@ -2160,7 +2227,7 @@ + virtual const char* tao_repository_id (); + + // create () goes here +- ++ + }; + + #endif /* end #if !defined */ +@@ -2197,25 +2264,25 @@ + + class _tao_seq_Octet; + class _tao_seq_Octet_var; +- ++ + // ************************************************************* + // _tao_seq_Octet + // ************************************************************* +- +- class TAO_Export _tao_seq_Octet : public ++ ++ class TAO_Export _tao_seq_Octet : public + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) + TAO_Unbounded_Sequence<CORBA::Octet> + #else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<CORBA::Octet> +-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ ++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + { + public: + _tao_seq_Octet (void); // default ctor + _tao_seq_Octet (CORBA::ULong max); // uses max size + _tao_seq_Octet ( +- CORBA::ULong max, +- CORBA::ULong length, +- CORBA::Octet *buffer, ++ CORBA::ULong max, ++ CORBA::ULong length, ++ CORBA::Octet *buffer, + CORBA::Boolean release=0 + ); + _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor +@@ -2236,7 +2303,7 @@ + #endif /* TAO_NO_COPY_OCTET_SEQUENCE */ + + }; +- ++ + #endif /* end #if !defined */ + + +@@ -2255,19 +2322,19 @@ + _tao_seq_Octet_var (const _tao_seq_Octet_var &); // copy constructor + _tao_seq_Octet_var (const _tao_seq_Octet &); // fixed-size base types only + ~_tao_seq_Octet_var (void); // destructor +- ++ + _tao_seq_Octet_var &operator= (_tao_seq_Octet *); + _tao_seq_Octet_var &operator= (const _tao_seq_Octet_var &); + _tao_seq_Octet_var &operator= (const _tao_seq_Octet &); // fixed-size base types only + _tao_seq_Octet *operator-> (void); + const _tao_seq_Octet *operator-> (void) const; +- ++ + operator const _tao_seq_Octet &() const; + operator _tao_seq_Octet &(); + operator _tao_seq_Octet &() const; +- ++ + CORBA::Octet &operator[] (CORBA::ULong index); +- // in, inout, out, _retn ++ // in, inout, out, _retn + const _tao_seq_Octet &in (void) const; + _tao_seq_Octet &inout (void); + _tao_seq_Octet *&out (void); +@@ -2297,7 +2364,7 @@ + _tao_seq_Octet *&ptr (void); + _tao_seq_Octet *operator-> (void); + CORBA::Octet &operator[] (CORBA::ULong index); +- ++ + private: + _tao_seq_Octet *&ptr_; + // assignment from T_var not allowed +@@ -2324,26 +2391,25 @@ + virtual void *_tao_obv_narrow (ptr_arith_t); + virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &); + virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &); +- ++ + private: + ExceptionHolder (const ExceptionHolder &); + void operator= (const ExceptionHolder &); +- ++ + protected: + virtual CORBA::Boolean _tao_marshal__Messaging_ExceptionHolder (TAO_OutputCDR &) = 0; + virtual CORBA::Boolean _tao_unmarshal__Messaging_ExceptionHolder (TAO_InputCDR &) = 0; +- ++ + }; + + #endif /* end #if !defined */ + +- + #if !defined (_MESSAGING_REPLYHANDLER___PTR_CH_) + #define _MESSAGING_REPLYHANDLER___PTR_CH_ + + class ReplyHandler; + typedef ReplyHandler *ReplyHandler_ptr; +- ++ + #endif /* end #if !defined */ + + +@@ -2357,14 +2423,14 @@ + ReplyHandler_var (ReplyHandler_ptr); + ReplyHandler_var (const ReplyHandler_var &); // copy constructor + ~ReplyHandler_var (void); // destructor +- ++ + ReplyHandler_var &operator= (ReplyHandler_ptr); + ReplyHandler_var &operator= (const ReplyHandler_var &); + ReplyHandler_ptr operator-> (void) const; +- ++ + operator const ReplyHandler_ptr &() const; + operator ReplyHandler_ptr &(); +- // in, inout, out, _retn ++ // in, inout, out, _retn + ReplyHandler_ptr in (void) const; + ReplyHandler_ptr &inout (void); + ReplyHandler_ptr &out (void); +@@ -2394,7 +2460,7 @@ + operator ReplyHandler_ptr &(); + ReplyHandler_ptr &ptr (void); + ReplyHandler_ptr operator-> (void); +- ++ + private: + ReplyHandler_ptr &ptr_; + }; +@@ -2406,7 +2472,7 @@ + #if !defined (_MESSAGING_REPLYHANDLER_CH_) + #define _MESSAGING_REPLYHANDLER_CH_ + +-class TAO_Export ReplyHandler : public virtual CORBA_Object ++ class TAO_Export ReplyHandler : public virtual CORBA_Object + { + public: + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) +@@ -2418,12 +2484,12 @@ + static ReplyHandler_ptr _duplicate (ReplyHandler_ptr obj); + static ReplyHandler_ptr _narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static ReplyHandler_ptr _unchecked_narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static ReplyHandler_ptr _nil (void) +@@ -2434,18 +2500,18 @@ + static void _tao_any_destructor (void*); + + virtual CORBA::Boolean _is_a ( +- const CORBA::Char *type_id, +- CORBA::Environment &ACE_TRY_ENV = ++ const CORBA::Char *type_id, ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + virtual void *_tao_QueryInterface (ptr_arith_t type); +- ++ + virtual const char* _interface_repository_id (void) const; + + protected: + ReplyHandler (void); +- ReplyHandler (TAO_Stub *objref, +- TAO_ServantBase *_tao_servant = 0, ++ ReplyHandler (TAO_Stub *objref, ++ TAO_ServantBase *_tao_servant = 0, + CORBA::Boolean _tao_collocated = 0 + ); + virtual ~ReplyHandler (void); +@@ -2454,17 +2520,18 @@ + void operator= (const ReplyHandler &); + }; + ++#if (TAO_HAS_SMART_PROXIES == 1) + class TAO_Export TAO_Messaging_ReplyHandler_Default_Proxy_Factory + { + public: +- ++ + TAO_Messaging_ReplyHandler_Default_Proxy_Factory (int register_proxy_factory = 1); +- ++ + virtual ~TAO_Messaging_ReplyHandler_Default_Proxy_Factory (void); +- ++ + virtual ReplyHandler_ptr create_proxy ( + ReplyHandler_ptr proxy, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + }; +@@ -2472,26 +2539,26 @@ + class TAO_Export TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter + { + public: +- ++ + friend class ACE_Singleton<TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>; +- ++ + int register_proxy_factory ( + TAO_Messaging_ReplyHandler_Default_Proxy_Factory *df, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); +- ++ + int unregister_proxy_factory ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); +- ++ + ReplyHandler_ptr create_proxy ( + ReplyHandler_ptr proxy, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); +- ++ + protected: + TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter (void); + ~TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter (void); +@@ -2501,11 +2568,11 @@ + TAO_Messaging_ReplyHandler_Default_Proxy_Factory *proxy_factory_; + int delete_proxy_factory_; + ACE_SYNCH_RECURSIVE_MUTEX lock_; +- ++ + }; + + typedef ACE_Singleton<TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_Messaging_ReplyHandler_PROXY_FACTORY_ADAPTER; +- ++ + class TAO_Export TAO_Messaging_ReplyHandler_Smart_Proxy_Base + : public virtual ReplyHandler, + public virtual TAO_Smart_Proxy_Base +@@ -2519,15 +2586,20 @@ + ::Messaging::ReplyHandler_var proxy_; + }; + ++#endif /* TAO_HAS_SMART_PROXIES */ + + #endif /* end #if !defined */ + + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ReplyHandler; + ++#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */ ++ ++#if (TAO_HAS_AMI_POLLER == 1) ++ + // valuetype class + class Poller; + typedef Poller *Poller_ptr; +- ++ + #if !defined (_MESSAGING_POLLER___VAR_CH_) + #define _MESSAGING_POLLER___VAR_CH_ + +@@ -2539,14 +2611,14 @@ + Poller_var (const Poller*); // (TAO extension) + Poller_var (const Poller_var &); // copy constructor + ~Poller_var (void); // destructor +- ++ + Poller_var &operator= (Poller*); + Poller_var &operator= (const Poller_var &); + Poller* operator-> (void) const; +- ++ + operator const Poller* () const; + operator Poller* (); +- // in, inout, out, _retn ++ // in, inout, out, _retn + Poller* in (void) const; + Poller* &inout (void); + Poller* &out (void); +@@ -2576,7 +2648,7 @@ + operator Poller* &(); + Poller* &ptr (void); + Poller* operator-> (void); +- ++ + private: + Poller* &ptr_; + }; +@@ -2595,7 +2667,7 @@ + virtual const char* tao_repository_id (); + + // create () goes here +- ++ + }; + + #endif /* end #if !defined */ +@@ -2620,16 +2692,16 @@ + virtual const char* _tao_obv_repository_id () const; + static const char* _tao_obv_static_repository_id (); + public: +- virtual CORBA::Object_ptr operation_target ( CORBA::Environment &ACE_TRY_ENV = ++ virtual CORBA::Object_ptr operation_target ( CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment ()) = 0; +- virtual char * operation_name ( CORBA::Environment &ACE_TRY_ENV = ++ virtual char * operation_name ( CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment ()) = 0; +- virtual Messaging::ReplyHandler_ptr associated_handler ( CORBA::Environment &ACE_TRY_ENV = ++ virtual Messaging::ReplyHandler_ptr associated_handler ( CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment ()) = 0; + virtual void associated_handler (Messaging::ReplyHandler_ptr, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment ()) = 0; +- virtual CORBA::Boolean is_from_poller ( CORBA::Environment &ACE_TRY_ENV = ++ virtual CORBA::Boolean is_from_poller ( CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment ()) = 0; + virtual void target (CORBA::Object_ptr) = 0; // set + virtual CORBA::Object_ptr target (void) const = 0; // get method +@@ -2648,23 +2720,26 @@ + virtual void *_tao_obv_narrow (ptr_arith_t); + virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &); + virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &); +- ++ + private: + Poller (const Poller &); + void operator= (const Poller &); +- ++ + protected: + virtual CORBA::Boolean _tao_marshal__Messaging_Poller (TAO_OutputCDR &) = 0; + virtual CORBA::Boolean _tao_unmarshal__Messaging_Poller (TAO_InputCDR &) = 0; +- ++ + }; + + #endif /* end #if !defined */ + ++#endif /* TAO_HAS_AMI_POLLER == 1 */ + + } + TAO_NAMESPACE_CLOSE // module Messaging + ++#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) ++ + TAO_NAMESPACE OBV_Messaging + { + +@@ -2739,14 +2814,58 @@ + } + TAO_NAMESPACE_CLOSE + ++#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */ ++ ++// Typedef for the Reply Handler Skeleton. ++// This is handcrafted not generated by the IDL compiler. ++ ++class TAO_InputCDR; ++ ++enum TAO_AMI_Reply_Status ++{ ++ TAO_AMI_REPLY_OK, ++ // Reply is normal. ++ ++ TAO_AMI_REPLY_NOT_OK, ++ // Reply is not normal and no exceptions ++ ++ TAO_AMI_REPLY_USER_EXCEPTION, ++ // An user exception was raised. ++ ++ TAO_AMI_REPLY_SYSTEM_EXCEPTION ++ // An system exception was raised. ++}; ++ ++ ++#if (TAO_HAS_AMI_CALLBACK == 1) ++ ++typedef void (*TAO_Reply_Handler_Skeleton)( ++ TAO_InputCDR &, ++ Messaging::ReplyHandler *, ++ CORBA::ULong reply_status, ++ CORBA::Environment & ++ ); ++ ++#endif /* TAO_HAS_AMI_CALLBACK == 1 */ ++ ++#if (TAO_HAS_PRIORITY_POLICIES == 1) ++ + TAO_Export void operator<<= (CORBA::Any &, const Messaging::PriorityRange &); // copying version + TAO_Export void operator<<= (CORBA::Any &, Messaging::PriorityRange*); // noncopying version + TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::PriorityRange *&); // deprecated + TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Messaging::PriorityRange *&); ++ ++#endif /* TAO_HAS_PRIORITY_POLICIES == 1 */ ++ ++#if (TAO_HAS_ROUTING_POLICY == 1) ++ + TAO_Export void operator<<= (CORBA::Any &, const Messaging::RoutingTypeRange &); // copying version + TAO_Export void operator<<= (CORBA::Any &, Messaging::RoutingTypeRange*); // noncopying version + TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::RoutingTypeRange *&); // deprecated + TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Messaging::RoutingTypeRange *&); ++ ++#endif /* TAO_HAS_ROUTING_POLICY == 1 */ ++ + TAO_Export void operator<<= (CORBA::Any &, const Messaging::PolicyValue &); // copying version + TAO_Export void operator<<= (CORBA::Any &, Messaging::PolicyValue*); // noncopying version + TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::PolicyValue *&); // deprecated +@@ -2755,6 +2874,9 @@ + TAO_Export void operator<<= (CORBA::Any &, Messaging::PolicyValueSeq*); // noncopying version + TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::PolicyValueSeq *&); // deprecated + TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Messaging::PolicyValueSeq *&); ++ ++#if (TAO_HAS_AMI_CALLBACK == 1) ++ + extern TAO_Export Messaging::ReplyHandler_ptr (*_TAO_collocation_Messaging_ReplyHandler_Stub_Factory_function_pointer) ( + CORBA::Object_ptr obj + ); +@@ -2762,15 +2884,26 @@ + TAO_Export void operator<<= (CORBA::Any &, Messaging::ReplyHandler_ptr); + TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::ReplyHandler *&); + ++#endif /* TAO_HAS_AMI_CALLBACK */ ++ + #ifndef __ACE_INLINE__ + ++#if (TAO_HAS_PRIORITY_POLICIES == 1) ++ + TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::PriorityRange &); + TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::PriorityRange &); ++ ++#endif /* TAO_HAS_PRIORITY_POLICIES == 1 */ ++ ++#if (TAO_HAS_ROUTING_POLICY == 1) ++ + TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::RoutingTypeRange &); + TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::RoutingTypeRange &); + TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::PolicyValue &); + TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::PolicyValue &); + ++#endif /* TAO_HAS_ROUTING_POLICY == 1 */ ++ + #if !defined _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_H_ + #define _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_H_ + +@@ -2800,12 +2933,25 @@ + + #endif /* _TAO_CDR_OP_Messaging_PolicyValueSeq_H_ */ + +-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ExceptionHolder *); // +-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ExceptionHolder *&); ++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ExceptionHolder &); ++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ExceptionHolder &); ++ ++#if !defined _TAO_CDR_OP_Messaging_ExceptionHolder__tao_seq_Octet_H_ ++#define _TAO_CDR_OP_Messaging_ExceptionHolder__tao_seq_Octet_H_ ++ ++TAO_Export CORBA::Boolean operator<< ( ++ TAO_OutputCDR &, ++ const Messaging::ExceptionHolder::_tao_seq_Octet & ++ ); ++TAO_Export CORBA::Boolean operator>> ( ++ TAO_InputCDR &, ++ Messaging::ExceptionHolder::_tao_seq_Octet & ++ ); ++ ++#endif /* _TAO_CDR_OP_Messaging_ExceptionHolder__tao_seq_Octet_H_ */ ++ + TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ReplyHandler_ptr ); + TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ReplyHandler_ptr &); +-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::Poller *); // +-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Poller *&); + + #endif /* __ACE_INLINE__ */ + +@@ -2817,5 +2963,7 @@ + #if defined(_MSC_VER) && (_MSC_VER >= 1200) + #pragma warning(pop) + #endif /* _MSC_VER */ ++ ++#endif /* TAO_HAS_CORBA_MESSAGING */ + + #endif /* ifndef */ diff --git a/TAO/tao/diffs/MessagingC.i.diff b/TAO/tao/diffs/MessagingC.i.diff new file mode 100644 index 00000000000..75bdbad4b1f --- /dev/null +++ b/TAO/tao/diffs/MessagingC.i.diff @@ -0,0 +1,141 @@ +--- orig/MessagingC.i Fri Apr 28 16:44:03 2000 ++++ MessagingC.i Fri Apr 28 16:43:53 2000 +@@ -7,6 +7,8 @@ + // Information about TAO is available at: + // http://www.cs.wustl.edu/~schmidt/TAO.html + ++#if (TAO_HAS_REBIND_POLICY == 1) ++ + ACE_INLINE + Messaging::RebindPolicy::RebindPolicy (void) // default constructor + {} +@@ -189,6 +191,10 @@ + + #endif /* end #if !defined */ + ++#endif /* TAO_HAS_REBIND_POLICY == 1 */ ++ ++#if (TAO_HAS_SYNC_SCOPE_POLICY == 1) ++ + ACE_INLINE + Messaging::SyncScopePolicy::SyncScopePolicy (void) // default constructor + {} +@@ -371,6 +377,10 @@ + + #endif /* end #if !defined */ + ++#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ ++ ++#if (TAO_HAS_PRIORITY_POLICIES == 1) ++ + // ************************************************************* + // Inline operations for class Messaging::PriorityRange_var + // ************************************************************* +@@ -863,6 +873,10 @@ + + #endif /* end #if !defined */ + ++#endif /* TAO_HAS_PRIORITY_POLICIES == 1 */ ++ ++#if (TAO_HAS_REQUEST_START_TIME_POLICY == 1) ++ + ACE_INLINE + Messaging::RequestStartTimePolicy::RequestStartTimePolicy (void) // default constructor + {} +@@ -1045,6 +1059,10 @@ + + #endif /* end #if !defined */ + ++#endif /* TAO_HAS_REQUEST_START_TIME_POLICY == 1 */ ++ ++#if (TAO_HAS_REQUEST_END_TIME_POLICY == 1) ++ + ACE_INLINE + Messaging::RequestEndTimePolicy::RequestEndTimePolicy (void) // default constructor + {} +@@ -1227,6 +1245,10 @@ + + #endif /* end #if !defined */ + ++#endif /* TAO_HAS_REQUEST_END_TIME_POLICY == 1 */ ++ ++#if (TAO_HAS_REPLY_START_TIME_POLICY == 1) ++ + ACE_INLINE + Messaging::ReplyStartTimePolicy::ReplyStartTimePolicy (void) // default constructor + {} +@@ -1409,6 +1431,10 @@ + + #endif /* end #if !defined */ + ++#endif /* TAO_HAS_REPLY_START_TIME_POLICY == 1 */ ++ ++#if (TAO_HAS_REPLY_END_TIME_POLICY == 1) ++ + ACE_INLINE + Messaging::ReplyEndTimePolicy::ReplyEndTimePolicy (void) // default constructor + {} +@@ -1591,6 +1617,10 @@ + + #endif /* end #if !defined */ + ++#endif /* TAO_HAS_REPLY_END_TIME_POLICY == 1 */ ++ ++#if (TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1) ++ + ACE_INLINE + Messaging::RelativeRequestTimeoutPolicy::RelativeRequestTimeoutPolicy (void) // default constructor + {} +@@ -1773,6 +1803,10 @@ + + #endif /* end #if !defined */ + ++#endif /* TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1 */ ++ ++#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) ++ + ACE_INLINE + Messaging::RelativeRoundtripTimeoutPolicy::RelativeRoundtripTimeoutPolicy (void) // default constructor + {} +@@ -1959,6 +1993,10 @@ + // Inline operations for class Messaging::RoutingTypeRange_var + // ************************************************************* + ++#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ ++ ++#if (TAO_HAS_ROUTING_POLICY == 1) ++ + ACE_INLINE + Messaging::RoutingTypeRange_var::RoutingTypeRange_var (void) // default constructor + : ptr_ (0) +@@ -2265,6 +2303,10 @@ + + #endif /* end #if !defined */ + ++#endif /* TAO_HAS_ROUTING_POLICY == 1 */ ++ ++#if (TAO_HAS_MAX_HOPS_POLICY == 1) ++ + ACE_INLINE + Messaging::MaxHopsPolicy::MaxHopsPolicy (void) // default constructor + {} +@@ -2447,6 +2489,10 @@ + + #endif /* end #if !defined */ + ++#endif /* TAO_HAS_MAX_HOPS_POLICY == 1 */ ++ ++#if (TAO_HAS_QUEUE_ORDER_POLICY == 1) ++ + ACE_INLINE + Messaging::QueueOrderPolicy::QueueOrderPolicy (void) // default constructor + {} +@@ -2628,6 +2674,8 @@ + + + #endif /* end #if !defined */ ++ ++#endif /* TAO_HAS_QUEUE_ORDER_POLICY == 1 */ + + // ************************************************************* + // Inline operations for class Messaging::PolicyValue_var diff --git a/TAO/tao/diffs/MessagingS.cpp.diff b/TAO/tao/diffs/MessagingS.cpp.diff new file mode 100644 index 00000000000..0e96432c691 --- /dev/null +++ b/TAO/tao/diffs/MessagingS.cpp.diff @@ -0,0 +1,123 @@ +--- orig/MessagingS.cpp Fri Apr 28 16:44:03 2000 ++++ MessagingS.cpp Fri Apr 28 16:30:37 2000 +@@ -7,12 +7,24 @@ + // Information about TAO is available at: + // http://www.cs.wustl.edu/~schmidt/TAO.html + +-#include "MessagingS.h" ++#include "tao/orbconf.h" ++ ++#if (TAO_HAS_CORBA_MESSAGING == 1) ++ ++#include "tao/MessagingS.h" ++#include "tao/POA_CORBA.h" ++#include "tao/Operation_Table.h" ++#include "tao/Server_Request.h" ++#include "tao/Stub.h" ++#include "tao/ORB_Core.h" ++#include "tao/Object_Adapter.h" + + #if !defined (__ACE_INLINE__) +-#include "MessagingS.i" ++#include "tao/MessagingS.i" + #endif /* !defined INLINE */ + ++ACE_RCSID(tao, MessagingS, "$Id$") ++ + class TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable + { + private: +@@ -20,7 +32,7 @@ + public: + const TAO_operation_db_entry * lookup (const char *str, unsigned int len); + }; +-/* starting time is 16:44:03 */ ++/* starting time is 14:51:17 */ + /* C++ code produced by gperf version 2.8 (ACE version) */ + /* Command-line: /export/kelvar/coryan/head/ACE_wrappers/build/Linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable -N lookup */ + unsigned int +@@ -110,7 +122,7 @@ + } + return 0; + } +-/* ending time is 16:44:03 */ ++/* ending time is 14:51:17 */ + static TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable tao_Messaging_ReplyHandler_optable; + + Messaging::ReplyHandler_ptr _TAO_collocation_POA_Messaging_ReplyHandler_Stub_Factory ( +@@ -118,7 +130,7 @@ + ) + { + TAO_Stub *stub = obj->_stubobj (); +- ++ + switch (stub->servant_orb_var ()->orb_core ()->get_collocation_strategy ()) + { + case TAO_ORB_Core::THRU_POA: +@@ -156,14 +168,14 @@ + int _TAO_collocation_POA_Messaging_ReplyHandler_Stub_Factory_Initializer (long dummy) + { + ACE_UNUSED_ARG (dummy); +- +- _TAO_collocation_Messaging_ReplyHandler_Stub_Factory_function_pointer = ++ ++ _TAO_collocation_Messaging_ReplyHandler_Stub_Factory_function_pointer = + _TAO_collocation_POA_Messaging_ReplyHandler_Stub_Factory; +- ++ + return 0; + } + +-static int _TAO_collocation_POA_Messaging_ReplyHandler_Stub_Factory_Initializer_Scarecrow = ++static int _TAO_collocation_POA_Messaging_ReplyHandler_Stub_Factory_Initializer_Scarecrow = + _TAO_collocation_POA_Messaging_ReplyHandler_Stub_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_collocation_POA_Messaging_ReplyHandler_Stub_Factory_Initializer)); + + // skeleton constructor +@@ -183,7 +195,7 @@ + } + + void POA_Messaging::ReplyHandler::_is_a_skel ( +- CORBA::ServerRequest &_tao_server_request, ++ CORBA::ServerRequest &_tao_server_request, + void * _tao_object_reference, + void * /* context */, + CORBA::Environment &ACE_TRY_ENV +@@ -195,10 +207,10 @@ + CORBA::String_var value; + if (!((_tao_in >> value.out ()))) + ACE_THROW (CORBA::MARSHAL ()); +- ++ + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); + ACE_CHECK; +- ++ + _tao_server_request.init_reply (ACE_TRY_ENV); + ACE_CHECK; + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); +@@ -207,7 +219,7 @@ + } + + void POA_Messaging::ReplyHandler::_non_existent_skel ( +- CORBA::ServerRequest &_tao_server_request, ++ CORBA::ServerRequest &_tao_server_request, + void * _tao_object_reference, + void * /* context */, + CORBA::Environment &ACE_TRY_ENV +@@ -216,7 +228,7 @@ + POA_Messaging::ReplyHandler *_tao_impl = (POA_Messaging::ReplyHandler *) _tao_object_reference; + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); + ACE_CHECK; +- ++ + _tao_server_request.init_reply (ACE_TRY_ENV); + ACE_CHECK; + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); +@@ -395,6 +407,4 @@ + return this->servant_->_non_existent (ACE_TRY_ENV); + } + +- +- +- ++#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ diff --git a/TAO/tao/diffs/MessagingS.h.diff b/TAO/tao/diffs/MessagingS.h.diff new file mode 100644 index 00000000000..017f2ab99a8 --- /dev/null +++ b/TAO/tao/diffs/MessagingS.h.diff @@ -0,0 +1,167 @@ +--- orig/MessagingS.h Fri Apr 28 16:44:03 2000 ++++ MessagingS.h Fri Apr 28 16:30:37 2000 +@@ -7,15 +7,17 @@ + // Information about TAO is available at: + // http://www.cs.wustl.edu/~schmidt/TAO.html + +-#ifndef _TAO_IDL_ORIG_MESSAGINGS_H_ +-#define _TAO_IDL_ORIG_MESSAGINGS_H_ ++#ifndef _TAO_IDL_TMP_MESSAGINGS_H_ ++#define _TAO_IDL_TMP_MESSAGINGS_H_ ++#include "ace/pre.h" + +-#include "TimeBaseS.h" +-#include "IOPS.h" +-#include "PolicyS.h" +-#include "PollableS.h" +-#include "MessagingC.h" ++#include "tao/orbconf.h" + ++#if (TAO_HAS_CORBA_MESSAGING == 1) ++ ++#include "tao/TimeBaseS.h" ++#include "tao/POA_CORBA.h" ++#include "tao/MessagingC.h" + + #if !defined (ACE_LACKS_PRAGMA_ONCE) + # pragma once +@@ -30,6 +32,9 @@ + + TAO_NAMESPACE POA_Messaging + { ++ ++#if (TAO_HAS_AMI_CALLBACK == 1) ++ + class ReplyHandler; + typedef ReplyHandler *ReplyHandler_ptr; + class TAO_Export ReplyHandler : public virtual PortableServer::ServantBase +@@ -44,7 +49,7 @@ + + virtual CORBA::Boolean _is_a ( + const char* logical_type_id, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +@@ -56,7 +61,7 @@ + CORBA::ServerRequest &req, + void *obj, + void *context, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +@@ -64,19 +69,19 @@ + CORBA::ServerRequest &req, + void *obj, + void *context, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual void _dispatch ( + CORBA::ServerRequest &_tao_req, + void *_tao_context, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + ::Messaging::ReplyHandler *_this ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +@@ -99,11 +104,11 @@ + const CORBA::Char *logical_type_id, + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () + ); +- ++ + virtual CORBA::Boolean _non_existent( + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () + ); +- ++ + }; + + +@@ -124,14 +129,14 @@ + const CORBA::Char *logical_type_id, + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () + ); +- ++ + ReplyHandler_ptr _get_servant (void) const; +- ++ + virtual CORBA::Boolean _non_existent( + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () + ); +- +- ++ ++ + private: + ReplyHandler_ptr servant_; + }; +@@ -139,7 +144,7 @@ + + #endif /* end #if !defined */ + +- ++ + #if defined (ACE_HAS_USING_KEYWORD) + // TIE class: Refer to CORBA v2.2, Section 20.34.4 + template <class T> +@@ -156,7 +161,7 @@ + // ctor with T*, ownership flag and a POA + ~ReplyHandler_tie (void); + // dtor +- ++ + // TIE specific functions + T *_tied_object (void); + // return the underlying object +@@ -168,17 +173,17 @@ + // do we own it + void _is_owner (CORBA::Boolean b); + // set the ownership +- ++ + // overridden ServantBase operations + PortableServer::POA_ptr _default_POA ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + private: + T *ptr_; + PortableServer::POA_var poa_; + CORBA::Boolean rel_; +- ++ + // copy and assignment are not allowed + ReplyHandler_tie (const ReplyHandler_tie &); + void operator= (const ReplyHandler_tie &); +@@ -186,6 +191,8 @@ + + #endif /* ACE_HAS_USING_KEYWORD */ + ++#endif /* TAO_HAS_AMI_CALLBACK == 1 */ ++ + } + TAO_NAMESPACE_CLOSE + +@@ -199,4 +206,7 @@ + #pragma warning(pop) + #endif /* _MSC_VER */ + ++#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ ++ ++#include "ace/post.h" + #endif /* ifndef */ diff --git a/TAO/tao/diffs/MessagingS.i.diff b/TAO/tao/diffs/MessagingS.i.diff new file mode 100644 index 00000000000..5c36d5f8bfd --- /dev/null +++ b/TAO/tao/diffs/MessagingS.i.diff @@ -0,0 +1,7 @@ +--- orig/MessagingS.i Fri Apr 28 16:44:03 2000 ++++ MessagingS.i Fri Apr 28 16:30:37 2000 +@@ -6,4 +6,3 @@ + // + // Information about TAO is available at: + // http://www.cs.wustl.edu/~schmidt/TAO.html +- diff --git a/TAO/tao/diffs/MessagingS_T.cpp.diff b/TAO/tao/diffs/MessagingS_T.cpp.diff new file mode 100644 index 00000000000..ae8923a5ad3 --- /dev/null +++ b/TAO/tao/diffs/MessagingS_T.cpp.diff @@ -0,0 +1,13 @@ +--- orig/MessagingS_T.cpp Fri Apr 28 16:44:03 2000 ++++ MessagingS_T.cpp Fri Apr 28 16:30:37 2000 +@@ -7,8 +7,8 @@ + // Information about TAO is available at: + // http://www.cs.wustl.edu/~schmidt/TAO.html + +-#ifndef _TAO_IDL_ORIG_MESSAGINGS_T_CPP_ +-#define _TAO_IDL_ORIG_MESSAGINGS_T_CPP_ ++#ifndef _TAO_IDL_TMP_MESSAGINGS_T_CPP_ ++#define _TAO_IDL_TMP_MESSAGINGS_T_CPP_ + + #include "MessagingS_T.h" + diff --git a/TAO/tao/diffs/MessagingS_T.h.diff b/TAO/tao/diffs/MessagingS_T.h.diff new file mode 100644 index 00000000000..f9d255ea66d --- /dev/null +++ b/TAO/tao/diffs/MessagingS_T.h.diff @@ -0,0 +1,13 @@ +--- orig/MessagingS_T.h Fri Apr 28 16:44:03 2000 ++++ MessagingS_T.h Fri Apr 28 16:30:37 2000 +@@ -7,8 +7,8 @@ + // Information about TAO is available at: + // http://www.cs.wustl.edu/~schmidt/TAO.html + +-#ifndef _TAO_IDL_ORIG_MESSAGINGS_T_H_ +-#define _TAO_IDL_ORIG_MESSAGINGS_T_H_ ++#ifndef _TAO_IDL_TMP_MESSAGINGS_T_H_ ++#define _TAO_IDL_TMP_MESSAGINGS_T_H_ + + #if defined(_MSC_VER) + #if (_MSC_VER >= 1200) diff --git a/TAO/tao/diffs/MessagingS_T.i.diff b/TAO/tao/diffs/MessagingS_T.i.diff new file mode 100644 index 00000000000..c81735be3ce --- /dev/null +++ b/TAO/tao/diffs/MessagingS_T.i.diff @@ -0,0 +1,15 @@ +--- orig/MessagingS_T.i Fri Apr 28 16:44:03 2000 ++++ MessagingS_T.i Fri Apr 28 16:30:37 2000 +@@ -8,6 +8,7 @@ + // http://www.cs.wustl.edu/~schmidt/TAO.html + + ++#if (TAO_HAS_AMI_POLLER == 1) + #if defined (ACE_HAS_USING_KEYWORD) + template <class T> ACE_INLINE + POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T &t) +@@ -87,3 +88,4 @@ + } + + #endif /* ACE_HAS_USING_KEYWORD */ ++#endif /* TAO_HAS_AMI_POLLER == 1 */ diff --git a/TAO/tao/diffs/PollableC.cpp.diff b/TAO/tao/diffs/PollableC.cpp.diff new file mode 100644 index 00000000000..935e117e2c2 --- /dev/null +++ b/TAO/tao/diffs/PollableC.cpp.diff @@ -0,0 +1,121 @@ +--- orig/PollableC.cpp Fri Apr 28 12:20:09 2000 ++++ PollableC.cpp Fri Apr 28 12:12:21 2000 +@@ -9,10 +9,19 @@ + + #include "PollableC.h" + ++#if (TAO_HAS_AMI_POLLER == 1) ++ ++#include "tao/POA_CORBA.h" ++#include "tao/Stub.h" ++#include "tao/Invocation.h" ++#include "tao/Any.h" ++ + #if !defined (__ACE_INLINE__) + #include "PollableC.i" + #endif /* !defined INLINE */ + ++ACE_RCSID(tao, PollableC, "$Id$") ++ + CORBA_Pollable_ptr CORBA_Pollable::_narrow ( + CORBA::Object_ptr obj, + CORBA::Environment &ACE_TRY_ENV +@@ -43,7 +52,7 @@ + ); + } + +-CORBA_Pollable_ptr ++CORBA_Pollable_ptr + CORBA_Pollable::_duplicate (CORBA_Pollable_ptr obj) + { + if (!CORBA::is_nil (obj)) +@@ -61,7 +70,7 @@ + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); +- ++ + if (retv) + this->_add_ref (); + return retv; +@@ -69,7 +78,7 @@ + + const char* CORBA_Pollable::_interface_repository_id (void) const + { +- return "IDL:omg.org/CORBA_Pollable:1.0"; ++ return "IDL:omg.org/CORBA/Pollable:1.0"; + } + + CORBA_DIIPollable_ptr CORBA_DIIPollable::_narrow ( +@@ -102,7 +111,7 @@ + ); + } + +-CORBA_DIIPollable_ptr ++CORBA_DIIPollable_ptr + CORBA_DIIPollable::_duplicate (CORBA_DIIPollable_ptr obj) + { + if (!CORBA::is_nil (obj)) +@@ -132,7 +141,7 @@ + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); +- ++ + if (retv) + this->_add_ref (); + return retv; +@@ -140,7 +149,7 @@ + + const char* CORBA_DIIPollable::_interface_repository_id (void) const + { +- return "IDL:omg.org/CORBA_DIIPollable:1.0"; ++ return "IDL:omg.org/CORBA/DIIPollable:1.0"; + } + + CORBA_PollableSet_ptr CORBA_PollableSet::_narrow ( +@@ -173,7 +182,7 @@ + ); + } + +-CORBA_PollableSet_ptr ++CORBA_PollableSet_ptr + CORBA_PollableSet::_duplicate (CORBA_PollableSet_ptr obj) + { + if (!CORBA::is_nil (obj)) +@@ -210,7 +219,7 @@ + CORBA_PollableSet::NoPossiblePollable * + CORBA_PollableSet::NoPossiblePollable::_narrow (CORBA::Exception *exc) + { +- if (!ACE_OS::strcmp ("IDL:omg.org/CORBA_PollableSet/NoPossiblePollable:1.0", exc->_id ())) // same type ++ if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PollableSet/NoPossiblePollable:1.0", exc->_id ())) // same type + return ACE_dynamic_cast (NoPossiblePollable *, exc); + else + return 0; +@@ -275,7 +284,7 @@ + CORBA_PollableSet::UnknownPollable * + CORBA_PollableSet::UnknownPollable::_narrow (CORBA::Exception *exc) + { +- if (!ACE_OS::strcmp ("IDL:omg.org/CORBA_PollableSet/UnknownPollable:1.0", exc->_id ())) // same type ++ if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PollableSet/UnknownPollable:1.0", exc->_id ())) // same type + return ACE_dynamic_cast (UnknownPollable *, exc); + else + return 0; +@@ -321,7 +330,7 @@ + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); +- ++ + if (retv) + this->_add_ref (); + return retv; +@@ -329,6 +338,7 @@ + + const char* CORBA_PollableSet::_interface_repository_id (void) const + { +- return "IDL:omg.org/CORBA_PollableSet:1.0"; ++ return "IDL:omg.org/CORBA/PollableSet:1.0"; + } + ++#endif /* TAO_HAS_AMI_POLLER == 1 */ diff --git a/TAO/tao/diffs/PollableC.h.diff b/TAO/tao/diffs/PollableC.h.diff new file mode 100644 index 00000000000..577be649118 --- /dev/null +++ b/TAO/tao/diffs/PollableC.h.diff @@ -0,0 +1,274 @@ +--- orig/PollableC.h Fri Apr 28 12:20:09 2000 ++++ PollableC.h Fri Apr 28 12:02:10 2000 +@@ -7,20 +7,22 @@ + // Information about TAO is available at: + // http://www.cs.wustl.edu/~schmidt/TAO.html + +-#ifndef _TAO_IDL_ORIG_POLLABLEC_H_ +-#define _TAO_IDL_ORIG_POLLABLEC_H_ ++#ifndef _TAO_IDL_TMP_POLLABLEC_H_ ++#define _TAO_IDL_TMP_POLLABLEC_H_ ++#include "ace/pre.h" + +-#include "tao/corba.h" ++#include "tao/corbafwd.h" ++ ++#if (TAO_HAS_AMI_POLLER == 1) + +-#if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION) +-#include "ace/streams.h" +-#endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */ ++#include "tao/Object.h" ++#include "tao/Exception.h" ++#include "tao/CDR.h" + + #if !defined (ACE_LACKS_PRAGMA_ONCE) + # pragma once + #endif /* ACE_LACKS_PRAGMA_ONCE */ + +-#include "tao/corbafwd.h" + + #if defined (TAO_EXPORT_MACRO) + #undef TAO_EXPORT_MACRO +@@ -61,14 +63,14 @@ + CORBA_PollableSet_var (CORBA_PollableSet_ptr); + CORBA_PollableSet_var (const CORBA_PollableSet_var &); // copy constructor + ~CORBA_PollableSet_var (void); // destructor +- ++ + CORBA_PollableSet_var &operator= (CORBA_PollableSet_ptr); + CORBA_PollableSet_var &operator= (const CORBA_PollableSet_var &); + CORBA_PollableSet_ptr operator-> (void) const; +- ++ + operator const CORBA_PollableSet_ptr &() const; + operator CORBA_PollableSet_ptr &(); +- // in, inout, out, _retn ++ // in, inout, out, _retn + CORBA_PollableSet_ptr in (void) const; + CORBA_PollableSet_ptr &inout (void); + CORBA_PollableSet_ptr &out (void); +@@ -98,7 +100,7 @@ + operator CORBA_PollableSet_ptr &(); + CORBA_PollableSet_ptr &ptr (void); + CORBA_PollableSet_ptr operator-> (void); +- ++ + private: + CORBA_PollableSet_ptr &ptr_; + }; +@@ -126,14 +128,14 @@ + CORBA_Pollable_var (CORBA_Pollable_ptr); + CORBA_Pollable_var (const CORBA_Pollable_var &); // copy constructor + ~CORBA_Pollable_var (void); // destructor +- ++ + CORBA_Pollable_var &operator= (CORBA_Pollable_ptr); + CORBA_Pollable_var &operator= (const CORBA_Pollable_var &); + CORBA_Pollable_ptr operator-> (void) const; +- ++ + operator const CORBA_Pollable_ptr &() const; + operator CORBA_Pollable_ptr &(); +- // in, inout, out, _retn ++ // in, inout, out, _retn + CORBA_Pollable_ptr in (void) const; + CORBA_Pollable_ptr &inout (void); + CORBA_Pollable_ptr &out (void); +@@ -163,7 +165,7 @@ + operator CORBA_Pollable_ptr &(); + CORBA_Pollable_ptr &ptr (void); + CORBA_Pollable_ptr operator-> (void); +- ++ + private: + CORBA_Pollable_ptr &ptr_; + }; +@@ -187,12 +189,12 @@ + static CORBA_Pollable_ptr _duplicate (CORBA_Pollable_ptr obj); + static CORBA_Pollable_ptr _narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static CORBA_Pollable_ptr _unchecked_narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static CORBA_Pollable_ptr _nil (void) +@@ -202,7 +204,7 @@ + + virtual CORBA::Boolean is_ready ( + CORBA::ULong timeout, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -210,7 +212,7 @@ + )) = 0; + + virtual CORBA_PollableSet_ptr create_pollable_set ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -218,7 +220,7 @@ + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); +- ++ + virtual const char* _interface_repository_id (void) const; + + protected: +@@ -252,14 +254,14 @@ + CORBA_DIIPollable_var (CORBA_DIIPollable_ptr); + CORBA_DIIPollable_var (const CORBA_DIIPollable_var &); // copy constructor + ~CORBA_DIIPollable_var (void); // destructor +- ++ + CORBA_DIIPollable_var &operator= (CORBA_DIIPollable_ptr); + CORBA_DIIPollable_var &operator= (const CORBA_DIIPollable_var &); + CORBA_DIIPollable_ptr operator-> (void) const; +- ++ + operator const CORBA_DIIPollable_ptr &() const; + operator CORBA_DIIPollable_ptr &(); +- // in, inout, out, _retn ++ // in, inout, out, _retn + CORBA_DIIPollable_ptr in (void) const; + CORBA_DIIPollable_ptr &inout (void); + CORBA_DIIPollable_ptr &out (void); +@@ -289,7 +291,7 @@ + operator CORBA_DIIPollable_ptr &(); + CORBA_DIIPollable_ptr &ptr (void); + CORBA_DIIPollable_ptr operator-> (void); +- ++ + private: + CORBA_DIIPollable_ptr &ptr_; + }; +@@ -313,12 +315,12 @@ + static CORBA_DIIPollable_ptr _duplicate (CORBA_DIIPollable_ptr obj); + static CORBA_DIIPollable_ptr _narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static CORBA_DIIPollable_ptr _unchecked_narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static CORBA_DIIPollable_ptr _nil (void) +@@ -327,7 +329,7 @@ + } + + virtual void *_tao_QueryInterface (ptr_arith_t type); +- ++ + virtual const char* _interface_repository_id (void) const; + + protected: +@@ -361,14 +363,14 @@ + CORBA_PollableSet_var (CORBA_PollableSet_ptr); + CORBA_PollableSet_var (const CORBA_PollableSet_var &); // copy constructor + ~CORBA_PollableSet_var (void); // destructor +- ++ + CORBA_PollableSet_var &operator= (CORBA_PollableSet_ptr); + CORBA_PollableSet_var &operator= (const CORBA_PollableSet_var &); + CORBA_PollableSet_ptr operator-> (void) const; +- ++ + operator const CORBA_PollableSet_ptr &() const; + operator CORBA_PollableSet_ptr &(); +- // in, inout, out, _retn ++ // in, inout, out, _retn + CORBA_PollableSet_ptr in (void) const; + CORBA_PollableSet_ptr &inout (void); + CORBA_PollableSet_ptr &out (void); +@@ -398,7 +400,7 @@ + operator CORBA_PollableSet_ptr &(); + CORBA_PollableSet_ptr &ptr (void); + CORBA_PollableSet_ptr operator-> (void); +- ++ + private: + CORBA_PollableSet_ptr &ptr_; + }; +@@ -422,12 +424,12 @@ + static CORBA_PollableSet_ptr _duplicate (CORBA_PollableSet_ptr obj); + static CORBA_PollableSet_ptr _narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static CORBA_PollableSet_ptr _unchecked_narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static CORBA_PollableSet_ptr _nil (void) +@@ -506,7 +508,7 @@ + #endif /* end #if !defined */ + + virtual CORBA_DIIPollable_ptr create_dii_pollable ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -515,7 +517,7 @@ + + virtual void add_pollable ( + CORBA_Pollable_ptr potential, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -524,7 +526,7 @@ + + virtual CORBA_Pollable_ptr poll ( + CORBA::ULong timeout, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -534,7 +536,7 @@ + + virtual void remove ( + CORBA_Pollable_ptr potential, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -543,7 +545,7 @@ + )) = 0; + + virtual CORBA::UShort number_left ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -580,4 +582,7 @@ + #pragma warning(pop) + #endif /* _MSC_VER */ + ++#endif /* TAO_HAS_AMI_POLLER == 1 */ ++ ++#include "ace/post.h" + #endif /* ifndef */ diff --git a/TAO/tao/diffs/PollableC.i.diff b/TAO/tao/diffs/PollableC.i.diff new file mode 100644 index 00000000000..55cb66553bd --- /dev/null +++ b/TAO/tao/diffs/PollableC.i.diff @@ -0,0 +1,83 @@ +--- orig/PollableC.i Fri Apr 28 12:20:09 2000 ++++ PollableC.i Fri Apr 28 12:02:10 2000 +@@ -69,14 +69,14 @@ + return *this; + } + +-ACE_INLINE ++ACE_INLINE + CORBA_Pollable_var::operator const ::CORBA_Pollable_ptr &() const // cast + { + return this->ptr_; + } + +-ACE_INLINE +-CORBA_Pollable_var::operator ::CORBA_Pollable_ptr &() // cast ++ACE_INLINE ++CORBA_Pollable_var::operator ::CORBA_Pollable_ptr &() // cast + { + return this->ptr_; + } +@@ -168,7 +168,7 @@ + return *this; + } + +-ACE_INLINE ++ACE_INLINE + CORBA_Pollable_out::operator ::CORBA_Pollable_ptr &() // cast + { + return this->ptr_; +@@ -251,14 +251,14 @@ + return *this; + } + +-ACE_INLINE ++ACE_INLINE + CORBA_DIIPollable_var::operator const ::CORBA_DIIPollable_ptr &() const // cast + { + return this->ptr_; + } + +-ACE_INLINE +-CORBA_DIIPollable_var::operator ::CORBA_DIIPollable_ptr &() // cast ++ACE_INLINE ++CORBA_DIIPollable_var::operator ::CORBA_DIIPollable_ptr &() // cast + { + return this->ptr_; + } +@@ -350,7 +350,7 @@ + return *this; + } + +-ACE_INLINE ++ACE_INLINE + CORBA_DIIPollable_out::operator ::CORBA_DIIPollable_ptr &() // cast + { + return this->ptr_; +@@ -433,14 +433,14 @@ + return *this; + } + +-ACE_INLINE ++ACE_INLINE + CORBA_PollableSet_var::operator const ::CORBA_PollableSet_ptr &() const // cast + { + return this->ptr_; + } + +-ACE_INLINE +-CORBA_PollableSet_var::operator ::CORBA_PollableSet_ptr &() // cast ++ACE_INLINE ++CORBA_PollableSet_var::operator ::CORBA_PollableSet_ptr &() // cast + { + return this->ptr_; + } +@@ -532,7 +532,7 @@ + return *this; + } + +-ACE_INLINE ++ACE_INLINE + CORBA_PollableSet_out::operator ::CORBA_PollableSet_ptr &() // cast + { + return this->ptr_; diff --git a/TAO/tao/diffs/TAOC.cpp.diff b/TAO/tao/diffs/TAOC.cpp.diff new file mode 100644 index 00000000000..d01555d123b --- /dev/null +++ b/TAO/tao/diffs/TAOC.cpp.diff @@ -0,0 +1,52 @@ +--- orig/TAOC.cpp Fri Apr 28 18:04:26 2000 ++++ tmp/TAOC.cpp Fri Apr 28 18:15:43 2000 +@@ -9,10 +9,15 @@ + + #include "TAOC.h" + ++#include "tao/TAOS.h" ++#include "tao/Typecode.h" ++ + #if !defined (__ACE_INLINE__) + #include "TAOC.i" + #endif /* !defined INLINE */ + ++#if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1) ++ + static const CORBA::Long _oc_TAO_PrioritySelectionMode[] = + { + TAO_ENCAP_BYTE_ORDER, // byte order +@@ -135,7 +140,7 @@ + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); +- ++ + if (retv) + this->_add_ref (); + return retv; +@@ -146,6 +151,10 @@ + return "IDL:TAO/ClientPriorityPolicy:1.0"; + } + ++#endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */ ++ ++#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) ++ + static const CORBA::Long _oc_TAO_BufferingConstraintMode[] = + { + TAO_ENCAP_BYTE_ORDER, // byte order +@@ -281,7 +290,7 @@ + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); +- ++ + if (retv) + this->_add_ref (); + return retv; +@@ -454,3 +463,4 @@ + return 0; + } + ++#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ diff --git a/TAO/tao/diffs/TAOC.h.diff b/TAO/tao/diffs/TAOC.h.diff new file mode 100644 index 00000000000..b868fdbc763 --- /dev/null +++ b/TAO/tao/diffs/TAOC.h.diff @@ -0,0 +1,307 @@ +--- orig/TAOC.h Fri Apr 28 18:04:26 2000 ++++ tmp/TAOC.h Fri Apr 28 18:17:11 2000 +@@ -9,20 +9,22 @@ + + #ifndef _TAO_IDL_ORIG_TAOC_H_ + #define _TAO_IDL_ORIG_TAOC_H_ ++#include "ace/pre.h" + +-#include "tao/corba.h" +- +-#if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION) +-#include "ace/streams.h" +-#endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */ ++#include "tao/corbafwd.h" + + #if !defined (ACE_LACKS_PRAGMA_ONCE) + # pragma once + #endif /* ACE_LACKS_PRAGMA_ONCE */ + +-#include "tao/corbafwd.h" +-#include "PolicyC.h" +-#include "TimeBaseC.h" ++#if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1 || \ ++ TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) ++ ++#include "tao/PolicyC.h" ++#include "tao/TimeBaseC.h" ++ ++#endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 || ++ TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ + + #if defined (TAO_EXPORT_MACRO) + #undef TAO_EXPORT_MACRO +@@ -45,6 +47,9 @@ + + TAO_NAMESPACE TAO + { ++ ++#if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1) ++ + typedef CORBA::Short PrioritySelectionMode; + typedef CORBA::Short_out PrioritySelectionMode_out; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PrioritySelectionMode; +@@ -57,7 +62,7 @@ + + struct PrioritySpecification; + class PrioritySpecification_var; +- ++ + struct TAO_Export PrioritySpecification + { + +@@ -80,18 +85,18 @@ + PrioritySpecification_var (const PrioritySpecification_var &); // copy constructor + PrioritySpecification_var (const PrioritySpecification &); // fixed-size types only + ~PrioritySpecification_var (void); // destructor +- ++ + PrioritySpecification_var &operator= (PrioritySpecification *); + PrioritySpecification_var &operator= (const PrioritySpecification_var &); + PrioritySpecification_var &operator= (const PrioritySpecification &); // fixed-size types only + PrioritySpecification *operator-> (void); + const PrioritySpecification *operator-> (void) const; +- ++ + operator const PrioritySpecification &() const; + operator PrioritySpecification &(); + operator PrioritySpecification &() const; +- +- // in, inout, out, _retn ++ ++ // in, inout, out, _retn + const PrioritySpecification &in (void) const; + PrioritySpecification &inout (void); + PrioritySpecification &out (void); +@@ -114,7 +119,7 @@ + + class ClientPriorityPolicy; + typedef ClientPriorityPolicy *ClientPriorityPolicy_ptr; +- ++ + #endif /* end #if !defined */ + + +@@ -128,14 +133,14 @@ + ClientPriorityPolicy_var (ClientPriorityPolicy_ptr); + ClientPriorityPolicy_var (const ClientPriorityPolicy_var &); // copy constructor + ~ClientPriorityPolicy_var (void); // destructor +- ++ + ClientPriorityPolicy_var &operator= (ClientPriorityPolicy_ptr); + ClientPriorityPolicy_var &operator= (const ClientPriorityPolicy_var &); + ClientPriorityPolicy_ptr operator-> (void) const; +- ++ + operator const ClientPriorityPolicy_ptr &() const; + operator ClientPriorityPolicy_ptr &(); +- // in, inout, out, _retn ++ // in, inout, out, _retn + ClientPriorityPolicy_ptr in (void) const; + ClientPriorityPolicy_ptr &inout (void); + ClientPriorityPolicy_ptr &out (void); +@@ -165,7 +170,7 @@ + operator ClientPriorityPolicy_ptr &(); + ClientPriorityPolicy_ptr &ptr (void); + ClientPriorityPolicy_ptr operator-> (void); +- ++ + private: + ClientPriorityPolicy_ptr &ptr_; + }; +@@ -189,12 +194,12 @@ + static ClientPriorityPolicy_ptr _duplicate (ClientPriorityPolicy_ptr obj); + static ClientPriorityPolicy_ptr _narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static ClientPriorityPolicy_ptr _unchecked_narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static ClientPriorityPolicy_ptr _nil (void) +@@ -203,7 +208,7 @@ + } + + virtual TAO::PrioritySpecification priority_specification ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -211,7 +216,7 @@ + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); +- ++ + virtual const char* _interface_repository_id (void) const; + + protected: +@@ -225,6 +230,10 @@ + + #endif /* end #if !defined */ + ++#endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */ ++ ++#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) ++ + typedef CORBA::UShort BufferingConstraintMode; + typedef CORBA::UShort_out BufferingConstraintMode_out; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_BufferingConstraintMode; +@@ -239,7 +248,7 @@ + + struct BufferingConstraint; + class BufferingConstraint_var; +- ++ + struct TAO_Export BufferingConstraint + { + +@@ -263,18 +272,18 @@ + BufferingConstraint_var (const BufferingConstraint_var &); // copy constructor + BufferingConstraint_var (const BufferingConstraint &); // fixed-size types only + ~BufferingConstraint_var (void); // destructor +- ++ + BufferingConstraint_var &operator= (BufferingConstraint *); + BufferingConstraint_var &operator= (const BufferingConstraint_var &); + BufferingConstraint_var &operator= (const BufferingConstraint &); // fixed-size types only + BufferingConstraint *operator-> (void); + const BufferingConstraint *operator-> (void) const; +- ++ + operator const BufferingConstraint &() const; + operator BufferingConstraint &(); + operator BufferingConstraint &() const; +- +- // in, inout, out, _retn ++ ++ // in, inout, out, _retn + const BufferingConstraint &in (void) const; + BufferingConstraint &inout (void); + BufferingConstraint &out (void); +@@ -297,7 +306,7 @@ + + class BufferingConstraintPolicy; + typedef BufferingConstraintPolicy *BufferingConstraintPolicy_ptr; +- ++ + #endif /* end #if !defined */ + + +@@ -311,14 +320,14 @@ + BufferingConstraintPolicy_var (BufferingConstraintPolicy_ptr); + BufferingConstraintPolicy_var (const BufferingConstraintPolicy_var &); // copy constructor + ~BufferingConstraintPolicy_var (void); // destructor +- ++ + BufferingConstraintPolicy_var &operator= (BufferingConstraintPolicy_ptr); + BufferingConstraintPolicy_var &operator= (const BufferingConstraintPolicy_var &); + BufferingConstraintPolicy_ptr operator-> (void) const; +- ++ + operator const BufferingConstraintPolicy_ptr &() const; + operator BufferingConstraintPolicy_ptr &(); +- // in, inout, out, _retn ++ // in, inout, out, _retn + BufferingConstraintPolicy_ptr in (void) const; + BufferingConstraintPolicy_ptr &inout (void); + BufferingConstraintPolicy_ptr &out (void); +@@ -348,7 +357,7 @@ + operator BufferingConstraintPolicy_ptr &(); + BufferingConstraintPolicy_ptr &ptr (void); + BufferingConstraintPolicy_ptr operator-> (void); +- ++ + private: + BufferingConstraintPolicy_ptr &ptr_; + }; +@@ -372,12 +381,12 @@ + static BufferingConstraintPolicy_ptr _duplicate (BufferingConstraintPolicy_ptr obj); + static BufferingConstraintPolicy_ptr _narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static BufferingConstraintPolicy_ptr _unchecked_narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static BufferingConstraintPolicy_ptr _nil (void) +@@ -386,7 +395,7 @@ + } + + virtual TAO::BufferingConstraint buffering_constraint ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -394,7 +403,7 @@ + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); +- ++ + virtual const char* _interface_repository_id (void) const; + + protected: +@@ -408,26 +417,44 @@ + + #endif /* end #if !defined */ + ++#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ + + } + TAO_NAMESPACE_CLOSE // module TAO + ++#if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1) ++ + TAO_Export void operator<<= (CORBA::Any &, const TAO::PrioritySpecification &); // copying version + TAO_Export void operator<<= (CORBA::Any &, TAO::PrioritySpecification*); // noncopying version + TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::PrioritySpecification *&); // deprecated + TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO::PrioritySpecification *&); ++#endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */ ++ ++#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) ++ + TAO_Export void operator<<= (CORBA::Any &, const TAO::BufferingConstraint &); // copying version + TAO_Export void operator<<= (CORBA::Any &, TAO::BufferingConstraint*); // noncopying version + TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::BufferingConstraint *&); // deprecated + TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO::BufferingConstraint *&); + ++#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ ++ + #ifndef __ACE_INLINE__ + ++#if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1) ++ + TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO::PrioritySpecification &); + TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::PrioritySpecification &); ++ ++#endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */ ++ ++#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) ++ + TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO::BufferingConstraint &); + TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::BufferingConstraint &); + ++#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ ++ + #endif /* __ACE_INLINE__ */ + + +@@ -439,4 +466,5 @@ + #pragma warning(pop) + #endif /* _MSC_VER */ + ++#include "ace/post.h" + #endif /* ifndef */ diff --git a/TAO/tao/diffs/TAOC.i.diff b/TAO/tao/diffs/TAOC.i.diff new file mode 100644 index 00000000000..7386e3e3386 --- /dev/null +++ b/TAO/tao/diffs/TAOC.i.diff @@ -0,0 +1,162 @@ +--- orig/TAOC.i Fri Apr 28 18:04:26 2000 ++++ tmp/TAOC.i Fri Apr 28 18:12:52 2000 +@@ -11,6 +11,8 @@ + // Inline operations for class TAO::PrioritySpecification_var + // ************************************************************* + ++#if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1) ++ + ACE_INLINE + TAO::PrioritySpecification_var::PrioritySpecification_var (void) // default constructor + : ptr_ (0) +@@ -93,13 +95,13 @@ + } + + ACE_INLINE +-TAO::PrioritySpecification_var::operator ::TAO::PrioritySpecification &() // cast ++TAO::PrioritySpecification_var::operator ::TAO::PrioritySpecification &() // cast + { + return *this->ptr_; + } + + ACE_INLINE +-TAO::PrioritySpecification_var::operator ::TAO::PrioritySpecification &() const // cast ++TAO::PrioritySpecification_var::operator ::TAO::PrioritySpecification &() const // cast + { + return *this->ptr_; + } +@@ -116,7 +118,7 @@ + return *this->ptr_; + } + +-// mapping for fixed size ++// mapping for fixed size + ACE_INLINE ::TAO::PrioritySpecification & + TAO::PrioritySpecification_var::out (void) + { +@@ -197,14 +199,14 @@ + return *this; + } + +-ACE_INLINE ++ACE_INLINE + TAO::ClientPriorityPolicy_var::operator const ::TAO::ClientPriorityPolicy_ptr &() const // cast + { + return this->ptr_; + } + +-ACE_INLINE +-TAO::ClientPriorityPolicy_var::operator ::TAO::ClientPriorityPolicy_ptr &() // cast ++ACE_INLINE ++TAO::ClientPriorityPolicy_var::operator ::TAO::ClientPriorityPolicy_ptr &() // cast + { + return this->ptr_; + } +@@ -296,7 +298,7 @@ + return *this; + } + +-ACE_INLINE ++ACE_INLINE + TAO::ClientPriorityPolicy_out::operator ::TAO::ClientPriorityPolicy_ptr &() // cast + { + return this->ptr_; +@@ -317,6 +319,10 @@ + + #endif /* end #if !defined */ + ++#endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */ ++ ++#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) ++ + // ************************************************************* + // Inline operations for class TAO::BufferingConstraint_var + // ************************************************************* +@@ -403,13 +409,13 @@ + } + + ACE_INLINE +-TAO::BufferingConstraint_var::operator ::TAO::BufferingConstraint &() // cast ++TAO::BufferingConstraint_var::operator ::TAO::BufferingConstraint &() // cast + { + return *this->ptr_; + } + + ACE_INLINE +-TAO::BufferingConstraint_var::operator ::TAO::BufferingConstraint &() const // cast ++TAO::BufferingConstraint_var::operator ::TAO::BufferingConstraint &() const // cast + { + return *this->ptr_; + } +@@ -426,7 +432,7 @@ + return *this->ptr_; + } + +-// mapping for fixed size ++// mapping for fixed size + ACE_INLINE ::TAO::BufferingConstraint & + TAO::BufferingConstraint_var::out (void) + { +@@ -507,14 +513,14 @@ + return *this; + } + +-ACE_INLINE ++ACE_INLINE + TAO::BufferingConstraintPolicy_var::operator const ::TAO::BufferingConstraintPolicy_ptr &() const // cast + { + return this->ptr_; + } + +-ACE_INLINE +-TAO::BufferingConstraintPolicy_var::operator ::TAO::BufferingConstraintPolicy_ptr &() // cast ++ACE_INLINE ++TAO::BufferingConstraintPolicy_var::operator ::TAO::BufferingConstraintPolicy_ptr &() // cast + { + return this->ptr_; + } +@@ -606,7 +612,7 @@ + return *this; + } + +-ACE_INLINE ++ACE_INLINE + TAO::BufferingConstraintPolicy_out::operator ::TAO::BufferingConstraintPolicy_ptr &() // cast + { + return this->ptr_; +@@ -637,7 +643,7 @@ + return 1; + else + return 0; +- ++ + } + + ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, TAO::PrioritySpecification &_tao_aggregate) +@@ -650,7 +656,7 @@ + return 1; + else + return 0; +- ++ + } + + ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO::BufferingConstraint &_tao_aggregate) +@@ -664,7 +670,7 @@ + return 1; + else + return 0; +- ++ + } + + ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, TAO::BufferingConstraint &_tao_aggregate) +@@ -678,6 +684,7 @@ + return 1; + else + return 0; +- ++ + } + ++#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ |