diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2001-03-24 14:29:35 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2001-03-24 14:29:35 +0000 |
| commit | bee70f6b2e54dfce466992d7915d2a172419588f (patch) | |
| tree | 97843003ebbed3db9686a9597e6216ef187b0b2e | |
| parent | a1c4ce63a5118bb3191e1b589046d966dd8eb9ab (diff) | |
| download | ATCD-bee70f6b2e54dfce466992d7915d2a172419588f.tar.gz | |
ChangeLogTag: Sat Mar 24 07:55:45 2001 Balachandran Natarajan <bala@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp | 3 | ||||
| -rw-r--r-- | TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp | 3 | ||||
| -rw-r--r-- | TAO/tao/Strategies/UIOP_Connection_Handler.cpp | 3 |
4 files changed, 14 insertions, 3 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 6eba21a9a89..7e753e6d7db 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Sat Mar 24 07:55:45 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * tao/Strategies/UIOP_Connection_Handler.cpp: + * tao/Strategies/SHMIOP_Connection_Handler.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp: + Under Win32 the handle() has to be cast before setting the id() + field on TAO_Transport. + Fri Mar 23 21:19:17 2001 Carlos O'Ryan <coryan@uci.edu> * tao/IIOP_Connection_Handler.cpp (activate): diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp index 14e72398fb5..477da2e6fec 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp @@ -158,7 +158,8 @@ TAO_SSLIOP_Connection_Handler::activate (long flags, THR_BOUND)); // Set the id in the transport now that we're active. - this->transport ()->id (this->get_handle ()); + this->transport ()->id (ACE_static_cast (int, + this->get_handle ())); return TAO_SSL_SVC_HANDLER::activate (flags, n_threads, diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp index 96320dfe48c..f5d6318f019 100644 --- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp @@ -146,7 +146,8 @@ TAO_SHMIOP_Connection_Handler::activate (long flags, THR_BOUND)); // Set the id in the transport now that we're active. - this->transport ()->id (this->get_handle ()); + this->transport ()->id (ACE_static_cast (int, + this->get_handle ())); return TAO_SHMIOP_SVC_HANDLER::activate (flags, n_threads, diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp index f17c384286e..0daf5ee4571 100644 --- a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp @@ -128,7 +128,8 @@ TAO_UIOP_Connection_Handler::activate (long flags, THR_BOUND)); // Set the id in the transport now that we're active. - this->transport ()->id (this->get_handle ()); + this->transport ()->id (ACE_static_cast (int, + this->get_handle ())); return TAO_UIOP_SVC_HANDLER::activate (flags, n_threads, |