Merge branch 'master' into cmake

2022-01-11 19:19:09 +01:00
parent 4709295598 8e551bb287
commit f3bb5ccef9
955 changed files with 424454 additions and 217753 deletions
--- a/thirdparty/Boost/lib/pthread/thread.cpp
+++ b/thirdparty/Boost/lib/pthread/thread.cpp
@@ -350,7 +350,7 @@ namespace boost
                    cond.timed_wait(lock, xt);
 #   endif
                    xtime cur;
-                    xtime_get(&cur, TIME_UTC);
+                    xtime_get(&cur, TIME_UTC_);
                    if (xtime_cmp(xt, cur) <= 0)
                        return;
                }
@@ -365,7 +365,7 @@ namespace boost
            BOOST_VERIFY(!pthread_yield());
 #   else
            xtime xt;
-            xtime_get(&xt, TIME_UTC);
+            xtime_get(&xt, TIME_UTC_);
            sleep(xt);
 #   endif
        }