From 8235c5fcacb0fa5a5a7fa8b45913d9e3f80e704f Mon Sep 17 00:00:00 2001
From: Vinnie Falco <vinnie.falco@gmail.com>
Date: Wed, 9 Nov 2016 11:13:58 -0500
Subject: [PATCH] [FOLD] buffer_cat

---
 include/beast/core/detail/buffer_cat.hpp | 63 +++++++++++++-----------
 1 file changed, 35 insertions(+), 28 deletions(-)

diff --git a/include/beast/core/detail/buffer_cat.hpp b/include/beast/core/detail/buffer_cat.hpp
index 4db9aaf281..fdf2b6104f 100644
--- a/include/beast/core/detail/buffer_cat.hpp
+++ b/include/beast/core/detail/buffer_cat.hpp
@@ -152,7 +152,7 @@ class buffer_cat_helper<Bn...>::const_iterator
         std::tuple<Bn...> const& bn, bool at_end);
 
     void
-    construct(C<sizeof...(Bn)>)
+    construct(C<sizeof...(Bn)> const&)
     {
         auto constexpr I = sizeof...(Bn);
         n_ = I;
@@ -160,7 +160,7 @@ class buffer_cat_helper<Bn...>::const_iterator
 
     template<std::size_t I>
     void
-    construct(C<I>)
+    construct(C<I> const&)
     {
         if(std::get<I>(*bn_).begin() !=
             std::get<I>(*bn_).end())
@@ -174,14 +174,14 @@ class buffer_cat_helper<Bn...>::const_iterator
     }
 
     void
-    destroy(C<sizeof...(Bn)>)
+    destroy(C<sizeof...(Bn)> const&)
     {
         return;
     }
 
     template<std::size_t I>
     void
-    destroy(C<I>)
+    destroy(C<I> const&)
     {
         if(n_ == I)
         {
@@ -193,13 +193,15 @@ class buffer_cat_helper<Bn...>::const_iterator
     }
 
     void
-    move(C<sizeof...(Bn)>, const_iterator&&)
+    move(const_iterator&&,
+        C<sizeof...(Bn)> const&)
     {
     }
 
     template<std::size_t I>
     void
-    move(C<I>, const_iterator&& other)
+    move(const_iterator&& other,
+        C<I> const&)
     {
         if(n_ == I)
         {
@@ -207,17 +209,19 @@ class buffer_cat_helper<Bn...>::const_iterator
                 std::move(other.iter<I>())};
             return;
         }
-        move(C<I+1>{}, std::move(other));
+        move(std::move(other), C<I+1>{});
     }
 
     void
-    copy(C<sizeof...(Bn)>, const_iterator const&)
+    copy(const_iterator const&,
+        C<sizeof...(Bn)> const&)
     {
     }
 
     template<std::size_t I>
     void
-    copy(C<I>, const_iterator const& other)
+    copy(const_iterator const& other,
+        C<I> const&)
     {
         if(n_ == I)
         {
@@ -225,35 +229,36 @@ class buffer_cat_helper<Bn...>::const_iterator
                 other.iter<I>()};
             return;
         }
-        copy(C<I+1>{}, other);
+        copy(other, C<I+1>{});
     }
 
     bool
-    equal(C<sizeof...(Bn)>,
-        const_iterator const&) const
+    equal(const_iterator const&,
+        C<sizeof...(Bn)> const&) const
     {
         return true;
     }
 
     template<std::size_t I>
     bool
-    equal(C<I>, const_iterator const& other) const
+    equal(const_iterator const& other,
+        C<I> const&) const
     {
         if(n_ == I)
             return iter<I>() == other.iter<I>();
-        return equal(C<I+1>{}, other);
+        return equal(other, C<I+1>{});
     }
 
     [[noreturn]]
     reference
-    dereference(C<sizeof...(Bn)>) const
+    dereference(C<sizeof...(Bn)> const&) const
     {
         throw std::logic_error("invalid iterator");
     }
 
     template<std::size_t I>
     reference
-    dereference(C<I>) const
+    dereference(C<I> const&) const
     {
         if(n_ == I)
             return *iter<I>();
@@ -262,14 +267,14 @@ class buffer_cat_helper<Bn...>::const_iterator
 
     [[noreturn]]
     void
-    increment(C<sizeof...(Bn)>)
+    increment(C<sizeof...(Bn)> const&)
     {
         throw std::logic_error("invalid iterator");
     }
 
     template<std::size_t I>
     void
-    increment(C<I>)
+    increment(C<I> const&)
     {
         if(n_ == I)
         {
@@ -284,7 +289,7 @@ class buffer_cat_helper<Bn...>::const_iterator
     }
 
     void
-    decrement(C<sizeof...(Bn)>)
+    decrement(C<sizeof...(Bn)> const&)
     {
         auto constexpr I = sizeof...(Bn);
         if(n_ == I)
@@ -297,7 +302,7 @@ class buffer_cat_helper<Bn...>::const_iterator
     }
 
     void
-    decrement(C<0>)
+    decrement(C<0> const&)
     {
         auto constexpr I = 0;
         if(iter<I>() != std::get<I>(*bn_).begin())
@@ -310,7 +315,7 @@ class buffer_cat_helper<Bn...>::const_iterator
 
     template<std::size_t I>
     void
-    decrement(C<I>)
+    decrement(C<I> const&)
     {
         if(n_ == I)
         {
@@ -364,7 +369,7 @@ const_iterator::const_iterator(const_iterator&& other)
     : n_(other.n_)
     , bn_(other.bn_)
 {
-    move(C<0>{}, std::move(other));
+    move(std::move(other), C<0>{});
 }
 
 template<class... Bn>
@@ -373,7 +378,7 @@ const_iterator::const_iterator(const_iterator const& other)
     : n_(other.n_)
     , bn_(other.bn_)
 {
-    copy(C<0>{}, other);
+    copy(other, C<0>{});
 }
 
 template<class... Bn>
@@ -387,7 +392,7 @@ const_iterator::operator=(const_iterator&& other) ->
     destroy(C<0>{});
     n_ = other.n_;
     bn_ = other.bn_;
-    move(C<0>{}, std::move(other));
+    move(std::move(other), C<0>{});
     return *this;
 }
 
@@ -402,7 +407,7 @@ const_iterator&
     destroy(C<0>{});
     n_ = other.n_;
     bn_ = other.bn_;
-    copy(C<0>{}, other);
+    copy(other, C<0>{});
     return *this;
 }
 
@@ -415,7 +420,7 @@ const_iterator::operator==(const_iterator const& other) const
         return false;
     if(n_ != other.n_)
         return false;
-    return equal(C<0>{}, other);
+    return equal(other, C<0>{});
 }
 
 template<class... Bn>
@@ -448,19 +453,21 @@ const_iterator::operator--() ->
 }
 
 template<class... Bn>
+inline
 auto
 buffer_cat_helper<Bn...>::begin() const ->
     const_iterator
 {
-    return const_iterator(bn_, false);
+    return const_iterator{bn_, false};
 }
 
 template<class... Bn>
+inline
 auto
 buffer_cat_helper<Bn...>::end() const ->
     const_iterator
 {
-    return const_iterator(bn_, true);
+    return const_iterator{bn_, true};
 }
 
 } // detail