Fix c++11-ism in list splicing

diff --git a/src/acl/HttpHeaderData.cc b/src/acl/HttpHeaderData.cc
index ed94a4d75c9edbf58946d911a9ea6fda3b853299..98e6cab6f311b4d4533683e74ce20a56f98f853b 100644 (file)
--- 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 5c15244218a2f8e24db6b477db0e0250bf2ca720..eae1771d0e504a984f57511a2d16fc7dcb330d14 100644 (file)
--- 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 06b745cd857800dca3746a65653d94043c0997bb..652d1a5f056914c7953f39a830ebc2e45fd318cf 100644 (file)
--- 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;