ChangeLogTag: Fri Aug 27 09:35:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>

8 files changed, 34 insertions, 34 deletions

diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp b/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp
index 07373da7ef7..95553833e72 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp
@@ -5,7 +5,7 @@
 ACE_RCSID(server, Handle_R_Stream, "$Id$")
 
 #if defined (SunOS4)
-extern "C" 
+extern "C"
 {
   int init (void);
   int fini (void);
@@ -13,14 +13,14 @@ extern "C"
   void __std__Handle_R_Stream_C_recv_n_();
 }
 
-int 
+int
 init (void)
 {
   __sti__Handle_R_Stream_C_recv_n_();
   return 0;
 }
 
-int 
+int
 fini (void)
 {
   __std__Handle_R_Stream_C_recv_n_();
@@ -28,7 +28,7 @@ fini (void)
 }
 #endif /* SunOS4 */
 
-// Static variables. 
+// Static variables.
 
 u_short Handle_R_Stream::DEFAULT_PORT = ACE_DEFAULT_SERVER_PORT;
 char *Handle_R_Stream::login_name  = 0;
@@ -39,4 +39,4 @@ char Handle_R_Stream::login[ACE_MAX_USERID];
 #endif /* __ACE_INLINE__ */
 
 Handle_R_Stream	    remote_stream;
-ACE_Service_Object_Type rs (&remote_stream, "Remote_Stream");
+ACE_Service_Object_Type rs (&remote_stream, ACE_TEXT("Remote_Stream"));
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h b/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h
index 2b7978cbff2..d49d10ae4a5 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h
@@ -24,8 +24,8 @@ class ACE_Svc_Export Handle_R_Stream : public ACE_Service_Object, public ACE_SOC
 {
 public:
   Handle_R_Stream (void);
-  virtual int init (int argc, char *argv[]);
-  virtual int info (char **, size_t) const;
+  virtual int init (int argc, ACE_TCHAR *argv[]);
+  virtual int info (ACE_TCHAR **, size_t) const;
   virtual int fini (void);
 
 private:
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i b/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i
index 8f8912c8f63..f126cd13aee 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i
@@ -27,19 +27,19 @@ Handle_R_Stream::open (const ACE_INET_Addr &sia, int async)
 }
 
 ACE_INLINE int
-Handle_R_Stream::info (char **strp, size_t length) const
+Handle_R_Stream::info (ACE_TCHAR **strp, size_t length) const
 {
-  char buf[BUFSIZ];
+  ACE_TCHAR buf[BUFSIZ];
   ACE_INET_Addr sa;
 
   if (this->get_local_addr (sa) == -1)
     return -1;
 
   ACE_OS::sprintf (buf,
-                   "%d/%s %s",
+                   ACE_TEXT("%d/%s %s"),
                    sa.get_port_number (),
-                   "tcp",
-                   "# tests remote stream\n");
+                   ACE_TEXT("tcp"),
+                   ACE_TEXT("# tests remote stream\n"));
 
   if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0)
     return -1;
@@ -49,10 +49,10 @@ Handle_R_Stream::info (char **strp, size_t length) const
 }
 
 ACE_INLINE int
-Handle_R_Stream::init (int argc, char *argv[])
+Handle_R_Stream::init (int argc, ACE_TCHAR *argv[])
 {
   ACE_INET_Addr sis (Handle_R_Stream::DEFAULT_PORT);
-  ACE_Get_Opt   get_opt (argc, argv, "p:", 0);
+  ACE_Get_Opt   get_opt (argc, argv, ACE_TEXT("p:"), 0);
 
   for (int c; (c = get_opt ()) != -1; )
      switch (c)
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp b/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp
index 8083f372b42..ed914792c3e 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp
@@ -40,17 +40,17 @@ Handle_Thr_Acceptor<SVH, PR_AC_2>::Handle_Thr_Acceptor (void)
 }
 
 template <class SVH, PR_AC_1> int
-Handle_Thr_Acceptor<SVH, PR_AC_2>::info (char **strp,
+Handle_Thr_Acceptor<SVH, PR_AC_2>::info (ACE_TCHAR **strp,
 					size_t length) const
 {
-  char buf[BUFSIZ];
+  ACE_TCHAR buf[BUFSIZ];
   ACE_INET_Addr sa;
 
   if (this->acceptor ().get_local_addr (sa) == -1)
     return -1;
 
-  ACE_OS::sprintf (buf, "%d/%s %s", sa.get_port_number (), "tcp",
-	     "# tests threaded remote stream\n");
+  ACE_OS::sprintf (buf, ACE_TEXT("%d/%s %s"), sa.get_port_number (), ACE_TEXT("tcp"),
+       ACE_TEXT("# tests threaded remote stream\n"));
 
   if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0)
     return -1;
@@ -60,12 +60,12 @@ Handle_Thr_Acceptor<SVH, PR_AC_2>::info (char **strp,
 }
 
 template <class SVH, PR_AC_1> int
-Handle_Thr_Acceptor<SVH, PR_AC_2>::init (int argc, char *argv[])
+Handle_Thr_Acceptor<SVH, PR_AC_2>::init (int argc, ACE_TCHAR *argv[])
 {
   ACE_INET_Addr local_addr (ACE_DEFAULT_THR_PORT);
   int n_threads = ACE_DEFAULT_THREADS;
 
-  ACE_Get_Opt get_opt (argc, argv, "p:t:", 0);
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("p:t:"), 0);
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c)
@@ -192,7 +192,7 @@ typedef Handle_Thr_Acceptor<CLI_STREAM, THR_ACCEPTOR> HANDLE_THR_ACCEPTOR;
 
 // Service object.
 HANDLE_THR_ACCEPTOR remote_thr_stream;
-ACE_Service_Object_Type rts (&remote_thr_stream, "Remote_Thr_Stream");
+ACE_Service_Object_Type rts (&remote_thr_stream, ACE_TEXT("Remote_Thr_Stream"));
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Acceptor<CLI_STREAM, THR_ACCEPTOR>;
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h b/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h
index da61b0357e4..7b98b361869 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h
@@ -27,8 +27,8 @@ public:
   ~Handle_Thr_Acceptor (void);
 
   // = Dynamic linking hooks.
-  virtual int init (int argc, char *argv[]);
-  virtual int info (char **, size_t) const;
+  virtual int init (int argc, ACE_TCHAR *argv[]);
+  virtual int info (ACE_TCHAR **, size_t) const;
   virtual int fini (void);
 
 private:
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp b/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp
index 74081e1581e..9eccf88ef43 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp
@@ -5,7 +5,7 @@
 ACE_RCSID(server, Handle_Timeout, "$Id$")
 
 #if defined (SunOS4)
-extern "C" 
+extern "C"
 {
   int init (void);
   int fini (void);
@@ -13,14 +13,14 @@ extern "C"
   void __std__Handle_Timeout_C_init_();
 }
 
-int 
+int
 init (void)
 {
   __sti__Handle_Timeout_C_init_();
   return 0;
 }
 
-int 
+int
 fini (void)
 {
   __std__Handle_Timeout_C_init_();
@@ -33,4 +33,4 @@ fini (void)
 #endif /* __ACE_INLINE__ */
 
 Handle_Timeout timer_1;
-ACE_Service_Object_Type t1 (&timer_1, "Timer_1");
+ACE_Service_Object_Type t1 (&timer_1, ACE_TEXT("Timer_1"));
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h b/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h
index 1e3c82960fe..8f30199b480 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h
@@ -21,8 +21,8 @@ class ACE_Svc_Export Handle_Timeout : public ACE_Service_Object
 {
 public:
   Handle_Timeout (void);
-  virtual int init (int argc, char *argv[]);
-  virtual int info (char **, size_t) const;
+  virtual int init (int argc, ACE_TCHAR *argv[]);
+  virtual int info (ACE_TCHAR **, size_t) const;
   virtual int fini (void);
 
 private:
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i b/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i
index efad9dd62b3..fbea27d826c 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i
@@ -12,11 +12,11 @@ Handle_Timeout::Handle_Timeout (void): count (0)
 }
 
 ACE_INLINE int
-Handle_Timeout::info (char **strp, size_t length) const
+Handle_Timeout::info (ACE_TCHAR **strp, size_t length) const
 {
-  char buf[BUFSIZ];
+  ACE_TCHAR buf[BUFSIZ];
 
-  ACE_OS::sprintf (buf, "%s", "# tests timeout facility\n");
+  ACE_OS::sprintf (buf, ACE_TEXT("%s"), ACE_TEXT("# tests timeout facility\n"));
 
   if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0)
     return -1;
@@ -26,11 +26,11 @@ Handle_Timeout::info (char **strp, size_t length) const
 }
 
 ACE_INLINE int
-Handle_Timeout::init (int argc, char *argv[])
+Handle_Timeout::init (int argc, ACE_TCHAR *argv[])
 {
   ACE_Time_Value delta (10);
   ACE_Time_Value interval (1);
-  ACE_Get_Opt    get_opt (argc, argv, "a:d:i:", 0);
+  ACE_Get_Opt    get_opt (argc, argv, ACE_TEXT("a:d:i:"), 0);
   int        arg = 0;
 
   for (int c; (c = get_opt ()) != -1; )