summaryrefslogtreecommitdiff
path: root/TAO/tests/RTScheduling
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/RTScheduling')
-rw-r--r--TAO/tests/RTScheduling/Current/test.cpp9
-rw-r--r--TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h2
-rw-r--r--TAO/tests/RTScheduling/DT_Spawn/test.cpp9
-rw-r--r--TAO/tests/RTScheduling/Scheduler.cpp3
-rw-r--r--TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp17
-rw-r--r--TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp18
-rw-r--r--TAO/tests/RTScheduling/Thread_Cancel/test.cpp9
-rw-r--r--TAO/tests/RTScheduling/VoidData/test_client.cpp9
8 files changed, 50 insertions, 26 deletions
diff --git a/TAO/tests/RTScheduling/Current/test.cpp b/TAO/tests/RTScheduling/Current/test.cpp
index ffcf6dbf8a3..481fe5eaebd 100644
--- a/TAO/tests/RTScheduling/Current/test.cpp
+++ b/TAO/tests/RTScheduling/Current/test.cpp
@@ -3,15 +3,18 @@
#include "Thread_Task.h"
#include "../Scheduler.h"
#include "tao/RTScheduling/RTScheduler_Manager.h"
+#include "ace/Argv_Type_Converter.h"
int
-main (int argc, char* argv [])
+ACE_TMAIN (int argc, ACE_TCHAR* argv [])
{
+ ACE_Argv_Type_Converter convert (argc, argv);
+
ACE_TRY_NEW_ENV
{
CORBA::ORB_var orb =
- CORBA::ORB_init (argc,
- argv,
+ CORBA::ORB_init (convert.get_argc(),
+ convert.get_ASCII_argv(),
""
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
diff --git a/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h b/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h
index 37da9a5de01..873abdd819a 100644
--- a/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h
+++ b/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h
@@ -7,6 +7,8 @@
#include "ace/OS_NS_string.h"
#include "ace/SString.h"
+#include "tao/RTScheduling/RTSchedulerC.h"
+
class Data
{
public:
diff --git a/TAO/tests/RTScheduling/DT_Spawn/test.cpp b/TAO/tests/RTScheduling/DT_Spawn/test.cpp
index fab57bcd8ce..bfbb4a96681 100644
--- a/TAO/tests/RTScheduling/DT_Spawn/test.cpp
+++ b/TAO/tests/RTScheduling/DT_Spawn/test.cpp
@@ -5,10 +5,13 @@
#include "Thread_Action.h"
#include "ace/Thread_Manager.h"
#include "ace/SString.h"
+#include "ace/Argv_Type_Converter.h"
int
-main (int argc, char* argv [])
+ACE_TMAIN (int argc, ACE_TCHAR* argv [])
{
+ ACE_Argv_Type_Converter convert (argc, argv);
+
CORBA::ORB_var orb;
RTScheduling::Current_var current;
@@ -20,8 +23,8 @@ main (int argc, char* argv [])
ACE_TRY_NEW_ENV
{
- orb = CORBA::ORB_init (argc,
- argv,
+ orb = CORBA::ORB_init (convert.get_argc(),
+ convert.get_ASCII_argv(),
""
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
diff --git a/TAO/tests/RTScheduling/Scheduler.cpp b/TAO/tests/RTScheduling/Scheduler.cpp
index 885e7ba2fd7..5e9ac4bf9e0 100644
--- a/TAO/tests/RTScheduling/Scheduler.cpp
+++ b/TAO/tests/RTScheduling/Scheduler.cpp
@@ -3,8 +3,11 @@
#include "Scheduler.h"
#include "tao/ORB.h"
#include "ace/Atomic_Op.h"
+#include "ace/Argv_Type_Converter.h"
#include "tao/RTScheduling/Request_Interceptor.h"
+#include "tao/IOP_IORC.h"
+
TAO_Scheduler::TAO_Scheduler (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
{
CORBA::Object_var current_obj =
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp
index 14c947939fb..a1d655029af 100644
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp
@@ -3,16 +3,17 @@
#include "tao/RTScheduling/RTScheduler_Manager.h"
#include "testC.h"
#include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
#include "ace/SString.h"
ACE_CString ior = "file://test.ior";
int
parse_args (int argc,
- ACE_TCHAR* argv [])
+ char* argv [])
{
// Parse command line arguments
- ACE_Get_Opt opts (argc, argv, "f:");
+ ACE_Get_Arg_Opt<char> opts (argc, argv, "f:");
int c;
while ((c= opts ()) != -1)
@@ -21,7 +22,7 @@ parse_args (int argc,
{
case 'f':
ior = "file://";
- ior += opts.opt_arg ();
+ ior += ACE_TEXT_TO_CHAR_IN(opts.opt_arg ());
break;
default:
ACE_DEBUG ((LM_DEBUG, "Unknown Option\n"));
@@ -36,8 +37,10 @@ parse_args (int argc,
#endif /* THREAD_CANCELLED */
int
-main (int argc, char* argv [])
+ACE_TMAIN (int argc, ACE_TCHAR* argv [])
{
+ ACE_Argv_Type_Converter convert (argc, argv);
+
CORBA::ORB_var orb;
test_var server;
RTScheduling::Scheduler_var safe_scheduler;
@@ -45,13 +48,13 @@ main (int argc, char* argv [])
ACE_TRY_NEW_ENV
{
- orb = CORBA::ORB_init (argc,
- argv,
+ orb = CORBA::ORB_init (convert.get_argc(),
+ convert.get_ASCII_argv(),
""
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- if (parse_args (argc, argv) == -1)
+ if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
return (-1);
CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager"
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp
index 73e333552ca..3cb3f08da75 100644
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp
@@ -4,7 +4,9 @@
#include "tao/RTScheduling/RTScheduler_Manager.h"
#include "testS.h"
#include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
#include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
const char* filename = "test.ior";
@@ -60,10 +62,10 @@ private:
int
parse_args (int argc,
- ACE_TCHAR* argv [])
+ char* argv [])
{
// Parse command line arguments
- ACE_Get_Opt opts (argc, argv, "f:");
+ ACE_Get_Arg_Opt<char> opts (argc, argv, "f:");
int c;
while ((c= opts ()) != -1)
@@ -82,18 +84,20 @@ parse_args (int argc,
}
int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
{
+ ACE_Argv_Type_Converter convert (argc, argv);
+
ACE_TRY_NEW_ENV
{
CORBA::ORB_var orb =
- CORBA::ORB_init (argc,
- argv,
+ CORBA::ORB_init (convert.get_argc(),
+ convert.get_ASCII_argv(),
""
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- parse_args (argc, argv);
+ parse_args (convert.get_argc(), convert.get_ASCII_argv());
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA"
@@ -169,7 +173,7 @@ main (int argc, char* argv[])
// Print ior to the file.
if (filename != 0)
{
- FILE* output_file = ACE_OS::fopen (filename, "w");
+ FILE* output_file = ACE_OS::fopen (filename, ACE_TEXT("w"));
if (output_file == 0)
ACE_ERROR_RETURN ((LM_ERROR,
"Cannot open output file for writing IOR: %s",
diff --git a/TAO/tests/RTScheduling/Thread_Cancel/test.cpp b/TAO/tests/RTScheduling/Thread_Cancel/test.cpp
index 42a390c4b01..51e136dffd5 100644
--- a/TAO/tests/RTScheduling/Thread_Cancel/test.cpp
+++ b/TAO/tests/RTScheduling/Thread_Cancel/test.cpp
@@ -5,15 +5,18 @@
#include "../Scheduler.h"
#include "tao/RTScheduling/RTScheduler_Manager.h"
#include "tao/ORB_Core.h"
+#include "ace/Argv_Type_Converter.h"
int
-main (int argc, char* argv [])
+ACE_TMAIN (int argc, ACE_TCHAR* argv [])
{
+ ACE_Argv_Type_Converter convert (argc, argv);
+
ACE_TRY_NEW_ENV
{
CORBA::ORB_var orb =
- CORBA::ORB_init (argc,
- argv,
+ CORBA::ORB_init (convert.get_argc(),
+ convert.get_ASCII_argv(),
""
ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (-1);
diff --git a/TAO/tests/RTScheduling/VoidData/test_client.cpp b/TAO/tests/RTScheduling/VoidData/test_client.cpp
index 087080ddbba..fdfb092a483 100644
--- a/TAO/tests/RTScheduling/VoidData/test_client.cpp
+++ b/TAO/tests/RTScheduling/VoidData/test_client.cpp
@@ -2,15 +2,18 @@
#include "tao/RTScheduling/RTScheduler.h"
#include "testC.h"
#include "test.h"
+#include "ace/Argv_Type_Converter.h"
int
-main (int argc, char* argv [])
+ACE_TMAIN (int argc, ACE_TCHAR* argv [])
{
+ ACE_Argv_Type_Converter convert (argc, argv);
+
CORBA::ORB_var orb;
ACE_TRY_NEW_ENV
{
- orb = CORBA::ORB_init (argc,
- argv,
+ orb = CORBA::ORB_init (convert.get_argc(),
+ convert.get_ASCII_argv(),
""
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
View Lorry Controller Status