[Boost-commit] svn:boost r43470 - in trunk/boost/asio: detail impl

From: chris_at_[hidden]
Date: 2008-03-03 08:27:07

Author: chris_kohlhoff
Date: 2008-03-03 08:27:06 EST (Mon, 03 Mar 2008)
New Revision: 43470
URL: http://svn.boost.org/trac/boost/changeset/43470

Log:
Add missing 'boost_' prefix to helper namespace.

Text files modified: 
   trunk/boost/asio/detail/bind_handler.hpp            |    10 +++++-----                              
   trunk/boost/asio/detail/handler_invoke_helpers.hpp  |     6 +++---                                  
   trunk/boost/asio/detail/handler_queue.hpp           |     2 +-                                      
   trunk/boost/asio/detail/strand_service.hpp          |     4 ++--                                    
   trunk/boost/asio/detail/task_io_service.hpp         |     2 +-                                      
   trunk/boost/asio/detail/win_iocp_io_service.hpp     |     4 ++--                                    
   trunk/boost/asio/detail/win_iocp_socket_service.hpp |    10 +++++-----                              
   trunk/boost/asio/detail/wrapped_handler.hpp         |     2 +-                                      
   trunk/boost/asio/impl/read.ipp                      |     4 ++--                                    
   trunk/boost/asio/impl/read_until.ipp                |     6 +++---                                  
   trunk/boost/asio/impl/write.ipp                     |     4 ++--                                    
   11 files changed, 27 insertions(+), 27 deletions(-)

Modified: trunk/boost/asio/detail/bind_handler.hpp
==============================================================================
--- trunk/boost/asio/detail/bind_handler.hpp	(original)
+++ trunk/boost/asio/detail/bind_handler.hpp	2008-03-03 08:27:06 EST (Mon, 03 Mar 2008)
@@ -69,7 +69,7 @@
 inline void asio_handler_invoke(const Function& function,
     binder1<Handler, Arg1>* this_handler)
 {
-  asio_handler_invoke_helpers::invoke(
+  boost_asio_handler_invoke_helpers::invoke(
       function, &this_handler->handler_);
 }
 
@@ -127,7 +127,7 @@
 inline void asio_handler_invoke(const Function& function,
     binder2<Handler, Arg1, Arg2>* this_handler)
 {
-  asio_handler_invoke_helpers::invoke(
+  boost_asio_handler_invoke_helpers::invoke(
       function, &this_handler->handler_);
 }
 
@@ -189,7 +189,7 @@
 inline void asio_handler_invoke(const Function& function,
     binder3<Handler, Arg1, Arg2, Arg3>* this_handler)
 {
-  asio_handler_invoke_helpers::invoke(
+  boost_asio_handler_invoke_helpers::invoke(
       function, &this_handler->handler_);
 }
 
@@ -256,7 +256,7 @@
 inline void asio_handler_invoke(const Function& function,
     binder4<Handler, Arg1, Arg2, Arg3, Arg4>* this_handler)
 {
-  asio_handler_invoke_helpers::invoke(
+  boost_asio_handler_invoke_helpers::invoke(
       function, &this_handler->handler_);
 }
 
@@ -328,7 +328,7 @@
 inline void asio_handler_invoke(const Function& function,
     binder5<Handler, Arg1, Arg2, Arg3, Arg4, Arg5>* this_handler)
 {
-  asio_handler_invoke_helpers::invoke(
+  boost_asio_handler_invoke_helpers::invoke(
       function, &this_handler->handler_);
 }
 

Modified: trunk/boost/asio/detail/handler_invoke_helpers.hpp
==============================================================================
--- trunk/boost/asio/detail/handler_invoke_helpers.hpp	(original)
+++ trunk/boost/asio/detail/handler_invoke_helpers.hpp	2008-03-03 08:27:06 EST (Mon, 03 Mar 2008)
@@ -24,9 +24,9 @@
 #include <boost/asio/handler_invoke_hook.hpp>
 
 // Calls to asio_handler_invoke must be made from a namespace that does not
-// contain overloads of this function. The asio_handler_invoke_helpers
+// contain overloads of this function. The boost_asio_handler_invoke_helpers
 // namespace is defined here for that purpose.
-namespace asio_handler_invoke_helpers {
+namespace boost_asio_handler_invoke_helpers {
 
 template <typename Function, typename Context>
 inline void invoke(const Function& function, Context* context)
@@ -40,7 +40,7 @@
 #endif
 }
 
-} // namespace asio_handler_invoke_helpers
+} // namespace boost_asio_handler_invoke_helpers
 
 #include <boost/asio/detail/pop_options.hpp>
 

Modified: trunk/boost/asio/detail/handler_queue.hpp
==============================================================================
--- trunk/boost/asio/detail/handler_queue.hpp	(original)
+++ trunk/boost/asio/detail/handler_queue.hpp	2008-03-03 08:27:06 EST (Mon, 03 Mar 2008)
@@ -189,7 +189,7 @@
       ptr.reset();
 
       // Make the upcall.
-      asio_handler_invoke_helpers::invoke(handler, &handler);
+      boost_asio_handler_invoke_helpers::invoke(handler, &handler);
     }
 
     static void do_destroy(handler* base)

Modified: trunk/boost/asio/detail/strand_service.hpp
==============================================================================
--- trunk/boost/asio/detail/strand_service.hpp	(original)
+++ trunk/boost/asio/detail/strand_service.hpp	2008-03-03 08:27:06 EST (Mon, 03 Mar 2008)
@@ -336,7 +336,7 @@
       call_stack<strand_impl>::context ctx(impl.get());
 
       // Make the upcall.
-      asio_handler_invoke_helpers::invoke(handler, &handler);
+      boost_asio_handler_invoke_helpers::invoke(handler, &handler);
     }
 
     static void do_destroy(handler_base* base)
@@ -413,7 +413,7 @@
   {
     if (call_stack<strand_impl>::contains(impl.get()))
     {
-      asio_handler_invoke_helpers::invoke(handler, &handler);
+      boost_asio_handler_invoke_helpers::invoke(handler, &handler);
     }
     else
     {

Modified: trunk/boost/asio/detail/task_io_service.hpp
==============================================================================
--- trunk/boost/asio/detail/task_io_service.hpp	(original)
+++ trunk/boost/asio/detail/task_io_service.hpp	2008-03-03 08:27:06 EST (Mon, 03 Mar 2008)
@@ -162,7 +162,7 @@
   void dispatch(Handler handler)
   {
     if (call_stack<task_io_service>::contains(this))
-      asio_handler_invoke_helpers::invoke(handler, &handler);
+      boost_asio_handler_invoke_helpers::invoke(handler, &handler);
     else
       post(handler);
   }

Modified: trunk/boost/asio/detail/win_iocp_io_service.hpp
==============================================================================
--- trunk/boost/asio/detail/win_iocp_io_service.hpp	(original)
+++ trunk/boost/asio/detail/win_iocp_io_service.hpp	2008-03-03 08:27:06 EST (Mon, 03 Mar 2008)
@@ -260,7 +260,7 @@
   void dispatch(Handler handler)
   {
     if (call_stack<win_iocp_io_service>::contains(this))
-      asio_handler_invoke_helpers::invoke(handler, &handler);
+      boost_asio_handler_invoke_helpers::invoke(handler, &handler);
     else
       post(handler);
   }
@@ -627,7 +627,7 @@
       ptr.reset();
 
       // Make the upcall.
-      asio_handler_invoke_helpers::invoke(handler, &handler);
+      boost_asio_handler_invoke_helpers::invoke(handler, &handler);
     }
 
     static void destroy_impl(operation* op)

Modified: trunk/boost/asio/detail/win_iocp_socket_service.hpp
==============================================================================
--- trunk/boost/asio/detail/win_iocp_socket_service.hpp	(original)
+++ trunk/boost/asio/detail/win_iocp_socket_service.hpp	2008-03-03 08:27:06 EST (Mon, 03 Mar 2008)
@@ -765,7 +765,7 @@
       ptr.reset();
 
       // Call the handler.
-      asio_handler_invoke_helpers::invoke(
+      boost_asio_handler_invoke_helpers::invoke(
           detail::bind_handler(handler, ec, bytes_transferred), &handler);
     }
 
@@ -958,7 +958,7 @@
       ptr.reset();
 
       // Call the handler.
-      asio_handler_invoke_helpers::invoke(
+      boost_asio_handler_invoke_helpers::invoke(
           detail::bind_handler(handler, ec, bytes_transferred), &handler);
     }
 
@@ -1170,7 +1170,7 @@
       ptr.reset();
 
       // Call the handler.
-      asio_handler_invoke_helpers::invoke(
+      boost_asio_handler_invoke_helpers::invoke(
           detail::bind_handler(handler, ec, bytes_transferred), &handler);
     }
 
@@ -1390,7 +1390,7 @@
       ptr.reset();
 
       // Call the handler.
-      asio_handler_invoke_helpers::invoke(
+      boost_asio_handler_invoke_helpers::invoke(
           detail::bind_handler(handler, ec, bytes_transferred), &handler);
     }
 
@@ -1704,7 +1704,7 @@
       // Call the handler.
       boost::system::error_code ec(last_error,
           boost::asio::error::get_system_category());
-      asio_handler_invoke_helpers::invoke(
+      boost_asio_handler_invoke_helpers::invoke(
           detail::bind_handler(handler, ec), &handler);
     }
 

Modified: trunk/boost/asio/detail/wrapped_handler.hpp
==============================================================================
--- trunk/boost/asio/detail/wrapped_handler.hpp	(original)
+++ trunk/boost/asio/detail/wrapped_handler.hpp	2008-03-03 08:27:06 EST (Mon, 03 Mar 2008)
@@ -182,7 +182,7 @@
 inline void asio_handler_invoke(const Function& function,
     rewrapped_handler<Handler, Context>* this_handler)
 {
-  asio_handler_invoke_helpers::invoke(
+  boost_asio_handler_invoke_helpers::invoke(
       function, &this_handler->context_);
 }
 

Modified: trunk/boost/asio/impl/read.ipp
==============================================================================
--- trunk/boost/asio/impl/read.ipp	(original)
+++ trunk/boost/asio/impl/read.ipp	2008-03-03 08:27:06 EST (Mon, 03 Mar 2008)
@@ -186,7 +186,7 @@
       read_handler<AsyncReadStream, MutableBufferSequence,
         CompletionCondition, ReadHandler>* this_handler)
   {
-    asio_handler_invoke_helpers::invoke(
+    boost_asio_handler_invoke_helpers::invoke(
         function, &this_handler->handler_);
   }
 } // namespace detail
@@ -282,7 +282,7 @@
       read_streambuf_handler<AsyncReadStream, Allocator,
         CompletionCondition, ReadHandler>* this_handler)
   {
-    asio_handler_invoke_helpers::invoke(
+    boost_asio_handler_invoke_helpers::invoke(
         function, &this_handler->handler_);
   }
 } // namespace detail

Modified: trunk/boost/asio/impl/read_until.ipp
==============================================================================
--- trunk/boost/asio/impl/read_until.ipp	(original)
+++ trunk/boost/asio/impl/read_until.ipp	2008-03-03 08:27:06 EST (Mon, 03 Mar 2008)
@@ -358,7 +358,7 @@
       read_until_delim_handler<AsyncReadStream,
         Allocator, ReadHandler>* this_handler)
   {
-    asio_handler_invoke_helpers::invoke(
+    boost_asio_handler_invoke_helpers::invoke(
         function, &this_handler->handler_);
   }
 } // namespace detail
@@ -515,7 +515,7 @@
       read_until_delim_string_handler<AsyncReadStream,
         Allocator, ReadHandler>* this_handler)
   {
-    asio_handler_invoke_helpers::invoke(
+    boost_asio_handler_invoke_helpers::invoke(
         function, &this_handler->handler_);
   }
 } // namespace detail
@@ -689,7 +689,7 @@
       read_until_expr_handler<AsyncReadStream,
         Allocator, ReadHandler>* this_handler)
   {
-    asio_handler_invoke_helpers::invoke(
+    boost_asio_handler_invoke_helpers::invoke(
         function, &this_handler->handler_);
   }
 } // namespace detail

Modified: trunk/boost/asio/impl/write.ipp
==============================================================================
--- trunk/boost/asio/impl/write.ipp	(original)
+++ trunk/boost/asio/impl/write.ipp	2008-03-03 08:27:06 EST (Mon, 03 Mar 2008)
@@ -172,7 +172,7 @@
       write_handler<AsyncWriteStream, ConstBufferSequence,
         CompletionCondition, WriteHandler>* this_handler)
   {
-    asio_handler_invoke_helpers::invoke(
+    boost_asio_handler_invoke_helpers::invoke(
         function, &this_handler->handler_);
   }
 } // namespace detail
@@ -250,7 +250,7 @@
       write_streambuf_handler<AsyncWriteStream,
         Allocator, WriteHandler>* this_handler)
   {
-    asio_handler_invoke_helpers::invoke(
+    boost_asio_handler_invoke_helpers::invoke(
         function, &this_handler->handler_);
   }
 } // namespace detail