ChangeLogTag: Tue Apr 23 10:01:12 2002 Johnny Willemsen <jwillemsen@remedy.nl>

21 files changed, 119 insertions, 50 deletions

diff --git a/ChangeLog b/ChangeLog
index cb6d8cce128..ed1fe2f079a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Tue Apr 23 10:03:12 UTC 2002  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Reactor/Makefile.bor:
+          Added WFMO_Reactor directory
+
+        * examples/Reactor/WFMO_Reactor/Makefile.bor:
+          Added this BCB makefile
+
+        * examples/Reactor/WFMO_Reactor/*.cpp
+          Fixed several unused argument warnings that appeared with bcb.
+          Made all files compiling when doing a wchar build.
+
 Tue Apr 23 07:35:12 UTC 2002  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/Base_Thread_Adapter.h:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index cb6d8cce128..ed1fe2f079a 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,15 @@
+Tue Apr 23 10:03:12 UTC 2002  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Reactor/Makefile.bor:
+          Added WFMO_Reactor directory
+
+        * examples/Reactor/WFMO_Reactor/Makefile.bor:
+          Added this BCB makefile
+
+        * examples/Reactor/WFMO_Reactor/*.cpp
+          Fixed several unused argument warnings that appeared with bcb.
+          Made all files compiling when doing a wchar build.
+
 Tue Apr 23 07:35:12 UTC 2002  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/Base_Thread_Adapter.h:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index cb6d8cce128..ed1fe2f079a 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,15 @@
+Tue Apr 23 10:03:12 UTC 2002  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Reactor/Makefile.bor:
+          Added WFMO_Reactor directory
+
+        * examples/Reactor/WFMO_Reactor/Makefile.bor:
+          Added this BCB makefile
+
+        * examples/Reactor/WFMO_Reactor/*.cpp
+          Fixed several unused argument warnings that appeared with bcb.
+          Made all files compiling when doing a wchar build.
+
 Tue Apr 23 07:35:12 UTC 2002  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/Base_Thread_Adapter.h:
diff --git a/examples/Reactor/Makefile.bor b/examples/Reactor/Makefile.bor
index 7193d55a2fd..106d1095bfe 100644
--- a/examples/Reactor/Makefile.bor
+++ b/examples/Reactor/Makefile.bor
@@ -5,6 +5,7 @@
 DIRS = \
         Dgram \
         Multicast \
-        Ntalker
+        Ntalker \
+        WFMO_Reactor
 
 !include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/examples/Reactor/WFMO_Reactor/Makefile.bor b/examples/Reactor/WFMO_Reactor/Makefile.bor
new file mode 100644
index 00000000000..7ccbdef59a7
--- /dev/null
+++ b/examples/Reactor/WFMO_Reactor/Makefile.bor
@@ -0,0 +1,32 @@
+#
+# Makefile for building the ACE WFMO_Reactor examples
+#
+
+NAMES = \
+        test_abandoned \
+        test_apc \
+        test_console_input \
+        test_directory_changes \
+        test_exceptions \
+        test_handle_close \
+        test_multithreading \
+        test_network_events \
+        test_prerun_state_changes \
+        test_registration \
+        test_registry_changes \
+        test_removals \
+        test_suspended_removals \
+        test_talker \
+        test_timeouts \
+        test_window_messages
+
+OBJFILES = $(OBJDIR)\$(NAME).obj
+
+CFLAGS = $(ACE_CFLAGS)
+
+CPPDIR = .
+
+LIBFILES = $(ACE_LIB)
+
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/examples/Reactor/WFMO_Reactor/test_abandoned.cpp b/examples/Reactor/WFMO_Reactor/test_abandoned.cpp
index b3c6c14b86c..52b4a3b1731 100644
--- a/examples/Reactor/WFMO_Reactor/test_abandoned.cpp
+++ b/examples/Reactor/WFMO_Reactor/test_abandoned.cpp
@@ -56,7 +56,7 @@ worker (void *data)
 }
 
 int
-Event_Handler::handle_signal (int signum,
+Event_Handler::handle_signal (int,
                               siginfo_t *s,
                               ucontext_t *)
 {
@@ -75,8 +75,8 @@ Event_Handler::handle_signal (int signum,
 }
 
 int
-Event_Handler::handle_timeout (const ACE_Time_Value &tv,
-                               const void *arg)
+Event_Handler::handle_timeout (const ACE_Time_Value &,
+                               const void *)
 {
   --this->iterations_;
   ACE_DEBUG ((LM_DEBUG,
@@ -98,7 +98,7 @@ Event_Handler::handle_timeout (const ACE_Time_Value &tv,
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int , ACE_TCHAR *[])
 {
   Event_Handler event_handler;
 
diff --git a/examples/Reactor/WFMO_Reactor/test_apc.cpp b/examples/Reactor/WFMO_Reactor/test_apc.cpp
index 5a2d79a4de5..cb245086d1c 100644
--- a/examples/Reactor/WFMO_Reactor/test_apc.cpp
+++ b/examples/Reactor/WFMO_Reactor/test_apc.cpp
@@ -59,7 +59,7 @@ queue_apc (void)
 }
 
 int
-Event_Handler::handle_signal (int signum,
+Event_Handler::handle_signal (int,
                               siginfo_t *,
                               ucontext_t *)
 {
@@ -72,8 +72,8 @@ Event_Handler::handle_signal (int signum,
 }
 
 int
-Event_Handler::handle_timeout (const ACE_Time_Value &tv,
-                               const void *arg)
+Event_Handler::handle_timeout (const ACE_Time_Value &,
+                               const void *)
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%t) timeout occured @ %T\n"));
@@ -82,7 +82,7 @@ Event_Handler::handle_timeout (const ACE_Time_Value &tv,
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   Event_Handler event_handler;
   event_handler.iterations_ = 5;
diff --git a/examples/Reactor/WFMO_Reactor/test_console_input.cpp b/examples/Reactor/WFMO_Reactor/test_console_input.cpp
index adc9915b0a2..e983c44bdfb 100644
--- a/examples/Reactor/WFMO_Reactor/test_console_input.cpp
+++ b/examples/Reactor/WFMO_Reactor/test_console_input.cpp
@@ -42,7 +42,7 @@ Event_Handler::Event_Handler (ACE_Reactor &reactor)
 }
 
 int
-Event_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *)
+Event_Handler::handle_signal (int, siginfo_t *, ucontext_t *)
 {
   ACE_TCHAR buffer[BUFSIZ];
   int result = ACE_OS::read (ACE_STDIN, buffer, sizeof buffer);
@@ -63,15 +63,15 @@ Event_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *)
 }
 
 int
-Event_Handler::handle_close (ACE_HANDLE handle,
-                             ACE_Reactor_Mask close_mask)
+Event_Handler::handle_close (ACE_HANDLE,
+                             ACE_Reactor_Mask)
 {
   ACE_DEBUG ((LM_DEBUG, "Event_Handler removed from Reactor\n"));
   return 0;
 }
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_Reactor reactor;
   Event_Handler handler (reactor);
diff --git a/examples/Reactor/WFMO_Reactor/test_directory_changes.cpp b/examples/Reactor/WFMO_Reactor/test_directory_changes.cpp
index 48c486380cb..989c063205a 100644
--- a/examples/Reactor/WFMO_Reactor/test_directory_changes.cpp
+++ b/examples/Reactor/WFMO_Reactor/test_directory_changes.cpp
@@ -63,7 +63,7 @@ Event_Handler::~Event_Handler (void)
 }
 
 int
-Event_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *)
+Event_Handler::handle_signal (int, siginfo_t *, ucontext_t *)
 {
   ::FindNextChangeNotification (this->handle_);
   if (stop_test)
@@ -72,8 +72,8 @@ Event_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *)
 }
 
 int
-Event_Handler::handle_close (ACE_HANDLE handle,
-                             ACE_Reactor_Mask close_mask)
+Event_Handler::handle_close (ACE_HANDLE,
+                             ACE_Reactor_Mask)
 {
   ACE_DEBUG ((LM_DEBUG, "Event_Handler removed from Reactor\n"));
   ::FindCloseChangeNotification (this->handle_);
@@ -100,7 +100,7 @@ worker (void)
 }
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_Reactor reactor;
   Event_Handler handler (reactor);
diff --git a/examples/Reactor/WFMO_Reactor/test_exceptions.cpp b/examples/Reactor/WFMO_Reactor/test_exceptions.cpp
index 951959f39e1..c9332b60326 100644
--- a/examples/Reactor/WFMO_Reactor/test_exceptions.cpp
+++ b/examples/Reactor/WFMO_Reactor/test_exceptions.cpp
@@ -85,7 +85,7 @@ public:
 };
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   Event_Handler handler;
   ACE_WFMO_Reactor wfmo_reactor;
diff --git a/examples/Reactor/WFMO_Reactor/test_handle_close.cpp b/examples/Reactor/WFMO_Reactor/test_handle_close.cpp
index 72a8ef29b2f..70c5759b302 100644
--- a/examples/Reactor/WFMO_Reactor/test_handle_close.cpp
+++ b/examples/Reactor/WFMO_Reactor/test_handle_close.cpp
@@ -246,7 +246,7 @@ create_reactor (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int result = 0;
 
diff --git a/examples/Reactor/WFMO_Reactor/test_multithreading.cpp b/examples/Reactor/WFMO_Reactor/test_multithreading.cpp
index 023f6c02ec3..7a66f49b25c 100644
--- a/examples/Reactor/WFMO_Reactor/test_multithreading.cpp
+++ b/examples/Reactor/WFMO_Reactor/test_multithreading.cpp
@@ -51,9 +51,9 @@ print_usage_and_die (void)
 
 // Parse the command-line arguments and set options.
 static void
-parse_args (int argc, char **argv)
+parse_args (int argc, ACE_TCHAR **argv)
 {
-  ACE_Get_Opt get_opt (argc, argv, "t:h:s:i:e:");
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("t:h:s:i:e:"));
   int c;
 
   while ((c = get_opt ()) != -1)
@@ -149,7 +149,7 @@ Task_Handler::~Task_Handler (void)
 
 
 int
-Task_Handler::handle_signal (int signum, siginfo_t *siginfo, ucontext_t *)
+Task_Handler::handle_signal (int, siginfo_t *siginfo, ucontext_t *)
 {
   // When signaled, print message, remove self, and add self
   // This will force Reactor to update its internal handle tables
@@ -174,7 +174,7 @@ Task_Handler::handle_signal (int signum, siginfo_t *siginfo, ucontext_t *)
 
 int
 Task_Handler::handle_close (ACE_HANDLE handle,
-                            ACE_Reactor_Mask close_mask)
+                            ACE_Reactor_Mask)
 {
   ACE_DEBUG ((LM_DEBUG, "(%t) handle_close() called: handle value = %d\n",
               handle));
@@ -182,7 +182,7 @@ Task_Handler::handle_close (ACE_HANDLE handle,
 }
 
 int
-Task_Handler::handle_timeout (const ACE_Time_Value &tv,
+Task_Handler::handle_timeout (const ACE_Time_Value &,
                               const void *arg)
 {
   ACE_DEBUG ((LM_DEBUG, "(%t) handle_timeout() called: iteration value = %d\n",
@@ -197,7 +197,7 @@ Task_Handler::signal (size_t index)
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
   parse_args (argc, argv);
   Task_Handler task (number_of_handles,
diff --git a/examples/Reactor/WFMO_Reactor/test_network_events.cpp b/examples/Reactor/WFMO_Reactor/test_network_events.cpp
index 3a13487af7c..22376eff58b 100644
--- a/examples/Reactor/WFMO_Reactor/test_network_events.cpp
+++ b/examples/Reactor/WFMO_Reactor/test_network_events.cpp
@@ -102,7 +102,7 @@ Network_Handler::handle_input (ACE_HANDLE handle)
 
 int
 Network_Handler::handle_close (ACE_HANDLE handle,
-                               ACE_Reactor_Mask close_mask)
+                               ACE_Reactor_Mask)
 {
   ACE_DEBUG ((LM_DEBUG, "Network_Handler::handle_close handle = %d\n", handle));
 
@@ -184,7 +184,7 @@ Network_Listener::handle_input (ACE_HANDLE handle)
 
 int
 Network_Listener::handle_close (ACE_HANDLE handle,
-                                ACE_Reactor_Mask close_mask)
+                                ACE_Reactor_Mask)
 {
   ACE_DEBUG ((LM_DEBUG, "Network_Listener::handle_close handle = %d\n", handle));
 
@@ -194,7 +194,7 @@ Network_Listener::handle_close (ACE_HANDLE handle,
 }
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   Network_Listener listener;
 
diff --git a/examples/Reactor/WFMO_Reactor/test_prerun_state_changes.cpp b/examples/Reactor/WFMO_Reactor/test_prerun_state_changes.cpp
index fb880b8c8ee..73466ac6a15 100644
--- a/examples/Reactor/WFMO_Reactor/test_prerun_state_changes.cpp
+++ b/examples/Reactor/WFMO_Reactor/test_prerun_state_changes.cpp
@@ -40,7 +40,7 @@ public:
 };
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_HANDLE handle = (ACE_HANDLE) ::socket (PF_INET, SOCK_STREAM, 0);
 
diff --git a/examples/Reactor/WFMO_Reactor/test_registration.cpp b/examples/Reactor/WFMO_Reactor/test_registration.cpp
index 6409efc2749..20a5aeb4560 100644
--- a/examples/Reactor/WFMO_Reactor/test_registration.cpp
+++ b/examples/Reactor/WFMO_Reactor/test_registration.cpp
@@ -65,7 +65,7 @@ Simple_Handler::Simple_Handler (void)
 }
 
 int
-Simple_Handler::handle_signal (int signum, siginfo_t *s, ucontext_t *)
+Simple_Handler::handle_signal (int, siginfo_t *s, ucontext_t *)
 {
   ACE_HANDLE handle = s->si_handle_;
 
@@ -90,7 +90,7 @@ Simple_Handler::handle_signal (int signum, siginfo_t *s, ucontext_t *)
 
 int
 Simple_Handler::handle_close (ACE_HANDLE handle,
-                              ACE_Reactor_Mask close_mask)
+                              ACE_Reactor_Mask)
 {
   ACE_DEBUG ((LM_DEBUG, "Simple_Handler::handle_close handle = %d\n", handle));
   this->handle_close_count_++;
@@ -133,7 +133,7 @@ worker (void)
 }
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   int result = reactor.register_handler (&simple_handler,
                                        simple_handler.event1_.handle ());
diff --git a/examples/Reactor/WFMO_Reactor/test_registry_changes.cpp b/examples/Reactor/WFMO_Reactor/test_registry_changes.cpp
index 1dd25680a1f..d8d893719ea 100644
--- a/examples/Reactor/WFMO_Reactor/test_registry_changes.cpp
+++ b/examples/Reactor/WFMO_Reactor/test_registry_changes.cpp
@@ -65,7 +65,7 @@ Event_Handler::~Event_Handler (void)
 }
 
 int
-Event_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *)
+Event_Handler::handle_signal (int, siginfo_t *, ucontext_t *)
 {
   if (stop_test)
     this->reactor ()->close ();
@@ -81,8 +81,8 @@ Event_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *)
 }
 
 int
-Event_Handler::handle_close (ACE_HANDLE handle,
-                             ACE_Reactor_Mask close_mask)
+Event_Handler::handle_close (ACE_HANDLE,
+                             ACE_Reactor_Mask)
 {
   ACE_DEBUG ((LM_DEBUG, "Event_Handler removed from Reactor\n"));
   return 0;
@@ -118,7 +118,7 @@ worker (Event_Handler *event_handler)
 }
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_Reactor reactor;
   Event_Handler handler (reactor);
diff --git a/examples/Reactor/WFMO_Reactor/test_removals.cpp b/examples/Reactor/WFMO_Reactor/test_removals.cpp
index 1c4b4acf687..43a80fc2ed3 100644
--- a/examples/Reactor/WFMO_Reactor/test_removals.cpp
+++ b/examples/Reactor/WFMO_Reactor/test_removals.cpp
@@ -79,7 +79,7 @@ private:
 };
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *[])
 {
   int close_down = argc > 1 ? 1 : 0;
 
diff --git a/examples/Reactor/WFMO_Reactor/test_suspended_removals.cpp b/examples/Reactor/WFMO_Reactor/test_suspended_removals.cpp
index 4dc7cc33bb7..cd3c51d1cbf 100644
--- a/examples/Reactor/WFMO_Reactor/test_suspended_removals.cpp
+++ b/examples/Reactor/WFMO_Reactor/test_suspended_removals.cpp
@@ -53,7 +53,7 @@ public:
 };
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   Event_Handler handler;
   ACE_WFMO_Reactor reactor;
diff --git a/examples/Reactor/WFMO_Reactor/test_talker.cpp b/examples/Reactor/WFMO_Reactor/test_talker.cpp
index 84ccb8a78b6..a09980baa7d 100644
--- a/examples/Reactor/WFMO_Reactor/test_talker.cpp
+++ b/examples/Reactor/WFMO_Reactor/test_talker.cpp
@@ -154,7 +154,7 @@ class Peer_Handler : public MT_TASK, public ACE_Handler
 {
 public:
   // = Initialization methods.
-  Peer_Handler (int argc, char *argv[]);
+  Peer_Handler (int argc, ACE_TCHAR *argv[]);
   ~Peer_Handler (void);
 
   int open (void * =0);
@@ -195,7 +195,7 @@ private:
   // something is added to the queue.
 
   // = Remote peer info.
-  char *host_;
+  ACE_TCHAR *host_;
   // Name of remote host.
 
   u_short port_;
@@ -248,7 +248,7 @@ private:
   // Handle of our thread.
 };
 
-Peer_Handler::Peer_Handler (int argc, char *argv[])
+Peer_Handler::Peer_Handler (int argc, ACE_TCHAR *argv[])
   : host_ (0),
     port_ (ACE_DEFAULT_SERVER_PORT),
     strategy_ (ACE_Reactor::instance (),
@@ -261,7 +261,7 @@ Peer_Handler::Peer_Handler (int argc, char *argv[])
   // then notifies us.
   this->msg_queue ()->notification_strategy (&this->strategy_);
 
-  ACE_Get_Opt get_opt (argc, argv, "h:p:");
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("h:p:"));
   int c;
 
   while ((c = get_opt ()) != EOF)
@@ -390,7 +390,7 @@ Peer_Handler::handle_close (ACE_HANDLE, ACE_Reactor_Mask)
 
 // New stuff added to the message queue.  Try to dequeue a message.
 int
-Peer_Handler::handle_output (ACE_HANDLE fd)
+Peer_Handler::handle_output (ACE_HANDLE)
 {
   ACE_Message_Block *mb;
 
@@ -511,7 +511,7 @@ STDIN_Handler::handle_signal (int, siginfo_t *si, ucontext_t *)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   // Let the proactor know that it will be used with Reactor
   // Create specific proactor
diff --git a/examples/Reactor/WFMO_Reactor/test_timeouts.cpp b/examples/Reactor/WFMO_Reactor/test_timeouts.cpp
index 8fa41f46a66..4a9cfe8f320 100644
--- a/examples/Reactor/WFMO_Reactor/test_timeouts.cpp
+++ b/examples/Reactor/WFMO_Reactor/test_timeouts.cpp
@@ -54,7 +54,7 @@ private:
 };
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   Timeout_Handler handler;
 
diff --git a/examples/Reactor/WFMO_Reactor/test_window_messages.cpp b/examples/Reactor/WFMO_Reactor/test_window_messages.cpp
index 93ea3b91e4d..146a9c308da 100644
--- a/examples/Reactor/WFMO_Reactor/test_window_messages.cpp
+++ b/examples/Reactor/WFMO_Reactor/test_window_messages.cpp
@@ -35,7 +35,7 @@ public:
 };
 
 int
-Event_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *)
+Event_Handler::handle_signal (int, siginfo_t *, ucontext_t *)
 {
   --this->iterations_;
 
@@ -48,9 +48,9 @@ Event_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *)
 static Event_Handler *global_event_handler;
 
 void WINAPI
-timer_callback (HWND hwnd,
-                UINT uMsg,
-                UINT idEvent,
+timer_callback (HWND,
+                UINT,
+                UINT,
                 DWORD dwTime)
 {
   ACE_DEBUG ((LM_DEBUG, "(%t) timeout occured @ %u\n", dwTime));
@@ -59,7 +59,7 @@ timer_callback (HWND hwnd,
 }
 
 int
-main (int argc, char** argv)
+ACE_TMAIN (int, ACE_TCHAR*[])
 {
   // Manage memory automagically.
   // Note that ordering here is important.