summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorBjoseph Wombat <bjoseph@vivox.com>2015-10-06 22:39:07 +0100
committerBjoseph Wombat <bjoseph@vivox.com>2015-10-06 22:39:07 +0100
commit9c4202f2f837601b76d1e04045a1914e1c974981 (patch)
tree30eadf8bd2fa12537d15a7b8eedca17321f767c9 /indra/llcommon
parent8aedbbda159344ed1af042e562c34ae5759a3b0d (diff)
parent17ff449ae6b2759f212daa4fd3de0a7ea2664866 (diff)
merged changes from viewer-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;
}
}