summaryrefslogtreecommitdiff
path: root/netsvcs/clients
diff options
context:
space:
mode:
Diffstat (limited to 'netsvcs/clients')
-rw-r--r--netsvcs/clients/Naming/Client/Client_Test.cpp2
-rw-r--r--netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp2
-rw-r--r--netsvcs/clients/Naming/Dump_Restore/createfile.cpp2
-rw-r--r--netsvcs/clients/Tokens/collection/collection.cpp6
-rw-r--r--netsvcs/clients/Tokens/collection/rw_locks.cpp6
-rw-r--r--netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp6
-rw-r--r--netsvcs/clients/Tokens/invariant/invariant.cpp4
-rw-r--r--netsvcs/clients/Tokens/manual/manual.cpp6
-rw-r--r--netsvcs/clients/Tokens/mutex/test_mutex.cpp6
-rw-r--r--netsvcs/clients/Tokens/rw_lock/rw_locks.cpp6
10 files changed, 23 insertions, 23 deletions
diff --git a/netsvcs/clients/Naming/Client/Client_Test.cpp b/netsvcs/clients/Naming/Client/Client_Test.cpp
index 0cc05964720..1357af3a6cd 100644
--- a/netsvcs/clients/Naming/Client/Client_Test.cpp
+++ b/netsvcs/clients/Naming/Client/Client_Test.cpp
@@ -407,7 +407,7 @@ Client_Test::set_host (const char *hostname, int port)
this->name_options_->context (ACE_Naming_Context::NET_LOCAL);
// Set Name Options
- this->name_options_->nameserver_host (ACE_TEXT_CHAR_TO_TCHAR (hostname));
+ this->name_options_->nameserver_host (ACE_TEXT_TO_TCHAR_IN (hostname));
this->name_options_->nameserver_port (port);
return NAMING_CONTEXT ()->open (ACE_Naming_Context::NET_LOCAL);
diff --git a/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp b/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp
index bfda59cd09f..c3aba7ee354 100644
--- a/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp
+++ b/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp
@@ -98,7 +98,7 @@ Dump_Restore::handle_input (ACE_HANDLE)
case 'h' :
if (::scanf ("%s %hu", buf1, &port) <= 0)
break;
- set_host (ACE_TEXT_CHAR_TO_TCHAR (buf1), port);
+ set_host (ACE_TEXT_TO_TCHAR_IN (buf1), port);
break;
case 'F':
case 'f':
diff --git a/netsvcs/clients/Naming/Dump_Restore/createfile.cpp b/netsvcs/clients/Naming/Dump_Restore/createfile.cpp
index 25bf2fb803c..0e9f08889fc 100644
--- a/netsvcs/clients/Naming/Dump_Restore/createfile.cpp
+++ b/netsvcs/clients/Naming/Dump_Restore/createfile.cpp
@@ -7,7 +7,7 @@
ACE_RCSID(Dump_Restore, createfile, "$Id$")
int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
{
FILE *infile, *outfile;
char buf[BUFSIZ];
diff --git a/netsvcs/clients/Tokens/collection/collection.cpp b/netsvcs/clients/Tokens/collection/collection.cpp
index 8df0ae625fc..5853c5afd91 100644
--- a/netsvcs/clients/Tokens/collection/collection.cpp
+++ b/netsvcs/clients/Tokens/collection/collection.cpp
@@ -92,7 +92,7 @@ parse_args (int argc, char *argv[])
{
ACE_LOG_MSG->open (argv[0], ACE_Log_Msg::STDERR); // | ACE_Log_Msg::VERBOSE);
- ACE_Get_Opt get_opt (argc, argv, "un:dp:h:", 1);
+ ACE_Get_Arg_Opt get_opt (argc, argv, "un:dp:h:", 1);
for (int c; (c = get_opt ()) != -1; )
{
@@ -129,7 +129,7 @@ parse_args (int argc, char *argv[])
}
int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
{
if (parse_args (argc, argv) == -1)
return -1;
@@ -202,7 +202,7 @@ main (int argc, char* argv[])
#else
int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
{
ACE_ERROR_RETURN ((LM_ERROR,
"threads not supported on this platform\n"), -1);
diff --git a/netsvcs/clients/Tokens/collection/rw_locks.cpp b/netsvcs/clients/Tokens/collection/rw_locks.cpp
index 2670f99214f..81923e630c4 100644
--- a/netsvcs/clients/Tokens/collection/rw_locks.cpp
+++ b/netsvcs/clients/Tokens/collection/rw_locks.cpp
@@ -74,7 +74,7 @@ parse_args (int argc, char *argv[])
{
ACE_LOG_MSG->open (argv[0], ACE_Log_Msg::STDERR); // | ACE_Log_Msg::VERBOSE);
- ACE_Get_Opt get_opt (argc, argv, "t:iun:drR:sp:h:", 1);
+ ACE_Get_Arg_Opt get_opt (argc, argv, "t:iun:drR:sp:h:", 1);
for (int c; (c = get_opt ()) != -1; )
{
@@ -127,7 +127,7 @@ parse_args (int argc, char *argv[])
}
int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
{
if (parse_args (argc, argv) == -1)
return -1;
@@ -165,7 +165,7 @@ main (int argc, char* argv[])
#else
int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
{
ACE_ERROR_RETURN ((LM_ERROR,
"threads not supported on this platform\n"), -1);
diff --git a/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp b/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp
index e1a9d60ccd6..0ca8c13df54 100644
--- a/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp
+++ b/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp
@@ -170,7 +170,7 @@ parse_args (int argc, char *argv[])
{
ACE_LOG_MSG->open (argv[0]);
- ACE_Get_Opt get_opt (argc, argv, "iuh:rp:n:", 1);
+ ACE_Get_Arg_Opt get_opt (argc, argv, "iuh:rp:n:", 1);
for (int c; (c = get_opt ()) != -1; )
{
@@ -317,7 +317,7 @@ rwlock_test (void)
}
int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
{
if (parse_args (argc, argv) == -1)
return -1;
@@ -332,7 +332,7 @@ main (int argc, char* argv[])
}
#else
int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
{
ACE_ERROR_RETURN ((LM_ERROR,
"threads not supported on this platform\n"), -1);
diff --git a/netsvcs/clients/Tokens/invariant/invariant.cpp b/netsvcs/clients/Tokens/invariant/invariant.cpp
index cda1f54f6f7..cc9e643a0e2 100644
--- a/netsvcs/clients/Tokens/invariant/invariant.cpp
+++ b/netsvcs/clients/Tokens/invariant/invariant.cpp
@@ -157,7 +157,7 @@ run_final_test (void)
}
int
-main (int /* argc */, char* /* argv */ [])
+ACE_TMAIN (int /* argc */, ACE_TCHAR* /* argv */ [])
{
ACE_Thread_Manager mgr;
@@ -188,7 +188,7 @@ main (int /* argc */, char* /* argv */ [])
#else
int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
{
ACE_ERROR_RETURN ((LM_ERROR,
"threads not supported on this platform\n"), -1);
diff --git a/netsvcs/clients/Tokens/manual/manual.cpp b/netsvcs/clients/Tokens/manual/manual.cpp
index d75c2b543b1..f8a5e18a5a1 100644
--- a/netsvcs/clients/Tokens/manual/manual.cpp
+++ b/netsvcs/clients/Tokens/manual/manual.cpp
@@ -103,7 +103,7 @@ STDIN_Token::parse_args (int argc, char *argv[])
{
ACE_LOG_MSG->open (argv[0], ACE_Log_Msg::STDERR);
- ACE_Get_Opt get_opt (argc, argv, "h:p:diu", 1);
+ ACE_Get_Arg_Opt get_opt (argc, argv, "h:p:diu", 1);
for (int c; (c = get_opt ()) != -1; )
{
@@ -349,7 +349,7 @@ STDIN_Token::create_proxy (const char *token, char type)
}
int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
{
STDIN_Token st;
return st.open (argc, argv);
@@ -357,7 +357,7 @@ main (int argc, char* argv[])
#else
int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
{
ACE_ERROR_RETURN ((LM_ERROR,
"threads or ACE_HAS_TOKENS_LIBRARY not supported on this platform\n"), -1);
diff --git a/netsvcs/clients/Tokens/mutex/test_mutex.cpp b/netsvcs/clients/Tokens/mutex/test_mutex.cpp
index 73a33cb6c6e..5697b1aa426 100644
--- a/netsvcs/clients/Tokens/mutex/test_mutex.cpp
+++ b/netsvcs/clients/Tokens/mutex/test_mutex.cpp
@@ -69,7 +69,7 @@ parse_args (int argc, char *argv[])
{
ACE_LOG_MSG->open (argv[0]);
- ACE_Get_Opt get_opt (argc, argv, "t:uh:p:n:", 1);
+ ACE_Get_Arg_Opt get_opt (argc, argv, "t:uh:p:n:", 1);
for (int c; (c = get_opt ()) != -1; )
{
@@ -107,7 +107,7 @@ parse_args (int argc, char *argv[])
}
int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
ACE_Thread_Manager thread_mgr;
@@ -135,7 +135,7 @@ main (int argc, char *argv[])
return 0;
}
#else
-int main (int, char *[])
+int ACE_TMAIN (int, ACE_TCHAR *[])
{
ACE_ERROR_RETURN ((LM_ERROR, "you must have threads to run this test program\n"), -1);
}
diff --git a/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp b/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp
index 5d0d95af876..a4d0ddb5ecd 100644
--- a/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp
+++ b/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp
@@ -142,7 +142,7 @@ parse_args (int argc, char *argv[])
{
ACE_LOG_MSG->open (argv[0], ACE_Log_Msg::STDERR); // | ACE_Log_Msg::VERBOSE);
- ACE_Get_Opt get_opt (argc, argv, "t:iun:dr:sp:h:R", 1);
+ ACE_Get_Arg_Opt get_opt (argc, argv, "t:iun:dr:sp:h:R", 1);
for (int c; (c = get_opt ()) != -1; )
{
@@ -204,7 +204,7 @@ parse_args (int argc, char *argv[])
#endif
int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
{
if (parse_args (argc, argv) == -1)
return -1;
@@ -244,7 +244,7 @@ main (int argc, char* argv[])
#else
int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
{
ACE_ERROR_RETURN ((LM_ERROR,
"threads not supported on this platform\n"), -1);
View Lorry Controller Status