Skip to content

Commit d5acb82

Browse files
committed
Revert "workaround boost.span non-SFINAE friendly constructor"
1 parent 1a8a81c commit d5acb82

6 files changed

Lines changed: 19 additions & 27 deletions

File tree

include/boost/http_proto/impl/sink.hpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,9 @@ write_impl(
5858
while(
5959
p != tmp_end &&
6060
it != end_);
61-
rv += on_write(
62-
true,
63-
boost::span<
64-
buffers::const_buffer const>(
65-
tmp, p - tmp),
61+
rv += on_write(boost::span<
62+
buffers::const_buffer const>(
63+
tmp, p - tmp),
6664
it != end_ || more);
6765
if(rv.ec.failed())
6866
return rv;

include/boost/http_proto/impl/source.hpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,9 @@ read_impl(
5858
while(
5959
p != tmp_end &&
6060
it != end_);
61-
rv += on_read(
62-
true,
63-
boost::span<
64-
buffers::mutable_buffer const>(
65-
tmp, p - tmp));
61+
rv += on_read(boost::span<
62+
buffers::mutable_buffer const>(
63+
tmp, p - tmp));
6664
if(rv.ec.failed())
6765
return rv;
6866
if(rv.finished)

include/boost/http_proto/sink.hpp

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@ struct BOOST_SYMBOL_VISIBLE
192192
virtual
193193
results
194194
on_write(
195-
bool boost_span_issue_202_workaround,
196195
boost::span<const buffers::const_buffer> bs,
197196
bool more);
198197

@@ -213,13 +212,13 @@ struct BOOST_SYMBOL_VISIBLE
213212
return on_write(b, more);
214213
}
215214

216-
// results
217-
// write_impl(
218-
// boost::span<const buffers::const_buffer> const& bs,
219-
// bool more)
220-
// {
221-
// return on_write(bs, more);
222-
// }
215+
results
216+
write_impl(
217+
boost::span<const buffers::const_buffer> const& bs,
218+
bool more)
219+
{
220+
return on_write(bs, more);
221+
}
223222

224223
template<class T>
225224
results

include/boost/http_proto/source.hpp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ struct BOOST_SYMBOL_VISIBLE
195195
virtual
196196
results
197197
on_read(
198-
bool boost_span_issue_202_workaround,
199198
boost::span<buffers::mutable_buffer const> bs);
200199

201200
private:
@@ -206,12 +205,12 @@ struct BOOST_SYMBOL_VISIBLE
206205
return on_read(b);
207206
}
208207

209-
// results
210-
// read_impl(
211-
// boost::span<buffers::mutable_buffer const> const& bs)
212-
// {
213-
// return on_read(bs);
214-
// }
208+
results
209+
read_impl(
210+
boost::span<buffers::mutable_buffer const> const& bs)
211+
{
212+
return on_read(bs);
213+
}
215214

216215
template<class T>
217216
results

src/sink.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ namespace http_proto {
1515
auto
1616
sink::
1717
on_write(
18-
bool,
1918
boost::span<buffers::const_buffer const> bs,
2019
bool more) ->
2120
results

src/source.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ namespace http_proto {
1616
auto
1717
source::
1818
on_read(
19-
bool,
2019
boost::span<buffers::mutable_buffer const> bs) ->
2120
results
2221
{

0 commit comments

Comments
 (0)