From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Sat, 12 Apr 2014 19:16:46 +0000 (+0200)
Subject: Fix c++11-ism in list splicing
X-Git-Tag: SQUID_3_5_0_1~294^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d75c2229c54dde4679cee4897db041a6f5f9efe;p=thirdparty%2Fsquid.git

Fix c++11-ism in list splicing
---

diff --git a/src/acl/HttpHeaderData.cc b/src/acl/HttpHeaderData.cc
index ed94a4d75c..98e6cab6f3 100644
--- a/src/acl/HttpHeaderData.cc
+++ b/src/acl/HttpHeaderData.cc
@@ -84,7 +84,9 @@ ACLHTTPHeaderData::dump() const
 {
     SBufList sl;
     sl.push_back(SBuf(hdrName));
-    sl.splice(sl.end(),regex_rule->dump());
+    // temp is needed until c++11 move-constructor
+    SBufList temp = regex_rule->dump();
+    sl.splice(sl.end(), temp);
     return sl;
 }
 
diff --git a/src/acl/NoteData.cc b/src/acl/NoteData.cc
index 5c15244218..eae1771d0e 100644
--- a/src/acl/NoteData.cc
+++ b/src/acl/NoteData.cc
@@ -56,7 +56,9 @@ ACLNoteData::dump() const
 {
     SBufList sl;
     sl.push_back(SBuf(name));
-    sl.splice(sl.end(),values->dump());
+    // temp is needed until c++11 move constructor
+    SBufList temp = values->dump();
+    sl.splice(sl.end(), temp);
     return sl;
 }
 
diff --git a/src/acl/Tree.cc b/src/acl/Tree.cc
index 06b745cd85..652d1a5f05 100644
--- a/src/acl/Tree.cc
+++ b/src/acl/Tree.cc
@@ -65,7 +65,9 @@ Acl::Tree::treeDump(const char *prefix, const ActionToString &convert) const
             ++action;
         }
 
-        text.splice(text.end(),(*node)->dump());
+        // temp is needed until c++11 move constructor
+        SBufList temp = (*node)->dump();
+        text.splice(text.end(), temp);
         text.push_back(SBuf("\n"));
     }
     return text;