import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / asio / detail / resolver_service.hpp

diff --git a/ceph/src/boost/boost/asio/detail/resolver_service.hpp b/ceph/src/boost/boost/asio/detail/resolver_service.hpp
index dfde7011d081824c1dcea26e3fc4fb3e284a5a05..c8101e48b7dbccff386452bff030ea3ccc2be52d 100644 (file)
--- a/ceph/src/boost/boost/asio/detail/resolver_service.hpp
+++ b/ceph/src/boost/boost/asio/detail/resolver_service.hpp
@@ -72,29 +72,29 @@ public:
   }
 
   // Resolve a query to a list of entries.
-  results_type resolve(implementation_type&, const query_type& query,
+  results_type resolve(implementation_type&, const query_type& qry,
       boost::system::error_code& ec)
   {
     boost::asio::detail::addrinfo_type* address_info = 0;
 
-    socket_ops::getaddrinfo(query.host_name().c_str(),
-        query.service_name().c_str(), query.hints(), &address_info, ec);
+    socket_ops::getaddrinfo(qry.host_name().c_str(),
+        qry.service_name().c_str(), qry.hints(), &address_info, ec);
     auto_addrinfo auto_address_info(address_info);
 
     return ec ? results_type() : results_type::create(
-        address_info, query.host_name(), query.service_name());
+        address_info, qry.host_name(), qry.service_name());
   }
 
   // Asynchronously resolve a query to a list of entries.
   template <typename Handler, typename IoExecutor>
-  void async_resolve(implementation_type& impl, const query_type& query,
+  void async_resolve(implementation_type& impl, const query_type& qry,
       Handler& handler, const IoExecutor& io_ex)
   {
     // Allocate and construct an operation to wrap the handler.
     typedef resolve_query_op<Protocol, Handler, IoExecutor> op;
     typename op::ptr p = { boost::asio::detail::addressof(handler),
       op::ptr::allocate(handler), 0 };
-    p.p = new (p.v) op(impl, query, scheduler_, handler, io_ex);
+    p.p = new (p.v) op(impl, qry, scheduler_, handler, io_ex);
 
     BOOST_ASIO_HANDLER_CREATION((scheduler_.context(),
           *p.p, "resolver", &impl, 0, "async_resolve"));