summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2004-12-16 12:57:15 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2004-12-16 12:57:15 +0000
commitfb971cbee839997b18f6e3962bbc251619482a99 (patch)
tree3edf4b982fcad49a5264be1c5139e5d00c44c658
parent29b578c98345d3b20adee4b2e3e087d8ce2c74b4 (diff)
downloadATCD-fb971cbee839997b18f6e3962bbc251619482a99.tar.gz
ChangeLogTag: Thu Dec 16 12:57:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--examples/Reactor/Misc/test_early_timeouts.cpp2
-rw-r--r--examples/Reactor/Misc/test_event_handler_t.cpp2
-rw-r--r--examples/Reactor/Misc/test_reactors.cpp2
-rw-r--r--examples/Reactor/Misc/test_signals_1.cpp16
-rw-r--r--examples/Reactor/Misc/test_signals_2.cpp12
-rw-r--r--examples/Reactor/Misc/test_timer_queue.cpp6
6 files changed, 20 insertions, 20 deletions
diff --git a/examples/Reactor/Misc/test_early_timeouts.cpp b/examples/Reactor/Misc/test_early_timeouts.cpp
index 910fad2e3f9..4c7193d9a67 100644
--- a/examples/Reactor/Misc/test_early_timeouts.cpp
+++ b/examples/Reactor/Misc/test_early_timeouts.cpp
@@ -28,7 +28,7 @@
ACE_RCSID(Misc, test_early_timeouts, "$Id$")
int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
{
// Mumber of seconds this test should run
int runtime_in_seconds = 10;
diff --git a/examples/Reactor/Misc/test_event_handler_t.cpp b/examples/Reactor/Misc/test_event_handler_t.cpp
index f5195d17aff..d973e0f6530 100644
--- a/examples/Reactor/Misc/test_event_handler_t.cpp
+++ b/examples/Reactor/Misc/test_event_handler_t.cpp
@@ -24,7 +24,7 @@ public:
};
int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
{
typedef ACE_Event_Handler_T<ACE_Test_Sig_Handler> EH_SH;
diff --git a/examples/Reactor/Misc/test_reactors.cpp b/examples/Reactor/Misc/test_reactors.cpp
index 59eb101b036..7af2c2709f8 100644
--- a/examples/Reactor/Misc/test_reactors.cpp
+++ b/examples/Reactor/Misc/test_reactors.cpp
@@ -158,7 +158,7 @@ worker (void *args)
}
int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
{
ACE_Reactor *react1 = ACE_Reactor::instance ();
ACE_Reactor *react2 = new ACE_Reactor ();
diff --git a/examples/Reactor/Misc/test_signals_1.cpp b/examples/Reactor/Misc/test_signals_1.cpp
index dcb7ba39c54..5c7c35e53b6 100644
--- a/examples/Reactor/Misc/test_signals_1.cpp
+++ b/examples/Reactor/Misc/test_signals_1.cpp
@@ -14,7 +14,7 @@ ACE_RCSID(Misc, test_signals_1, "$Id$")
// Number of times to allow signal to execute until we quit.
static size_t count = 10;
-static void
+static void
my_signal_function (int sig)
{
ACE_DEBUG ((LM_DEBUG,
@@ -32,7 +32,7 @@ public:
// @@ Note that this code is not portable to all OS platforms
// since it uses print statements within signal handler context.
ACE_DEBUG ((LM_DEBUG,
- "Executed ACE signal handler for signal %S, count = %d\n",
+ "Executed ACE signal handler for signal %S, count = %d\n",
sig,
count));
count--;
@@ -53,8 +53,8 @@ public:
}
};
-int
-main (int argc, char *argv[])
+int
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
// First you need a handler for the timeout.
My_Handler my_handler;
@@ -66,8 +66,8 @@ main (int argc, char *argv[])
period.set (ACE_OS::atoi (argv[1]));
// Set up the periodic interval timer.
- if (ACE_Reactor::instance ()->schedule_timer
- (&my_handler,
+ if (ACE_Reactor::instance ()->schedule_timer
+ (&my_handler,
"hello",
period,
period) == -1)
@@ -78,7 +78,7 @@ main (int argc, char *argv[])
// Set up an ACE signal handler.
- if (ACE_Reactor::instance ()->register_handler
+ if (ACE_Reactor::instance ()->register_handler
(SIGINT,
&my_handler) == -1)
ACE_ERROR_RETURN ((LM_DEBUG,
@@ -92,7 +92,7 @@ main (int argc, char *argv[])
SIGQUIT);
ACE_UNUSED_ARG (sig);
- ACE_DEBUG ((LM_DEBUG,
+ ACE_DEBUG ((LM_DEBUG,
"starting event loop that runs until you've typed ^C a total of 10 times or ^\\ once.\n"));
// This call executes the reactor events until we're finished.
diff --git a/examples/Reactor/Misc/test_signals_2.cpp b/examples/Reactor/Misc/test_signals_2.cpp
index 12ea63e6478..466ab58482f 100644
--- a/examples/Reactor/Misc/test_signals_2.cpp
+++ b/examples/Reactor/Misc/test_signals_2.cpp
@@ -230,20 +230,20 @@ external_handler (int signum)
}
#if !defined (HPUX)
-int
-main (int argc, char *[])
+int
+ACE_TMAIN (int argc, ACE_TCHAR *[])
{
// If argc > 1 then allow multiple handlers per-signal, else just
// allow 1 handler per-signal.
ACE_Sig_Handlers multi_handlers;
#if defined (ACE_WIN32)
- ACE_WFMO_Reactor reactor_impl (argc > 1
- ? &multi_handlers
+ ACE_WFMO_Reactor reactor_impl (argc > 1
+ ? &multi_handlers
: (ACE_Sig_Handler *) 0);
#else
- ACE_Select_Reactor reactor_impl (argc > 1
- ? &multi_handlers
+ ACE_Select_Reactor reactor_impl (argc > 1
+ ? &multi_handlers
: (ACE_Sig_Handler *) 0);
#endif /* ACE_WIN32 */
ACE_Reactor reactor (&reactor_impl);
diff --git a/examples/Reactor/Misc/test_timer_queue.cpp b/examples/Reactor/Misc/test_timer_queue.cpp
index e92dfe4561a..0a4d676989f 100644
--- a/examples/Reactor/Misc/test_timer_queue.cpp
+++ b/examples/Reactor/Misc/test_timer_queue.cpp
@@ -56,10 +56,10 @@ test_functionality (ACE_Timer_Queue *tq)
ACE_ASSERT (result != -1);
ACE_NEW (timer_act, int (42));
result = tq->schedule (&eh, timer_act, ACE_OS::gettimeofday ());
- ACE_ASSERT (result != -1);
+ ACE_ASSERT (result != -1);
result = tq->cancel (timer_id1, &timer_act);
- ACE_ASSERT (result == 1);
+ ACE_ASSERT (result == 1);
delete (int *) timer_act;
result = tq->is_empty ();
ACE_ASSERT (!result);
@@ -103,7 +103,7 @@ static Timer_Queues timer_queues[] =
};
int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
{
for (int i = 0; timer_queues[i].name_ != 0; i++)
{