diff options
| author | Mathis Logemann <mathisloge@gmail.com> | 2021-07-01 16:29:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-01 07:29:42 -0700 |
| commit | 153fcbcbc2e90f097eb4336669f0083320cfd504 (patch) | |
| tree | 37f8d36c0b7b869b9a85332e13ca19d938d6dffb | |
| parent | 7b97e041ae52a9439be4dbcaaafb7965a8dc1c57 (diff) | |
| download | vcpkg-153fcbcbc2e90f097eb4336669f0083320cfd504.tar.gz vcpkg-153fcbcbc2e90f097eb4336669f0083320cfd504.zip | |
[asio] update to 1.18.2 (#18728)
* [asio] update to 1.18.2
* update versions
| -rw-r--r-- | ports/asio/inline_dummy_return.patch | 13 | ||||
| -rw-r--r-- | ports/asio/portfile.cmake | 7 | ||||
| -rw-r--r-- | ports/asio/vcpkg.json | 3 | ||||
| -rw-r--r-- | versions/a-/asio.json | 5 | ||||
| -rw-r--r-- | versions/baseline.json | 4 |
5 files changed, 10 insertions, 22 deletions
diff --git a/ports/asio/inline_dummy_return.patch b/ports/asio/inline_dummy_return.patch deleted file mode 100644 index 7df7ca641..000000000 --- a/ports/asio/inline_dummy_return.patch +++ /dev/null @@ -1,13 +0,0 @@ -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) diff --git a/ports/asio/portfile.cmake b/ports/asio/portfile.cmake index af3683874..d5f65149a 100644 --- a/ports/asio/portfile.cmake +++ b/ports/asio/portfile.cmake @@ -3,11 +3,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO chriskohlhoff/asio - REF asio-1-18-1 - SHA512 c84e6fca448ed419a976756840f3f4543291a5a7d4f62d4de7c06945b2cd9ececca6633049ad5e36367d60f67a4f2735be017445514ae9fa9497d4af2a4d48f8 + REF asio-1-18-2 + SHA512 5a2312f1a14106e3109a9f02e8ac65a1d639b411834f0aa301767a4dd30d8384f6f1a94034b6016ef989c7d7880fd4c8de11c7be0cb58b4dc64a49ec335a7113 HEAD_REF master - PATCHES - inline_dummy_return.patch ) # Always use "ASIO_STANDALONE" to avoid boost dependency @@ -30,4 +28,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) # Handle copyright file(INSTALL ${SOURCE_PATH}/asio/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - diff --git a/ports/asio/vcpkg.json b/ports/asio/vcpkg.json index 076b4f608..5f285c16f 100644 --- a/ports/asio/vcpkg.json +++ b/ports/asio/vcpkg.json @@ -1,7 +1,6 @@ { "name": "asio", - "version": "1.18.1", - "port-version": 1, + "version": "1.18.2", "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/", diff --git a/versions/a-/asio.json b/versions/a-/asio.json index abb512925..658bbdd9a 100644 --- a/versions/a-/asio.json +++ b/versions/a-/asio.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "ae594f45685a04883ec38208caf740ee9c9635e8", + "version": "1.18.2", + "port-version": 0 + }, + { "git-tree": "09afe8ce875f1c4e5e46d54c7c8bd5d0b9b512fc", "version": "1.18.1", "port-version": 1 diff --git a/versions/baseline.json b/versions/baseline.json index c20979b05..1374bb9e4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -165,8 +165,8 @@ "port-version": 0 }, "asio": { - "baseline": "1.18.1", - "port-version": 1 + "baseline": "1.18.2", + "port-version": 0 }, "asiosdk": { "baseline": "2.3.3", |