[core] Fix unresolved '_Thrd_sleep_for@4' symbol

root-project · Mar 15, 2024 · 08460af · 08460af
1 parent a91045d
commit 08460af
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/core/metacling/src/CMakeLists.txt b/core/metacling/src/CMakeLists.txt
@@ -135,12 +135,6 @@ if(MSVC)
     )
   endif()
 
-  if(MSVC_VERSION GREATER_EQUAL 1939)
-    set(cling_exports ${cling_exports}
-      _Thrd_sleep_for
-    )
-  endif()
-
   set(cling_exports ${cling_exports}
     _Smtx_lock_shared
     _Smtx_unlock_shared

diff --git a/core/winnt/src/TWinNTSystem.cxx b/core/winnt/src/TWinNTSystem.cxx
@@ -63,6 +63,8 @@
 #include <conio.h>
 #include <time.h>
 #include <bcrypt.h>
+#include <chrono>
+#include <thread>
 
 #if defined (_MSC_VER) && (_MSC_VER >= 1400)
    #include <intrin.h>
@@ -1130,6 +1132,7 @@ Bool_t TWinNTSystem::Init()
       if (buf[0]) AddDynamicPath(buf);
    }
    delete [] buf;
+   std::this_thread::sleep_for(std::chrono::duration<double, std::nano>(10));
    SetConsoleWindowName();
    fGroupsInitDone = kFALSE;
 
@@ -4579,7 +4582,7 @@ TTime TWinNTSystem::Now()
 
 void TWinNTSystem::Sleep(UInt_t milliSec)
 {
-   ::Sleep(milliSec);
+   std::this_thread::sleep_for(std::chrono::milliseconds(milliSec));
 }
 
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt
@@ -255,12 +255,6 @@ endif()
 if(MSVC)
   #---Multiproc is not supported on Windows
   set(imt_veto ${imt_veto} multicore/mp*.C multicore/mtbb201_parallelHistoFill.C)
-  if(CMAKE_SIZEOF_VOID_P EQUAL 4 AND NOT win_broken_tests)
-    # std::this_thread::sleep_for(std::chrono::duration<double, std::nano>(500));
-    # fails on Windows 32 bit and Visual Studio v17.9 with the following error:
-    # IncrementalExecutor::executeFunction: symbol '_Thrd_sleep_for@4' unresolved while linking [cling interface function]!
-    set(imt_veto ${imt_veto} multicore/mt201_parallelHistoFill.C)
-  endif()
 endif()
 
 if(ROOT_CLASSIC_BUILD)