From dd4d549dc1a68ad4ef53581f4ac42560e6cebb02 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Fri, 25 Dec 2015 21:06:25 +0900 Subject: [PATCH] asio: Rename http2::get_io_services() as http2::io_services() The naming convention in asio lib does not use get_something. --- src/asio_io_service_pool.cc | 2 +- src/asio_io_service_pool.h | 2 +- src/asio_server.cc | 4 ++-- src/asio_server.h | 2 +- src/asio_server_http2.cc | 4 ++-- src/asio_server_http2_impl.cc | 4 ++-- src/asio_server_http2_impl.h | 2 +- src/includes/nghttp2/asio_http2_server.h | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/asio_io_service_pool.cc b/src/asio_io_service_pool.cc index 1f6c1353..b35a8c82 100644 --- a/src/asio_io_service_pool.cc +++ b/src/asio_io_service_pool.cc @@ -93,7 +93,7 @@ boost::asio::io_service &io_service_pool::get_io_service() { } const std::vector> & -io_service_pool::get_io_services() const { +io_service_pool::io_services() const { return io_services_; } diff --git a/src/asio_io_service_pool.h b/src/asio_io_service_pool.h index e7aaa049..c9ce1de4 100644 --- a/src/asio_io_service_pool.h +++ b/src/asio_io_service_pool.h @@ -72,7 +72,7 @@ public: /// Get access to all io_service objects. const std::vector> & - get_io_services() const; + io_services() const; private: /// The pool of io_services. diff --git a/src/asio_server.cc b/src/asio_server.cc index 002c947d..ef5becb2 100644 --- a/src/asio_server.cc +++ b/src/asio_server.cc @@ -180,8 +180,8 @@ void server::stop() { io_service_pool_.stop(); } void server::join() { io_service_pool_.join(); } const std::vector> & -server::get_io_services() const { - return io_service_pool_.get_io_services(); +server::io_services() const { + return io_service_pool_.io_services(); } } // namespace server diff --git a/src/asio_server.h b/src/asio_server.h index e1c52792..ba840348 100644 --- a/src/asio_server.h +++ b/src/asio_server.h @@ -77,7 +77,7 @@ public: /// Get access to all io_service objects. const std::vector> & - get_io_services() const; + io_services() const; private: /// Initiate an asynchronous accept operation. diff --git a/src/asio_server_http2.cc b/src/asio_server_http2.cc index 5606d833..997fd402 100644 --- a/src/asio_server_http2.cc +++ b/src/asio_server_http2.cc @@ -86,8 +86,8 @@ void http2::stop() { impl_->stop(); } void http2::join() { return impl_->join(); } const std::vector> & -http2::get_io_services() const { - return impl_->get_io_services(); +http2::io_services() const { + return impl_->io_services(); } } // namespace server diff --git a/src/asio_server_http2_impl.cc b/src/asio_server_http2_impl.cc index 5e420219..6a047f66 100644 --- a/src/asio_server_http2_impl.cc +++ b/src/asio_server_http2_impl.cc @@ -73,8 +73,8 @@ void http2_impl::stop() { return server_->stop(); } void http2_impl::join() { return server_->join(); } const std::vector> & -http2_impl::get_io_services() const { - return server_->get_io_services(); +http2_impl::io_services() const { + return server_->io_services(); } } // namespace server diff --git a/src/asio_server_http2_impl.h b/src/asio_server_http2_impl.h index a3b98552..b55b68c5 100644 --- a/src/asio_server_http2_impl.h +++ b/src/asio_server_http2_impl.h @@ -53,7 +53,7 @@ public: void stop(); void join(); const std::vector> & - get_io_services() const; + 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 5b969593..5818e301 100644 --- a/src/includes/nghttp2/asio_http2_server.h +++ b/src/includes/nghttp2/asio_http2_server.h @@ -212,7 +212,7 @@ public: // Get access to the io_service objects. const std::vector> & - get_io_services() const; + io_services() const; private: std::unique_ptr impl_;