feedc0de/boost_beast
1
0
Fork 0
forked from boostorg/beast
Code Pull Requests Activity

Fix C++20 tests for basic_stream

Browse Source 
fixes #2029
This commit is contained in:
Richard Hodges
2020-11-03 17:08:38 +01:00
parent 66a8ec3713
commit 7e30dd7d76
6 changed files with 48 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.dockers/ubuntu-20/user-config.jam
View File

@ -7,5 +7,5 @@ feature.compose <asio.mode>ts : <define>"BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT"
feature.compose <asio.mode>nodep-nots : <define>"BOOST_ASIO_NO_DEPRECATED" <define>"BOOST_ASIO_NO_TS_EXECUTORS" ;
feature.compose <asio.mode>nodep-ts : <define>"BOOST_ASIO_NO_DEPRECATED" <define>"BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT" ;
using clang : : clang++ : <cxxflags>-stdlib=libc++ <cxxflags>"-DBOOST_ASIO_DISABLE_CONCEPTS" <cxxflags>"-Wno-c99-extensions" <linkflags>-stdlib=libc++ ;
using clang : : clang++ : <cxxflags>-stdlib=libc++ <cxxflags>"-Wno-c99-extensions" <linkflags>-stdlib=libc++ ;
using gcc : : g++ : <cxxflags>"-Wno-c99-extensions" ;

19
.dockers/ubuntu-focal/Dockerfile Normal file
View File

@ -0,0 +1,19 @@
FROM ubuntu:focal
RUN apt-get update
RUN DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata
RUN apt-get install -y build-essential
RUN apt-get install -y git cmake libssl-dev clang libc++-dev libc++abi-dev libbz2-dev zlib1g-dev
WORKDIR /devel
RUN git clone -b develop https://github.com/boostorg/boost.git
COPY .dockers/ubuntu-focal/user-config.jam /devel/boost/
COPY .dockers/ubuntu-focal/tests.sh /devel/boost/
WORKDIR /devel/boost
RUN git submodule update --init --recursive
COPY . /devel/boost/libs/beast/
RUN ./bootstrap.sh
RUN ./b2 toolset=gcc variant=release cxxstd=latest headers
RUN ./tests.sh || true

14
.dockers/ubuntu-focal/tests.sh Executable file
View File

@ -0,0 +1,14 @@
#!/usr/bin/env bash
set -e
# cxxstd=2a,17,14,11 \
./b2 --user-config=./user-config.jam \
toolset=clang,gcc \
asio.mode=dflt,nodep,nots,ts,nodep-nots,nodep-ts \
variant=release \
cxxstd=14,11 \
-j`grep processor /proc/cpuinfo | wc -l` \
-q \
libs/beast/test libs/beast/example

11
.dockers/ubuntu-focal/user-config.jam Normal file
View File

@ -0,0 +1,11 @@
import feature ;
feature.feature asio.mode : dflt nodep nots ts nodep-nots nodep-ts : propagated composite ;
feature.compose <asio.mode>nodep : <define>"BOOST_ASIO_NO_DEPRECATED" ;
feature.compose <asio.mode>nots : <define>"BOOST_ASIO_NO_TS_EXECUTORS" ;
feature.compose <asio.mode>ts : <define>"BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT" ;
feature.compose <asio.mode>nodep-nots : <define>"BOOST_ASIO_NO_DEPRECATED" <define>"BOOST_ASIO_NO_TS_EXECUTORS" ;
feature.compose <asio.mode>nodep-ts : <define>"BOOST_ASIO_NO_DEPRECATED" <define>"BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT" ;
using clang : : clang++ : <stdlib>"libc++" <cxxflags>"-Wno-c99-extensions" ;
using gcc : : g++ : <cxxflags>"-Wno-c99-extensions" ;

1
CHANGELOG.md
View File

@ -1,3 +1,4 @@
* Fix C++20 coroutine tests.
* Fix links to Bishop Fox Security Assessment.
--------------------------------------------------------------------------------

4
test/beast/core/basic_stream.cpp
View File

@ -1339,7 +1339,7 @@ public:
{
void
operator()(error_code const &,
net::ip::tcp::endpoint const &) const;
net::ip::tcp::resolver::results_type::const_iterator) const;
};
static_assert(std::is_void<decltype(
@ -1355,7 +1355,7 @@ public:
{
void
operator()(error_code const &,
net::ip::tcp::resolver::results_type::const_iterator);
net::ip::tcp::endpoint const &);
};
static_assert(std::is_void<decltype(