Rename to async_op_base::invoke_now

CHANGELOG.md

@@ -5,6 +5,7 @@ Version 215:
 * bind_front_handler works with member functions
 * Examples use bind_front_handler
 * Add experimental test/handler.hpp
+* Rename to async_op_base::invoke_now
 
 --------------------------------------------------------------------------------
 

example/echo-op/echo_op.cpp

@@ -316,7 +316,7 @@ async_echo(
                 // The function `async_op_base::invoke` takes care of calling
                 // the final completion handler.
 
-                this->invoke(ec);
+                this->invoke_now(ec);
             }
         }
     };

include/boost/beast/_experimental/http/impl/icy_stream.hpp

@@ -284,7 +284,7 @@ public:
                 }
             }
         upcall:
-            this->invoke(ec, bytes_transferred);
+            this->invoke_now(ec, bytes_transferred);
         }
     }
 };

include/boost/beast/core/async_op_base.hpp

@@ -119,7 +119,7 @@ namespace beast {
                 }
 
                 // Call the completion handler with the result
-                this->invoke(ec, total_bytes_transferred_);
+                this->invoke_now(ec, total_bytes_transferred_);
             }
         };
 
@@ -326,7 +326,7 @@ public:
     */
     template<class... Args>
     void
-    invoke(Args&&... args)
+    invoke_now(Args&&... args)
     {
         this->before_invoke_hook();
         wg1_.reset();
@@ -522,7 +522,7 @@ public:
                 }
 
                 // The base class destroys the temporary data automatically, before invoking the final completion handler
-                this->invoke(ec);
+                this->invoke_now(ec);
             }
         };
 

include/boost/beast/core/detail/impl/read.hpp

@@ -96,7 +96,7 @@ public:
                     beast::bind_front_handler(
                         std::move(*this), ec, total_));
             }
-            this->invoke(ec, total_);
+            this->invoke_now(ec, total_);
         }
     }
 };
@@ -204,7 +204,7 @@ public:
                     beast::bind_front_handler(
                         std::move(*this), ec, total_));
             }
-            this->invoke(ec, total_);
+            this->invoke_now(ec, total_);
         }
     }
 

include/boost/beast/core/impl/basic_stream.hpp

@@ -273,7 +273,7 @@ public:
 
         upcall:
             pg_.reset();
-            this->invoke(ec, bytes_transferred);
+            this->invoke_now(ec, bytes_transferred);
         }
     }
 };
@@ -416,7 +416,7 @@ public:
 
         pg0_.reset();
         pg1_.reset();
-        this->invoke(ec, std::forward<Args>(args)...);
+        this->invoke_now(ec, std::forward<Args>(args)...);
     }
 };
 

include/boost/beast/core/impl/buffered_read_stream.hpp

@@ -95,7 +95,7 @@ public:
             s_.buffer_.consume(bytes_transferred);
             break;
         }
-        this->invoke(ec, bytes_transferred);
+        this->invoke_now(ec, bytes_transferred);
     }
 };
 

include/boost/beast/core/impl/flat_stream.hpp

@@ -68,7 +68,7 @@ public:
         boost::system::error_code ec,
         std::size_t bytes_transferred)
     {
-        this->invoke(ec, bytes_transferred);
+        this->invoke_now(ec, bytes_transferred);
     }
 };
 

include/boost/beast/http/impl/file_body_win32.ipp

@@ -432,7 +432,7 @@ public:
                 BOOST_ASSERT(sr_.is_done());
             }
         }
-        this->invoke(ec, bytes_transferred_);
+        this->invoke_now(ec, bytes_transferred_);
     }
 };
 

include/boost/beast/http/impl/read.ipp

@@ -199,7 +199,7 @@ public:
     {
         if(! ec)
             d_.m = d_.p.release();
-        this->invoke(ec, bytes_transferred);
+        this->invoke_now(ec, bytes_transferred);
     }
 };
 

include/boost/beast/http/impl/write.ipp

@@ -117,7 +117,7 @@ public:
     {
         if(! ec)
             sr_.consume(bytes_transferred);
-        this->invoke(ec, bytes_transferred);
+        this->invoke_now(ec, bytes_transferred);
     }
 };
 
@@ -203,7 +203,7 @@ public:
                     break;
             }
         upcall:
-            this->invoke(ec, bytes_transferred_);
+            this->invoke_now(ec, bytes_transferred_);
         }
     }
 };
@@ -249,7 +249,7 @@ public:
     operator()(
         error_code ec, std::size_t bytes_transferred)
     {
-        this->invoke(ec, bytes_transferred);
+        this->invoke_now(ec, bytes_transferred);
     }
 };
 

include/boost/beast/websocket/impl/accept.hpp

@@ -83,7 +83,7 @@ public:
                 ws_.impl_->do_pmd_config(res_);
                 ws_.impl_->open(role_type::server);
             }
-            this->invoke(ec);
+            this->invoke_now(ec);
         }
     }
 };
@@ -176,7 +176,7 @@ public:
                 #endif
                 }
             }
-            this->invoke(ec);
+            this->invoke_now(ec);
         }
     }
 };

include/boost/beast/websocket/impl/close.hpp

@@ -253,7 +253,7 @@ public:
                     d_.ws.get_executor(),
                     beast::bind_front_handler(std::move(*this), ec));
             }
-            this->invoke(ec);
+            this->invoke_now(ec);
         }
     }
 };

include/boost/beast/websocket/impl/handshake.hpp

@@ -112,7 +112,7 @@ public:
             if(d_.res_p)
                 swap(d_.res, *d_.res_p);
         upcall:
-            this->invoke(ec);
+            this->invoke_now(ec);
         }
     }
 };

include/boost/beast/websocket/impl/ping.hpp

@@ -125,7 +125,7 @@ public:
             d_.ws.impl_->paused_close.maybe_invoke() ||
                 d_.ws.impl_->paused_rd.maybe_invoke() ||
                 d_.ws.impl_->paused_wr.maybe_invoke();
-            this->invoke(ec);
+            this->invoke_now(ec);
         }
     }
 };

include/boost/beast/websocket/impl/read.hpp

@@ -617,7 +617,7 @@ public:
                     beast::bind_front_handler(std::move(*this),
                         ec, bytes_written_));
             }
-            this->invoke(ec, bytes_written_);
+            this->invoke_now(ec, bytes_written_);
         }
     }
 };
@@ -690,7 +690,7 @@ public:
             }
             while(! some_ && ! ws_.is_message_done());
         upcall:
-            this->invoke(ec, bytes_written_);
+            this->invoke_now(ec, bytes_written_);
         }
     }
 };

include/boost/beast/websocket/impl/teardown.hpp

@@ -114,7 +114,7 @@ public:
                 error_code ignored;
                 s_.non_blocking(nb_, ignored);
             }
-            this->invoke(ec);
+            this->invoke_now(ec);
         }
     }
 };

include/boost/beast/websocket/impl/write.hpp

@@ -431,7 +431,7 @@ operator()(
                     std::move(*this),
                     ec, bytes_transferred_));
         }
-        this->invoke(ec, bytes_transferred_);
+        this->invoke_now(ec, bytes_transferred_);
     }
 }
 

test/beast/core/async_op_base.cpp

@@ -594,7 +594,7 @@ public:
                 }
 
                 // Call the completion handler with the result
-                this->invoke(ec, total_bytes_transferred_);
+                this->invoke_now(ec, total_bytes_transferred_);
             }
         };
 
@@ -681,7 +681,7 @@ public:
                 }
 
                 // The base class destroys the temporary data automatically, before invoking the final completion handler
-                this->invoke(ec);
+                this->invoke_now(ec);
             }
         };
 

test/doc/core_3_layers.cpp

@@ -179,7 +179,7 @@ public:
             void operator()(error_code ec, std::size_t bytes_transferred)
             {
                 stream_.bytes_read_ += bytes_transferred;
-                this->invoke(ec, bytes_transferred);
+                this->invoke_now(ec, bytes_transferred);
             }
         };
         net::async_completion<ReadHandler, void(error_code, std::size_t)> init{handler};
@@ -214,7 +214,7 @@ public:
             void operator()(error_code ec, std::size_t bytes_transferred)
             {
                 stream_.bytes_written_ += bytes_transferred;
-                this->invoke(ec, bytes_transferred);
+                this->invoke_now(ec, bytes_transferred);
             }
         };
         net::async_completion<WriteHandler, void(error_code, std::size_t)> init{handler};