From 0ef561355c8f541210beed8e4fe42c87fcf40e69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Micha=C3=ABl=20Celerier?= Date: Wed, 20 Dec 2023 14:40:56 -0500 Subject: [PATCH] [asio] Try to force higher version of winsock on windows --- 3rdparty/Servus | 2 +- 3rdparty/libremidi | 2 +- src/ossia/context.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/3rdparty/Servus b/3rdparty/Servus index fff8bd0242a..358841c314c 160000 --- a/3rdparty/Servus +++ b/3rdparty/Servus @@ -1 +1 @@ -Subproject commit fff8bd0242a0cc19e3bf7136a080e5c0d35b4ead +Subproject commit 358841c314c5eb4ee482103e34d0712630bc5946 diff --git a/3rdparty/libremidi b/3rdparty/libremidi index 38e1bd7abd3..48faf362cc1 160000 --- a/3rdparty/libremidi +++ b/3rdparty/libremidi @@ -1 +1 @@ -Subproject commit 38e1bd7abd3fa26594cbfd967fa7426034247a10 +Subproject commit 48faf362cc11b2479d464af695b6d36d08b28def diff --git a/src/ossia/context.cpp b/src/ossia/context.cpp index 636cca68b8f..94f5fc392a4 100644 --- a/src/ossia/context.cpp +++ b/src/ossia/context.cpp @@ -31,7 +31,7 @@ #pragma warning(push) #pragma warning(disable : 4073) #pragma init_seg(lib) -boost::asio::detail::winsock_init<>::manual manual_winsock_init; +boost::asio::detail::winsock_init<2, 2>::manual manual_winsock_init; #pragma warning(pop) #elif defined(_WIN32) #include