ChangeLogTag: Fri Aug 12 08:06:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

3 files changed, 13 insertions, 13 deletions

diff --git a/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp b/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp
index 5d3f4b65659..9ad66467fbb 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp
+++ b/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp
@@ -47,19 +47,19 @@ Client_Task::svc (void)
 
       Messaging::SyncScope selectedScope = Messaging::SYNC_NONE; // default
 
-      if(syncMode_ == Client_Task::TRANSPORT) {
+      if(syncMode_ == Client_Task::MODE_TRANSPORT) {
           selectedScope = Messaging::SYNC_WITH_TRANSPORT;
           ACE_DEBUG ((LM_DEBUG, "(%P|%t) - SYNC_WITH_TRANSPORT collocated oneway test\n"));
       }
-      else if(syncMode_ == Client_Task::SERVER) {
+      else if(syncMode_ == Client_Task::MODE_SERVER) {
           selectedScope = Messaging::SYNC_WITH_SERVER;
           ACE_DEBUG ((LM_DEBUG, "(%P|%t) - SYNC_WITH_SERVER collocated oneway test\n"));
       }
-      else if(syncMode_ == Client_Task::TARGET) {
+      else if(syncMode_ == Client_Task::MODE_TARGET) {
           selectedScope = Messaging::SYNC_WITH_TARGET;
           ACE_DEBUG ((LM_DEBUG, "(%P|%t) - SYNC_WITH_TARGET collocated oneway test\n"));
       }
-      else if(syncMode_ == Client_Task::NONE) {
+      else if(syncMode_ == Client_Task::MODE_NONE) {
           selectedScope = Messaging::SYNC_NONE;
           ACE_DEBUG ((LM_DEBUG, "(%P|%t) - SYNC_NONE collocated oneway test\n"));
       }
diff --git a/TAO/tests/Collocation_Oneway_Tests/Client_Task.h b/TAO/tests/Collocation_Oneway_Tests/Client_Task.h
index ffd155b2e2c..459a44e96ce 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Client_Task.h
+++ b/TAO/tests/Collocation_Oneway_Tests/Client_Task.h
@@ -19,10 +19,10 @@ class Client_Task : public ACE_Task_Base
 public:
 
 enum ClientSyncModeEnum {
-   NONE,
-   TRANSPORT,
-   SERVER,
-   TARGET
+   MODE_NONE,
+   MODE_TRANSPORT,
+   MODE_SERVER,
+   MODE_TARGET
 };
 
   /// Constructor
diff --git a/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp b/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp
index d2801d12946..f36e0cd48f9 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp
+++ b/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp
@@ -10,7 +10,7 @@ const char *output = "test.ior";
 const char *input = "file://test.ior";
 const char *mode = "SYNC_NONE";
 
-Client_Task::ClientSyncModeEnum syncMode = Client_Task::NONE;
+Client_Task::ClientSyncModeEnum syncMode = Client_Task::MODE_NONE;
 
 // static int named_orbs = 0;
 ACE_CString server_orb;
@@ -41,16 +41,16 @@ parse_args (int argc, char *argv[])
         ACE_DEBUG ((LM_DEBUG, "(%P|%t) - mode set to <%C> for collocated oneway test\n", mode));
         if(mode) {
              if(!strcmp("none", mode)) {
-                syncMode = Client_Task::NONE;
+                syncMode = Client_Task::MODE_NONE;
              }
              else if (!strcmp("transport", mode)) {
-                syncMode = Client_Task::TRANSPORT;
+                syncMode = Client_Task::MODE_TRANSPORT;
              }
              else if (!strcmp("server", mode)) {
-                syncMode = Client_Task::SERVER;
+                syncMode = Client_Task::MODE_SERVER;
              }
              else if (!strcmp("target", mode)) {
-                syncMode = Client_Task::TARGET;
+                syncMode = Client_Task::MODE_TARGET;
              }
           }
           else {