summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2015-09-29 15:32:01 -0400
committerOz Linden <oz@lindenlab.com>2015-09-29 15:32:01 -0400
commit9367a3787929dfff8b46763d9a7b4872c469e85a (patch)
treedb0351a86ebfa362ba8c4314e0db1141fbb46450 /indra/llcommon
parentbe9b1ee8afacabb64f82640de5f80ce9438e6c91 (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;
}
}