diff options
| author | callum_linden <none@none> | 2015-09-29 13:35:41 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2015-09-29 13:35:41 -0700 |
| commit | 6765d666374a293762fd9b2be09465649982b3cb (patch) | |
| tree | 8ffa9d2b78ca4abf9c0dda539d648b243322d004 /indra/llcommon | |
| parent | 11c188dc734fd1dc921a2fa4c14e89a0e190c26b (diff) | |
| parent | 17ff449ae6b2759f212daa4fd3de0a7ea2664866 (diff) | |
Merge with viewer-xcode-7 for Xcode 7 patches
Diffstat (limited to 'indra/llcommon')
| -rwxr-xr-x | indra/llcommon/llprocess.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/llcommon/llprocess.cpp b/indra/llcommon/llprocess.cpp index 715df36f39..e0aa30cc1a 100755 --- a/indra/llcommon/llprocess.cpp +++ b/indra/llcommon/llprocess.cpp @@ -738,8 +738,11 @@ LLProcess::LLProcess(const LLSDOrParams& params): { mPipes.replace(i, new ReadPipeImpl(desc, pipe, FILESLOT(i))); } - LL_DEBUGS("LLProcess") << "Instantiating " << typeid(mPipes[i]).name() - << "('" << desc << "')" << LL_ENDL; + // Removed temporaily for Xcode 7 build tests: error was: + // "error: expression with side effects will be evaluated despite + // being used as an operand to 'typeid' [-Werror,-Wpotentially-evaluated-expression]"" + //LL_DEBUGS("LLProcess") << "Instantiating " << typeid(mPipes[i]).name() + // << "('" << desc << "')" << LL_ENDL; } } |