diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-08 15:30:19 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-08 15:30:19 +0000 |
| commit | f69973822a2f3d75cab660f0f86a0ed3c73c2815 (patch) | |
| tree | b9eaef7f9f577efad335166ec71447aa0c146e48 | |
| parent | 89c593e1ddb69f47d644c77795cf8acb972fa736 (diff) | |
| download | ATCD-f69973822a2f3d75cab660f0f86a0ed3c73c2815.tar.gz | |
ChangeLogTag: Thu Jul 08 10:28:25 1999 David L. Levine <levine@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-99c | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Time_Utilities.i | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 725180a7ca0..03e878e2df3 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,10 @@ +Thu Jul 08 10:28:25 1999 David L. Levine <levine@cs.wustl.edu> + + * orbsvcs/orbsvcs/Time_Utilities.i (TimeT_to_Time_Value): + use ACE_U_ONE_SECOND_IN_NSECS instead of the signed constant, + to avoid overload ambiguity now that we have an ACE_U_LongLong + conversion to ptr_arith_t. + Thu Jul 08 09:59:47 1999 David L. Levine <levine@cs.wustl.edu> * docs/releasenotes/orbcore.html: updated description of diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.i b/TAO/orbsvcs/orbsvcs/Time_Utilities.i index 6f4dea5f231..7d3a4c5a10b 100644 --- a/TAO/orbsvcs/orbsvcs/Time_Utilities.i +++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.i @@ -49,8 +49,9 @@ ORBSVCS_Time::TimeT_to_Time_Value (ACE_Time_Value& lhs, ORBSVCS_Time::TimeT_to_hrtime (t, rhs); - lhs.set (ACE_static_cast(ACE_UINT32, t / ACE_ONE_SECOND_IN_NSECS), - ACE_static_cast(ACE_UINT32, (t % ACE_ONE_SECOND_IN_NSECS) / 1000)); + lhs.set (ACE_static_cast(ACE_UINT32, t / ACE_U_ONE_SECOND_IN_NSECS), + ACE_static_cast(ACE_UINT32, + (t % ACE_U_ONE_SECOND_IN_NSECS) / 1000)); } ACE_INLINE ACE_Time_Value |