diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2003-12-13 14:30:53 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2003-12-13 14:30:53 +0000 |
| commit | 975a76e6315c50914534189318279bdbefdaacb5 (patch) | |
| tree | caf098e08c29d3262ca4e74936cbccc75e27d2f5 | |
| parent | 07a953eac36efbac1c7e4de6eeabd81de01cb98f (diff) | |
| download | ATCD-975a76e6315c50914534189318279bdbefdaacb5.tar.gz | |
ChangeLogTag:Sat Dec 13 08:29:33 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Log/Log_i.cpp | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index b28434a759c..7eeff52d286 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Sat Dec 13 08:29:33 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * orbsvcs/orbsvcs/Log/Log_i.cpp: + + Reverted a change that was made accidentally with no ChangeLog + entry. This should fix VC6.0 problems in the daily builds. + Sat Dec 13 08:05:50 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * tests/OBV/Collocated/Makefile: diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp index a33ee680cd5..f34180947a0 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp @@ -1247,8 +1247,7 @@ TAO_Log_i::remove_old_records (ACE_ENV_SINGLE_ARG_DECL) static char out[256] = ""; - // ACE_UINT64_DBLCAST_ADAPTER doesn't work here with MSVC 7.1. - double temp1 = (double) (p_time); + double temp1 = ACE_UINT64_DBLCAST_ADAPTER (p_time);; ACE_OS::sprintf (out, "time > %.0f", temp1); |