Fix std::memory_order according to changes in C++20

The new code should be compatible with C++17 as well
sofa-framework · Oct 22, 2024 · e58a66b · e58a66b
1 parent 1d9f613
commit e58a66b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...agrangian/Solver/src/sofa/component/constraint/lagrangian/solver/ConstraintSolverImpl.cpp b/...agrangian/Solver/src/sofa/component/constraint/lagrangian/solver/ConstraintSolverImpl.cpp
@@ -52,7 +52,7 @@ void ConstraintProblem::clear(int nbConstraints)
     f.resize(nbConstraints);
 
     static std::atomic<unsigned int> counter = 0;
-    problemId = counter.fetch_add(1, std::memory_order::memory_order_relaxed);
+    problemId = counter.fetch_add(1, std::memory_order_relaxed);
 }
 
 unsigned int ConstraintProblem::getProblemId()

diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/DefaultTaskScheduler.cpp b/Sofa/framework/Simulation/Core/src/sofa/simulation/DefaultTaskScheduler.cpp
@@ -224,12 +224,12 @@ void DefaultTaskScheduler::WaitForWorkersToBeReady()
 
 void DefaultTaskScheduler::setMainTaskStatus(const Task::Status* mainTaskStatus)
 {
-    m_mainTaskStatus.store(mainTaskStatus, std::memory_order::memory_order_relaxed);
+    m_mainTaskStatus.store(mainTaskStatus, std::memory_order_relaxed);
 }
 
 bool DefaultTaskScheduler::testMainTaskStatus(const Task::Status* status)
 {
-    return m_mainTaskStatus.load(std::memory_order::memory_order_relaxed) == status;
+    return m_mainTaskStatus.load(std::memory_order_relaxed) == status;
 }
 
 } // namespace sofa::simulation