diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2011-10-21 23:38:39 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2011-10-21 23:38:39 +0000 |
| commit | 4ca0a6504ae7f533d932451292f8bf6573be605b (patch) | |
| tree | c6144f8342ba804e251ca67a39dd08df384dc251 /ACE/ace/Time_Value.inl | |
| parent | 3ec50a7b1e175b3266c421224acd63c6a2d400fc (diff) | |
| download | ATCD-4ca0a6504ae7f533d932451292f8bf6573be605b.tar.gz | |
Fri Oct 21 23:35:30 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu>
* ace/Time_Value.inl:
Changed the operator comparing __builtin_constant_p to be a
bitwise (&) instead oflogical and (&&) to address a warning from the
LLVM compiler. In this case, the result of the two operators is
logically equivalent. Thanks to Abdullah Sowayan <sowayan@gmail.com>
for reporting the issue.
Diffstat (limited to 'ACE/ace/Time_Value.inl')
| -rw-r--r-- | ACE/ace/Time_Value.inl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ACE/ace/Time_Value.inl b/ACE/ace/Time_Value.inl index a1cde15dcf3..25346ad2506 100644 --- a/ACE/ace/Time_Value.inl +++ b/ACE/ace/Time_Value.inl @@ -61,8 +61,8 @@ ACE_Time_Value::set (time_t sec, suseconds_t usec) this->tv_.tv_sec = sec; this->tv_.tv_usec = usec; #if __GNUC__ - if (__builtin_constant_p(sec) && - __builtin_constant_p(usec) && + if ((__builtin_constant_p(sec) & + __builtin_constant_p(usec)) && (sec >= 0 && usec >= 0 && usec < ACE_ONE_SECOND_IN_USECS)) return; #endif |