diff options
Diffstat (limited to 'TAO/tao/MessagingS.h')
| -rw-r--r-- | TAO/tao/MessagingS.h | 42 |
1 files changed, 18 insertions, 24 deletions
diff --git a/TAO/tao/MessagingS.h b/TAO/tao/MessagingS.h index 2c73d1cbdd9..c0dbb5ae462 100644 --- a/TAO/tao/MessagingS.h +++ b/TAO/tao/MessagingS.h @@ -1015,10 +1015,11 @@ private: virtual void* _downcast ( const char* logical_type_id ); - virtual TimeBase::TimeT relative_expiry ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ) = 0; + 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 = @@ -1047,10 +1048,8 @@ private: CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); - virtual TimeBase::TimeT relative_expiry ( - 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_; @@ -1090,10 +1089,8 @@ private: CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); - TimeBase::TimeT relative_expiry ( - 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 () @@ -1136,10 +1133,11 @@ private: virtual void* _downcast ( const char* logical_type_id ); - virtual TimeBase::TimeT relative_expiry ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ) = 0; + 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 = @@ -1168,10 +1166,8 @@ private: CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); - virtual TimeBase::TimeT relative_expiry ( - 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_; @@ -1211,10 +1207,8 @@ private: CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); - TimeBase::TimeT relative_expiry ( - 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 () |