Commit897de7b

committed

Fixed async_connection::write() SFINAE-isation

Overloaded function selection based on ConstBufferSeq::value_type.http_server_async_less_copy test fixed accordingly.

1 parent6ca564d commit897de7bCopy full SHA for 897de7b

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -214,15 +214,15 @@ namespace boost { namespace network { namespace http {`
`214`	`214`	`}`
`215`	`215`
`216`	`216`	`template<classRange,classCallback>`
`217`		`-typename disable_if<is_base_of<asio::const_buffer, Range>,void>::type`
	`217`	`+typename disable_if<is_base_of<asio::const_buffer,typenameRange::value_type>,void>::type`
`218`	`218`	`write(Rangeconst & range, Callbackconst & callback) {`
`219`	`219`	`lock_guardlock(headers_mutex);`
`220`	`220`	`if (error_encountered)boost::throw_exception(boost::system::system_error(*error_encountered));`
`221`	`221`	`write_impl(boost::make_iterator_range(range), callback);`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`template<classConstBufferSeq,classCallback>`
`225`		`-typename enable_if<is_base_of<asio::const_buffer, ConstBufferSeq>,void>::type`
	`225`	`+typename enable_if<is_base_of<asio::const_buffer,typenameConstBufferSeq::value_type>,void>::type`
`226`	`226`	`write(ConstBufferSeqconst & seq, Callbackconst & callback)`
`227`	`227`	`{`
`228`	`228`	`write_vec_impl(seq, callback,shared_array_list(),shared_buffers());`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@`
`6`	`6`
`7`	`7`	`#defineBOOST_TEST_MODULE HTTP Asynchronous Server Tests`
`8`	`8`
	`9`	`+#include<vector>`
	`10`	`+`
`9`	`11`	`#include<boost/config/warning_disable.hpp>`
`10`	`12`	`#include<boost/network/include/http/server.hpp>`
`11`	`13`	`#include<boost/network/utils/thread_pool.hpp>`
`@@ -51,9 +53,9 @@ struct async_hello_world {`
`51`	`53`	`staticcharconst * hello_world ="Hello, World!";`
`52`	`54`	`connection->set_status(server::connection::ok);`
`53`	`55`	`connection->set_headers(boost::make_iterator_range(headers, headers+3));`
`54`		`-connection->write(`
`55`		`-boost::asio::const_buffers_1(hello_world,13)`
`56`		`-,boost::bind(&async_hello_world::error,this, _1));`
	`56`	`+std::vector<boost::asio::const_buffer> iovec;`
	`57`	`+iovec.push_back(boost::asio::const_buffer(hello_world,13));`
	`58`	`+connection->write(iovec,boost::bind(&async_hello_world::error,this, _1));`
`57`	`59`	`}`
`58`	`60`	`}`
`59`	`61`

Comments

(0)