diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-02-26 18:30:42 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-02-26 18:30:42 +0000 |
| commit | 3ea4e2cabba4b4814448d652f4ee4c58c67f304b (patch) | |
| tree | f9741e8dddfc7ecee5fed9a2d9fb7f40deaccb42 | |
| parent | 12626142b74b34a6a4bf0a8df4e33d201eab54bc (diff) | |
| download | ATCD-3ea4e2cabba4b4814448d652f4ee4c58c67f304b.tar.gz | |
Fri Feb 26 18:30:54 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/OS_NS_sys_time.inl:
Changed ACE_HAS_CLOCK_REALTIME to ACE_HAS_CLOCK_GETTIME_REALTIME
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_sys_time.inl | 11 |
2 files changed, 7 insertions, 9 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index f08d2f3d9b6..30443a7c79e 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Fri Feb 26 18:30:54 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/OS_NS_sys_time.inl: + Changed ACE_HAS_CLOCK_REALTIME to ACE_HAS_CLOCK_GETTIME_REALTIME + Fri Feb 26 16:00:04 UTC 2010 Steve Huston <shuston@riverace.com> * Fixed double-declaration of ACE_LACKS_CEILL and ACE_LACKS_FLOORL in: diff --git a/ACE/ace/OS_NS_sys_time.inl b/ACE/ace/OS_NS_sys_time.inl index 72259a9236f..0067c079b39 100644 --- a/ACE/ace/OS_NS_sys_time.inl +++ b/ACE/ace/OS_NS_sys_time.inl @@ -5,7 +5,7 @@ #include "ace/os_include/sys/os_time.h" #include "ace/os_include/os_errno.h" -#if defined (ACE_VXWORKS) || defined (ACE_HAS_CLOCK_REALTIME) +#if defined (ACE_VXWORKS) || defined (ACE_HAS_CLOCK_GETTIME_REALTIME) # include "ace/OS_NS_time.h" #endif /* ACE_VXWORKS || ACE_HAS_CLOCK_REALTIME */ @@ -21,7 +21,7 @@ ACE_OS::gettimeofday (void) int result = 0; #endif // !defined (ACE_WIN32) -#if defined (ACE_HAS_CLOCK_REALTIME) +#if defined (ACE_HAS_CLOCK_GETTIME_REALTIME) struct timespec ts; ACE_OSCALL (ACE_OS::clock_gettime (CLOCK_REALTIME, &ts), int, -1, result); @@ -38,13 +38,6 @@ ACE_OS::gettimeofday (void) FILETIME tfile; ::GetSystemTimeAsFileTime (&tfile); return ACE_Time_Value (tfile); -#if 0 - // From Todd Montgomery... - struct _timeb tb; - ::_ftime (&tb); - tv.tv_sec = tb.time; - tv.tv_usec = 1000 * tb.millitm; -#endif /* 0 */ #elif defined (ACE_HAS_AIX_HI_RES_TIMER) timebasestruct_t tb; |