Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix ambiguity in basic_stream constructor overloads #2864

Merged
merged 2 commits into from
May 11, 2024
Merged

Fix ambiguity in basic_stream constructor overloads #2864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1180af
Fix ambiguity in test::basic_stream constructor overloads
ashtum May 11, 2024
f26c7be
Expand CI matrix to include msvc-14.3 with C++14 and C++17
ashtum May 11, 2024
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
56 changes: 28 additions & 28 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,41 +333,41 @@ jobs:
os: windows-2019
cxxflags: "cxxflags=-D_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING=1"
supported: true
# - description: msvc-14.3-cxx14-win32
# toolset: msvc-14.3
# cxxstd: "14"
# addrmd: 32
# os: windows-2022
# cxxflags: ""
# supported: true
# - description: msvc-14.3-cxx17-win32
# toolset: msvc-14.3
# cxxstd: "17"
# addrmd: 32
# os: windows-2022
# cxxflags: "cxxflags=-D_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING=1"
# supported: true
- description: msvc-14.3-cxx14-win32
toolset: msvc-14.3
cxxstd: "14"
addrmd: 32
os: windows-2022
cxxflags: ""
supported: true
- description: msvc-14.3-cxx17-win32
toolset: msvc-14.3
cxxstd: "17"
addrmd: 32
os: windows-2022
cxxflags: "cxxflags=-D_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING=1"
supported: true
- description: msvc-14.3-cxx20-win32
toolset: msvc-14.3
cxxstd: "20"
addrmd: 32
os: windows-2022
cxxflags: "cxxflags=-D_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING=1"
supported: true
# - description: msvc-14.3-cxx14-win64
# toolset: msvc-14.3
# cxxstd: "14"
# addrmd: 64
# os: windows-2022
# cxxflags: ""
# supported: true
# - description: msvc-14.3-cxx17-win64
# toolset: msvc-14.3
# cxxstd: "17"
# addrmd: 64
# os: windows-2022
# cxxflags: "cxxflags=-D_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING=1"
# supported: true
- description: msvc-14.3-cxx14-win64
toolset: msvc-14.3
cxxstd: "14"
addrmd: 64
os: windows-2022
cxxflags: ""
supported: true
- description: msvc-14.3-cxx17-win64
toolset: msvc-14.3
cxxstd: "17"
addrmd: 64
os: windows-2022
cxxflags: "cxxflags=-D_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING=1"
supported: true
- description: msvc-14.3-cxx20-win64
toolset: msvc-14.3
cxxstd: "20"
Expand Down
10 changes: 5 additions & 5 deletions include/boost/beast/_experimental/test/stream.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,11 +235,11 @@ class basic_stream
@param context The `io_context` object that the stream will use to
dispatch handlers for any asynchronous operations.
*/
template <typename ExecutionContext>
explicit basic_stream(ExecutionContext& context,
typename std::enable_if<
std::is_convertible<ExecutionContext&, net::execution_context&>::value
>::type* = 0)
template <class ExecutionContext,
class = typename std::enable_if<
std::is_convertible<ExecutionContext&, net::execution_context&>::value>::type>
explicit
basic_stream(ExecutionContext& context)
: basic_stream(context.get_executor())
{
}
Expand Down
Loading