Skip to content
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

[asio] Add inline dummy return patch #17611

Merged
merged 1 commit into from
May 3, 2021
+22 −1
Merged

[asio] Add inline dummy return patch #17611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions ports/asio/inline_dummy_return.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/asio/include/asio/impl/use_awaitable.hpp b/asio/include/asio/impl/use_awaitable.hpp
index 60a6f5cd..af7be635 100644
--- a/asio/include/asio/impl/use_awaitable.hpp
+++ b/asio/include/asio/impl/use_awaitable.hpp
@@ -236,7 +236,7 @@ T dummy_return()
}

template <>
-void dummy_return()
+inline void dummy_return()
{
}
#endif // defined(_MSC_VER)
2 changes: 2 additions & 0 deletions ports/asio/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ vcpkg_from_github(
REF asio-1-18-1
SHA512 c84e6fca448ed419a976756840f3f4543291a5a7d4f62d4de7c06945b2cd9ececca6633049ad5e36367d60f67a4f2735be017445514ae9fa9497d4af2a4d48f8
HEAD_REF master
PATCHES
inline_dummy_return.patch
)

# Always use "ASIO_STANDALONE" to avoid boost dependency
Expand Down
1 change: 1 addition & 0 deletions ports/asio/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "asio",
"version": "1.18.1",
"port-version": 1,
"description": "Asio is a cross-platform C++ library for network and low-level I/O programming that provides developers with a consistent asynchronous model using a modern C++ approach.",
"homepage": "https://github.com/chriskohlhoff/asio",
"documentation": "https://think-async.com/Asio/asio-1.18.0/doc/",
Expand Down
5 changes: 5 additions & 0 deletions versions/a-/asio.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "09afe8ce875f1c4e5e46d54c7c8bd5d0b9b512fc",
"version": "1.18.1",
"port-version": 1
},
{
"git-tree": "f564160afbc91228b0fe5c48f8f4c0b7dcd99b31",
"version": "1.18.1",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
},
"asio": {
"baseline": "1.18.1",
"port-version": 0
"port-version": 1
},
"asiosdk": {
"baseline": "2.3.3-1",
Expand Down