if(UNIX)

microsoft · Jul 22, 2024 · 7386423 · 7386423
1 parent 254c8c1
commit 7386423
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -40,7 +40,7 @@ include(FetchContent)
 include(CheckFunctionExists)
 
 # TODO: update this once all system adapt c++20
-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "Linux")
+if(UNIX)
 set(CMAKE_CXX_STANDARD 20)
 else()
 set(CMAKE_CXX_STANDARD 17)

diff --git a/onnxruntime/core/session/inference_session.cc b/onnxruntime/core/session/inference_session.cc
@@ -2745,15 +2745,10 @@ common::Status InferenceSession::RunAsync(const RunOptions* run_options,
   if (!tp || concurrency::ThreadPool::DegreeOfParallelism(tp) < 2) {
     return ORT_MAKE_STATUS(ONNXRUNTIME, INVALID_ARGUMENT, "intra op thread pool must have at least one thread for RunAsync");
   }
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated"
-  std::function<void()> run_fn = [=]() {
-#pragma GCC diagnostic pop
+#if __cplusplus >= 202002L
+  std::function<void()> run_fn = [=, this]() {
 #else
-  #ifdef __cplusplus >= 202002L
-    std::function<void()> run_fn = [=, this]() {
-  #endif
+  std::function<void()> run_fn = [=]() {
 #endif
     Status status = Status::OK();
     ORT_TRY {