diff --git a/CMakePresets.json b/CMakePresets.json index 530a1f43e92..34c1ee26bc9 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -94,10 +94,6 @@ "strategy": "set", "value": "x64" }, - "toolset": { - "strategy": "set", - "value": "host=x64" - }, "hidden": true }, { diff --git a/system/jlib/jtrace.cpp b/system/jlib/jtrace.cpp index 14f3137aca0..778447893ae 100644 --- a/system/jlib/jtrace.cpp +++ b/system/jlib/jtrace.cpp @@ -327,7 +327,7 @@ class JLogSpanExporter final : public opentelemetry::sdk::trace::SpanExporter out.append(" }"); } - catch(const std::bad_variant_access & e) + catch(const std::exception & e) { ERRLOG("Could not export span %s: %s", attsContainerName, e.what()); } @@ -1423,3 +1423,9 @@ ITraceManager & queryTraceManager() { return *theTraceManager.query([] () { return new CTraceManager; }); //throws if not initialized } + +#if WIN32 && _MSC_VER < 1933 // VS 2022 17.9 +extern "C" void __stdcall _Thrd_sleep_for(const unsigned long ms) noexcept { // suspend current thread for `ms` milliseconds + Sleep(ms); +} +#endif \ No newline at end of file