max_cap_ is a member of fields_base

Author: ashtum

include/boost/http_proto/detail/header.hpp

@@ -123,9 +123,6 @@ struct header
     char const* cbuf = nullptr;
     char* buf = nullptr;
     std::size_t cap = 0;
-    std::size_t max_cap =
-        std::numeric_limits<
-            std::size_t>::max();
 
     offset_type size = 0;
     offset_type count = 0;

include/boost/http_proto/fields.hpp

@@ -214,6 +214,7 @@ class fields final
     swap(fields& other) noexcept
     {
         h_.swap(other.h_);
+        std::swap(max_cap_, other.max_cap_);
     }
 
     /** Swap two instances

include/boost/http_proto/fields_base.hpp

@@ -38,7 +38,10 @@ class fields_base
     : public virtual fields_view_base
 {
     detail::header h_;
-    bool static_storage = false;
+    bool static_storage_ = false;
+    std::size_t max_cap_ =
+        std::numeric_limits<
+            std::size_t>::max();
 
     using entry =
         detail::header::entry;
@@ -77,7 +80,6 @@ class fields_base
     friend class static_response;
     friend class serializer;
     friend class message_base;
-    friend struct detail::header;
     friend struct detail::prefix_op;
 
     BOOST_HTTP_PROTO_DECL
@@ -142,7 +144,7 @@ class fields_base
     std::size_t
     max_capacity_in_bytes() noexcept
     {
-        return h_.max_cap;
+        return max_cap_;
     }
 
     /** Returns the total number of bytes allocated by the container
@@ -588,20 +590,6 @@ class fields_base
     void raw_erase_n(field, std::size_t) noexcept;
 };
 
-//------------------------------------------------
-
-#ifndef BOOST_HTTP_PROTO_DOCS
-namespace detail {
-inline
-header&
-header::
-get(fields_base& f) noexcept
-{
-    return f.h_;
-}
-} // detail
-#endif
-
 } // http_proto
 } // boost
 

include/boost/http_proto/request.hpp

@@ -194,6 +194,7 @@ class request
     swap(request& other) noexcept
     {
         h_.swap(other.h_);
+        std::swap(max_cap_, other.max_cap_);
     }
 
     /** Swap two instances

include/boost/http_proto/response.hpp

@@ -213,6 +213,7 @@ class response
     swap(response& other) noexcept
     {
         h_.swap(other.h_);
+        std::swap(max_cap_, other.max_cap_);
     }
 
     /** Swap two instances

src/detail/header.cpp

@@ -137,7 +137,6 @@ swap(header& h) noexcept
     std::swap(cbuf, h.cbuf);
     std::swap(buf, h.buf);
     std::swap(cap, h.cap);
-    std::swap(max_cap, h.max_cap);
     std::swap(size, h.size);
     std::swap(count, h.count);
     std::swap(prefix, h.prefix);
@@ -339,12 +338,10 @@ assign_to(
     auto const buf_ = dest.buf;
     auto const cbuf_ = dest.cbuf;
     auto const cap_ = dest.cap;
-    auto const max_cap_ = dest.max_cap;
     dest = *this;
     dest.buf = buf_;
     dest.cbuf = cbuf_;
     dest.cap = cap_;
-    dest.max_cap = max_cap_;
 }
 
 //------------------------------------------------

src/fields_base.cpp

@@ -171,7 +171,7 @@ op_t::
 reserve(
     std::size_t n)
 {
-    if(n > self_.max_capacity_in_bytes())
+    if(n > self_.max_cap_)
     {
         // max capacity exceeded
         detail::throw_length_error();
@@ -270,7 +270,7 @@ prefix_op_t(
     {
         // static storage will always throw which is
         // intended since they cannot reallocate.
-        if(self.h_.max_cap < new_size)
+        if(self.max_cap_ < new_size)
             detail::throw_length_error();
 
         auto bytes_needed =
@@ -347,14 +347,14 @@ fields_base(
     std::size_t storage_size) noexcept
     : fields_view_base(&h_)
     , h_(k)
-    , static_storage(true)
+    , static_storage_(true)
 {
     h_.buf = storage;
     h_.cap = align_down(
         storage,
         storage_size,
         alignof(detail::header::entry));
-    h_.max_cap = h_.cap;
+    max_cap_ = h_.cap;
 }
 
 fields_base::
@@ -367,7 +367,7 @@ fields_base(
     if(storage_size != 0)
     {
         reserve_bytes(storage_size);
-        h_.max_cap = h_.cap;
+        max_cap_ = h_.cap;
     }
 }
 
@@ -383,7 +383,7 @@ fields_base(
         detail::throw_length_error();
 
     reserve_bytes(storage_size);
-    h_.max_cap = max_storage_size;
+    max_cap_ = max_storage_size;
 }
 
 // copy s and parse it
@@ -427,15 +427,15 @@ fields_base(
     core::string_view s)
     : fields_view_base(&h_)
     , h_(detail::empty{k})
-    , static_storage(true)
+    , static_storage_(true)
 {
     h_.cbuf = storage;
     h_.buf = storage;
     h_.cap = align_down(
         storage,
         storage_size,
         alignof(detail::header::entry));
-    h_.max_cap = h_.cap;
+    max_cap_ = h_.cap;
 
     auto n = detail::header::count_crlf(s);
     if(h_.kind == detail::kind::fields)
@@ -492,14 +492,14 @@ fields_base(
     std::size_t storage_size)
     : fields_view_base(&h_)
     , h_(h.kind)
-    , static_storage(true)
+    , static_storage_(true)
 {
     h_.buf = storage;
     h_.cap = align_down(
         storage,
         storage_size,
         alignof(detail::header::entry));
-    h_.max_cap = h_.cap;
+    max_cap_ = h_.cap;
 
     if(h.is_default())
         return;
@@ -522,7 +522,7 @@ fields_base(
 fields_base::
 ~fields_base()
 {
-    if(h_.buf && !static_storage)
+    if(h_.buf && !static_storage_)
         delete[] h_.buf;
 }
 
@@ -578,7 +578,7 @@ shrink_to_fit() noexcept
             h_.cap)
         return;
 
-    if(static_storage)
+    if(static_storage_)
         return;
 
     fields_base tmp(h_);
@@ -941,7 +941,7 @@ copy_impl(
         return;
     }
 
-    if(static_storage)
+    if(static_storage_)
     {
         if(h.is_default())
         {

src/rfc/detail/rules.cpp

@@ -22,7 +22,7 @@
 #include <boost/url/grammar/parse.hpp>
 #include <boost/url/grammar/tuple_rule.hpp>
 
-#include "rules.hpp"
+#include "src/rfc/detail/rules.hpp"
 
 namespace boost {
 namespace http_proto {