Skip to content

Support building cpprestsdk with /MT on Windows #884

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

Support building cpprestsdk with /MT on Windows #884

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f743245
Remove _ASYNCRTIMP from ~http_listener() and implement inline
ioannis-e Aug 29, 2018
d104d95
Correct relative include path to resource.h and version.h
ioannis-e Aug 29, 2018
5247191
Allow ppltasks.h and pplxtasks.h to co-exist
ioannis-e Oct 1, 2018
4be5657
Make class constructors public to allow use of make_shared
ioannis-e Oct 2, 2018
1fe626f
Correct spelling mistake
ioannis-e Oct 2, 2018
6009909
Use container allocators and deallocators with HeapAlloc and HeapFree
ioannis-e Oct 2, 2018
893c61f
Replace std:: containers with utility:: containers and new with make_…
ioannis-e Oct 2, 2018
8e5a572
Replace std:: containers with utility:: containers and new with make_…
ioannis-e Oct 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Remove _ASYNCRTIMP from ~http_listener() and implement inline
  • Loading branch information
@ioannis-e
ioannis-e committed Oct 2, 2018
commit f7432456fd1dd8a3e2dd92b5b51cfac231585ee7
11 changes: 10 additions & 1 deletion Release/include/cpprest/http_listener.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
15 changes: 0 additions & 15 deletions Release/src/http/listener/http_listener.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down