Add ASIO_NO_DEPRECATED test around io_service::reset().

diff --git a/asio/include/asio/basic_socket_streambuf.hpp b/asio/include/asio/basic_socket_streambuf.hpp
index d71e1d4..2dbe033 100644
--- a/asio/include/asio/basic_socket_streambuf.hpp
+++ b/asio/include/asio/basic_socket_streambuf.hpp

@@ -174,7 +174,7 @@
         endpoint, handler);
 
     ec_ = asio::error::would_block;
-    this->get_service().get_io_service().reset();
+    this->get_service().get_io_service().restart();
     do this->get_service().get_io_service().run_one();
     while (ec_ == asio::error::would_block);
 
@@ -314,7 +314,7 @@
           0, handler);
 
       ec_ = asio::error::would_block;
-      this->get_service().get_io_service().reset();
+      this->get_service().get_io_service().restart();
       do this->get_service().get_io_service().run_one();
       while (ec_ == asio::error::would_block);
       if (ec_)
@@ -354,7 +354,7 @@
             asio::buffer(&ch, sizeof(char_type)), 0, handler);
 
         ec_ = asio::error::would_block;
-        this->get_service().get_io_service().reset();
+        this->get_service().get_io_service().restart();
         do this->get_service().get_io_service().run_one();
         while (ec_ == asio::error::would_block);
         if (ec_)
@@ -381,7 +381,7 @@
             asio::buffer(buffer), 0, handler);
 
         ec_ = asio::error::would_block;
-        this->get_service().get_io_service().reset();
+        this->get_service().get_io_service().restart();
         do this->get_service().get_io_service().run_one();
         while (ec_ == asio::error::would_block);
         if (ec_)
@@ -467,7 +467,7 @@
             *i, handler);
 
         ec_ = asio::error::would_block;
-        this->get_service().get_io_service().reset();
+        this->get_service().get_io_service().restart();
         do this->get_service().get_io_service().run_one();
         while (ec_ == asio::error::would_block);
 

diff --git a/asio/include/asio/detail/impl/resolver_service_base.ipp b/asio/include/asio/detail/impl/resolver_service_base.ipp
index 2f99983..7244612 100644
--- a/asio/include/asio/detail/impl/resolver_service_base.ipp
+++ b/asio/include/asio/detail/impl/resolver_service_base.ipp

@@ -76,7 +76,7 @@
     }
     else
     {
-      work_io_service_->reset();
+      work_io_service_->restart();
       work_thread_.reset(new asio::detail::thread(
             work_io_service_runner(*work_io_service_)));
     }

diff --git a/asio/include/asio/impl/io_service.hpp b/asio/include/asio/impl/io_service.hpp
index bd730e1..d113056 100644
--- a/asio/include/asio/impl/io_service.hpp
+++ b/asio/include/asio/impl/io_service.hpp

@@ -64,10 +64,12 @@
   return executor_type(*this);
 }
 
+#if !defined(ASIO_NO_DEPRECATED)
 inline void io_service::reset()
 {
   restart();
 }
+#endif // !defined(ASIO_NO_DEPRECATED)
 
 template <typename CompletionHandler>
 ASIO_INITFN_RESULT_TYPE(CompletionHandler, void ())

diff --git a/asio/include/asio/io_service.hpp b/asio/include/asio/io_service.hpp
index 0cc4167..e3dc487 100644
--- a/asio/include/asio/io_service.hpp
+++ b/asio/include/asio/io_service.hpp

@@ -379,6 +379,7 @@
    */
   ASIO_DECL void restart();
 
+#if !defined(ASIO_NO_DEPRECATED)
   /// (Deprecated: Use restart().) Reset the io_service in preparation for a
   /// subsequent run() invocation.
   /**
@@ -392,6 +393,7 @@
    * the run(), run_one(), poll() or poll_one() functions.
    */
   void reset();
+#endif // !defined(ASIO_NO_DEPRECATED)
 
   /// Request the io_service to invoke the given handler.
   /**