Remove _ASYNCRTIMP from ~http_listener() and implement inline

microsoft · Oct 2, 2018 · f743245 · f743245
1 parent f897582
commit f743245
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/Release/include/cpprest/http_listener.h b/Release/include/cpprest/http_listener.h
@@ -270,7 +270,16 @@ class http_listener
     /// Destructor frees any held resources.
     /// </summary>
     /// <remarks>Call close() before allowing a listener to be destroyed.</remarks>
-    _ASYNCRTIMP ~http_listener();
+    ~http_listener() {
+        if (m_impl) {
+            // As a safe guard close the listener if not already done.
+            // Users are required to call close, but this is just a safeguard.
+            try {
+                m_impl->close().wait();
+            } catch (...) {
+            }
+        }
+    }
 
     /// <summary>
     /// Asynchronously open the listener, i.e. start accepting requests.

diff --git a/Release/src/http/listener/http_listener.cpp b/Release/src/http/listener/http_listener.cpp
@@ -63,21 +63,6 @@ details::http_listener_impl::http_listener_impl(http::uri address, http_listener
     check_listener_uri(m_uri);
 }
 
-http_listener::~http_listener()
-{
-    if(m_impl)
-    {
-        // As a safe guard close the listener if not already done.
-        // Users are required to call close, but this is just a safeguard.
-        try
-        {
-            close().wait();
-        } catch(...)
-        {
-        }
-    }
-}
-
 pplx::task<void> details::http_listener_impl::open()
 {
     // Do nothing if the open operation was already attempted