Fri Dec 17 14:42:53 UTC 2010 Martin Corino <mcorino@remedy.nl>

        * */*.*:
          Merged RemedyWork branch. 

1 files changed, 16 insertions, 16 deletions

diff --git a/ACE/tests/Atomic_Op_Test.cpp b/ACE/tests/Atomic_Op_Test.cpp
index d0109b6093a..739531d009f 100644
--- a/ACE/tests/Atomic_Op_Test.cpp
+++ b/ACE/tests/Atomic_Op_Test.cpp
@@ -36,39 +36,39 @@ int test (const ACE_TCHAR* type, int iterations)
   int retval = 0;
   ACE_Atomic_Op <ACE_SYNCH_MUTEX, TYPE> foo (5);
 
-  ACE_ASSERT (foo == 5);
+  ACE_TEST_ASSERT (foo == 5);
 
   TYPE result = ++foo;
-  ACE_ASSERT (foo == 6);
-  ACE_ASSERT (result == 6);
+  ACE_TEST_ASSERT (foo == 6);
+  ACE_TEST_ASSERT (result == 6);
 
   result = --foo;
-  ACE_ASSERT (foo == 5);
-  ACE_ASSERT (result == 5);
+  ACE_TEST_ASSERT (foo == 5);
+  ACE_TEST_ASSERT (result == 5);
 
   result = foo++;
-  ACE_ASSERT (foo == 6);
-  ACE_ASSERT (result == 5);
+  ACE_TEST_ASSERT (foo == 6);
+  ACE_TEST_ASSERT (result == 5);
 
   result = foo--;
-  ACE_ASSERT (foo == 5);
-  ACE_ASSERT (result == 6);
+  ACE_TEST_ASSERT (foo == 5);
+  ACE_TEST_ASSERT (result == 6);
 
   result = foo += 10;
-  ACE_ASSERT (foo == 15);
-  ACE_ASSERT (result == 15);
+  ACE_TEST_ASSERT (foo == 15);
+  ACE_TEST_ASSERT (result == 15);
 
   result = foo -= 10;
-  ACE_ASSERT (foo == 5);
-  ACE_ASSERT (result == 5);
+  ACE_TEST_ASSERT (foo == 5);
+  ACE_TEST_ASSERT (result == 5);
 
   foo = 7;
-  ACE_ASSERT (foo == 7);
+  ACE_TEST_ASSERT (foo == 7);
 
   ACE_Atomic_Op <ACE_SYNCH_MUTEX, TYPE> foo2 (5);
   foo2 = foo;
-  ACE_ASSERT (foo == 7);
-  ACE_ASSERT (foo2 == 7);
+  ACE_TEST_ASSERT (foo == 7);
+  ACE_TEST_ASSERT (foo2 == 7);
 
   ACE_UINT64 usec;