2 files changed, 9 insertions, 11 deletions

diff --git a/flat/CIAO/DAnCE/tests/DeploymentTest1/test.cpp b/flat/CIAO/DAnCE/tests/DeploymentTest1/test.cpp
index 03aaec7fd51..26515951abb 100644
--- a/flat/CIAO/DAnCE/tests/DeploymentTest1/test.cpp
+++ b/flat/CIAO/DAnCE/tests/DeploymentTest1/test.cpp
@@ -9,7 +9,7 @@
 #include "tools/Config_Handlers/DnC_Dump.h"
 #include "tools/Config_Handlers/XML_File_Intf.h"
 
-int main (int argc, char * argv[])
+int main (int argc, ACE_TCHAR * argv[])
 {
   try
     {
@@ -24,13 +24,13 @@ int main (int argc, char * argv[])
       const char * ior = "file://execution_manager.ior";
 
       CORBA::Object_var obj = orb->string_to_object (ior);
-      if (CORBA::is_nil (obj))
+      if (CORBA::is_nil (obj. in()))
         {
           throw 0;
         }
 
       Deployment::ExecutionManager_var em = Deployment::ExecutionManager::_narrow (obj);
-      if (CORBA::is_nil (em))
+      if (CORBA::is_nil (em.in ()))
         {
           throw 0;
         }
@@ -42,7 +42,7 @@ int main (int argc, char * argv[])
       Deployment::Connections_var dc;
       Deployment::Application_var na = dam->startLaunch (dp, dc.out());
       Deployment::DomainApplication_var da = Deployment::DomainApplication::_narrow (na);
-      if (CORBA::is_nil (da))
+      if (CORBA::is_nil (da.in ()))
         {
           DANCE_DEBUG((LM_DEBUG, "[%M] narrow fails\n"));
         }
diff --git a/flat/CIAO/examples/Display/RateGen/controller.cpp b/flat/CIAO/examples/Display/RateGen/controller.cpp
index 4b9d4f5166f..6416a5e0666 100644
--- a/flat/CIAO/examples/Display/RateGen/controller.cpp
+++ b/flat/CIAO/examples/Display/RateGen/controller.cpp
@@ -12,14 +12,14 @@
  * RateGen.
  */
 
-const char *rategen_ior_ = 0;
+const ACE_TCHAR *rategen_ior_ = 0;
 int rate = 2;
 int turn_on = 1;
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:r:of");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:r:of"));
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -55,7 +55,7 @@ parse_args (int argc, char *argv[])
 
   if (rategen_ior_ == 0)
     {
-      rategen_ior_ = "file://RateGen.ior";
+      rategen_ior_ = ACE_TEXT("file://RateGen.ior");
     }
 
   if (rate == 0)
@@ -73,9 +73,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     {
       // Initialize orb
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         {