diff options
| -rw-r--r-- | examples/Reactor/Misc/test_reactors.cpp | 4 | ||||
| -rw-r--r-- | examples/Threads/future1.cpp | 4 | ||||
| -rw-r--r-- | examples/Threads/future2.cpp | 4 | ||||
| -rw-r--r-- | examples/Threads/manual_event.cpp | 4 | ||||
| -rw-r--r-- | examples/Threads/task_two.cpp | 2 | ||||
| -rw-r--r-- | performance-tests/Synch-Benchmarks/Benchmark.cpp | 1 | ||||
| -rw-r--r-- | tests/Future_Test.cpp | 4 | ||||
| -rw-r--r-- | tests/Reactors_Test.cpp | 4 |
8 files changed, 13 insertions, 14 deletions
diff --git a/examples/Reactor/Misc/test_reactors.cpp b/examples/Reactor/Misc/test_reactors.cpp index 5426af32d2a..8eb0c94e447 100644 --- a/examples/Reactor/Misc/test_reactors.cpp +++ b/examples/Reactor/Misc/test_reactors.cpp @@ -35,7 +35,7 @@ private: int Test_Task::task_count_ = 0; -static ACE_Atomic_Op<ACE_Thread_Mutex, u_long> done_count = MAX_TASKS * 2; +static ACE_Atomic_Op<ACE_Thread_Mutex, int> done_count = MAX_TASKS * 2; static ACE_Recursive_Thread_Mutex reclock_; @@ -183,7 +183,7 @@ main (void) } #if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION) -template class ACE_Atomic_Op<ACE_Thread_Mutex, u_long>; +template class ACE_Atomic_Op<ACE_Thread_Mutex, int>; #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */ #else diff --git a/examples/Threads/future1.cpp b/examples/Threads/future1.cpp index 00814fee881..a83e72eb97a 100644 --- a/examples/Threads/future1.cpp +++ b/examples/Threads/future1.cpp @@ -29,7 +29,7 @@ #if defined (ACE_HAS_THREADS) -typedef ACE_Atomic_Op<ACE_Thread_Mutex, u_long> ATOMIC_INT; +typedef ACE_Atomic_Op<ACE_Thread_Mutex, int> ATOMIC_INT; // a counter for the tasks.. static ATOMIC_INT task_count (0); @@ -399,7 +399,7 @@ main (int, char *[]) } #if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION) -template class ACE_Atomic_Op<ACE_Thread_Mutex, u_long>; +template class ACE_Atomic_Op<ACE_Thread_Mutex, int>; #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */ #else diff --git a/examples/Threads/future2.cpp b/examples/Threads/future2.cpp index f034d765c1e..de7e741108d 100644 --- a/examples/Threads/future2.cpp +++ b/examples/Threads/future2.cpp @@ -37,7 +37,7 @@ #if defined (ACE_HAS_THREADS) -typedef ACE_Atomic_Op<ACE_Thread_Mutex, u_long> ATOMIC_INT; +typedef ACE_Atomic_Op<ACE_Thread_Mutex, int> ATOMIC_INT; // a counter for the tasks.. static ATOMIC_INT scheduler_open_count (0); @@ -507,7 +507,7 @@ main (int, char *[]) } #if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION) -template class ACE_Atomic_Op<ACE_Thread_Mutex, u_long>; +template class ACE_Atomic_Op<ACE_Thread_Mutex, int>; #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */ #else diff --git a/examples/Threads/manual_event.cpp b/examples/Threads/manual_event.cpp index 26d477fabc0..65e08920d05 100644 --- a/examples/Threads/manual_event.cpp +++ b/examples/Threads/manual_event.cpp @@ -16,7 +16,7 @@ #include "ace/Thread_Manager.h" #if defined (ACE_HAS_THREADS) -static ACE_Atomic_Op <ACE_Thread_Mutex, u_long> amount_of_work = (u_long) 0; +static ACE_Atomic_Op <ACE_Thread_Mutex, int> amount_of_work = (u_long) 0; class Pseudo_Barrier // = TITLE @@ -35,7 +35,7 @@ public: int wait (void); private: - ACE_Atomic_Op <ACE_Thread_Mutex, u_long> counter_; + ACE_Atomic_Op <ACE_Thread_Mutex, int> counter_; ACE_Manual_Event event_; }; diff --git a/examples/Threads/task_two.cpp b/examples/Threads/task_two.cpp index c6e88d8eaa5..454b3a62adf 100644 --- a/examples/Threads/task_two.cpp +++ b/examples/Threads/task_two.cpp @@ -135,7 +135,7 @@ main (int argc, char *argv[]) } #if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION) -template class ACE_Atomic_Op<ACE_Thread_Mutex, u_long>; +template class ACE_Atomic_Op<ACE_Thread_Mutex, int>; #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */ #else diff --git a/performance-tests/Synch-Benchmarks/Benchmark.cpp b/performance-tests/Synch-Benchmarks/Benchmark.cpp index f85de897a89..74a8bf9f903 100644 --- a/performance-tests/Synch-Benchmarks/Benchmark.cpp +++ b/performance-tests/Synch-Benchmarks/Benchmark.cpp @@ -89,7 +89,6 @@ Thr_ID::thr_id (int i) #if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION) template class ACE_TSS<Thr_ID>; -template class ACE_Atomic_Op<ACE_Thread_Mutex, int>; #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */ #endif /* ACE_HAS_PTHREADS || VXWORKS */ #endif /* ACE_HAS_THREADS */ diff --git a/tests/Future_Test.cpp b/tests/Future_Test.cpp index 8207ede913c..a02542c9aff 100644 --- a/tests/Future_Test.cpp +++ b/tests/Future_Test.cpp @@ -30,7 +30,7 @@ #if defined (ACE_HAS_THREADS) -typedef ACE_Atomic_Op<ACE_Thread_Mutex, u_long> ATOMIC_INT; +typedef ACE_Atomic_Op<ACE_Thread_Mutex, int> ATOMIC_INT; // a counter for the tasks.. static ATOMIC_INT task_count (0); @@ -297,7 +297,7 @@ static int n_iterations = 50000; static int n_loops = 100; #if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION) -template class ACE_Atomic_Op<ACE_Thread_Mutex, u_long>; +template class ACE_Atomic_Op<ACE_Thread_Mutex, int>; #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */ #endif /* ACE_HAS_THREADS */ diff --git a/tests/Reactors_Test.cpp b/tests/Reactors_Test.cpp index 2c459cdbf15..661298efd2d 100644 --- a/tests/Reactors_Test.cpp +++ b/tests/Reactors_Test.cpp @@ -51,7 +51,7 @@ private: int Test_Task::task_count_ = 0; -static ACE_Atomic_Op<ACE_Thread_Mutex, u_long> done_count = MAX_TASKS * 2; +static ACE_Atomic_Op<ACE_Thread_Mutex, int> done_count = MAX_TASKS * 2; static ACE_Recursive_Thread_Mutex reclock_; @@ -164,7 +164,7 @@ worker (void *args) } #if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION) -template class ACE_Atomic_Op<ACE_Thread_Mutex, u_long>; +template class ACE_Atomic_Op<ACE_Thread_Mutex, int>; #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */ #endif /* ACE_HAS_THREADS */ |