summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorGlenn Glazer <coyot@lindenlab.com>2015-10-01 09:02:45 -0700
committerGlenn Glazer <coyot@lindenlab.com>2015-10-01 09:02:45 -0700
commitd3928405e3498fabd9215da96fcd0d72e71e83e1 (patch)
tree218b97ae3d0173a9b8c106c09306aef03f42c7f6 /indra/llcommon
parentc1e3f778cb377999edf49764088f3f23a2302afc (diff)
parent6c422a881499c0d7649a59db47905a584bbd2bc1 (diff)
merge, close develop branch
--HG-- branch : develop
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;
}
}