Skip to content

Commit 131fecf

Browse files
vinniefalcovinniefalco
committed
chore: route_params
1 parent 409b76f commit 131fecf

File tree

14 files changed

+616
-634
lines changed

14 files changed

+616
-634
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1018,50 +1018,50 @@ jobs:
10181018
run: |
10191019
echo "LD_LIBRARY_PATH=$GITHUB_WORKSPACE/.local/lib:$LD_LIBRARY_PATH" >> "$GITHUB_ENV"
10201020
1021-
- name: Find Package Integration Workflow
1022-
uses: alandefreitas/cpp-actions/[email protected]
1023-
if: ${{ matrix.build-cmake || matrix.is-earliest }}
1024-
with:
1025-
source-dir: boost-root/libs/${{ steps.patch.outputs.module }}/test/cmake_test
1026-
build-dir: __build_cmake_install_test__
1027-
generator: ${{ matrix.generator }}
1028-
generator-toolset: ${{ matrix.generator-toolset }}
1029-
build-type: ${{ matrix.build-type }}
1030-
cxxstd: ${{ matrix.latest-cxxstd }}
1031-
cc: ${{ steps.setup-cpp.outputs.cc || matrix.cc }}
1032-
ccflags: ${{ matrix.ccflags }}
1033-
cxx: ${{ steps.setup-cpp.outputs.cxx || matrix.cxx }}
1034-
cxxflags: ${{ matrix.cxxflags }}
1035-
shared: ${{ matrix.shared }}
1036-
install: false
1037-
cmake-version: '>=3.20'
1038-
extra-args: |
1039-
-D BOOST_CI_INSTALL_TEST=ON
1040-
-D CMAKE_PREFIX_PATH=${{ steps.patch.outputs.workspace_root }}/.local
1041-
ref-source-dir: boost-root/libs/http_proto
1042-
trace-commands: true
1043-
toolchain: ${{ (startsWith(matrix.runs-on, 'windows') && steps.patch-user-config.outputs.toolchain) || '' }}
1044-
1045-
- name: Subdirectory Integration Workflow
1046-
uses: alandefreitas/cpp-actions/[email protected]
1047-
if: ${{ matrix.build-cmake || matrix.is-earliest }}
1048-
with:
1049-
source-dir: boost-root/libs/${{ steps.patch.outputs.module }}/test/cmake_test
1050-
build-dir: __build_cmake_subdir_test__
1051-
generator: ${{ matrix.generator }}
1052-
generator-toolset: ${{ matrix.generator-toolset }}
1053-
build-type: ${{ matrix.build-type }}
1054-
cxxstd: ${{ matrix.latest-cxxstd }}
1055-
cc: ${{ steps.setup-cpp.outputs.cc || matrix.cc }}
1056-
ccflags: ${{ matrix.ccflags }}
1057-
cxx: ${{ steps.setup-cpp.outputs.cxx || matrix.cxx }}
1058-
cxxflags: ${{ matrix.cxxflags }}
1059-
shared: ${{ matrix.shared }}
1060-
install: false
1061-
cmake-version: '>=3.20'
1062-
extra-args: -D BOOST_CI_INSTALL_TEST=OFF
1063-
ref-source-dir: boost-root/libs/http_proto/test/cmake_test
1064-
toolchain: ${{ (startsWith(matrix.runs-on, 'windows') && steps.patch-user-config.outputs.toolchain) || '' }}
1021+
# - name: Find Package Integration Workflow
1022+
# uses: alandefreitas/cpp-actions/[email protected]
1023+
# if: ${{ matrix.build-cmake || matrix.is-earliest }}
1024+
# with:
1025+
# source-dir: boost-root/libs/${{ steps.patch.outputs.module }}/test/cmake_test
1026+
# build-dir: __build_cmake_install_test__
1027+
# generator: ${{ matrix.generator }}
1028+
# generator-toolset: ${{ matrix.generator-toolset }}
1029+
# build-type: ${{ matrix.build-type }}
1030+
# cxxstd: ${{ matrix.latest-cxxstd }}
1031+
# cc: ${{ steps.setup-cpp.outputs.cc || matrix.cc }}
1032+
# ccflags: ${{ matrix.ccflags }}
1033+
# cxx: ${{ steps.setup-cpp.outputs.cxx || matrix.cxx }}
1034+
# cxxflags: ${{ matrix.cxxflags }}
1035+
# shared: ${{ matrix.shared }}
1036+
# install: false
1037+
# cmake-version: '>=3.20'
1038+
# extra-args: |
1039+
# -D BOOST_CI_INSTALL_TEST=ON
1040+
# -D CMAKE_PREFIX_PATH=${{ steps.patch.outputs.workspace_root }}/.local
1041+
# ref-source-dir: boost-root/libs/http_proto
1042+
# trace-commands: true
1043+
# toolchain: ${{ (startsWith(matrix.runs-on, 'windows') && steps.patch-user-config.outputs.toolchain) || '' }}
1044+
1045+
# - name: Subdirectory Integration Workflow
1046+
# uses: alandefreitas/cpp-actions/[email protected]
1047+
# if: ${{ matrix.build-cmake || matrix.is-earliest }}
1048+
# with:
1049+
# source-dir: boost-root/libs/${{ steps.patch.outputs.module }}/test/cmake_test
1050+
# build-dir: __build_cmake_subdir_test__
1051+
# generator: ${{ matrix.generator }}
1052+
# generator-toolset: ${{ matrix.generator-toolset }}
1053+
# build-type: ${{ matrix.build-type }}
1054+
# cxxstd: ${{ matrix.latest-cxxstd }}
1055+
# cc: ${{ steps.setup-cpp.outputs.cc || matrix.cc }}
1056+
# ccflags: ${{ matrix.ccflags }}
1057+
# cxx: ${{ steps.setup-cpp.outputs.cxx || matrix.cxx }}
1058+
# cxxflags: ${{ matrix.cxxflags }}
1059+
# shared: ${{ matrix.shared }}
1060+
# install: false
1061+
# cmake-version: '>=3.20'
1062+
# extra-args: -D BOOST_CI_INSTALL_TEST=OFF
1063+
# ref-source-dir: boost-root/libs/http_proto/test/cmake_test
1064+
# toolchain: ${{ (startsWith(matrix.runs-on, 'windows') && steps.patch-user-config.outputs.toolchain) || '' }}
10651065

10661066
- name: Root Project CMake Workflow
10671067
uses: alandefreitas/cpp-actions/[email protected]

‎CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ set(BOOST_HTTP_PROTO_DEPENDENCIES
5959
Boost::capy
6060
Boost::config
6161
Boost::core
62+
Boost::mp11
6263
Boost::static_assert
6364
Boost::system
6465
Boost::throw_exception

‎include/boost/http_proto.hpp‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,14 @@
2020
#include <boost/http_proto/file_source.hpp>
2121
#include <boost/http_proto/header_limits.hpp>
2222
#include <boost/http_proto/message_base.hpp>
23+
#include <boost/http_proto/metadata.hpp>
2324
#include <boost/http_proto/method.hpp>
2425
#include <boost/http_proto/parser.hpp>
2526
#include <boost/http_proto/request.hpp>
27+
#include <boost/http_proto/request_base.hpp>
2628
#include <boost/http_proto/request_parser.hpp>
2729
#include <boost/http_proto/response.hpp>
30+
#include <boost/http_proto/response_base.hpp>
2831
#include <boost/http_proto/response_parser.hpp>
2932
#include <boost/http_proto/serializer.hpp>
3033
#include <boost/http_proto/sink.hpp>
@@ -37,10 +40,16 @@
3740

3841
#include <boost/http_proto/rfc/combine_field_values.hpp>
3942
#include <boost/http_proto/rfc/list_rule.hpp>
43+
//#include <boost/http_proto/rfc/media_type.hpp>
4044
#include <boost/http_proto/rfc/parameter.hpp>
4145
#include <boost/http_proto/rfc/quoted_token_rule.hpp>
4246
#include <boost/http_proto/rfc/quoted_token_view.hpp>
4347
#include <boost/http_proto/rfc/token_rule.hpp>
4448
#include <boost/http_proto/rfc/upgrade_rule.hpp>
4549

50+
#include <boost/http_proto/server/basic_router.hpp>
51+
#include <boost/http_proto/server/cors.hpp>
52+
#include <boost/http_proto/server/route_handler.hpp>
53+
#include <boost/http_proto/server/router_types.hpp>
54+
4655
#endif

‎include/boost/http_proto/detail/type_traits.hpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,6 @@ using derived_from = std::integral_constant<bool,
8080
Derived const volatile*,
8181
Base const volatile*>::value>;
8282

83-
template<bool...> struct bool_pack {};
84-
template<bool... Bs>
85-
struct all_true : std::is_same<bool_pack<
86-
true, Bs...>, bool_pack<Bs..., true>> {};
87-
8883
} // detail
8984
} // http_proto
9085
} // boost

‎include/boost/http_proto/rfc/media_type.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ struct mime_type
2323
{
2424
/** The type
2525
*/
26-
string_view type;
26+
core::string_view type;
2727

2828
/** The subtype
2929
*/
30-
string_view subtype;
30+
core::string_view subtype;
3131
};
3232

3333
//------------------------------------------------
@@ -58,7 +58,7 @@ struct media_type_rule_t
5858
parse(
5959
char const*& it,
6060
char const* end) const noexcept ->
61-
result<value_type>;
61+
system::result<value_type>;
6262
};
6363
} // implementation_defined
6464

0 commit comments

Comments
 (0)