summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2011-02-01 14:33:16 +0000
committerSteve Huston <shuston@riverace.com>2011-02-01 14:33:16 +0000
commitb09e688963fa4231be7a859677fb5d3f78dc0a1c (patch)
tree1dee117ccec516ffcbc4290eec3b7e85b0e8ea61
parent1222385969ca282ce4f793cb057c52946aefdcc0 (diff)
downloadATCD-b09e688963fa4231be7a859677fb5d3f78dc0a1c.tar.gz
ChangeLogTag:Tue Feb 1 14:28:18 UTC 2011 Steve Huston <shuston@riverace.com>
-rw-r--r--ChangeLog6
-rw-r--r--ace/String_Base.cpp4
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 40256a36580..4c99c003c65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Feb 1 14:28:18 UTC 2011 Steve Huston <shuston@riverace.com>
+
+ * ace/String_Base.cpp (operator+=): Add a temporary for the return
+ value to quiet an IBM XL C++ 10 optimizer warning about returning
+ the address of a temporary. No, I'm not kidding.
+
Wed Jan 26 20:17:28 UTC 2011 Steve Huston <shuston@riverace.com>
* include/makeinclude/platform_aix_ibm.GNU: If XL C/C++ 10.1 is used,
diff --git a/ace/String_Base.cpp b/ace/String_Base.cpp
index 7000454972f..b24a9f9d0d4 100644
--- a/ace/String_Base.cpp
+++ b/ace/String_Base.cpp
@@ -555,7 +555,9 @@ ACE_String_Base<CHAR>::operator+= (const CHAR c)
{
ACE_TRACE ("ACE_String_Base<CHAR>::operator+=(const CHAR)");
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