diff options
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/performance-tests/EC_Federated_Latency/Servant_var.h | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/performance-tests/EC_Federated_Latency/Servant_var.inl | 8 |
3 files changed, 14 insertions, 8 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index c5e9f72f89f..daf2a960729 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Wed Aug 29 13:13:23 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * orbsvcs/performance-tests/EC_Federated_Latency/Servant_var.h: + * orbsvcs/performance-tests/EC_Federated_Latency/Servant_var.inl: + Fixed warnings in TRU 64 builds. + Wed Aug 29 06:21:25 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> * tao/ORB.h (CORBA_ORB): Improved the documentation for diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Servant_var.h b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Servant_var.h index 6410a470e5a..75e68319ee0 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Servant_var.h +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Servant_var.h @@ -34,17 +34,17 @@ public: //@{ /** @name Smart pointer operations */ - SERVANT * const operator->() const; - SERVANT *operator->(); + const SERVANT * operator->() const; + SERVANT * operator->(); operator SERVANT *(); - operator SERVANT * const() const; + operator const SERVANT * () const; //@} //@{ /** @name Canonical CORBA T_var methods */ - SERVANT *in (); + SERVANT *in () const; SERVANT *&out (); SERVANT *&inout (); //@} diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Servant_var.inl b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Servant_var.inl index aacbe193678..3384e639028 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Servant_var.inl +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Servant_var.inl @@ -8,7 +8,7 @@ Servant_var<SERVANT>::Servant_var (SERVANT *s) template<typename SERVANT> ACE_INLINE Servant_var<SERVANT>::Servant_var (const Servant_var<SERVANT> &rhs) - : ptr_ (rhs) + : ptr_ (rhs.in ()) { if (this->ptr_ != 0) this->ptr_->_add_ref (); @@ -38,7 +38,7 @@ Servant_var<SERVANT>::operator-> () return this->ptr_; } -template<typename SERVANT> ACE_INLINE SERVANT* const +template<typename SERVANT> ACE_INLINE const SERVANT* Servant_var<SERVANT>::operator-> () const { return this->ptr_; @@ -51,13 +51,13 @@ Servant_var<SERVANT>::operator SERVANT *() } template<typename SERVANT> ACE_INLINE -Servant_var<SERVANT>::operator SERVANT * const () const +Servant_var<SERVANT>::operator const SERVANT * () const { return this->ptr_; } template<typename SERVANT> ACE_INLINE SERVANT * -Servant_var<SERVANT>::in () +Servant_var<SERVANT>::in () const { return this->ptr_; } |