Merge branch 'master' into sx-init

3 files changed, 17 insertions, 16 deletions

diff --git a/ports/boost-thread/CONTROL b/ports/boost-thread/CONTROL
index 0bd043a56..e38b6f31a 100644
--- a/ports/boost-thread/CONTROL
+++ b/ports/boost-thread/CONTROL
@@ -1,5 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-thread

-Version: 1.69.0

+Version: 1.70.0-1

 Build-Depends: boost-algorithm, boost-assert, boost-atomic, boost-bind, boost-build, boost-chrono, boost-concept-check, boost-config, boost-container, boost-container-hash, boost-core, boost-date-time, boost-detail, boost-exception, boost-function, boost-integer, boost-intrusive, boost-io, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-move, boost-mpl, boost-optional, boost-predef, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-system, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi

+Homepage: https://github.com/boostorg/thread

 Description: Boost thread module

diff --git a/ports/boost-thread/avoid-winapi.patch b/ports/boost-thread/avoid-winapi.patch
index ed6a89ee7..2308600ea 100644
--- a/ports/boost-thread/avoid-winapi.patch
+++ b/ports/boost-thread/avoid-winapi.patch
@@ -1,13 +1,13 @@
-diff --git a/include/boost/thread/win32/thread_primitives.hpp b/include/boost/thread/win32/thread_primitives.hpp

-index 5e378f7..6144621 100644

---- a/include/boost/thread/win32/thread_primitives.hpp

-+++ b/include/boost/thread/win32/thread_primitives.hpp

-@@ -70,7 +70,7 @@ namespace boost

-     {

-         namespace win32

-         {

--            namespace detail { typedef ticks_type (WINAPI *gettickcount64_t)(); }

-+            namespace detail { typedef ticks_type (__stdcall *gettickcount64_t)(); }

-             extern BOOST_THREAD_DECL boost::detail::win32::detail::gettickcount64_t gettickcount64;

- 

-             enum event_type

+diff --git a/include/boost/thread/win32/thread_primitives.hpp b/include/boost/thread/win32/thread_primitives.hpp
+index e075140..d60ab36 100644
+--- a/include/boost/thread/win32/thread_primitives.hpp
++++ b/include/boost/thread/win32/thread_primitives.hpp
+@@ -70,7 +70,7 @@ namespace boost
+     {
+         namespace win32
+         {
+-            namespace detail { typedef ticks_type (BOOST_WINAPI_WINAPI_CC *gettickcount64_t)(); }
++			namespace detail { typedef ticks_type (__stdcall *gettickcount64_t)(); }
+             extern BOOST_THREAD_DECL boost::detail::win32::detail::gettickcount64_t gettickcount64;
+ 
+             enum event_type
diff --git a/ports/boost-thread/portfile.cmake b/ports/boost-thread/portfile.cmake
index 712f1e310..f17812eb3 100644
--- a/ports/boost-thread/portfile.cmake
+++ b/ports/boost-thread/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO boostorg/thread

-    REF boost-1.69.0

-    SHA512 4315662f1592e1f71a1b1a4a502c61df759a4993a376eeb61b5f01a18f4099379ad12989242ccb7d20029b7538b2629e11e707afe10d7fd721e6005c5eb25c56

+    REF boost-1.70.0

+    SHA512 2c29fc8f1ff805f126f162865c8bad51f8aa56942d54999fe0191bcf4bf8f472c070d7977e731ceb6d46ff9d0e6d39013a3df79bfe8f4ed4631906cd26c8537a

     HEAD_REF master

     PATCHES avoid-winapi.patch

 )