Clean up invokable on destruction

vinniefalco · Oct 18, 2016 · c15ef5b · c15ef5b
1 parent 01f939d
commit c15ef5b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+1.0.0-b17
+
+* Clean up invokable on destruction
+
+--------------------------------------------------------------------------------
+
 1.0.0-b16
 
 * Make value optional in param-list

diff --git a/include/beast/websocket/detail/invokable.hpp b/include/beast/websocket/detail/invokable.hpp
@@ -74,15 +74,11 @@ class invokable
     alignas(holder<exemplar>) buf_type buf_;
 
 public:
-#ifndef NDEBUG
     ~invokable()
     {
-        // Engaged invokables must be invoked before
-        // destruction otherwise the io_service
-        // invariants are broken w.r.t completions.
-        BOOST_ASSERT(! base_);
+        if(base_)
+            base_->~base();
     }
-#endif
 
     invokable() = default;