From 30fe47fb706de7b0d19a00b3bf98dce07418b98f Mon Sep 17 00:00:00 2001 From: Adam Mitz Date: Sun, 16 Jul 2006 23:30:42 +0000 Subject: Sun Jul 16 23:28:27 UTC 2006 Adam Mitz --- TAO/ChangeLog | 26 ++++++++++++++++++++-- .../orbsvcs/CosEvent/CEC_Default_Factory.cpp | 5 ++--- TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h | 4 ++-- TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp | 5 ++--- TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h | 4 ++-- TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h | 4 ++-- .../orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp | 3 ++- .../orbsvcs/CosEvent/CEC_ProxyPullConsumer.h | 2 +- .../orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp | 2 +- .../orbsvcs/CosEvent/CEC_ProxyPullSupplier.h | 2 +- .../orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp | 4 ++-- .../orbsvcs/CosEvent/CEC_ProxyPushConsumer.h | 2 +- .../orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp | 10 +++++---- .../orbsvcs/CosEvent/CEC_ProxyPushSupplier.h | 4 ++-- .../orbsvcs/CosEvent/CEC_TypedEventChannel.cpp | 2 +- .../orbsvcs/CosEvent/CEC_TypedEventChannel.h | 3 ++- .../CosEvent/CEC_TypedProxyPushConsumer.cpp | 2 +- .../orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h | 2 +- 18 files changed, 55 insertions(+), 31 deletions(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 6eadefd5193..0edc22523ac 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,25 @@ +Sun Jul 16 23:28:27 UTC 2006 Adam Mitz + + * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h: + * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h: + * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_Factory.h: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h: + * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h: + * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp: + + Change method signatures to pass ACE_Time_Value by const-reference. + Sat Jul 15 22:08:58 UTC 2006 Shanshan Jiang * docs/tutorials/Quoter/RTCORBA/Admin.cpp @@ -12,7 +34,7 @@ Sat Jul 15 22:08:58 UTC 2006 Shanshan Jiang * docs/tutorials/Quoter/RTCORBA/Stock_Database.cpp * docs/tutorials/Quoter/RTCORBA/Stock_Database.h * docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h - + * docs/tutorials/Quoter/RTCORBA/docs/broker.html * docs/tutorials/Quoter/RTCORBA/docs/common.html * docs/tutorials/Quoter/RTCORBA/docs/database.html @@ -21,7 +43,7 @@ Sat Jul 15 22:08:58 UTC 2006 Shanshan Jiang * docs/tutorials/Quoter/RTCORBA/docs/mpc.html Modify these files based on the suggestions of William R. Otte. - + Sat Jul 15 12:25:11 UTC 2006 Johnny Willemsen * orbsvcs/tests/Bug_1393_Regression/client.cpp: diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp index 9bafca2f2c0..19b4f4d46d6 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp @@ -1375,9 +1375,8 @@ TAO_CEC_Default_Factory::destroy_supplier_control (TAO_CEC_SupplierControl* x) delete x; } -CORBA::Policy_ptr -TAO_CEC_Default_Factory::create_roundtrip_timeout_policy - (ACE_Time_Value timeout) +CORBA::Policy_ptr TAO_CEC_Default_Factory::create_roundtrip_timeout_policy +(const ACE_Time_Value &timeout) { //get the existing orb int fake_argc = 0; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h index b31ce703650..c0656e70d15 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h @@ -161,8 +161,8 @@ public: create_supplier_control (TAO_CEC_TypedEventChannel*); #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ - virtual CORBA::Policy_ptr create_roundtrip_timeout_policy - (ACE_Time_Value timeout); + virtual CORBA::Policy_ptr + create_roundtrip_timeout_policy (const ACE_Time_Value &timeout); private: /// Parse an argument to set the type of collections used. diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp index 24e0d92a5c4..11fb1dd92d7 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp @@ -232,9 +232,8 @@ TAO_CEC_EventChannel::destroy (ACE_ENV_SINGLE_ARG_DECL) this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA::Policy_ptr -TAO_CEC_EventChannel::create_roundtrip_timeout_policy - (ACE_Time_Value timeout) +CORBA::Policy_ptr TAO_CEC_EventChannel::create_roundtrip_timeout_policy +(const ACE_Time_Value &timeout) { return this->factory_->create_roundtrip_timeout_policy (timeout); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h index 7471e653f51..b25f91e9054 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h @@ -259,8 +259,8 @@ public: ServantRetryMap& get_servant_retry_map (void); /// Forwarded to the factory - CORBA::Policy_ptr create_roundtrip_timeout_policy - (ACE_Time_Value timeout); + CORBA::Policy_ptr + create_roundtrip_timeout_policy (const ACE_Time_Value &timeout); private: /// The POAs used to activate "supplier-side" and "consumer-side" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h index 56ebfb288c5..787bdca5177 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h @@ -225,8 +225,8 @@ public: virtual void destroy_supplier_control (TAO_CEC_SupplierControl*) = 0; - virtual CORBA::Policy_ptr create_roundtrip_timeout_policy - (ACE_Time_Value timeout) = 0; + virtual CORBA::Policy_ptr + create_roundtrip_timeout_policy (const ACE_Time_Value &timeout) = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp index f512d50eb9d..4aedb1f17c0 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp @@ -21,7 +21,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL typedef ACE_Reverse_Lock TAO_CEC_Unlock; TAO_CEC_ProxyPullConsumer:: - TAO_CEC_ProxyPullConsumer (TAO_CEC_EventChannel* ec, ACE_Time_Value timeout) +TAO_CEC_ProxyPullConsumer (TAO_CEC_EventChannel* ec, + const ACE_Time_Value &timeout) : event_channel_ (ec), timeout_ (timeout), refcount_ (1) diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h index 7e3e48e7aad..1949abadced 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h @@ -51,7 +51,7 @@ public: /// constructor... TAO_CEC_ProxyPullConsumer (TAO_CEC_EventChannel* event_channel, - ACE_Time_Value timeout); + const ACE_Time_Value &timeout); /// destructor... virtual ~TAO_CEC_ProxyPullConsumer (void); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp index 4bef1b19c1f..99208b46ef1 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp @@ -19,7 +19,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL typedef ACE_Reverse_Lock TAO_CEC_Unlock; TAO_CEC_ProxyPullSupplier::TAO_CEC_ProxyPullSupplier - (TAO_CEC_EventChannel* ec, ACE_Time_Value timeout) +(TAO_CEC_EventChannel* ec, const ACE_Time_Value &timeout) : event_channel_ (ec), timeout_ (timeout), refcount_ (1), diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h index 3e6e2fdea08..67eca07678f 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h @@ -58,7 +58,7 @@ public: /// constructor... TAO_CEC_ProxyPullSupplier (TAO_CEC_EventChannel* event_channel, - ACE_Time_Value timeout); + const ACE_Time_Value &timeout); /// destructor... virtual ~TAO_CEC_ProxyPullSupplier (void); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp index c0d85903564..dc056d83a65 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp @@ -20,8 +20,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL typedef ACE_Reverse_Lock TAO_CEC_Unlock; TAO_CEC_ProxyPushConsumer:: - TAO_CEC_ProxyPushConsumer (TAO_CEC_EventChannel* ec, - ACE_Time_Value timeout) +TAO_CEC_ProxyPushConsumer (TAO_CEC_EventChannel* ec, + const ACE_Time_Value &timeout) : event_channel_ (ec), timeout_(timeout), refcount_ (1), diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h index 7e141637291..a7922405f2a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h @@ -53,7 +53,7 @@ public: /// constructor... TAO_CEC_ProxyPushConsumer (TAO_CEC_EventChannel* event_channel, - ACE_Time_Value timeout); + const ACE_Time_Value &timeout); /// destructor... virtual ~TAO_CEC_ProxyPushConsumer (void); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp index 63da0351f24..a25b00b5942 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp @@ -35,8 +35,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL typedef ACE_Reverse_Lock TAO_CEC_Unlock; // TAO_CEC_ProxyPushSupplier Constructure (Un-typed EC) -TAO_CEC_ProxyPushSupplier::TAO_CEC_ProxyPushSupplier (TAO_CEC_EventChannel* ec, - ACE_Time_Value timeout) +TAO_CEC_ProxyPushSupplier:: +TAO_CEC_ProxyPushSupplier (TAO_CEC_EventChannel* ec, + const ACE_Time_Value &timeout) : event_channel_ (ec), timeout_ (timeout), refcount_ (1) @@ -56,8 +57,9 @@ TAO_CEC_ProxyPushSupplier::TAO_CEC_ProxyPushSupplier (TAO_CEC_EventChannel* ec, // TAO_CEC_ProxyPushSupplier Constructure (Typed EC) #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) -TAO_CEC_ProxyPushSupplier::TAO_CEC_ProxyPushSupplier (TAO_CEC_TypedEventChannel* ec, - ACE_Time_Value timeout) +TAO_CEC_ProxyPushSupplier:: +TAO_CEC_ProxyPushSupplier (TAO_CEC_TypedEventChannel* ec, + const ACE_Time_Value &timeout) : timeout_ (timeout), typed_event_channel_ (ec), refcount_ (1) diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h index 93edaeab43c..ab39589a301 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h @@ -63,12 +63,12 @@ public: /// constructor... TAO_CEC_ProxyPushSupplier (TAO_CEC_EventChannel* event_channel, - ACE_Time_Value timeout); + const ACE_Time_Value &timeout); /// typed ec constructor #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) TAO_CEC_ProxyPushSupplier (TAO_CEC_TypedEventChannel* typed_event_channel, - ACE_Time_Value timeout); + const ACE_Time_Value &timeout); #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ /// destructor... diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp index 1b1201e35fd..f29d1421580 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp @@ -589,7 +589,7 @@ TAO_CEC_TypedEventChannel::destroy (ACE_ENV_SINGLE_ARG_DECL) CORBA::Policy_ptr TAO_CEC_TypedEventChannel::create_roundtrip_timeout_policy - (ACE_Time_Value timeout) +(const ACE_Time_Value &timeout) { return this->factory_->create_roundtrip_timeout_policy (timeout); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h index e8c76b57d0b..d41f719f6d4 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h @@ -268,7 +268,8 @@ public: ServantRetryMap& get_servant_retry_map (void); /// Forwarded to the factory - CORBA::Policy_ptr create_roundtrip_timeout_policy (ACE_Time_Value timeout); + CORBA::Policy_ptr + create_roundtrip_timeout_policy (const ACE_Time_Value &timeout); protected: /// Function caches the full interface description from the IFR diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp index 903163c1d49..cdb9787b230 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp @@ -20,7 +20,7 @@ typedef ACE_Reverse_Lock TAO_CEC_Unlock; // Implementation skeleton constructor TAO_CEC_TypedProxyPushConsumer::TAO_CEC_TypedProxyPushConsumer - (TAO_CEC_TypedEventChannel* ec, ACE_Time_Value timeout) +(TAO_CEC_TypedEventChannel* ec, const ACE_Time_Value &timeout) : typed_event_channel_ (ec), timeout_ (timeout), refcount_ (1), diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h index 32dcb2ee99a..9595edd9420 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h @@ -43,7 +43,7 @@ public: //Constructor TAO_CEC_TypedProxyPushConsumer ( TAO_CEC_TypedEventChannel* typed_event_channel, - ACE_Time_Value timeout + const ACE_Time_Value &timeout ); //Destructor -- cgit v1.2.1