From d16e39bc44c04df15a68b58d738bc794229c23f6 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Tue, 7 Sep 2021 12:38:13 -0700 Subject: [PATCH] Flatten rfc namespace --- include/boost/url/impl/ipv4_address.ipp | 2 +- include/boost/url/impl/ipv6_address.ipp | 2 +- include/boost/url/impl/query_params_view.ipp | 12 ++++++------ include/boost/url/impl/url_view.ipp | 14 +++++++------- include/boost/url/query_params_view.hpp | 8 ++++---- include/boost/url/rfc/absolute_uri_bnf.hpp | 6 ++---- include/boost/url/rfc/authority_bnf.hpp | 6 ++---- include/boost/url/rfc/char_sets.hpp | 6 ++---- include/boost/url/rfc/detail/paths.hpp | 6 ++---- include/boost/url/rfc/detail/pct_encoding.hpp | 6 ++---- include/boost/url/rfc/detail/query_params_bnf.hpp | 6 ++---- include/boost/url/rfc/fragment_bnf.hpp | 6 ++---- include/boost/url/rfc/hier_part_bnf.hpp | 6 ++---- include/boost/url/rfc/host_bnf.hpp | 6 ++---- include/boost/url/rfc/impl/absolute_uri_bnf.ipp | 6 ++---- include/boost/url/rfc/impl/authority_bnf.ipp | 6 ++---- include/boost/url/rfc/impl/char_sets.ipp | 6 ++---- include/boost/url/rfc/impl/fragment_bnf.ipp | 6 ++---- include/boost/url/rfc/impl/hier_part_bnf.ipp | 6 ++---- include/boost/url/rfc/impl/host_bnf.ipp | 6 ++---- include/boost/url/rfc/impl/ip_literal_bnf.ipp | 6 ++---- include/boost/url/rfc/impl/ipv4_address_bnf.ipp | 6 ++---- include/boost/url/rfc/impl/ipv6_address_bnf.ipp | 6 ++---- include/boost/url/rfc/impl/ipv_future_bnf.ipp | 6 ++---- include/boost/url/rfc/impl/pct_encoded_bnf.hpp | 6 ++---- include/boost/url/rfc/impl/pct_encoded_bnf.ipp | 6 ++---- include/boost/url/rfc/impl/pct_encoding.hpp | 6 ++---- include/boost/url/rfc/impl/pct_encoding.ipp | 6 ++---- include/boost/url/rfc/impl/port_bnf.ipp | 6 ++---- include/boost/url/rfc/impl/query_bnf.ipp | 6 ++---- include/boost/url/rfc/impl/relative_part_bnf.ipp | 6 ++---- include/boost/url/rfc/impl/relative_ref_bnf.ipp | 6 ++---- include/boost/url/rfc/impl/scheme_bnf.ipp | 6 ++---- include/boost/url/rfc/impl/uri_bnf.ipp | 6 ++---- include/boost/url/rfc/impl/userinfo_bnf.ipp | 6 ++---- include/boost/url/rfc/ip_literal_bnf.hpp | 6 ++---- include/boost/url/rfc/ipv4_address_bnf.hpp | 6 ++---- include/boost/url/rfc/ipv6_address_bnf.hpp | 6 ++---- include/boost/url/rfc/ipv_future_bnf.hpp | 6 ++---- include/boost/url/rfc/pct_encoded_bnf.hpp | 6 ++---- include/boost/url/rfc/pct_encoding.hpp | 6 ++---- include/boost/url/rfc/port_bnf.hpp | 6 ++---- include/boost/url/rfc/query_bnf.hpp | 6 ++---- include/boost/url/rfc/relative_part_bnf.hpp | 6 ++---- include/boost/url/rfc/relative_ref_bnf.hpp | 6 ++---- include/boost/url/rfc/scheme_bnf.hpp | 6 ++---- include/boost/url/rfc/uri_bnf.hpp | 6 ++---- include/boost/url/rfc/userinfo_bnf.hpp | 6 ++---- include/boost/url/url_view.hpp | 2 +- test/rfc/absolute_uri_bnf.cpp | 2 -- test/rfc/authority_bnf.cpp | 2 -- test/rfc/char_sets.cpp | 2 -- test/rfc/fragment_bnf.cpp | 2 -- test/rfc/hier_part_bnf.cpp | 2 -- test/rfc/host_bnf.cpp | 2 -- test/rfc/ip_literal_bnf.cpp | 2 -- test/rfc/ipv4_address_bnf.cpp | 2 -- test/rfc/ipv6_address_bnf.cpp | 2 -- test/rfc/ipv_future_bnf.cpp | 2 -- test/rfc/pct_encoded_bnf.cpp | 2 -- test/rfc/pct_encoding.cpp | 2 -- test/rfc/port_bnf.cpp | 2 -- test/rfc/query_bnf.cpp | 2 -- test/rfc/relative_part_bnf.cpp | 2 -- test/rfc/scheme_bnf.cpp | 2 -- test/rfc/uri_bnf.cpp | 2 -- test/rfc/userinfo_bnf.cpp | 2 -- 67 files changed, 106 insertions(+), 228 deletions(-) diff --git a/include/boost/url/impl/ipv4_address.ipp b/include/boost/url/impl/ipv4_address.ipp index 5791fa15..499ce751 100644 --- a/include/boost/url/impl/ipv4_address.ipp +++ b/include/boost/url/impl/ipv4_address.ipp @@ -129,7 +129,7 @@ make_ipv4_address( string_view s, error_code& ec) noexcept { - rfc::ipv4_address_bnf t; + ipv4_address_bnf t; using bnf::parse; if(! parse(s, ec, t)) return {}; diff --git a/include/boost/url/impl/ipv6_address.ipp b/include/boost/url/impl/ipv6_address.ipp index 01990877..0e22ae9d 100644 --- a/include/boost/url/impl/ipv6_address.ipp +++ b/include/boost/url/impl/ipv6_address.ipp @@ -301,7 +301,7 @@ make_ipv6_address( string_view s, error_code& ec) noexcept { - rfc::ipv6_address_bnf t; + ipv6_address_bnf t; using bnf::parse; if(! parse(s, ec, t)) return {}; diff --git a/include/boost/url/impl/query_params_view.ipp b/include/boost/url/impl/query_params_view.ipp index 2439da6c..cd31c657 100644 --- a/include/boost/url/impl/query_params_view.ipp +++ b/include/boost/url/impl/query_params_view.ipp @@ -39,8 +39,8 @@ iterator( return; } error_code ec; - rfc::query_param t; - rfc::detail:: + query_param t; + detail:: query_params_bnf::begin( next_, end_, ec, t); if(ec) @@ -60,8 +60,8 @@ operator++() noexcept -> iterator& { error_code ec; - rfc::query_param t; - rfc::detail:: + query_param t; + detail:: query_params_bnf::increment( next_, end_, ec, t); if(ec == error::end) @@ -175,9 +175,9 @@ parse_query_params( { using bnf::parse; bnf::range< - rfc::query_param> t; + query_param> t; if(! parse(s, ec, - rfc::query_bnf{t})) + query_bnf{t})) return {}; return query_params_view( t.str(), t.size()); diff --git a/include/boost/url/impl/url_view.ipp b/include/boost/url/impl/url_view.ipp index d45c8163..c4cb9560 100644 --- a/include/boost/url/impl/url_view.ipp +++ b/include/boost/url/impl/url_view.ipp @@ -649,7 +649,7 @@ static void apply_host( parts& p, - rfc::host_bnf const& h) + host_bnf const& h) { p.host_type = h.host_type(); switch(h.host_type()) @@ -702,7 +702,7 @@ static void apply_authority( parts& p, optional< - rfc::authority_bnf> const& t) + authority_bnf> const& t) { if(! t.has_value()) { @@ -753,7 +753,7 @@ apply_authority( static void apply_path(parts& p, bnf::range< - rfc::pct_encoded_str> const& t) + pct_encoded_str> const& t) { p.resize( part::id_path, @@ -764,7 +764,7 @@ static void apply_query(parts& p, optional> const& t) + query_param>> const& t) { if(t.has_value()) p.resize( @@ -776,7 +776,7 @@ static void apply_fragment( parts& p, - optional const& t) + optional const& t) { if(t.has_value()) p.resize( @@ -793,7 +793,7 @@ parse_uri( string_view s, error_code& ec) noexcept { - rfc::uri_bnf t; + uri_bnf t; if(! bnf::parse(s, ec, t)) return none; detail::parts p; @@ -840,7 +840,7 @@ parse_relative_ref( string_view s, error_code& ec) noexcept { - rfc::relative_ref_bnf t; + relative_ref_bnf t; if(! bnf::parse(s, ec, t)) return none; detail::parts p; diff --git a/include/boost/url/query_params_view.hpp b/include/boost/url/query_params_view.hpp index 179b8354..cf3e16d9 100644 --- a/include/boost/url/query_params_view.hpp +++ b/include/boost/url/query_params_view.hpp @@ -159,8 +159,8 @@ parse_query_params( */ class query_params_view::value_type { - rfc::pct_encoded_str k_; - rfc::pct_encoded_str v_; + pct_encoded_str k_; + pct_encoded_str v_; bool has_value_ = false; friend class iterator; @@ -210,7 +210,7 @@ public: string_type key(Allocator const& a = {}) const { - return rfc::pct_decode_unchecked( + return pct_decode_unchecked( k_.str, k_.decoded_size, a); } @@ -236,7 +236,7 @@ public: string_type value(Allocator const& a = {}) const { - return rfc::pct_decode_unchecked( + return pct_decode_unchecked( v_.str, v_.decoded_size, a); } diff --git a/include/boost/url/rfc/absolute_uri_bnf.hpp b/include/boost/url/rfc/absolute_uri_bnf.hpp index d49c8960..8e649cbe 100644 --- a/include/boost/url/rfc/absolute_uri_bnf.hpp +++ b/include/boost/url/rfc/absolute_uri_bnf.hpp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_ABSOLUTE_URI_BNF_HPP -#define BOOST_URL_RFC_ABSOLUTE_URI_BNF_HPP +#ifndef BOOST_URL_ABSOLUTE_URI_BNF_HPP +#define BOOST_URL_ABSOLUTE_URI_BNF_HPP #include #include @@ -21,7 +21,6 @@ namespace boost { namespace urls { -namespace rfc { /** BNF for absolute-URI @@ -50,7 +49,6 @@ struct absolute_uri_bnf absolute_uri_bnf& t); }; -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/authority_bnf.hpp b/include/boost/url/rfc/authority_bnf.hpp index 8be97df3..b81d1dd5 100644 --- a/include/boost/url/rfc/authority_bnf.hpp +++ b/include/boost/url/rfc/authority_bnf.hpp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_AUTHORITY_BNF_HPP -#define BOOST_URL_RFC_AUTHORITY_BNF_HPP +#ifndef BOOST_URL_AUTHORITY_BNF_HPP +#define BOOST_URL_AUTHORITY_BNF_HPP #include #include @@ -21,7 +21,6 @@ namespace boost { namespace urls { -namespace rfc { /** BNF for authority @@ -50,7 +49,6 @@ struct authority_bnf authority_bnf& t); }; -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/char_sets.hpp b/include/boost/url/rfc/char_sets.hpp index 555ff7d0..0b8b52d5 100644 --- a/include/boost/url/rfc/char_sets.hpp +++ b/include/boost/url/rfc/char_sets.hpp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_CHAR_SETS_HPP -#define BOOST_URL_RFC_CHAR_SETS_HPP +#ifndef BOOST_URL_CHAR_SETS_HPP +#define BOOST_URL_CHAR_SETS_HPP #include #include @@ -16,7 +16,6 @@ namespace boost { namespace urls { -namespace rfc { #ifndef BOOST_URL_DOCS namespace detail { @@ -219,7 +218,6 @@ constexpr std::uint8_t pchar_mask = colon_char_mask | at_char_mask; -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/detail/paths.hpp b/include/boost/url/rfc/detail/paths.hpp index 8f1da6df..68e6571b 100644 --- a/include/boost/url/rfc/detail/paths.hpp +++ b/include/boost/url/rfc/detail/paths.hpp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_DETAIL_PATHS_HPP -#define BOOST_URL_RFC_DETAIL_PATHS_HPP +#ifndef BOOST_URL_DETAIL_PATHS_HPP +#define BOOST_URL_DETAIL_PATHS_HPP #include #include @@ -18,7 +18,6 @@ namespace boost { namespace urls { -namespace rfc { namespace detail { struct segment_bnf @@ -365,7 +364,6 @@ struct path_empty_bnf }; } // detail -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/detail/pct_encoding.hpp b/include/boost/url/rfc/detail/pct_encoding.hpp index 7e2869e0..f84387a4 100644 --- a/include/boost/url/rfc/detail/pct_encoding.hpp +++ b/include/boost/url/rfc/detail/pct_encoding.hpp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_DETAIL_PCT_ENCODING_HPP -#define BOOST_URL_RFC_DETAIL_PCT_ENCODING_HPP +#ifndef BOOST_URL_DETAIL_PCT_ENCODING_HPP +#define BOOST_URL_DETAIL_PCT_ENCODING_HPP #include #include @@ -16,7 +16,6 @@ namespace boost { namespace urls { -namespace rfc { namespace detail { template @@ -82,7 +81,6 @@ finish: } } // detail -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/detail/query_params_bnf.hpp b/include/boost/url/rfc/detail/query_params_bnf.hpp index 4a8a7fcb..c412f34e 100644 --- a/include/boost/url/rfc/detail/query_params_bnf.hpp +++ b/include/boost/url/rfc/detail/query_params_bnf.hpp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_DETAIL_QUERY_PARAMS_BNF_IPP -#define BOOST_URL_RFC_DETAIL_QUERY_PARAMS_BNF_IPP +#ifndef BOOST_URL_DETAIL_QUERY_PARAMS_BNF_IPP +#define BOOST_URL_DETAIL_QUERY_PARAMS_BNF_IPP #include #include @@ -17,7 +17,6 @@ namespace boost { namespace urls { -namespace rfc { namespace detail { struct query_params_bnf @@ -102,7 +101,6 @@ struct query_params_bnf }; } // detail -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/fragment_bnf.hpp b/include/boost/url/rfc/fragment_bnf.hpp index f90684d7..ffbbbd44 100644 --- a/include/boost/url/rfc/fragment_bnf.hpp +++ b/include/boost/url/rfc/fragment_bnf.hpp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_FRAGMENT_BNF_HPP -#define BOOST_URL_RFC_FRAGMENT_BNF_HPP +#ifndef BOOST_URL_FRAGMENT_BNF_HPP +#define BOOST_URL_FRAGMENT_BNF_HPP #include #include @@ -17,7 +17,6 @@ namespace boost { namespace urls { -namespace rfc { /** BNF for fragment @@ -43,7 +42,6 @@ struct fragment_bnf fragment_bnf const& t); }; -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/hier_part_bnf.hpp b/include/boost/url/rfc/hier_part_bnf.hpp index 197946fa..f726e027 100644 --- a/include/boost/url/rfc/hier_part_bnf.hpp +++ b/include/boost/url/rfc/hier_part_bnf.hpp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_HIER_PART_HPP -#define BOOST_URL_RFC_HIER_PART_HPP +#ifndef BOOST_URL_HIER_PART_HPP +#define BOOST_URL_HIER_PART_HPP #include #include @@ -19,7 +19,6 @@ namespace boost { namespace urls { -namespace rfc { /** BNF for hier-part @@ -49,7 +48,6 @@ struct hier_part_bnf hier_part_bnf& t); }; -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/host_bnf.hpp b/include/boost/url/rfc/host_bnf.hpp index 855afd7f..dc969c75 100644 --- a/include/boost/url/rfc/host_bnf.hpp +++ b/include/boost/url/rfc/host_bnf.hpp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_HOST_BNF_HPP -#define BOOST_URL_RFC_HOST_BNF_HPP +#ifndef BOOST_URL_HOST_BNF_HPP +#define BOOST_URL_HOST_BNF_HPP #include #include @@ -20,7 +20,6 @@ namespace boost { namespace urls { -namespace rfc { /** BNF for host @@ -103,7 +102,6 @@ public: host_bnf& t); }; -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/impl/absolute_uri_bnf.ipp b/include/boost/url/rfc/impl/absolute_uri_bnf.ipp index 4620f435..c71c9437 100644 --- a/include/boost/url/rfc/impl/absolute_uri_bnf.ipp +++ b/include/boost/url/rfc/impl/absolute_uri_bnf.ipp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_IMPL_ABSOLUTE_URI_BNF_IPP -#define BOOST_URL_RFC_IMPL_ABSOLUTE_URI_BNF_IPP +#ifndef BOOST_URL_IMPL_ABSOLUTE_URI_BNF_IPP +#define BOOST_URL_IMPL_ABSOLUTE_URI_BNF_IPP #include #include @@ -19,7 +19,6 @@ namespace boost { namespace urls { -namespace rfc { bool parse( @@ -60,7 +59,6 @@ parse( return true; } -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/impl/authority_bnf.ipp b/include/boost/url/rfc/impl/authority_bnf.ipp index c7615c73..6a7e8ecc 100644 --- a/include/boost/url/rfc/impl/authority_bnf.ipp +++ b/include/boost/url/rfc/impl/authority_bnf.ipp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_IMPL_AUTHORITY_BNF_IPP -#define BOOST_URL_RFC_IMPL_AUTHORITY_BNF_IPP +#ifndef BOOST_URL_IMPL_AUTHORITY_BNF_IPP +#define BOOST_URL_IMPL_AUTHORITY_BNF_IPP #include #include @@ -18,7 +18,6 @@ namespace boost { namespace urls { -namespace rfc { bool parse( @@ -70,7 +69,6 @@ parse( return true; } -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/impl/char_sets.ipp b/include/boost/url/rfc/impl/char_sets.ipp index c6dd5c56..909a857d 100644 --- a/include/boost/url/rfc/impl/char_sets.ipp +++ b/include/boost/url/rfc/impl/char_sets.ipp @@ -7,14 +7,13 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_IMPL_CHAR_SETS_IPP -#define BOOST_URL_RFC_IMPL_CHAR_SETS_IPP +#ifndef BOOST_URL_IMPL_CHAR_SETS_IPP +#define BOOST_URL_IMPL_CHAR_SETS_IPP #include namespace boost { namespace urls { -namespace rfc { namespace detail { std::uint8_t @@ -38,7 +37,6 @@ char_set_flags[256] = { }; } // detail -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/impl/fragment_bnf.ipp b/include/boost/url/rfc/impl/fragment_bnf.ipp index 784d912b..5b9da82a 100644 --- a/include/boost/url/rfc/impl/fragment_bnf.ipp +++ b/include/boost/url/rfc/impl/fragment_bnf.ipp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_IMPL_FRAGMENT_BNF_IPP -#define BOOST_URL_RFC_IMPL_FRAGMENT_BNF_IPP +#ifndef BOOST_URL_IMPL_FRAGMENT_BNF_IPP +#define BOOST_URL_IMPL_FRAGMENT_BNF_IPP #include #include @@ -17,7 +17,6 @@ namespace boost { namespace urls { -namespace rfc { bool parse( @@ -34,7 +33,6 @@ parse( question_char_mask>{t.v}); } -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/impl/hier_part_bnf.ipp b/include/boost/url/rfc/impl/hier_part_bnf.ipp index ae6e18c7..5842aad6 100644 --- a/include/boost/url/rfc/impl/hier_part_bnf.ipp +++ b/include/boost/url/rfc/impl/hier_part_bnf.ipp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_IMPL_HIER_PART_BNF_IPP -#define BOOST_URL_RFC_IMPL_HIER_PART_BNF_IPP +#ifndef BOOST_URL_IMPL_HIER_PART_BNF_IPP +#define BOOST_URL_IMPL_HIER_PART_BNF_IPP #include #include @@ -16,7 +16,6 @@ namespace boost { namespace urls { -namespace rfc { bool parse( @@ -71,7 +70,6 @@ parse( return true; } -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/impl/host_bnf.ipp b/include/boost/url/rfc/impl/host_bnf.ipp index bda35a64..501e22b4 100644 --- a/include/boost/url/rfc/impl/host_bnf.ipp +++ b/include/boost/url/rfc/impl/host_bnf.ipp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_IMPL_HOST_BNF_IPP -#define BOOST_URL_RFC_IMPL_HOST_BNF_IPP +#ifndef BOOST_URL_IMPL_HOST_BNF_IPP +#define BOOST_URL_IMPL_HOST_BNF_IPP #include #include @@ -16,7 +16,6 @@ namespace boost { namespace urls { -namespace rfc { host_bnf:: ~host_bnf() noexcept = default; @@ -89,7 +88,6 @@ finish: return true; } -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/impl/ip_literal_bnf.ipp b/include/boost/url/rfc/impl/ip_literal_bnf.ipp index 347752d1..72e131cd 100644 --- a/include/boost/url/rfc/impl/ip_literal_bnf.ipp +++ b/include/boost/url/rfc/impl/ip_literal_bnf.ipp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_IMPL_IP_LITERAL_BNF_IPP -#define BOOST_URL_RFC_IMPL_IP_LITERAL_BNF_IPP +#ifndef BOOST_URL_IMPL_IP_LITERAL_BNF_IPP +#define BOOST_URL_IMPL_IP_LITERAL_BNF_IPP #include #include @@ -17,7 +17,6 @@ namespace boost { namespace urls { -namespace rfc { bool parse( @@ -67,7 +66,6 @@ finish: return true; } -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/impl/ipv4_address_bnf.ipp b/include/boost/url/rfc/impl/ipv4_address_bnf.ipp index 90e7a29a..778638e5 100644 --- a/include/boost/url/rfc/impl/ipv4_address_bnf.ipp +++ b/include/boost/url/rfc/impl/ipv4_address_bnf.ipp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_IMPL_IPV4_ADDRESS_BNF_IPP -#define BOOST_URL_RFC_IMPL_IPV4_ADDRESS_BNF_IPP +#ifndef BOOST_URL_IMPL_IPV4_ADDRESS_BNF_IPP +#define BOOST_URL_IMPL_IPV4_ADDRESS_BNF_IPP #include #include @@ -17,7 +17,6 @@ namespace boost { namespace urls { -namespace rfc { namespace detail { @@ -128,7 +127,6 @@ parse( return true; } -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/impl/ipv6_address_bnf.ipp b/include/boost/url/rfc/impl/ipv6_address_bnf.ipp index b9cff28b..66c0a370 100644 --- a/include/boost/url/rfc/impl/ipv6_address_bnf.ipp +++ b/include/boost/url/rfc/impl/ipv6_address_bnf.ipp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_IMPL_IPV6_ADDRESS_BNF_IPP -#define BOOST_URL_RFC_IMPL_IPV6_ADDRESS_BNF_IPP +#ifndef BOOST_URL_IMPL_IPV6_ADDRESS_BNF_IPP +#define BOOST_URL_IMPL_IPV6_ADDRESS_BNF_IPP #include #include @@ -21,7 +21,6 @@ namespace boost { namespace urls { -namespace rfc { namespace detail { @@ -285,7 +284,6 @@ parse( return true; } -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/impl/ipv_future_bnf.ipp b/include/boost/url/rfc/impl/ipv_future_bnf.ipp index 3ade6787..cb348d87 100644 --- a/include/boost/url/rfc/impl/ipv_future_bnf.ipp +++ b/include/boost/url/rfc/impl/ipv_future_bnf.ipp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_IMPL_IPV_FUTURE_BNF_IPP -#define BOOST_URL_RFC_IMPL_IPV_FUTURE_BNF_IPP +#ifndef BOOST_URL_IMPL_IPV_FUTURE_BNF_IPP +#define BOOST_URL_IMPL_IPV_FUTURE_BNF_IPP #include #include @@ -17,7 +17,6 @@ namespace boost { namespace urls { -namespace rfc { bool parse( @@ -55,7 +54,6 @@ parse( return true; } -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/impl/pct_encoded_bnf.hpp b/include/boost/url/rfc/impl/pct_encoded_bnf.hpp index 02ecdf68..77979216 100644 --- a/include/boost/url/rfc/impl/pct_encoded_bnf.hpp +++ b/include/boost/url/rfc/impl/pct_encoded_bnf.hpp @@ -7,15 +7,14 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_IMPL_PCT_ENCODED_BNF_HPP -#define BOOST_URL_RFC_IMPL_PCT_ENCODED_BNF_HPP +#ifndef BOOST_URL_IMPL_PCT_ENCODED_BNF_HPP +#define BOOST_URL_IMPL_PCT_ENCODED_BNF_HPP #include #include namespace boost { namespace urls { -namespace rfc { template bool @@ -37,7 +36,6 @@ parse( return true; } -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/impl/pct_encoded_bnf.ipp b/include/boost/url/rfc/impl/pct_encoded_bnf.ipp index a5ad909f..d23f30ba 100644 --- a/include/boost/url/rfc/impl/pct_encoded_bnf.ipp +++ b/include/boost/url/rfc/impl/pct_encoded_bnf.ipp @@ -7,15 +7,14 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_IMPL_PCT_ENCODED_BNF_IPP -#define BOOST_URL_RFC_IMPL_PCT_ENCODED_BNF_IPP +#ifndef BOOST_URL_IMPL_PCT_ENCODED_BNF_IPP +#define BOOST_URL_IMPL_PCT_ENCODED_BNF_IPP #include #include namespace boost { namespace urls { -namespace rfc { // returns true if plain_key == decode(encoded) bool @@ -54,7 +53,6 @@ key_equal_encoded( } } -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/impl/pct_encoding.hpp b/include/boost/url/rfc/impl/pct_encoding.hpp index 8c424e70..e8de19cc 100644 --- a/include/boost/url/rfc/impl/pct_encoding.hpp +++ b/include/boost/url/rfc/impl/pct_encoding.hpp @@ -7,14 +7,13 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_IMPL_PCT_ENCODING_HPP -#define BOOST_URL_RFC_IMPL_PCT_ENCODING_HPP +#ifndef BOOST_URL_IMPL_PCT_ENCODING_HPP +#define BOOST_URL_IMPL_PCT_ENCODING_HPP #include namespace boost { namespace urls { -namespace rfc { #if 0 @@ -57,7 +56,6 @@ pct_decoded_size( #endif -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/impl/pct_encoding.ipp b/include/boost/url/rfc/impl/pct_encoding.ipp index b9256a21..55c2f6db 100644 --- a/include/boost/url/rfc/impl/pct_encoding.ipp +++ b/include/boost/url/rfc/impl/pct_encoding.ipp @@ -7,12 +7,11 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_IMPL_PCT_ENCODING_IPP -#define BOOST_URL_RFC_IMPL_PCT_ENCODING_IPP +#ifndef BOOST_URL_IMPL_PCT_ENCODING_IPP +#define BOOST_URL_IMPL_PCT_ENCODING_IPP namespace boost { namespace urls { -namespace rfc { #if 0 std::size_t @@ -70,7 +69,6 @@ pct_decode_unchecked( } } -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/impl/port_bnf.ipp b/include/boost/url/rfc/impl/port_bnf.ipp index 50f83adb..4337b06e 100644 --- a/include/boost/url/rfc/impl/port_bnf.ipp +++ b/include/boost/url/rfc/impl/port_bnf.ipp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_IMPL_PORT_BNF_IPP -#define BOOST_URL_RFC_IMPL_PORT_BNF_IPP +#ifndef BOOST_URL_IMPL_PORT_BNF_IPP +#define BOOST_URL_IMPL_PORT_BNF_IPP #include #include @@ -19,7 +19,6 @@ namespace boost { namespace urls { -namespace rfc { bool parse( @@ -59,7 +58,6 @@ parse( return true; } -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/impl/query_bnf.ipp b/include/boost/url/rfc/impl/query_bnf.ipp index 166a5102..88d31fd2 100644 --- a/include/boost/url/rfc/impl/query_bnf.ipp +++ b/include/boost/url/rfc/impl/query_bnf.ipp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_IMPL_QUERY_BNF_IPP -#define BOOST_URL_RFC_IMPL_QUERY_BNF_IPP +#ifndef BOOST_URL_IMPL_QUERY_BNF_IPP +#define BOOST_URL_IMPL_QUERY_BNF_IPP #include #include @@ -18,7 +18,6 @@ namespace boost { namespace urls { -namespace rfc { bool parse( @@ -32,7 +31,6 @@ parse( detail::query_params_bnf{}); } -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/impl/relative_part_bnf.ipp b/include/boost/url/rfc/impl/relative_part_bnf.ipp index 15a7216b..9e1fc789 100644 --- a/include/boost/url/rfc/impl/relative_part_bnf.ipp +++ b/include/boost/url/rfc/impl/relative_part_bnf.ipp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_IMPL_RELATIVE_PART_BNF_IPP -#define BOOST_URL_RFC_IMPL_RELATIVE_PART_BNF_IPP +#ifndef BOOST_URL_IMPL_RELATIVE_PART_BNF_IPP +#define BOOST_URL_IMPL_RELATIVE_PART_BNF_IPP #include #include @@ -16,7 +16,6 @@ namespace boost { namespace urls { -namespace rfc { bool parse( @@ -71,7 +70,6 @@ parse( return true; } -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/impl/relative_ref_bnf.ipp b/include/boost/url/rfc/impl/relative_ref_bnf.ipp index 6998f1ca..a6bacabe 100644 --- a/include/boost/url/rfc/impl/relative_ref_bnf.ipp +++ b/include/boost/url/rfc/impl/relative_ref_bnf.ipp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_IMPL_RELATIVE_REF_BNF_IPP -#define BOOST_URL_RFC_IMPL_RELATIVE_REF_BNF_IPP +#ifndef BOOST_URL_IMPL_RELATIVE_REF_BNF_IPP +#define BOOST_URL_IMPL_RELATIVE_REF_BNF_IPP #include #include @@ -18,7 +18,6 @@ namespace boost { namespace urls { -namespace rfc { bool parse( @@ -70,7 +69,6 @@ parse( return true; } -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/impl/scheme_bnf.ipp b/include/boost/url/rfc/impl/scheme_bnf.ipp index 941c3932..069de020 100644 --- a/include/boost/url/rfc/impl/scheme_bnf.ipp +++ b/include/boost/url/rfc/impl/scheme_bnf.ipp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_IMPL_SCHEME_BNF_IPP -#define BOOST_URL_RFC_IMPL_SCHEME_BNF_IPP +#ifndef BOOST_URL_IMPL_SCHEME_BNF_IPP +#define BOOST_URL_IMPL_SCHEME_BNF_IPP #include #include @@ -19,7 +19,6 @@ namespace boost { namespace urls { -namespace rfc { bool parse( @@ -52,7 +51,6 @@ parse( return true; } -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/impl/uri_bnf.ipp b/include/boost/url/rfc/impl/uri_bnf.ipp index a5ad0bba..1fc05c2d 100644 --- a/include/boost/url/rfc/impl/uri_bnf.ipp +++ b/include/boost/url/rfc/impl/uri_bnf.ipp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_IMPL_URI_BNF_IPP -#define BOOST_URL_RFC_IMPL_URI_BNF_IPP +#ifndef BOOST_URL_IMPL_URI_BNF_IPP +#define BOOST_URL_IMPL_URI_BNF_IPP #include #include @@ -19,7 +19,6 @@ namespace boost { namespace urls { -namespace rfc { bool parse( @@ -76,7 +75,6 @@ parse( return true; } -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/impl/userinfo_bnf.ipp b/include/boost/url/rfc/impl/userinfo_bnf.ipp index 228a246b..27af1b0f 100644 --- a/include/boost/url/rfc/impl/userinfo_bnf.ipp +++ b/include/boost/url/rfc/impl/userinfo_bnf.ipp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_IMPL_USERINFO_BNF_IPP -#define BOOST_URL_RFC_IMPL_USERINFO_BNF_IPP +#ifndef BOOST_URL_IMPL_USERINFO_BNF_IPP +#define BOOST_URL_IMPL_USERINFO_BNF_IPP #include #include @@ -20,7 +20,6 @@ namespace boost { namespace urls { -namespace rfc { bool parse( @@ -53,7 +52,6 @@ parse( return true; } -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/ip_literal_bnf.hpp b/include/boost/url/rfc/ip_literal_bnf.hpp index 23da168f..f529bb02 100644 --- a/include/boost/url/rfc/ip_literal_bnf.hpp +++ b/include/boost/url/rfc/ip_literal_bnf.hpp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_IP_LITERAL_BNF_HPP -#define BOOST_URL_RFC_IP_LITERAL_BNF_HPP +#ifndef BOOST_URL_IP_LITERAL_BNF_HPP +#define BOOST_URL_IP_LITERAL_BNF_HPP #include #include @@ -17,7 +17,6 @@ namespace boost { namespace urls { -namespace rfc { /** BNF for IP-literal @@ -46,7 +45,6 @@ struct ip_literal_bnf ip_literal_bnf& t); }; -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/ipv4_address_bnf.hpp b/include/boost/url/rfc/ipv4_address_bnf.hpp index 1a16998a..47190c63 100644 --- a/include/boost/url/rfc/ipv4_address_bnf.hpp +++ b/include/boost/url/rfc/ipv4_address_bnf.hpp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_IPV4_ADDRESS_BNF_HPP -#define BOOST_URL_RFC_IPV4_ADDRESS_BNF_HPP +#ifndef BOOST_URL_IPV4_ADDRESS_BNF_HPP +#define BOOST_URL_IPV4_ADDRESS_BNF_HPP #include #include @@ -19,7 +19,6 @@ namespace boost { namespace urls { -namespace rfc { /** BNF for IPv4address @@ -55,7 +54,6 @@ struct ipv4_address_bnf ipv4_address_bnf& t); }; -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/ipv6_address_bnf.hpp b/include/boost/url/rfc/ipv6_address_bnf.hpp index 8fa30c4d..a3b33322 100644 --- a/include/boost/url/rfc/ipv6_address_bnf.hpp +++ b/include/boost/url/rfc/ipv6_address_bnf.hpp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_IPV6_ADDRESS_BNF_HPP -#define BOOST_URL_RFC_IPV6_ADDRESS_BNF_HPP +#ifndef BOOST_URL_IPV6_ADDRESS_BNF_HPP +#define BOOST_URL_IPV6_ADDRESS_BNF_HPP #include #include @@ -19,7 +19,6 @@ namespace boost { namespace urls { -namespace rfc { /** BNF for IPv6address @@ -60,7 +59,6 @@ struct ipv6_address_bnf ipv6_address_bnf& t); }; -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/ipv_future_bnf.hpp b/include/boost/url/rfc/ipv_future_bnf.hpp index ffd6607b..213a4f3d 100644 --- a/include/boost/url/rfc/ipv_future_bnf.hpp +++ b/include/boost/url/rfc/ipv_future_bnf.hpp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_IPV_FUTURE_BNF_HPP -#define BOOST_URL_RFC_IPV_FUTURE_BNF_HPP +#ifndef BOOST_URL_IPV_FUTURE_BNF_HPP +#define BOOST_URL_IPV_FUTURE_BNF_HPP #include #include @@ -16,7 +16,6 @@ namespace boost { namespace urls { -namespace rfc { /** BNF for IPvFuture @@ -44,7 +43,6 @@ struct ipv_future_bnf ipv_future_bnf& t); }; -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/pct_encoded_bnf.hpp b/include/boost/url/rfc/pct_encoded_bnf.hpp index dc163562..c4e8ec97 100644 --- a/include/boost/url/rfc/pct_encoded_bnf.hpp +++ b/include/boost/url/rfc/pct_encoded_bnf.hpp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_PCT_ENCODED_BNF_HPP -#define BOOST_URL_RFC_PCT_ENCODED_BNF_HPP +#ifndef BOOST_URL_PCT_ENCODED_BNF_HPP +#define BOOST_URL_PCT_ENCODED_BNF_HPP #include #include @@ -16,7 +16,6 @@ namespace boost { namespace urls { -namespace rfc { /** Base type for a percent-encoded BNF element */ @@ -51,7 +50,6 @@ struct pct_encoded_bnf pct_encoded_bnf const& t) noexcept; }; -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/pct_encoding.hpp b/include/boost/url/rfc/pct_encoding.hpp index c98f4851..493cc3ce 100644 --- a/include/boost/url/rfc/pct_encoding.hpp +++ b/include/boost/url/rfc/pct_encoding.hpp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_PCT_ENCODING_HPP -#define BOOST_URL_RFC_PCT_ENCODING_HPP +#ifndef BOOST_URL_PCT_ENCODING_HPP +#define BOOST_URL_PCT_ENCODING_HPP #include #include @@ -17,7 +17,6 @@ namespace boost { namespace urls { -namespace rfc { #if 0 template @@ -95,7 +94,6 @@ key_equal_encoded( string_view plain_key, pct_encoded_str encoded) noexcept; -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/port_bnf.hpp b/include/boost/url/rfc/port_bnf.hpp index f3ae880c..cf9313bf 100644 --- a/include/boost/url/rfc/port_bnf.hpp +++ b/include/boost/url/rfc/port_bnf.hpp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_PORT_BNF_HPP -#define BOOST_URL_RFC_PORT_BNF_HPP +#ifndef BOOST_URL_PORT_BNF_HPP +#define BOOST_URL_PORT_BNF_HPP #include #include @@ -18,7 +18,6 @@ namespace boost { namespace urls { -namespace rfc { /** BNF for port @@ -49,7 +48,6 @@ struct port_bnf port_bnf& t); }; -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/query_bnf.hpp b/include/boost/url/rfc/query_bnf.hpp index 646b041e..1e306997 100644 --- a/include/boost/url/rfc/query_bnf.hpp +++ b/include/boost/url/rfc/query_bnf.hpp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_QUERY_BNF_HPP -#define BOOST_URL_RFC_QUERY_BNF_HPP +#ifndef BOOST_URL_QUERY_BNF_HPP +#define BOOST_URL_QUERY_BNF_HPP #include #include @@ -18,7 +18,6 @@ namespace boost { namespace urls { -namespace rfc { struct query_param { @@ -60,7 +59,6 @@ struct query_bnf query_bnf const& t); }; -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/relative_part_bnf.hpp b/include/boost/url/rfc/relative_part_bnf.hpp index 6c67ac35..4685dd5e 100644 --- a/include/boost/url/rfc/relative_part_bnf.hpp +++ b/include/boost/url/rfc/relative_part_bnf.hpp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_RELATIVE_PART_BNF_HPP -#define BOOST_URL_RFC_RELATIVE_PART_BNF_HPP +#ifndef BOOST_URL_RELATIVE_PART_BNF_HPP +#define BOOST_URL_RELATIVE_PART_BNF_HPP #include #include @@ -19,7 +19,6 @@ namespace boost { namespace urls { -namespace rfc { /** BNF for relative-part @@ -52,7 +51,6 @@ struct relative_part_bnf relative_part_bnf& t); }; -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/relative_ref_bnf.hpp b/include/boost/url/rfc/relative_ref_bnf.hpp index 8f303269..0e277045 100644 --- a/include/boost/url/rfc/relative_ref_bnf.hpp +++ b/include/boost/url/rfc/relative_ref_bnf.hpp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_RELATIVE_REF_BNF_HPP -#define BOOST_URL_RFC_RELATIVE_REF_BNF_HPP +#ifndef BOOST_URL_RELATIVE_REF_BNF_HPP +#define BOOST_URL_RELATIVE_REF_BNF_HPP #include #include @@ -21,7 +21,6 @@ namespace boost { namespace urls { -namespace rfc { /** BNF for relative-ref @@ -50,7 +49,6 @@ struct relative_ref_bnf relative_ref_bnf& t); }; -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/scheme_bnf.hpp b/include/boost/url/rfc/scheme_bnf.hpp index 0a7d85d3..2ddc33a8 100644 --- a/include/boost/url/rfc/scheme_bnf.hpp +++ b/include/boost/url/rfc/scheme_bnf.hpp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_SCHEME_BNF_HPP -#define BOOST_URL_RFC_SCHEME_BNF_HPP +#ifndef BOOST_URL_SCHEME_BNF_HPP +#define BOOST_URL_SCHEME_BNF_HPP #include #include @@ -17,7 +17,6 @@ namespace boost { namespace urls { -namespace rfc { /** BNF for scheme @@ -44,7 +43,6 @@ struct scheme_bnf scheme_bnf& t); }; -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/uri_bnf.hpp b/include/boost/url/rfc/uri_bnf.hpp index 8129f825..5802f205 100644 --- a/include/boost/url/rfc/uri_bnf.hpp +++ b/include/boost/url/rfc/uri_bnf.hpp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_URI_BNF_HPP -#define BOOST_URL_RFC_URI_BNF_HPP +#ifndef BOOST_URL_URI_BNF_HPP +#define BOOST_URL_URI_BNF_HPP #include #include @@ -21,7 +21,6 @@ namespace boost { namespace urls { -namespace rfc { /** BNF for URI @@ -51,7 +50,6 @@ struct uri_bnf uri_bnf& t); }; -} // rfc } // urls } // boost diff --git a/include/boost/url/rfc/userinfo_bnf.hpp b/include/boost/url/rfc/userinfo_bnf.hpp index 77380267..6c20d5b2 100644 --- a/include/boost/url/rfc/userinfo_bnf.hpp +++ b/include/boost/url/rfc/userinfo_bnf.hpp @@ -7,8 +7,8 @@ // Official repository: https://github.com/CPPAlliance/url // -#ifndef BOOST_URL_RFC_USERINFO_BNF_HPP -#define BOOST_URL_RFC_USERINFO_BNF_HPP +#ifndef BOOST_URL_USERINFO_BNF_HPP +#define BOOST_URL_USERINFO_BNF_HPP #include #include @@ -18,7 +18,6 @@ namespace boost { namespace urls { -namespace rfc { /** BNF for userinfo @@ -49,7 +48,6 @@ struct userinfo_bnf userinfo_bnf& t); }; -} // rfc } // urls } // boost diff --git a/include/boost/url/url_view.hpp b/include/boost/url/url_view.hpp index 9c8200c0..ed09c00e 100644 --- a/include/boost/url/url_view.hpp +++ b/include/boost/url/url_view.hpp @@ -344,7 +344,7 @@ public: return string_type( s0.data(), s0.size(), a); } - return rfc::pct_decode_unchecked( + return pct_decode_unchecked( s0, pt_.decoded[id_host], a); } diff --git a/test/rfc/absolute_uri_bnf.cpp b/test/rfc/absolute_uri_bnf.cpp index 63e98c8b..8921438b 100644 --- a/test/rfc/absolute_uri_bnf.cpp +++ b/test/rfc/absolute_uri_bnf.cpp @@ -17,7 +17,6 @@ namespace boost { namespace urls { -namespace rfc { class absolute_uri_bnf_test { @@ -56,6 +55,5 @@ TEST_SUITE( absolute_uri_bnf_test, "boost.url.absolute_uri_bnf"); -} // rfc } // urls } // boost diff --git a/test/rfc/authority_bnf.cpp b/test/rfc/authority_bnf.cpp index e8383102..67c13b4d 100644 --- a/test/rfc/authority_bnf.cpp +++ b/test/rfc/authority_bnf.cpp @@ -19,7 +19,6 @@ namespace boost { namespace urls { -namespace rfc { BOOST_STATIC_ASSERT( std::is_copy_constructible< @@ -78,6 +77,5 @@ TEST_SUITE( authority_bnf_test, "boost.url.authority_bnf"); -} // rfc } // urls } // boost diff --git a/test/rfc/char_sets.cpp b/test/rfc/char_sets.cpp index 5394fa86..10cf6e2a 100644 --- a/test/rfc/char_sets.cpp +++ b/test/rfc/char_sets.cpp @@ -19,7 +19,6 @@ namespace boost { namespace urls { -namespace rfc { class char_sets_test { @@ -174,6 +173,5 @@ TEST_SUITE( char_sets_test, "boost.url.char_sets"); -} // rfc } // urls } // boost diff --git a/test/rfc/fragment_bnf.cpp b/test/rfc/fragment_bnf.cpp index 7ef60bfd..e0eaad6c 100644 --- a/test/rfc/fragment_bnf.cpp +++ b/test/rfc/fragment_bnf.cpp @@ -17,7 +17,6 @@ namespace boost { namespace urls { -namespace rfc { class fragment_bnf_test { @@ -69,6 +68,5 @@ TEST_SUITE( fragment_bnf_test, "boost.url.fragment_bnf"); -} // rfc } // urls } // boost diff --git a/test/rfc/hier_part_bnf.cpp b/test/rfc/hier_part_bnf.cpp index a92b821b..12399309 100644 --- a/test/rfc/hier_part_bnf.cpp +++ b/test/rfc/hier_part_bnf.cpp @@ -15,7 +15,6 @@ namespace boost { namespace urls { -namespace rfc { class hier_part_bnf_test { @@ -69,6 +68,5 @@ TEST_SUITE( hier_part_bnf_test, "boost.url.hier_part_bnf"); -} // rfc } // urls } // boost diff --git a/test/rfc/host_bnf.cpp b/test/rfc/host_bnf.cpp index b6cb3da6..48004b9e 100644 --- a/test/rfc/host_bnf.cpp +++ b/test/rfc/host_bnf.cpp @@ -20,7 +20,6 @@ namespace boost { namespace urls { -namespace rfc { BOOST_STATIC_ASSERT( std::is_copy_constructible< @@ -92,6 +91,5 @@ TEST_SUITE( host_bnf_test, "boost.url.host_bnf"); -} // rfc } // urls } // boost diff --git a/test/rfc/ip_literal_bnf.cpp b/test/rfc/ip_literal_bnf.cpp index 6dcab235..e0e7ae69 100644 --- a/test/rfc/ip_literal_bnf.cpp +++ b/test/rfc/ip_literal_bnf.cpp @@ -15,7 +15,6 @@ namespace boost { namespace urls { -namespace rfc { class ip_literal_bnf_test { @@ -41,6 +40,5 @@ TEST_SUITE( ip_literal_bnf_test, "boost.url.ip_literal_bnf"); -} // rfc } // urls } // boost diff --git a/test/rfc/ipv4_address_bnf.cpp b/test/rfc/ipv4_address_bnf.cpp index 5f466066..3877caa6 100644 --- a/test/rfc/ipv4_address_bnf.cpp +++ b/test/rfc/ipv4_address_bnf.cpp @@ -15,7 +15,6 @@ namespace boost { namespace urls { -namespace rfc { class ip_v4address_bnf_test { @@ -63,6 +62,5 @@ TEST_SUITE( ip_v4address_bnf_test, "boost.url.ipv4_address_bnf"); -} // rfc } // urls } // boost diff --git a/test/rfc/ipv6_address_bnf.cpp b/test/rfc/ipv6_address_bnf.cpp index 67308cd3..91e65eb1 100644 --- a/test/rfc/ipv6_address_bnf.cpp +++ b/test/rfc/ipv6_address_bnf.cpp @@ -16,7 +16,6 @@ namespace boost { namespace urls { -namespace rfc { class ipv6_address_bnf_test { @@ -172,6 +171,5 @@ TEST_SUITE( ipv6_address_bnf_test, "boost.url.ipv6_address_bnf"); -} // rfc } // urls } // boost diff --git a/test/rfc/ipv_future_bnf.cpp b/test/rfc/ipv_future_bnf.cpp index 31b32956..454ad873 100644 --- a/test/rfc/ipv_future_bnf.cpp +++ b/test/rfc/ipv_future_bnf.cpp @@ -15,7 +15,6 @@ namespace boost { namespace urls { -namespace rfc { class ipv_future_bnf_test { @@ -40,6 +39,5 @@ TEST_SUITE( ipv_future_bnf_test, "boost.url.ipv_future_bnf"); -} // rfc } // urls } // boost diff --git a/test/rfc/pct_encoded_bnf.cpp b/test/rfc/pct_encoded_bnf.cpp index 2275ba33..0e14f904 100644 --- a/test/rfc/pct_encoded_bnf.cpp +++ b/test/rfc/pct_encoded_bnf.cpp @@ -14,7 +14,6 @@ namespace boost { namespace urls { -namespace rfc { class pct_encoded_bnf_test { @@ -29,6 +28,5 @@ TEST_SUITE( pct_encoded_bnf_test, "boost.url.pct_encoded_bnf"); -} // rfc } // urls } // boost diff --git a/test/rfc/pct_encoding.cpp b/test/rfc/pct_encoding.cpp index 15432afb..e6c874bc 100644 --- a/test/rfc/pct_encoding.cpp +++ b/test/rfc/pct_encoding.cpp @@ -14,7 +14,6 @@ namespace boost { namespace urls { -namespace rfc { class pct_encoding_test { @@ -29,6 +28,5 @@ TEST_SUITE( pct_encoding_test, "boost.url.pct_encoding"); -} // rfc } // urls } // boost diff --git a/test/rfc/port_bnf.cpp b/test/rfc/port_bnf.cpp index 6231c39f..ac1416ea 100644 --- a/test/rfc/port_bnf.cpp +++ b/test/rfc/port_bnf.cpp @@ -15,7 +15,6 @@ namespace boost { namespace urls { -namespace rfc { class port_bnf_test { @@ -61,6 +60,5 @@ TEST_SUITE( port_bnf_test, "boost.url.port_bnf"); -} // rfc } // urls } // boost diff --git a/test/rfc/query_bnf.cpp b/test/rfc/query_bnf.cpp index f4beb615..b328e477 100644 --- a/test/rfc/query_bnf.cpp +++ b/test/rfc/query_bnf.cpp @@ -17,7 +17,6 @@ namespace boost { namespace urls { -namespace rfc { class query_bnf_test { @@ -69,6 +68,5 @@ TEST_SUITE( query_bnf_test, "boost.url.query_bnf"); -} // rfc } // urls } // boost diff --git a/test/rfc/relative_part_bnf.cpp b/test/rfc/relative_part_bnf.cpp index 25a9aad5..6038aef8 100644 --- a/test/rfc/relative_part_bnf.cpp +++ b/test/rfc/relative_part_bnf.cpp @@ -15,7 +15,6 @@ namespace boost { namespace urls { -namespace rfc { class relative_part_bnf_test { @@ -67,6 +66,5 @@ TEST_SUITE( relative_part_bnf_test, "boost.url.relative_part_bnf"); -} // rfc } // urls } // boost diff --git a/test/rfc/scheme_bnf.cpp b/test/rfc/scheme_bnf.cpp index e4c9c363..837096dc 100644 --- a/test/rfc/scheme_bnf.cpp +++ b/test/rfc/scheme_bnf.cpp @@ -16,7 +16,6 @@ namespace boost { namespace urls { -namespace rfc { class scheme_bnf_test { @@ -61,6 +60,5 @@ TEST_SUITE( scheme_bnf_test, "boost.url.scheme_bnf"); -} // rfc } // urls } // boost diff --git a/test/rfc/uri_bnf.cpp b/test/rfc/uri_bnf.cpp index 48e7e8ae..f88fe196 100644 --- a/test/rfc/uri_bnf.cpp +++ b/test/rfc/uri_bnf.cpp @@ -17,7 +17,6 @@ namespace boost { namespace urls { -namespace rfc { class uri_bnf_test { @@ -58,6 +57,5 @@ TEST_SUITE( uri_bnf_test, "boost.url.uri_bnf"); -} // rfc } // urls } // boost diff --git a/test/rfc/userinfo_bnf.cpp b/test/rfc/userinfo_bnf.cpp index 60d4ccf8..ff661422 100644 --- a/test/rfc/userinfo_bnf.cpp +++ b/test/rfc/userinfo_bnf.cpp @@ -16,7 +16,6 @@ namespace boost { namespace urls { -namespace rfc { class userinfo_bnf_test { @@ -81,6 +80,5 @@ TEST_SUITE( userinfo_bnf_test, "boost.url.userinfo_bnf"); -} // rfc } // urls } // boost