Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
cad1df58
Commit
cad1df58
authored
10 years ago
by
callum_linden
Browse files
Options
Downloads
Patches
Plain Diff
Update to build on Xcode 6.0: fix typo in functions params
parent
52347307
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
XCODE_6_UPGRADES_TODO.txt
+6
-7
6 additions, 7 deletions
XCODE_6_UPGRADES_TODO.txt
indra/llcommon/llpredicate.h
+2
-3
2 additions, 3 deletions
indra/llcommon/llpredicate.h
with
8 additions
and
10 deletions
XCODE_6_UPGRADES_TODO.txt
+
6
−
7
View file @
cad1df58
* Remove references to Xcode < 6 from CMake (and everywhere else I guess)
* Build with tests on (LL_TESTS:BOOL=ON) and fix
* /Users/callum/work/Linden/viewer-tools-update-callum/indra/llcommon/llpredicate.h:144:17 trying to decipher correct code here. (via Richard)
* Missed off some #if LL_DARWINs around #pragmas to turn off non-useful warnings for OS X - will fix when build Windows viewer
* 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
* 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 up commented out code in 'tut' package - tut/tut/tut_assert.hpp #82 & #84 (no operator << for T & Q)
* Fix llphysicsextension:
* Fix llphysicsextension:
...
@@ -15,6 +11,9 @@
...
@@ -15,6 +11,9 @@
* remove unused variables 78-81
* remove unused variables 78-81
* remove pointer to hacked version in vewer autobuild.xml
* 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
* 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 ) { })
This diff is collapsed.
Click to expand it.
indra/llcommon/llpredicate.h
+
2
−
3
View file @
cad1df58
...
@@ -139,10 +139,9 @@ namespace LLPredicate
...
@@ -139,10 +139,9 @@ namespace LLPredicate
Rule
()
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
,
match
);
// mRule.set(e, require);
}
}
void
allow
(
ENUM
e
)
void
allow
(
ENUM
e
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment