diff options
| author | Johnny Willemsen <jwillemsen@users.noreply.github.com> | 2016-09-24 08:14:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-24 08:14:01 +0200 |
| commit | 41f7f5747390ecc906b9677670321c37fd0879c1 (patch) | |
| tree | b6345d93944ece5cd1aed170a6e0e08be6a03efa | |
| parent | ce6a48bf72de2c6f5aa2bfc099f1e87d4246b5dd (diff) | |
| download | ATCD-revert-300-master.tar.gz | |
Revert "ACE Core Typo Bug"revert-300-master
| -rw-r--r-- | ACE/ace/Time_Value.inl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ACE/ace/Time_Value.inl b/ACE/ace/Time_Value.inl index f748f21b240..98459b47713 100644 --- a/ACE/ace/Time_Value.inl +++ b/ACE/ace/Time_Value.inl @@ -58,7 +58,7 @@ ACE_Time_Value::set (time_t sec, suseconds_t usec) this->tv_.tv_sec = sec; this->tv_.tv_usec = usec; #if __GNUC__ && !(__GNUC__ == 3 && __GNUC_MINOR__ == 4) - if ((__builtin_constant_p(sec) && + if ((__builtin_constant_p(sec) & __builtin_constant_p(usec)) && (sec >= 0 && usec >= 0 && usec < ACE_ONE_SECOND_IN_USECS)) return; |