summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2020-12-10 18:41:15 +0100
committerJohnny Willemsen <jwillemsen@remedy.nl>2020-12-10 18:41:15 +0100
commit1379972a6222c61316bb85522cd9f23fcb6e344a (patch)
tree0f5d3e7f7c1dcf3a0393f57568b898fe79e5ca45
parentfc1845b702d0a269abfbe102819f79556c55eaf6 (diff)
downloadATCD-1379972a6222c61316bb85522cd9f23fcb6e344a.tar.gz
Make server_guid_counter a std::atomic
* TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp: * TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp:
-rw-r--r--TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp4
-rw-r--r--TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
index f4707507c05..28563f1378f 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
@@ -1,9 +1,9 @@
#include "FP_Scheduler.h"
-#include "ace/Atomic_Op.h"
#include "tao/RTScheduling/Request_Interceptor.h"
#include "test.h"
+#include <atomic>
-ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> server_guid_counter;
+std::atomic<long> server_guid_counter;
RTCORBA::Priority
Segment_Sched_Param_Policy::value (void)
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp
index d1a9f4b6ba2..a26d17387d1 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp
@@ -1,9 +1,9 @@
#include "MIF_Scheduler.h"
-#include "ace/Atomic_Op.h"
#include "tao/RTScheduling/Request_Interceptor.h"
#include "test.h"
+#include <atomic>
-ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> server_guid_counter;
+std::atomic<long> server_guid_counter;
DT::DT (TAO_SYNCH_MUTEX &lock,
int guid)