ChangeLogTag:Mon Jul 28 13:01:49 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

1 files changed, 17 insertions, 17 deletions

diff --git a/tests/UUIDTest.cpp b/tests/UUIDTest.cpp
index 3a034e65579..3174aeeaae5 100644
--- a/tests/UUIDTest.cpp
+++ b/tests/UUIDTest.cpp
@@ -17,7 +17,7 @@ int
 Tester::init (void)
 {
   ///Initialise the UUID Generator
-  ACE_UUID_GENERATOR::instance ()->init ();
+  ACE_Utils::UUID_GENERATOR::instance ()->init ();
   return 0;
 }
 
@@ -25,30 +25,31 @@ int
 Tester::test (void)
 {
   // Generate UUID
-  ACE_UUID* uuid = ACE_UUID_GENERATOR::instance ()->generateUUID ();
+  ACE_Utils::UUID* uuid = ACE_Utils::UUID_GENERATOR::instance ()->generateUUID ();
   ACE_CString uuid_str (uuid->to_string ()->c_str ());
   ACE_DEBUG ((LM_DEBUG,
-	      "Generated UUID\n %s\n",
-	      uuid_str.c_str ()));
+              "Generated UUID\n %s\n",
+              uuid_str.c_str ()));
   delete uuid;
 
   // Construct UUID from string
-  ACE_UUID new_uuid (uuid_str);
+  ACE_Utils::UUID new_uuid (uuid_str);
   ACE_DEBUG ((LM_DEBUG,
-	      "UUID Constructed from above Generated UUID\n %s\n",
-	      new_uuid.to_string ()->c_str ()));
+              "UUID Constructed from above Generated UUID\n %s\n",
+              new_uuid.to_string ()->c_str ()));
 
   // Generate UUID with process and thread ids.
-  ACE_UUID* uuid_with_tp_id = ACE_UUID_GENERATOR::instance ()->generateUUID (0x0001, 0xc0);
+  ACE_Utils::UUID* uuid_with_tp_id =
+    ACE_Utils::UUID_GENERATOR::instance ()->generateUUID (0x0001, 0xc0);
   ACE_DEBUG ((LM_DEBUG,
-	      "UUID with Thread and Process ID\n %s\n",
-	      uuid_with_tp_id->to_string ()->c_str ()));
+              "UUID with Thread and Process ID\n %s\n",
+              uuid_with_tp_id->to_string ()->c_str ()));
 
   // Construct UUID from string
-  ACE_UUID new_uuid_with_tp_id (uuid_with_tp_id->to_string ()->c_str ());
+  ACE_Utils::UUID new_uuid_with_tp_id (uuid_with_tp_id->to_string ()->c_str ());
   ACE_DEBUG ((LM_DEBUG,
-	      "UUID with Thread and Process ID reconstructed from above UUID \n %s\n",
-	      new_uuid_with_tp_id.to_string ()->c_str ()));
+              "UUID with Thread and Process ID reconstructed from above UUID \n %s\n",
+              new_uuid_with_tp_id.to_string ()->c_str ()));
   delete uuid_with_tp_id;
 
   return 0;
@@ -64,7 +65,7 @@ int run_main(int, ACE_TCHAR* [])
     {
 
       ACE_DEBUG((LM_DEBUG,
-		 "UUIDTest: Tester::init failed\n"));
+                 "UUIDTest: Tester::init failed\n"));
       return -1;
     }
 
@@ -73,16 +74,15 @@ int run_main(int, ACE_TCHAR* [])
   if (testRetValue == 0)
     {
       ACE_DEBUG((LM_DEBUG,
-		 "UUIDTest succeeded\n"));
+                 "UUIDTest succeeded\n"));
     }
   else
     {
       ACE_DEBUG((LM_DEBUG,
-		 "UUIDTest failed\n"));
+                 "UUIDTest failed\n"));
     }
 
   ACE_END_TEST;
 
   return testRetValue;
 }
-