------------------------------------------------------------
revno: 13733
revision-id: squid3@treenet.co.nz-20150120094840-g5m6w5rn1vkfiana
parent: squid3@treenet.co.nz-20150119172843-23yom739795wqifw
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.5
timestamp: Tue 2015-01-20 01:48:40 -0800
message:
  Portability: Remove more C++11-isms in ACLs
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20150120094840-g5m6w5rn1vkfiana
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: a2743e0faa7c68e5dfd6f43764a5ce9e1c2e1964
# timestamp: 2015-01-20 09:50:58 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squid3@treenet.co.nz-20150119172843-\
#   23yom739795wqifw
# 
# Begin patch
=== modified file 'src/acl/CertificateData.cc'
--- src/acl/CertificateData.cc	2015-01-19 13:54:09 +0000
+++ src/acl/CertificateData.cc	2015-01-20 09:48:40 +0000
@@ -78,7 +78,13 @@
     if (validAttributesStr)
         sl.push_back(SBuf(attribute));
 
+#if __cplusplus >= 201103L
     sl.splice(sl.end(),values.dump());
+#else
+    // temp is needed until c++11 move constructor
+    SBufList tmp = values.dump();
+    sl.splice(sl.end(),tmp);
+#endif
     return sl;
 }
 

=== modified file 'src/acl/HttpHeaderData.cc'
--- src/acl/HttpHeaderData.cc	2015-01-13 09:13:49 +0000
+++ src/acl/HttpHeaderData.cc	2015-01-20 09:48:40 +0000
@@ -60,9 +60,13 @@
 {
     SBufList sl;
     sl.push_back(SBuf(hdrName));
+#if __cplusplus >= 201103L
+    sl.splice(sl.end(), regex_rule->dump());
+#else
     // temp is needed until c++11 move-constructor
     SBufList temp = regex_rule->dump();
     sl.splice(sl.end(), temp);
+#endif
     return sl;
 }
 

=== modified file 'src/acl/NoteData.cc'
--- src/acl/NoteData.cc	2015-01-13 09:13:49 +0000
+++ src/acl/NoteData.cc	2015-01-20 09:48:40 +0000
@@ -64,9 +64,13 @@
 {
     SBufList sl;
     sl.push_back(SBuf(name));
+#if __cplusplus >= 201103L
+    sl.splice(sl.end(), values->dump());
+#else
     // temp is needed until c++11 move constructor
     SBufList temp = values->dump();
     sl.splice(sl.end(), temp);
+#endif
     return sl;
 }