From dd93b293973743852c1075896324e58902ebc173 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sun, 20 Dec 2015 12:48:39 +0900 Subject: [PATCH] clang-format --- src/asio_io_service_pool.cc | 3 ++- src/asio_io_service_pool.h | 3 ++- src/asio_server.cc | 3 ++- src/asio_server.h | 3 ++- src/asio_server_http2.cc | 3 ++- src/asio_server_http2_handler.cc | 2 +- src/asio_server_http2_impl.cc | 3 ++- src/asio_server_http2_impl.h | 3 ++- src/includes/nghttp2/asio_http2_server.h | 3 ++- tests/nghttp2_session_test.c | 3 +-- 10 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/asio_io_service_pool.cc b/src/asio_io_service_pool.cc index 916f6d1e..1f6c1353 100644 --- a/src/asio_io_service_pool.cc +++ b/src/asio_io_service_pool.cc @@ -92,7 +92,8 @@ boost::asio::io_service &io_service_pool::get_io_service() { return io_service; } -const std::vector> &io_service_pool::get_io_services() const { +const std::vector> & +io_service_pool::get_io_services() const { return io_services_; } diff --git a/src/asio_io_service_pool.h b/src/asio_io_service_pool.h index 9c29619d..e7aaa049 100644 --- a/src/asio_io_service_pool.h +++ b/src/asio_io_service_pool.h @@ -71,7 +71,8 @@ public: boost::asio::io_service &get_io_service(); /// Get access to all io_service objects. - const std::vector> &get_io_services() const; + const std::vector> & + get_io_services() const; private: /// The pool of io_services. diff --git a/src/asio_server.cc b/src/asio_server.cc index ff9bb3b5..a332d091 100644 --- a/src/asio_server.cc +++ b/src/asio_server.cc @@ -169,7 +169,8 @@ void server::stop() { io_service_pool_.stop(); } void server::join() { io_service_pool_.join(); } -const std::vector> &server::get_io_services() const { +const std::vector> & +server::get_io_services() const { return io_service_pool_.get_io_services(); } diff --git a/src/asio_server.h b/src/asio_server.h index 433f6530..49f99446 100644 --- a/src/asio_server.h +++ b/src/asio_server.h @@ -74,7 +74,8 @@ public: void stop(); /// Get access to all io_service objects. - const std::vector> &get_io_services() const; + const std::vector> & + get_io_services() const; private: /// Initiate an asynchronous accept operation. diff --git a/src/asio_server_http2.cc b/src/asio_server_http2.cc index ca270a25..2cc3495f 100644 --- a/src/asio_server_http2.cc +++ b/src/asio_server_http2.cc @@ -77,7 +77,8 @@ void http2::stop() { impl_->stop(); } void http2::join() { return impl_->join(); } -const std::vector> &http2::get_io_services() const { +const std::vector> & +http2::get_io_services() const { return impl_->get_io_services(); } diff --git a/src/asio_server_http2_handler.cc b/src/asio_server_http2_handler.cc index fced5248..48e0bd14 100644 --- a/src/asio_server_http2_handler.cc +++ b/src/asio_server_http2_handler.cc @@ -136,7 +136,7 @@ int on_frame_recv_callback(nghttp2_session *session, const nghttp2_frame *frame, break; } - auto& req = strm->request().impl(); + auto &req = strm->request().impl(); req.remote_endpoint(handler->remote_endpoint()); handler->call_on_request(*strm); diff --git a/src/asio_server_http2_impl.cc b/src/asio_server_http2_impl.cc index 62c0df29..db1e0105 100644 --- a/src/asio_server_http2_impl.cc +++ b/src/asio_server_http2_impl.cc @@ -59,7 +59,8 @@ void http2_impl::stop() { return server_->stop(); } void http2_impl::join() { return server_->join(); } -const std::vector> &http2_impl::get_io_services() const { +const std::vector> & +http2_impl::get_io_services() const { return server_->get_io_services(); } diff --git a/src/asio_server_http2_impl.h b/src/asio_server_http2_impl.h index 395310bd..21c2e924 100644 --- a/src/asio_server_http2_impl.h +++ b/src/asio_server_http2_impl.h @@ -50,7 +50,8 @@ public: bool handle(std::string pattern, request_cb cb); void stop(); void join(); - const std::vector> &get_io_services() const; + const std::vector> & + get_io_services() const; private: std::unique_ptr server_; diff --git a/src/includes/nghttp2/asio_http2_server.h b/src/includes/nghttp2/asio_http2_server.h index 94bdc911..7a580081 100644 --- a/src/includes/nghttp2/asio_http2_server.h +++ b/src/includes/nghttp2/asio_http2_server.h @@ -205,7 +205,8 @@ public: void join(); // Get access to the io_service objects. - const std::vector> &get_io_services() const; + const std::vector> & + get_io_services() const; private: std::unique_ptr impl_; diff --git a/tests/nghttp2_session_test.c b/tests/nghttp2_session_test.c index 4902625a..8e53aff1 100644 --- a/tests/nghttp2_session_test.c +++ b/tests/nghttp2_session_test.c @@ -1449,8 +1449,7 @@ void test_nghttp2_session_server_recv_push_response(void) { nghttp2_hd_deflate_init(&deflater, mem); nghttp2_session_open_stream(session, 2, NGHTTP2_STREAM_FLAG_NONE, - &pri_spec_default, - NGHTTP2_STREAM_RESERVED, NULL); + &pri_spec_default, NGHTTP2_STREAM_RESERVED, NULL); nvlen = ARRLEN(resnv); nghttp2_nv_array_copy(&nva, resnv, nvlen, mem);