Skip to content
Merged

Work #206

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
88 changes: 44 additions & 44 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1018,50 +1018,50 @@ jobs:
run: |
echo "LD_LIBRARY_PATH=$GITHUB_WORKSPACE/.local/lib:$LD_LIBRARY_PATH" >> "$GITHUB_ENV"

- name: Find Package Integration Workflow
uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.0
if: ${{ matrix.build-cmake || matrix.is-earliest }}
with:
source-dir: boost-root/libs/${{ steps.patch.outputs.module }}/test/cmake_test
build-dir: __build_cmake_install_test__
generator: ${{ matrix.generator }}
generator-toolset: ${{ matrix.generator-toolset }}
build-type: ${{ matrix.build-type }}
cxxstd: ${{ matrix.latest-cxxstd }}
cc: ${{ steps.setup-cpp.outputs.cc || matrix.cc }}
ccflags: ${{ matrix.ccflags }}
cxx: ${{ steps.setup-cpp.outputs.cxx || matrix.cxx }}
cxxflags: ${{ matrix.cxxflags }}
shared: ${{ matrix.shared }}
install: false
cmake-version: '>=3.20'
extra-args: |
-D BOOST_CI_INSTALL_TEST=ON
-D CMAKE_PREFIX_PATH=${{ steps.patch.outputs.workspace_root }}/.local
ref-source-dir: boost-root/libs/http_proto
trace-commands: true
toolchain: ${{ (startsWith(matrix.runs-on, 'windows') && steps.patch-user-config.outputs.toolchain) || '' }}

- name: Subdirectory Integration Workflow
uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.0
if: ${{ matrix.build-cmake || matrix.is-earliest }}
with:
source-dir: boost-root/libs/${{ steps.patch.outputs.module }}/test/cmake_test
build-dir: __build_cmake_subdir_test__
generator: ${{ matrix.generator }}
generator-toolset: ${{ matrix.generator-toolset }}
build-type: ${{ matrix.build-type }}
cxxstd: ${{ matrix.latest-cxxstd }}
cc: ${{ steps.setup-cpp.outputs.cc || matrix.cc }}
ccflags: ${{ matrix.ccflags }}
cxx: ${{ steps.setup-cpp.outputs.cxx || matrix.cxx }}
cxxflags: ${{ matrix.cxxflags }}
shared: ${{ matrix.shared }}
install: false
cmake-version: '>=3.20'
extra-args: -D BOOST_CI_INSTALL_TEST=OFF
ref-source-dir: boost-root/libs/http_proto/test/cmake_test
toolchain: ${{ (startsWith(matrix.runs-on, 'windows') && steps.patch-user-config.outputs.toolchain) || '' }}
# - name: Find Package Integration Workflow
# uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.0
# if: ${{ matrix.build-cmake || matrix.is-earliest }}
# with:
# source-dir: boost-root/libs/${{ steps.patch.outputs.module }}/test/cmake_test
# build-dir: __build_cmake_install_test__
# generator: ${{ matrix.generator }}
# generator-toolset: ${{ matrix.generator-toolset }}
# build-type: ${{ matrix.build-type }}
# cxxstd: ${{ matrix.latest-cxxstd }}
# cc: ${{ steps.setup-cpp.outputs.cc || matrix.cc }}
# ccflags: ${{ matrix.ccflags }}
# cxx: ${{ steps.setup-cpp.outputs.cxx || matrix.cxx }}
# cxxflags: ${{ matrix.cxxflags }}
# shared: ${{ matrix.shared }}
# install: false
# cmake-version: '>=3.20'
# extra-args: |
# -D BOOST_CI_INSTALL_TEST=ON
# -D CMAKE_PREFIX_PATH=${{ steps.patch.outputs.workspace_root }}/.local
# ref-source-dir: boost-root/libs/http_proto
# trace-commands: true
# toolchain: ${{ (startsWith(matrix.runs-on, 'windows') && steps.patch-user-config.outputs.toolchain) || '' }}

# - name: Subdirectory Integration Workflow
# uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.0
# if: ${{ matrix.build-cmake || matrix.is-earliest }}
# with:
# source-dir: boost-root/libs/${{ steps.patch.outputs.module }}/test/cmake_test
# build-dir: __build_cmake_subdir_test__
# generator: ${{ matrix.generator }}
# generator-toolset: ${{ matrix.generator-toolset }}
# build-type: ${{ matrix.build-type }}
# cxxstd: ${{ matrix.latest-cxxstd }}
# cc: ${{ steps.setup-cpp.outputs.cc || matrix.cc }}
# ccflags: ${{ matrix.ccflags }}
# cxx: ${{ steps.setup-cpp.outputs.cxx || matrix.cxx }}
# cxxflags: ${{ matrix.cxxflags }}
# shared: ${{ matrix.shared }}
# install: false
# cmake-version: '>=3.20'
# extra-args: -D BOOST_CI_INSTALL_TEST=OFF
# ref-source-dir: boost-root/libs/http_proto/test/cmake_test
# toolchain: ${{ (startsWith(matrix.runs-on, 'windows') && steps.patch-user-config.outputs.toolchain) || '' }}

- name: Root Project CMake Workflow
uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.0
Expand Down
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ set(BOOST_HTTP_PROTO_DEPENDENCIES
Boost::capy
Boost::config
Boost::core
Boost::mp11
Boost::static_assert
Boost::system
Boost::throw_exception
Expand Down
9 changes: 9 additions & 0 deletions include/boost/http_proto.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,14 @@
#include <boost/http_proto/file_source.hpp>
#include <boost/http_proto/header_limits.hpp>
#include <boost/http_proto/message_base.hpp>
#include <boost/http_proto/metadata.hpp>
#include <boost/http_proto/method.hpp>
#include <boost/http_proto/parser.hpp>
#include <boost/http_proto/request.hpp>
#include <boost/http_proto/request_base.hpp>
#include <boost/http_proto/request_parser.hpp>
#include <boost/http_proto/response.hpp>
#include <boost/http_proto/response_base.hpp>
#include <boost/http_proto/response_parser.hpp>
#include <boost/http_proto/serializer.hpp>
#include <boost/http_proto/sink.hpp>
Expand All @@ -37,10 +40,16 @@

#include <boost/http_proto/rfc/combine_field_values.hpp>
#include <boost/http_proto/rfc/list_rule.hpp>
//#include <boost/http_proto/rfc/media_type.hpp>
#include <boost/http_proto/rfc/parameter.hpp>
#include <boost/http_proto/rfc/quoted_token_rule.hpp>
#include <boost/http_proto/rfc/quoted_token_view.hpp>
#include <boost/http_proto/rfc/token_rule.hpp>
#include <boost/http_proto/rfc/upgrade_rule.hpp>

#include <boost/http_proto/server/basic_router.hpp>
#include <boost/http_proto/server/cors.hpp>
#include <boost/http_proto/server/route_handler.hpp>
#include <boost/http_proto/server/router_types.hpp>

#endif
5 changes: 0 additions & 5 deletions include/boost/http_proto/detail/type_traits.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,6 @@ using derived_from = std::integral_constant<bool,
Derived const volatile*,
Base const volatile*>::value>;

template<bool...> struct bool_pack {};
template<bool... Bs>
struct all_true : std::is_same<bool_pack<
true, Bs...>, bool_pack<Bs..., true>> {};

} // detail
} // http_proto
} // boost
Expand Down
6 changes: 3 additions & 3 deletions include/boost/http_proto/rfc/media_type.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ struct mime_type
{
/** The type
*/
string_view type;
core::string_view type;

/** The subtype
*/
string_view subtype;
core::string_view subtype;
};

//------------------------------------------------
Expand Down Expand Up @@ -58,7 +58,7 @@ struct media_type_rule_t
parse(
char const*& it,
char const* end) const noexcept ->
result<value_type>;
system::result<value_type>;
};
} // implementation_defined

Expand Down
Loading
Loading