5 files changed, 17 insertions, 17 deletions

diff --git a/TAO/tests/Exposed_Policies/Policy_Tester.cpp b/TAO/tests/Exposed_Policies/Policy_Tester.cpp
index 095b5a16c51..fa58c63454d 100644
--- a/TAO/tests/Exposed_Policies/Policy_Tester.cpp
+++ b/TAO/tests/Exposed_Policies/Policy_Tester.cpp
@@ -123,7 +123,7 @@ Policy_Tester::check_reference (CORBA::Object_ptr object,
 {
   if (CORBA::is_nil (object))
     {
-      ACE_DEBUG ((LM_DEBUG, ACE_TEXT (msg)));
+      ACE_DEBUG ((LM_DEBUG, msg));
       return 0;
     }
   return 1;
diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
index c78c3636bea..83dccdd7496 100644
--- a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
+++ b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
@@ -7,9 +7,9 @@ Policy_Verifier::Policy_Verifier (void)
   : priority_bands_ (0)
 {
   ACE_OS::strcpy (this->base_object_ref_,
-                  "file://default.ior");
+                  ACE_TEXT("file://default.ior"));
   ACE_OS::strcpy (this->overridden_object_ref_,
-                  "file://overridden.ior");
+                  ACE_TEXT("file://overridden.ior"));
 }
 
 Policy_Verifier::~Policy_Verifier (void)
@@ -51,7 +51,7 @@ Policy_Verifier::init (int argc, ACE_TCHAR *argv[])
                                                   CORBA::COMPLETED_NO));
             }
           this->rt_poa_properties_->ior_source (arg);
-          ACE_OS::strcpy (this->base_object_ref_, "file://");
+          ACE_OS::strcpy (this->base_object_ref_, ACE_TEXT("file://"));
           ACE_OS::strcat (this->base_object_ref_,
                           this->rt_poa_properties_->ior_source ());
         }
@@ -65,7 +65,7 @@ Policy_Verifier::init (int argc, ACE_TCHAR *argv[])
                                                   CORBA::COMPLETED_NO));
             }
           this->rt_object_properties_->ior_source (arg);
-          ACE_OS::strcpy (this->overridden_object_ref_, "file://");
+          ACE_OS::strcpy (this->overridden_object_ref_, ACE_TEXT("file://"));
           ACE_OS::strcat (this->overridden_object_ref_,
                           this->rt_object_properties_->ior_source ());
         }
@@ -230,7 +230,7 @@ Policy_Verifier::check_reference (CORBA::Object_ptr object,
 {
   if (CORBA::is_nil (object))
     {
-      ACE_DEBUG ((LM_DEBUG, ACE_TEXT (msg)));
+      ACE_DEBUG ((LM_DEBUG, msg));
       return 0;
     }
   return 1;
diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.h b/TAO/tests/Exposed_Policies/Policy_Verifier.h
index f921daed69d..52d06f1cdcb 100644
--- a/TAO/tests/Exposed_Policies/Policy_Verifier.h
+++ b/TAO/tests/Exposed_Policies/Policy_Verifier.h
@@ -62,8 +62,8 @@ private:
   Counter_var base_object_;
   Counter_var overridden_object_;
 
-  char base_object_ref_[256];
-  char overridden_object_ref_[256];
+  ACE_TCHAR base_object_ref_[256];
+  ACE_TCHAR overridden_object_ref_[256];
 };
 
 #endif /* POLICY_VERIFIER_H_ */
diff --git a/TAO/tests/Exposed_Policies/RT_Properties.cpp b/TAO/tests/Exposed_Policies/RT_Properties.cpp
index b284f3e2534..07b922d9ab1 100644
--- a/TAO/tests/Exposed_Policies/RT_Properties.cpp
+++ b/TAO/tests/Exposed_Policies/RT_Properties.cpp
@@ -12,7 +12,7 @@ ACE_RCSID (ExposedPolicies, RT_Properties, "$Id$")
 RT_Properties::RT_Properties (void)
   : priority_ (10)
 {
-  ACE_OS::strcpy (ior_source_, "poa_default.ior");
+  ACE_OS::strcpy (ior_source_, ACE_TEXT("poa_default.ior"));
 }
 
 RT_Properties::~RT_Properties (void)
@@ -21,11 +21,11 @@ RT_Properties::~RT_Properties (void)
 }
 
 RT_Properties *
-RT_Properties::read_from (const char *file_name)
+RT_Properties::read_from (const ACE_TCHAR *file_name)
 {
   FILE *fp = ACE_OS::fopen (file_name, "r");
 
-  RT_Properties *rt_properties;
+  RT_Properties *rt_properties = 0;
 
   ACE_NEW_THROW_EX (rt_properties,
                     RT_Properties,
@@ -92,14 +92,14 @@ RT_Properties::priority_bands (void)
 
 
 void
-RT_Properties::ior_source (const char *s)
+RT_Properties::ior_source (const ACE_TCHAR *s)
 {
   // @@ Angelo: please use strncpy() for strings like this, otherwise
   // you could blow the buffer limits!
   ACE_OS::strcpy (this->ior_source_, s);
 }
 
-const char *
+const ACE_TCHAR *
 RT_Properties::ior_source (void)
 {
   return this->ior_source_;
diff --git a/TAO/tests/Exposed_Policies/RT_Properties.h b/TAO/tests/Exposed_Policies/RT_Properties.h
index 4fbc06beed0..10eb8ef98d3 100644
--- a/TAO/tests/Exposed_Policies/RT_Properties.h
+++ b/TAO/tests/Exposed_Policies/RT_Properties.h
@@ -29,7 +29,7 @@ public:
   RT_Properties (void);
   ~RT_Properties (void);
 
-  static RT_Properties * read_from (const char *file_name);
+  static RT_Properties * read_from (const ACE_TCHAR *file_name);
 
   // -- Accessor Methods --
   void priority (RTCORBA::Priority priority);
@@ -38,14 +38,14 @@ public:
   void priority_bands (const RTCORBA::PriorityBands& priority_bands);
   const RTCORBA::PriorityBands& priority_bands (void);
 
-  void ior_source (const char *s);
-  const char* ior_source (void);
+  void ior_source (const ACE_TCHAR *s);
+  const ACE_TCHAR* ior_source (void);
 
 private:
 
   RTCORBA::Priority priority_;
   RTCORBA::PriorityBands priority_bands_;
-  char ior_source_[256];
+  ACE_TCHAR ior_source_[256];
 };
 
 #endif /* RT_PROPERTIES_H_ */