From 6441487ca5f20cdce453c65fc251cf12a07d4693 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Mon, 24 Oct 2011 07:07:00 +0000
Subject: Fixed OpenVMS ambiguity

---
 TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp     | 4 ++--
 TAO/tests/POA/On_Demand_Act_Direct_Coll/Collocated_Test.cpp | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp
index 8d58e75ad98..75f8e2d482e 100644
--- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp
+++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp
@@ -6,11 +6,11 @@
 Client_Task::Client_Task (const ACE_TCHAR *ior,
                           CORBA::ORB_ptr corb,
                           ACE_Thread_Manager *thr_mgr,
-                          CORBA::Boolean exception)
+                          CORBA::Boolean except)
   : ACE_Task_Base (thr_mgr)
     , input_ (ior)
     , corb_ (CORBA::ORB::_duplicate (corb))
-    , except_ (exception)
+    , except_ (except)
 {
 }
 
diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Collocated_Test.cpp b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Collocated_Test.cpp
index 53f3bf81805..47ac698d0f9 100644
--- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Collocated_Test.cpp
+++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Collocated_Test.cpp
@@ -8,7 +8,7 @@
 
 const ACE_TCHAR *output = ACE_TEXT("test.ior");
 const ACE_TCHAR *input = ACE_TEXT("file://test.ior");
-CORBA::Boolean exception = false;
+CORBA::Boolean exception_occured = false;
 
 int
 parse_args (int argc, ACE_TCHAR *argv[])
@@ -27,11 +27,11 @@ parse_args (int argc, ACE_TCHAR *argv[])
         break;
       case 't':
         // no exception expected
-        exception = false;
+        exception_occured = false;
         break;
       case 'd':
         // exception expected
-        exception = true;
+        exception_occured = true;
         break;
       case '?':
       default:
@@ -80,7 +80,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       Client_Task client_task (input,
                                corb.in (),
                                ACE_Thread_Manager::instance (),
-                               exception);
+                               exception_occured);
 
       if (client_task.activate (THR_NEW_LWP | THR_JOINABLE,
                                 1,
-- 
cgit v1.2.1