summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2015-10-06 11:32:00 -0400
committerOz Linden <oz@lindenlab.com>2015-10-06 11:32:00 -0400
commit22e3e8461cf5a36754369c2648b1b4cd252a4d5c (patch)
treed535deb3a0424366f2909f66f78ad5127844f25d /indra/llcommon
parent617e98f1fe3d5f8965680cdd06ab72756c9c5e78 (diff)
parent17ff449ae6b2759f212daa4fd3de0a7ea2664866 (diff)
merge changes for XCODE-7
Diffstat (limited to 'indra/llcommon')
-rwxr-xr-xindra/llcommon/llprocess.cpp7
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;
}
}