3 files changed, 8 insertions, 5 deletions
diff --git a/TAO/tests/DynAny_Test/driver.cpp b/TAO/tests/DynAny_Test/driver.cpp
index 5eae425f78a..cbea23a5fef 100644
--- a/TAO/tests/DynAny_Test/driver.cpp
+++ b/TAO/tests/DynAny_Test/driver.cpp
@@ -24,13 +24,16 @@
 #include "tao/PortableServer/PortableServer.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_string.h"
+#include "ace/Argv_Type_Converter.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Driver driver;
 
   // initialize the driver
-  if (driver.init (argc, argv) == -1)
+  if (driver.init (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "(%N:%l) driver.cpp - "
                        "Driver initialization failed\n"),
@@ -106,7 +109,7 @@ Driver::parse_args (int argc, char* argv[])
                        argv [0]),
                       -1);
 
-  ACE_Get_Opt get_opts (argc, argv, "t:d");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "t:d");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp
index ce68f01c925..afd281c6225 100644
--- a/TAO/tests/DynAny_Test/test_dynsequence.cpp
+++ b/TAO/tests/DynAny_Test/test_dynsequence.cpp
@@ -248,7 +248,7 @@ Test_DynSequence::run_test (void)
       DynAnyTests::test_seq *ts_out;
       out_any1.in () >>= ts_out;
 
-      if (!ACE_OS::strcmp ((*ts_out)[0U], data.m_string1))
+      if (!ACE_OS::strcmp (static_cast<const char *>((*ts_out)[0U]), data.m_string1))
         {
           ACE_DEBUG ((LM_DEBUG,
                      "++ OK ++\n"));
diff --git a/TAO/tests/DynAny_Test/test_dynstruct.cpp b/TAO/tests/DynAny_Test/test_dynstruct.cpp
index c5d5d9780e8..2960758f42e 100644
--- a/TAO/tests/DynAny_Test/test_dynstruct.cpp
+++ b/TAO/tests/DynAny_Test/test_dynstruct.cpp
@@ -375,7 +375,7 @@ Test_DynStruct::run_test (void)
 
       CORBA::ULong index = 2;
 
-      if (ACE_OS::strcmp (gm[index].id, "es"))
+      if (ACE_OS::strcmp (gm[index].id.in(), "es"))
         {
           ++this->error_count_;
         }