diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-08-23 06:36:25 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-08-23 06:36:25 +0000 |
| commit | 40d483be4c089874eaa58b7f52a91658009a380f (patch) | |
| tree | a7a0ad66a96b0f9744f29e5ef4a4a34eb269db4e | |
| parent | 1d616c4f8efc81a0a99737950e5bf707ed699077 (diff) | |
| download | ATCD-40d483be4c089874eaa58b7f52a91658009a380f.tar.gz | |
Thu Aug 23 06:35:20 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Condition_Attributes.inl:
Only check for ACE_LACKS_MONOTONIC_TIME
* ace/Monotonic_Time_Policy.inl:
Layout change
* ace/config-hpux-11.00.h:
Added ACE_LACKS_MONOTONIC_TIME
| -rw-r--r-- | ACE/ChangeLog | 15 | ||||
| -rw-r--r-- | ACE/ace/Condition_Attributes.inl | 2 | ||||
| -rw-r--r-- | ACE/ace/Monotonic_Time_Policy.inl | 3 | ||||
| -rw-r--r-- | ACE/ace/config-hpux-11.00.h | 2 |
4 files changed, 17 insertions, 5 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 6855338b8d8..aa72d72bb36 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,7 +1,18 @@ -Wed Aug 22 11:50:22 UTC 2012 johnny <johnny@remedy.nl> +Thu Aug 23 06:35:20 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Condition_Attributes.inl: + Only check for ACE_LACKS_MONOTONIC_TIME + + * ace/Monotonic_Time_Policy.inl: + Layout change + + * ace/config-hpux-11.00.h: + Added ACE_LACKS_MONOTONIC_TIME + +Wed Aug 22 11:50:22 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> * ace/config-win32-common.h: - Added ACE_LACKS_CLOCK_MONOTONIC and + Added ACE_LACKS_CLOCK_MONOTONIC and ACE_LACKS_CLOCK_REALTIME Wed Aug 22 06:13:12 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> diff --git a/ACE/ace/Condition_Attributes.inl b/ACE/ace/Condition_Attributes.inl index be524f7c06a..a438d5d7089 100644 --- a/ACE/ace/Condition_Attributes.inl +++ b/ACE/ace/Condition_Attributes.inl @@ -27,7 +27,7 @@ ACE_INLINE ACE_Condition_Attributes_T<ACE_Monotonic_Time_Policy>::ACE_Condition_Attributes_T (int type) : ACE_Condition_Attributes (type) { -#if (defined (_POSIX_MONOTONIC_CLOCK) && !defined (ACE_LACKS_MONOTONIC_TIME)) || defined (ACE_HAS_CLOCK_GETTIME_MONOTONIC) +#if !defined (ACE_LACKS_CLOCK_MONOTONIC) (void) ACE_OS::condattr_setclock (this->attributes_, CLOCK_MONOTONIC); #endif } diff --git a/ACE/ace/Monotonic_Time_Policy.inl b/ACE/ace/Monotonic_Time_Policy.inl index d0a0b56192e..67626e5556d 100644 --- a/ACE/ace/Monotonic_Time_Policy.inl +++ b/ACE/ace/Monotonic_Time_Policy.inl @@ -15,8 +15,7 @@ ACE_Monotonic_Time_Policy::operator()() const #elif (defined (_POSIX_MONOTONIC_CLOCK) && !defined (ACE_LACKS_MONOTONIC_TIME)) || defined (ACE_HAS_CLOCK_GETTIME_MONOTONIC) struct timespec ts; - if (ACE_OS::clock_gettime (CLOCK_MONOTONIC, - &ts) == 0) + if (ACE_OS::clock_gettime (CLOCK_MONOTONIC, &ts) == 0) return ACE_Time_Value_T<ACE_Monotonic_Time_Policy>(ts); else return ACE_Time_Value_T<ACE_Monotonic_Time_Policy> (ACE_Time_Value::zero); diff --git a/ACE/ace/config-hpux-11.00.h b/ACE/ace/config-hpux-11.00.h index bdf8bbb0045..5985130f666 100644 --- a/ACE/ace/config-hpux-11.00.h +++ b/ACE/ace/config-hpux-11.00.h @@ -164,6 +164,8 @@ #define ACE_HAS_CLOCK_GETTIME #define ACE_HAS_CLOCK_SETTIME +#define ACE_LACKS_CLOCK_MONOTONIC + // Prototypes for both signal() and struct sigaction are consistent. #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES |