diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-10-22 21:26:24 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-10-22 21:26:24 -0400 |
| commit | cc54f34d3fb66892258f82164bce67893f7cbff6 (patch) | |
| tree | 31ade7b47186c43c39159021fbd2032fbdecca28 | |
| parent | 9e9779d3f88a35bd9d3eb949b6fa08a36b505d5f (diff) | |
| parent | 2b8673d15a9298dde00f69373735abf68d11e5d3 (diff) | |
merge with head
| -rw-r--r-- | XCODE_6_UPGRADES_TODO.txt | 13 | ||||
| -rwxr-xr-x | indra/test/llsd_new_tut.cpp | 18 |
2 files changed, 13 insertions, 18 deletions
diff --git a/XCODE_6_UPGRADES_TODO.txt b/XCODE_6_UPGRADES_TODO.txt index 1330e33910..074e09c680 100644 --- a/XCODE_6_UPGRADES_TODO.txt +++ b/XCODE_6_UPGRADES_TODO.txt @@ -1,14 +1,9 @@ - -* autobuild configure with tests on (LL_TESTS:BOOL=ON) and fix errors - * Fix up commented out code in 'tut' package - tut/tut/tut_assert.hpp #82 & #84 (no operator << for T & Q), rebuild package and point autobuild.xml at original version -* Release builds on initial inspection at least, run 1/3 the speed (frame rate meter) of same viewer-release build - clang optimization off? - -* Should we be using libstdc++ (GNU) or libc++ (clang) - using the former but latter is more 'clang'y +* Fix and uncomment unit test in indra/test/llsd_new_tut.cpp -* Investigates: https://bitbucket.org/callum_linden/viewer-tools-update-callum/commits/3d2fb85943d527e7db9908ff2824bc54afe916f1 +* Should we be using libstdc++ (GNU) or libc++ (clang) - using the former but latter is more 'clang'y - see comments from Cinder in BB -Weird folder name "build-darwin-i386/newview/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/Second Life.app" - likely causes because those $() should be ${} for CMake? - No, it's something else - lots of occurences in build-darwin folder but where do they come from? .... +* Weird folder name "build-darwin-i386/newview/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/Second Life.app" - likely causes because those $() should be ${} for CMake? - No, it's something else - lots of occurences in build-darwin folder but where do they come from? .... -libjpeg is placed in lib folder vs lib/release - change it to match others +* libjpeg is placed in lib folder vs lib/release - change it to match others diff --git a/indra/test/llsd_new_tut.cpp b/indra/test/llsd_new_tut.cpp index 03df1d339b..e1de1bbd34 100755 --- a/indra/test/llsd_new_tut.cpp +++ b/indra/test/llsd_new_tut.cpp @@ -112,15 +112,15 @@ namespace tut SDTestGroup sdTestGroup("LLSD(new)"); - template<> template<> - void SDTestObject::test<1>() - // construction and test of undefined - { - SDCleanupCheck check; - - LLSD u; - ensure("is undefined", u.isUndefined()); - } + // template<> template<> + // void SDTestObject::test<1>() + // // construction and test of undefined + // { + // SDCleanupCheck check; + + // LLSD u; + // ensure("is undefined", u.isUndefined()); + // } template<> template<> void SDTestObject::test<2>() |