Skip to content
Snippets Groups Projects
Commit 74ac1bb4 authored by callum_linden's avatar callum_linden
Browse files

Update to build on Xcode 6.0: clang fix for bracketed logical operations

parent 685c36ef
No related branches found
No related tags found
No related merge requests found
...@@ -663,13 +663,13 @@ void LLInventoryFilter::setHoursAgo(U32 hours) ...@@ -663,13 +663,13 @@ void LLInventoryFilter::setHoursAgo(U32 hours)
BOOL more_restrictive; BOOL more_restrictive;
if (FILTERDATEDIRECTION_NEWER == mFilterOps.mDateSearchDirection) if (FILTERDATEDIRECTION_NEWER == mFilterOps.mDateSearchDirection)
{ {
less_restrictive = (are_date_limits_valid && ((is_increasing && mFilterOps.mHoursAgo)) || !hours); less_restrictive = ((are_date_limits_valid && ((is_increasing && mFilterOps.mHoursAgo))) || !hours);
more_restrictive = (are_date_limits_valid && (!is_increasing && hours) || is_increasing_from_zero); more_restrictive = ((are_date_limits_valid && (!is_increasing && hours)) || is_increasing_from_zero);
} }
else else
{ {
less_restrictive = (are_date_limits_valid && ((is_decreasing && mFilterOps.mHoursAgo)) || !hours); less_restrictive = ((are_date_limits_valid && ((is_decreasing && mFilterOps.mHoursAgo))) || !hours);
more_restrictive = (are_date_limits_valid && (!is_decreasing && hours) || is_increasing_from_zero); more_restrictive = ((are_date_limits_valid && (!is_decreasing && hours)) || is_increasing_from_zero);
} }
mFilterOps.mHoursAgo = hours; mFilterOps.mHoursAgo = hours;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment