From 2e21fa6b925c4572d620248f1b149a5d652836b2 Mon Sep 17 00:00:00 2001
From: Nay <dnpd.dd@gmail.com>
Date: Mon, 17 Sep 2012 23:21:01 +0100
Subject: Core/Dependencies: Update ACE to v6.1.4 (Windows only)

Tested in multiple configurations
.diff with TC changes added
---
 dep/acelite/ace/String_Base.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'dep/acelite/ace/String_Base.cpp')

diff --git a/dep/acelite/ace/String_Base.cpp b/dep/acelite/ace/String_Base.cpp
index 8438cc6e59d..2373c578204 100644
--- a/dep/acelite/ace/String_Base.cpp
+++ b/dep/acelite/ace/String_Base.cpp
@@ -1,4 +1,4 @@
-// $Id: String_Base.cpp 88793 2010-02-01 17:50:34Z cleeland $
+// $Id: String_Base.cpp 93238 2011-02-01 14:30:38Z shuston $
 
 #ifndef ACE_STRING_BASE_CPP
 #define ACE_STRING_BASE_CPP
@@ -655,7 +655,9 @@ ACE_String_Base<ACE_CHAR_T>::operator+= (const ACE_CHAR_T c)
 {
   ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::operator+=(const ACE_CHAR_T)");
   const size_type slen = 1;
-  return this->append (&c, slen);
+  // This temp is silly but it quiets an optimizer warning in IBM XL C++ 10.
+  ACE_String_Base<ACE_CHAR_T>& r = this->append (&c, slen);
+  return r;
 }
 
 ACE_END_VERSIONED_NAMESPACE_DECL
-- 
cgit v1.2.3