summaryrefslogtreecommitdiff
path: root/tests/Service_Config_Test.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/Service_Config_Test.cpp')
-rw-r--r--tests/Service_Config_Test.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/Service_Config_Test.cpp b/tests/Service_Config_Test.cpp
index 969df5f69c0..6f6e3b912a9 100644
--- a/tests/Service_Config_Test.cpp
+++ b/tests/Service_Config_Test.cpp
@@ -91,7 +91,7 @@ Test_Singleton::Test_Singleton (u_short variety)
if (variety_ != current_++)
{
ACE_DEBUG ((LM_ERROR,
- ASYS_TEXT ("ERROR: instance %u created out of order!\n"),
+ "ERROR: instance %u created out of order!\n",
variety_));
++error;
}
@@ -102,21 +102,21 @@ Test_Singleton::Test_Singleton (u_short variety)
Test_Singleton::~Test_Singleton (void)
{
- /* ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Test_Singleton %u dtor\n"), variety_)); */
+ /* ACE_DEBUG ((LM_DEBUG, "Test_Singleton %u dtor\n", variety_)); */
if (variety_ != --current_)
{
ACE_OS::fprintf (stderr,
- ASYS_TEXT ("ERROR: instance %u destroyed out of order!\n"),
+ "ERROR: instance %u destroyed out of order!\n",
variety_);
- /* ACE_DEBUG ((LM_ERROR, ASYS_TEXT ("ERROR: instance %u destroyed out of order!\n"),
+ /* ACE_DEBUG ((LM_ERROR, "ERROR: instance %u destroyed out of order!\n",
variety_)); */
++error;
}
}
static void
-run_test (int argc, ASYS_TCHAR *argv[])
+run_test (int argc, char *argv[])
{
// We need this scope to make sure that the destructor for the
// <ACE_Service_Config> gets called.
@@ -124,15 +124,15 @@ run_test (int argc, ASYS_TCHAR *argv[])
ACE_ASSERT (daemon.open (argc, argv) != -1 || errno == ENOENT);
- ACE_Time_Value tv (argc > 1 ? ACE_OS::atoi (argv[1]) : 2);
+ ACE_Time_Value tv (argc > 1 ? atoi (argv[1]) : 2);
ACE_ASSERT (ACE_Reactor::run_event_loop (tv) == 0);
}
int
-main (int argc, ASYS_TCHAR *argv[])
+main (int argc, char *argv[])
{
- ACE_START_TEST (ASYS_TEXT ("Service_Config_Test"));
+ ACE_START_TEST ("Service_Config_Test");
for (u_int i = 0; i < VARIETIES; ++i)
{
@@ -140,7 +140,7 @@ main (int argc, ASYS_TCHAR *argv[])
if (s == 0)
ACE_ERROR_RETURN ((LM_ERROR,
- ASYS_TEXT ("instance () allocate failed!\n")),
+ "instance () allocate failed!\n"),
1);
}