Merge branch 'master' into DOCGroup#2163-Race-condition-in-ACE_Future…

…-double-checked-locking-pattern-code
nfrmtkr · Jan 14, 2024 · 6695073 · 6695073
2 parents b94f1dc + 8c49e7b
commit 6695073
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/ACE/ace/Barrier.h b/ACE/ace/Barrier.h
@@ -45,6 +45,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 
 #else /* ACE_HAS_THREADS */
 
+#include <atomic>
 #include "ace/Condition_Thread_Mutex.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -63,7 +64,7 @@ struct ACE_Export ACE_Sub_Barrier
   ACE_Condition_Thread_Mutex barrier_finished_;
 
   /// Number of threads that are still running.
-  int running_threads_;
+  std::atomic<int> running_threads_;
 
   /// Dump the state of an object.
   void dump () const;