diff options
| author | mcorino <mcorino@users.noreply.github.com> | 2006-11-03 10:56:31 +0000 |
|---|---|---|
| committer | mcorino <mcorino@users.noreply.github.com> | 2006-11-03 10:56:31 +0000 |
| commit | 1e3139111434781e3625aca14cae17444e3a2803 (patch) | |
| tree | 30f28836667ff344891d511be2cc8afbdf297301 | |
| parent | 66e515605425947b2708cb39254b30ad5bc39de0 (diff) | |
| download | ATCD-1e3139111434781e3625aca14cae17444e3a2803.tar.gz | |
ChangeLogTag: Fri Nov 03 10:54:10 UTC 2006 Martin Corino <mcorino@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_sys_time.inl | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index e710e35b16a..9fd2a63f50b 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Fri Nov 03 10:54:10 UTC 2006 Martin Corino <mcorino@remedy.nl> + + * ace/OS_NS_sys_time.inl: + + Fixed conversion warning on OpenVMS. + Fri Nov 3 00:39:04 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> * ace/Sock_Connect.cpp: diff --git a/ACE/ace/OS_NS_sys_time.inl b/ACE/ace/OS_NS_sys_time.inl index 6c0e4038f1e..8849e37d96b 100644 --- a/ACE/ace/OS_NS_sys_time.inl +++ b/ACE/ace/OS_NS_sys_time.inl @@ -83,7 +83,7 @@ ACE_OS::gettimeofday (void) #endif /* 0 */ #if !defined (ACE_HAS_WINCE)&& !defined (ACE_WIN32) if (result == -1) - return ACE_Time_Value (-1); + return ACE_Time_Value ((time_t)-1); else return ACE_Time_Value (tv); #endif // !defined (ACE_HAS_WINCE)&& !defined (ACE_WIN32) |