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 | f183ace16a97648435252aae49f3920daf73a5b6 (patch) | |
| tree | c6144f8342ba804e251ca67a39dd08df384dc251 | |
| parent | a4fe4096adbfc2721bd07d7f0a7e02e9edeb4fac (diff) | |
| download | ATCD-f183ace16a97648435252aae49f3920daf73a5b6.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.
| -rw-r--r-- | ACE/ChangeLog | 10 | ||||
| -rw-r--r-- | ACE/ace/Time_Value.inl | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 3a43ba20292..bb137147099 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,13 @@ +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. + Fri Oct 21 11:26:49 UTC 2011 Marcel Smit <msmit@remedy.nl> * examples/Misc/test_trace.cpp: 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 |