diff options
| author | Johnny Willemsen <jwillemsen@users.noreply.github.com> | 2016-09-23 13:56:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-23 13:56:22 +0200 |
| commit | ce6a48bf72de2c6f5aa2bfc099f1e87d4246b5dd (patch) | |
| tree | 0a0af0bcdee5bbe6cb6439afef9d96cb690a623b | |
| parent | d788b5491133bd2993882517eb1323e5378de3b3 (diff) | |
| parent | ddc8667a968b1515aaf7707e945e53c5cf02e929 (diff) | |
| download | ATCD-ce6a48bf72de2c6f5aa2bfc099f1e87d4246b5dd.tar.gz | |
Merge pull request #300 from GaryN4/master
ACE Core Typo Bug
| -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 98459b47713..f748f21b240 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; |