Sun Jan 22 19:03:34 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/dds4ccm/examples/Hello/DDS_Receiver/Hello_Receiver.cpp:
        * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp:
        * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp:
        * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp:
        * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp:
          Unicode fixes

6 files changed, 22 insertions, 9 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 0c941540d29..601193e16f4 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,12 @@
+Sun Jan 22 19:03:34 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/examples/Hello/DDS_Receiver/Hello_Receiver.cpp:
+        * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp:
+        * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp:
+        * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp:
+        * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp:
+          Unicode fixes
+
 Sun Jan 22 18:01:27 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc:
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/DDS_Receiver/Hello_Receiver.cpp b/CIAO/connectors/dds4ccm/examples/Hello/DDS_Receiver/Hello_Receiver.cpp
index c9b1db849b3..28546c0a973 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/DDS_Receiver/Hello_Receiver.cpp
+++ b/CIAO/connectors/dds4ccm/examples/Hello/DDS_Receiver/Hello_Receiver.cpp
@@ -32,7 +32,7 @@ int ACE_TMAIN(int argc, ACE_TCHAR** argv) {
 
   if (argc == 2)
     {
-      char *end = 0;
+      ACE_TCHAR *end = 0;
       num_samples = ACE_OS::strtol (argv[1], &end, 10);
 
       if (end == argv[1] && num_samples < 0)
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp
index 904268dc8df..99bb034195f 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp
@@ -9,6 +9,7 @@ using namespace std;
 #include "BaseSupport.h"
 
 #include "ace/OS_main.h"
+#include "ace/OS_NS_stdlib.h"
 
 #define LIBRARY_NAME  "QueryCondition_Library"
 #define PROFILE_NAME  "QueryCondition_Profile"
@@ -265,7 +266,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 //       static_cast <NDDS_Config_LogVerbosity> (3);
 //     NDDSConfigLogger::get_instance()->set_verbosity (n_verbosity);
 
-  const char * env_domain_id = 0;
+  const ACE_TCHAR * env_domain_id = 0;
   if (argc > 1)
     {
       env_domain_id = argv[1];
@@ -279,7 +280,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   else
     printf ("Domain ID set to %s\n", env_domain_id);
 
-  const int domain_id = atoi (env_domain_id);
+  const int domain_id = ACE_OS::atoi (env_domain_id);
   /* Create the domain participant on domain ID 0 */
   DDSDomainParticipant *participant = DDSDomainParticipantFactory::get_instance()->
       create_participant_with_profile (domain_id,    /* Domain ID */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp
index ff1fff4ae4c..7b392da9354 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp
@@ -9,6 +9,7 @@ using namespace std;
 #include "BaseSupport.h"
 
 #include "ace/OS_main.h"
+#include "ace/OS_NS_stdlib.h"
 
 #define LIBRARY_NAME  "QueryCondition_Library"
 #define PROFILE_NAME  "QueryCondition_Profile"
@@ -79,7 +80,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 //     NDDS_Config_LogVerbosity n_verbosity =
 //       static_cast <NDDS_Config_LogVerbosity> (3);
 //     NDDSConfigLogger::get_instance()->set_verbosity (n_verbosity);
-    const char * env_domain_id = 0;
+    const ACE_TCHAR * env_domain_id = 0;
     if (argc > 1)
       {
         env_domain_id = argv[1];
@@ -93,7 +94,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     else
       printf ("Domain ID set to %s\n", env_domain_id);
 
-    const int domain_id = atoi (env_domain_id);
+    const int domain_id = ACE_OS::atoi (env_domain_id);
 
     DDSDomainParticipant *participant = DDSDomainParticipantFactory::get_instance()->
         create_participant_with_profile (domain_id,    /* Domain ID */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp
index e4c74e6fc6a..e70f891e82d 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp
@@ -6,6 +6,7 @@
 using namespace std;
 
 #include "ace/OS_main.h"
+#include "ace/OS_NS_stdlib.h"
 
 #include "Base_ObO.h"
 #include "Base_ObOSupport.h"
@@ -279,7 +280,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 //       static_cast <NDDS_Config_LogVerbosity> (3);
 //     NDDSConfigLogger::get_instance()->set_verbosity (n_verbosity);
 
-  const char * env_domain_id = 0;
+  const ACE_TCHAR * env_domain_id = 0;
   if (argc > 1)
     {
       env_domain_id = argv[1];
@@ -293,7 +294,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   else
     printf ("Domain ID set to %s\n", env_domain_id);
 
-  const int domain_id = atoi (env_domain_id);
+  const int domain_id = ACE_OS::atoi (env_domain_id);
 
   DDSDomainParticipant *participant = DDSDomainParticipantFactory::get_instance()->
       create_participant_with_profile (domain_id,    /* Domain ID */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp
index bfcddb3e03b..8e69e463ce3 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp
@@ -6,6 +6,7 @@
 using namespace std;
 
 #include "ace/OS_main.h"
+#include "ace/OS_NS_stdlib.h"
 
 #include "Base_ObO.h"
 #include "Base_ObOSupport.h"
@@ -79,7 +80,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 //     NDDS_Config_LogVerbosity n_verbosity =
 //       static_cast <NDDS_Config_LogVerbosity> (3);
 //     NDDSConfigLogger::get_instance()->set_verbosity (n_verbosity);
-    const char * env_domain_id = 0;
+    const ACE_TCHAR * env_domain_id = 0;
     if (argc > 1)
       {
         env_domain_id = argv[1];
@@ -93,7 +94,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     else
       printf ("Domain ID set to %s\n", env_domain_id);
 
-    const int domain_id = atoi (env_domain_id);
+    const int domain_id = ACE_OS::atoi (env_domain_id);
 
     DDSDomainParticipant *participant = DDSDomainParticipantFactory::get_instance()->
         create_participant_with_profile (domain_id,    /* Domain ID */