ChangeLogTag: Sat Jul 17 14:34:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>

4 files changed, 13 insertions, 13 deletions

diff --git a/examples/Shared_Malloc/test_malloc.cpp b/examples/Shared_Malloc/test_malloc.cpp
index cfc52c4accf..fe566da6eab 100644
--- a/examples/Shared_Malloc/test_malloc.cpp
+++ b/examples/Shared_Malloc/test_malloc.cpp
@@ -193,7 +193,7 @@ handler (int)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   // Register a signal handler.
   ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGINT);
diff --git a/examples/Shared_Malloc/test_multiple_mallocs.cpp b/examples/Shared_Malloc/test_multiple_mallocs.cpp
index 896759fa7f9..549b83a6044 100644
--- a/examples/Shared_Malloc/test_multiple_mallocs.cpp
+++ b/examples/Shared_Malloc/test_multiple_mallocs.cpp
@@ -31,7 +31,7 @@ static const char *request_string = "hello from request repository";
 static const char *response_string = "hello from response repository";
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_MMAP_Memory_Pool_Options request_options (REQUEST_BASE_ADDR);
 
@@ -49,8 +49,8 @@ main (int, char *[])
   TEST_MALLOC *ptr = 0;
   // Create a non-adapter version of an allocator.
   ACE_NEW_RETURN (ptr,
-                  TEST_MALLOC ("response_file",
-                               "response_lock",
+                  TEST_MALLOC (ACE_TEXT("response_file"),
+                               ACE_TEXT("response_lock"),
                                &response_options),
                   1);
   auto_ptr <TEST_MALLOC> shmem_response (ptr);
diff --git a/examples/Shared_Malloc/test_persistence.cpp b/examples/Shared_Malloc/test_persistence.cpp
index 2b08189fc05..8c2f5f61e19 100644
--- a/examples/Shared_Malloc/test_persistence.cpp
+++ b/examples/Shared_Malloc/test_persistence.cpp
@@ -294,14 +294,14 @@ GUI_Handler::delete_employee (const char *name)
 }
 
 void
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
   if (argc > 1)
     ACE_OS::strcpy (backing_store, argv[1]);
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   parse_args (argc, argv);
 
diff --git a/examples/Shared_Malloc/test_position_independent_malloc.cpp b/examples/Shared_Malloc/test_position_independent_malloc.cpp
index 068b78e6215..dc756bf6847 100644
--- a/examples/Shared_Malloc/test_position_independent_malloc.cpp
+++ b/examples/Shared_Malloc/test_position_independent_malloc.cpp
@@ -115,9 +115,9 @@ initialize (TEST_MALLOC *allocator)
 }
 
 static void
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, "a:T");
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("a:T"));
 
   for (int c;
        (c = get_opt ()) != -1;
@@ -127,7 +127,7 @@ parse_args (int argc, char *argv[])
         {
         case 'a':
           // Override the default base address.
-          base_addr = ACE_reinterpret_cast (void *, 
+          base_addr = ACE_reinterpret_cast (void *,
                                             ACE_OS::atoi (get_opt.opt_arg ()));
           break;
         case 'T':
@@ -140,17 +140,17 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   parse_args (argc, argv);
 
   ACE_MMAP_Memory_Pool_Options options (base_addr);
 
   // Create an allocator.
-  TEST_MALLOC *ptr;
+  TEST_MALLOC *ptr = 0;
   ACE_NEW_RETURN (ptr,
-                  TEST_MALLOC ("test_file",
-                               "test_lock",
+                  TEST_MALLOC (ACE_TEXT("test_file"),
+                               ACE_TEXT("test_lock"),
                                &options),
                   1);
   auto_ptr <TEST_MALLOC> allocator (ptr);