diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-07 17:59:58 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-07 17:59:58 +0000 |
| commit | cbdbddd82a5b20addb4a3ef617d75e6e59cb5896 (patch) | |
| tree | c7fa361c8758cad8a02be11a8f567d8371275a95 | |
| parent | 71d337d96f3e9a01791d6373da2e7e40cede803a (diff) | |
| download | ATCD-cbdbddd82a5b20addb4a3ef617d75e6e59cb5896.tar.gz | |
ChangeLogTag:Wed Jul 7 12:59:14 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-99c | 10 | ||||
| -rw-r--r-- | TAO/tao/Invocation.cpp | 10 | ||||
| -rw-r--r-- | TAO/tao/ORB.cpp | 1 |
3 files changed, 16 insertions, 5 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 7e40706f161..1ff48000ca2 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,13 @@ +Wed Jul 7 12:59:14 1999 Carlos O'Ryan <coryan@cs.wustl.edu> + + * tao/Invocation.cpp: + Fixed the timeout computations so it works in platforms without + native 64 bit ints. + + * tao/ORB.cpp: + It was not compiling in platforms without native C++ + exceptions. + Wed Jul 7 12:49:13 1999 Carlos O'Ryan <coryan@cs.wustl.edu> * orbsvcs/Concurrency_Service/Concurrency_Service.cpp: diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp index e3cd7046aa1..0d8e3b8eefa 100644 --- a/TAO/tao/Invocation.cpp +++ b/TAO/tao/Invocation.cpp @@ -150,11 +150,13 @@ TAO_GIOP_Invocation::start (CORBA::Environment &ACE_TRY_ENV) if (this->max_wait_time_ == 0 && timeout != 0) { - TimeBase::TimeT microseconds = - timeout->relative_expiry (ACE_TRY_ENV) / 10; + TimeBase::TimeT t = + timeout->relative_expiry (ACE_TRY_ENV); ACE_CHECK; - this->max_wait_time_value_.set ((long) microseconds / 1000000, - (long) microseconds % 1000000); + TimeBase::TimeT seconds = t / 10000000; + TimeBase::TimeT microseconds = t % 10000000; + this->max_wait_time_value_.set (ACE_U64_TO_U32(seconds), + ACE_U64_TO_U32(microseconds)); this->max_wait_time_ = &this->max_wait_time_value_; if (TAO_debug_level > 0) { diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 53a8096fc5a..35a0e52e624 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -1714,7 +1714,6 @@ CORBA_ORB::_find_collocated_servant (TAO_Stub *sobj, { const TAO_Profile* profile = mprofile.get_profile (j); TAO_ObjectKey_var objkey = profile->_key (); - ACE_CHECK_RETURN (0); CORBA::Environment ACE_TRY_ENV; ACE_TRY |