diff options
| -rw-r--r-- | XCODE_6_UPGRADES_TODO.txt | 5 | ||||
| -rwxr-xr-x | indra/llcommon/llsd.cpp | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/XCODE_6_UPGRADES_TODO.txt b/XCODE_6_UPGRADES_TODO.txt index ce1803805f..3b35607d70 100644 --- a/XCODE_6_UPGRADES_TODO.txt +++ b/XCODE_6_UPGRADES_TODO.txt @@ -6,4 +6,7 @@ * Nat to look at this please: https://bitbucket.org/callum_linden/viewer-tools-update-callum/commits/3d2fb85943d527e7db9908ff2824bc54afe916f1 -* Remove -Wno-sign-compare from indra/cmake/00-Common.cmake and see if it builds. (Why did this, switched off, still catch code like U32 v; if ( v < 0 ) { }) +Weird folder name "build-darwin-i386/newview/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/Second Life.app" - likely causes because those $() should be ${} for CMake? + +libjpeg is placed in lib folder vs lib/release - change it to match others + diff --git a/indra/llcommon/llsd.cpp b/indra/llcommon/llsd.cpp index d8bbb3a74f..57aa7d9c07 100755 --- a/indra/llcommon/llsd.cpp +++ b/indra/llcommon/llsd.cpp @@ -789,10 +789,7 @@ namespace { inline LLSD::Impl& safe(LLSD::Impl* impl) { return LLSD::Impl::safe(impl); } - - inline const LLSD::Impl& safe(const LLSD::Impl* impl) - { return LLSD::Impl::safe(impl); } - + inline ImplMap& makeMap(LLSD::Impl*& var) { return safe(var).makeMap(var); } |