Fixed wchar issue. Fixed compilation issue for QNX.

4 files changed, 22 insertions, 9 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 53d94dbfa8c..2aaff1f87b6 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,15 @@
+Fri Feb 22 14:25:37 UTC 2013  Kevin Stanley  <stanleyk@ociweb.com>
+
+        * orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.h:
+        * orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp:
+
+          Fixed wchar issue in tests.
+
+        * tests/Bug_4059_Regression/client.cpp:
+
+          Replaced global variable name = lock to avoid issue on QNX
+          of collision with lock() function defined in unistd.h.
+
 Fri Feb 22 04:24:41 UTC 2013  Phillip LaBanca  <labancap@ociweb.com>
 
         * tests/DynAny_Test/da_tests.idl:
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp
index 840c23188d3..94c388cefcc 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp
@@ -54,8 +54,8 @@ LB_server::naming_manager (void)
 }
 
 int
-LB_server::write_ior_to_file (const char* file_name,
-                              const char *ior)
+LB_server::write_ior_to_file (const ACE_TCHAR *file_name,
+                              const ACE_TCHAR *ior)
 {
   FILE *output_file =
     ACE_OS::fopen (file_name, "w");
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.h b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.h
index 08e89284234..9b5a4234183 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.h
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.h
@@ -93,7 +93,8 @@ private:
   static int called_once_;
 
   /// write the IOR to a file so that it can be read later.
-  int write_ior_to_file (const char *filename, const char *ior);
+  int write_ior_to_file (const ACE_TCHAR *filename,
+                         const ACE_TCHAR *ior);
 
   CORBA::ORB_var orb_;
   int argc_;
diff --git a/TAO/tests/Bug_4059_Regression/client.cpp b/TAO/tests/Bug_4059_Regression/client.cpp
index b8fbaa4a5aa..1d9cbe489c2 100644
--- a/TAO/tests/Bug_4059_Regression/client.cpp
+++ b/TAO/tests/Bug_4059_Regression/client.cpp
@@ -10,8 +10,8 @@
 #include "ace/Thread.h"
 #include "ace/Get_Opt.h"
 
-TAO_SYNCH_MUTEX lock;
-ACE_Condition<TAO_SYNCH_MUTEX> cond (lock);
+TAO_SYNCH_MUTEX test_lock;
+ACE_Condition<TAO_SYNCH_MUTEX> cond (test_lock);
 bool is_ok = false;
 CORBA::ORB_var orb;
 
@@ -45,10 +45,10 @@ parse_args (int argc, ACE_TCHAR *argv[])
 
 ACE_THR_FUNC_RETURN failsafe (void *)
 {
-  lock.acquire();
+  test_lock.acquire();
   ACE_Time_Value timeout = ACE_OS::gettimeofday() + ACE_Time_Value (10,0);
   cond.wait(&timeout);
-  lock.release();
+  test_lock.release();
   if (!is_ok)
     {
       ACE_DEBUG ((LM_DEBUG, "FAILURE: failsafe timed out\n"));
@@ -105,9 +105,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       Test::Hello_var hello = Test::Hello::_narrow(object.in());
 
       is_ok = true;
-      lock.acquire ();
+      test_lock.acquire ();
       cond.signal();
-      lock.release ();
+      test_lock.release ();
       ACE_DEBUG ((LM_DEBUG, "SUCCESS: test did not spin.\n"));
 
       CORBA::String_var the_string = hello->get_string ();