Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions include/boost/beast2/server/basic_router.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ struct router_options
};

//-----------------------------------------------

namespace detail {
//namespace detail {

class any_router;

Expand Down Expand Up @@ -189,7 +189,7 @@ class any_router
impl* impl_ = nullptr;
};

} // detail
//} // detail

//-----------------------------------------------

Expand Down Expand Up @@ -292,7 +292,7 @@ class any_router
@tparam Res The type of response object.
*/
template<class Req, class Res>
class basic_router : public detail::any_router
class basic_router : public /*detail::*/any_router
{
// Req must be publicly derived from basic_request
BOOST_CORE_STATIC_ASSERT(
Expand Down
4 changes: 2 additions & 2 deletions include/boost/beast2/server/router_types.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ class basic_request
core::string_view path;

private:
friend class detail::any_router;
friend class /*detail::*/any_router;
struct match_result;
http_proto::method verb_ =
http_proto::method::unknown;
Expand All @@ -311,7 +311,7 @@ class basic_request
class basic_response
{
private:
friend class detail::any_router;
friend class /*detail::*/any_router;
template<class, class>
friend class basic_router;

Expand Down
10 changes: 6 additions & 4 deletions src/server/basic_router.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
namespace boost {
namespace beast2 {

namespace detail {
//namespace detail {

// VFALCO Temporarily here until Boost.URL merges the fix
static
Expand Down Expand Up @@ -80,6 +80,7 @@ pattern target path(use) path(get)

//------------------------------------------------


any_router::any_handler::~any_handler() = default;

//------------------------------------------------
Expand Down Expand Up @@ -201,7 +202,7 @@ pct_decode_path(

//------------------------------------------------

} // detail
//} // detail

struct basic_request::
match_result
Expand Down Expand Up @@ -255,7 +256,7 @@ struct basic_request::

//------------------------------------------------

namespace detail {
//namespace detail {

// Matches a path against a pattern
struct any_router::matcher
Expand Down Expand Up @@ -867,6 +868,7 @@ do_dispatch(
return res.ec_;
}

} // detail
//} // detail

} // beast2
} // boost
Loading