diff options
| author | callum_linden <none@none> | 2014-10-17 22:14:23 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2014-10-17 22:14:23 -0700 |
| commit | ff5c13493e63509443a7a1fca189d3ddf1d4cb34 (patch) | |
| tree | 22639855689e38ae8fab5dbd33f32b1cc5f3f2f4 /indra | |
| parent | 3929725fe7eba9f020fc475ed4c4a959c18aea99 (diff) | |
Update to build on Xcode 6.0: fixes for brackets logical operations and signed/unsigned issue
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/llui/lltimectrl.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llui/lltimectrl.cpp b/indra/llui/lltimectrl.cpp index 9ea1e8815e..271947db7a 100755 --- a/indra/llui/lltimectrl.cpp +++ b/indra/llui/lltimectrl.cpp @@ -381,7 +381,7 @@ bool LLTimeCtrl::isHoursStringValid(const std::string& str) bool LLTimeCtrl::isMinutesStringValid(const std::string& str) { U32 minutes; - if (!LLStringUtil::convertToU32(str, minutes) || (minutes <= MINUTES_MAX) && str.length() < 3) + if (!LLStringUtil::convertToU32(str, minutes) || ((minutes <= MINUTES_MAX) && str.length() < 3)) return true; return false; @@ -415,7 +415,8 @@ U32 LLTimeCtrl::parseHours(const std::string& str) U32 LLTimeCtrl::parseMinutes(const std::string& str) { U32 minutes; - if (LLStringUtil::convertToU32(str, minutes) && (minutes >= MINUTES_MIN) && (minutes <= MINUTES_MAX)) + // not sure of this fix - clang doesnt like compare minutes U32 to >= MINUTES_MIN (0) but MINUTES_MIN can change + if (LLStringUtil::convertToU32(str, minutes) && ((S32)minutes >= MINUTES_MIN) && ((S32)minutes <= MINUTES_MAX)) { return minutes; } |