diff options
| author | callum_linden <none@none> | 2014-10-20 15:20:10 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2014-10-20 15:20:10 -0700 |
| commit | cad1df584be0ed62e4ae0393b84e57f192009da5 (patch) | |
| tree | 4b569d318ba5fbe511d5b2b9f350b40f1093b613 | |
| parent | 52347307796ba94515312bfceff04e0612e7f234 (diff) | |
Update to build on Xcode 6.0: fix typo in functions params
| -rw-r--r-- | XCODE_6_UPGRADES_TODO.txt | 13 | ||||
| -rw-r--r-- | indra/llcommon/llpredicate.h | 5 |
2 files changed, 8 insertions, 10 deletions
diff --git a/XCODE_6_UPGRADES_TODO.txt b/XCODE_6_UPGRADES_TODO.txt index 1529a2ee90..89b95c5836 100644 --- a/XCODE_6_UPGRADES_TODO.txt +++ b/XCODE_6_UPGRADES_TODO.txt @@ -1,13 +1,9 @@ -* Remove references to Xcode < 6 from CMake (and everywhere else I guess) - -* /Users/callum/work/Linden/viewer-tools-update-callum/indra/llcommon/llpredicate.h:144:17 trying to decipher correct code here. (via Richard) +* Build with tests on (LL_TESTS:BOOL=ON) and fix * Missed off some #if LL_DARWINs around #pragmas to turn off non-useful warnings for OS X - will fix when build Windows viewer * Remove explicit code to turn off unused funcs for tut.hpp (#pragma clang diagnostic ignored "-Wunused-function") - I moved it to package itself -* Port llQtWebKit with SSL3/TLS fix to hacked version and include in autobuild (Oz) - * Fix up commented out code in 'tut' package - tut/tut/tut_assert.hpp #82 & #84 (no operator << for T & Q) * Fix llphysicsextension: @@ -15,6 +11,9 @@ * remove unused variables 78-81 * remove pointer to hacked version in vewer autobuild.xml -* clang demands default ctor here: https://bitbucket.org/callum_linden/viewer-tools-update-callum/src/c58560da7bb6e00deffcbbc1c25cbf87bf2e96ec/indra/newview/llgrouplist.cpp?at=default#cl-53 side effects? - * Nat to look at this please: https://bitbucket.org/callum_linden/viewer-tools-update-callum/commits/3d2fb85943d527e7db9908ff2824bc54afe916f1 + +* Rebuild with CMake 3.0.2 + +* Remove -Wno-sign-compare from indra/cmake/00-Common.cmake and see if it builds. (Why did this switched off still catch U32 v; if ( v < 0 ) { }) + diff --git a/indra/llcommon/llpredicate.h b/indra/llcommon/llpredicate.h index 91d96e64f5..e6c56a5711 100644 --- a/indra/llcommon/llpredicate.h +++ b/indra/llcommon/llpredicate.h @@ -139,10 +139,9 @@ namespace LLPredicate Rule() {} - void require(ENUM e) + void require(ENUM e, bool match) { - // TEMP XCODE6FIX checkin while i figure out what the heck this is supposed to mean - // mRule.set(e, require); + mRule.set(e, match); } void allow(ENUM e) |