diff options
| author | elliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-02-19 19:56:25 +0000 |
|---|---|---|
| committer | elliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-02-19 19:56:25 +0000 |
| commit | 4c07d7b0ffc93d721bf5df1912836b92a30c50ef (patch) | |
| tree | fddf64ce5ddd9b69216f5cb306373ae4afb47129 /TAO | |
| parent | ea13bb6704475f56b2e58c34f57737df4fa03612 (diff) | |
| download | ATCD-4c07d7b0ffc93d721bf5df1912836b92a30c50ef.tar.gz | |
ChangeLogTag: Mon Feb 19 19:55:46 UTC 2007 Chad Elliott <elliott_c@ociweb.com>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/tests/CDR/allocator.cpp | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index bf9ea8ca85a..3b90f161ff1 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Mon Feb 19 19:55:46 UTC 2007 Chad Elliott <elliott_c@ociweb.com> + + * tests/CDR/allocator.cpp: + + Use a static cast to avoid warnings about converting from + ACE_hrtime_t to double. + Mon Feb 19 19:44:59 UTC 2007 Chad Elliott <elliott_c@ociweb.com> * tests/Bug_1495_Regression/Client_Task.cpp: diff --git a/TAO/tests/CDR/allocator.cpp b/TAO/tests/CDR/allocator.cpp index dfbae63cc44..5f0acd3c5a5 100644 --- a/TAO/tests/CDR/allocator.cpp +++ b/TAO/tests/CDR/allocator.cpp @@ -187,7 +187,8 @@ main (int argc, char *argv[]) ACE_hrtime_t usecs = tv.sec (); usecs *= static_cast<ACE_UINT32> (ACE_ONE_SECOND_IN_USECS); usecs += tv.usec (); - double average = ACE_HRTIME_CONVERSION(usecs) / repeat; + double average = + static_cast<double> (ACE_HRTIME_CONVERSION(usecs)) / repeat; if (!quiet) ACE_OS::printf ("AVE: %d %f\n", |