diff options
| author | elliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-06-19 12:22:51 +0000 |
|---|---|---|
| committer | elliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-06-19 12:22:51 +0000 |
| commit | cf031078e4d6b4569a847a77804543a6a910cb9b (patch) | |
| tree | a7d99d614d65cf66876f422659e44d9a42876112 | |
| parent | dad4404ef4287b0b7b741ff558cf50503c5c4233 (diff) | |
| download | ATCD-cf031078e4d6b4569a847a77804543a6a910cb9b.tar.gz | |
ChangeLogTag: Thu Jun 19 12:25:02 UTC 2008 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 10 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/media_timer.cpp | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 245a061a31f..740ce8f4905 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,8 +1,14 @@ +Thu Jun 19 12:25:02 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * orbsvcs/orbsvcs/AV/media_timer.cpp: + + Reverted the cast altogether at Johnny Willemsen's request. + Thu Jun 19 11:31:59 UTC 2008 Jeff Parsons <j.parsons@vanderbilt.edu> * orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.cpp: * orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp: - + Added TAO_HAS_MONITOR_FRAMEWORK==1 guards to these files. Thu Jun 19 11:31:45 UTC 2008 Chad Elliott <elliott_c@ociweb.com> @@ -15,7 +21,7 @@ Thu Jun 19 11:31:45 UTC 2008 Chad Elliott <elliott_c@ociweb.com> Thu Jun 19 11:25:58 UTC 2008 Phil Mesnier <mesnier_p@ociweb.com> * tests/POA/EndpointPolicy/server.cpp: - + Reword the report of a successful rejection of defaulted hotnames. Thu Jun 19 11:13:00 UTC 2008 Simon Massey <sma at prismtech dot com> diff --git a/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp b/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp index 94a537e0887..04084ea4aa0 100644 --- a/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp @@ -74,7 +74,7 @@ ACE_UINT32 MediaTimer::media_ts() u = (u << 3) + u; /* x 9 */ /* sec * 90Khz + (usec * 90Khz) / 1e6 */ // Borland can't handle a truncate_cast here. - u = static_cast<ACE_UINT32> (tv.sec () * 90000 + (u / 100)); + u = tv.sec () * 90000 + (u / 100); return (u + offset_); } |