diff options
Diffstat (limited to 'TAO/tests')
93 files changed, 170 insertions, 106 deletions
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.mpc b/TAO/tests/AMI_Buffering/AMI_Buffering.mpc index c9c48e5e726..8e9d0e4abb2 100644 --- a/TAO/tests/AMI_Buffering/AMI_Buffering.mpc +++ b/TAO/tests/AMI_Buffering/AMI_Buffering.mpc @@ -1,14 +1,15 @@ // -*- MPC -*- // $Id$ -project(*Server): taoserver, messaging, ami { +project(*Server): taoserver, ami { Source_Files { AMI_Buffering.cpp server.cpp } } -project(*Client): messaging, taoexe, portableserver, ami { +project(*Client): taoserver, ami { + exename = client Source_Files { Client_Task.cpp Reply_Handler.cpp @@ -16,7 +17,8 @@ project(*Client): messaging, taoexe, portableserver, ami { } } -project(*Admin): messaging, taoexe, portableserver, ami { +project(*Admin): taoserver, ami { + exename = admin Source_Files { AMI_Buffering_Admin.cpp admin.cpp diff --git a/TAO/tests/AMI_Buffering/client.cpp b/TAO/tests/AMI_Buffering/client.cpp index 9733d3be55d..6ec3f9364f6 100644 --- a/TAO/tests/AMI_Buffering/client.cpp +++ b/TAO/tests/AMI_Buffering/client.cpp @@ -4,6 +4,8 @@ #include "Client_Task.h" #include "tao/Messaging/Messaging.h" #include "tao/TAOC.h" +#include "tao/AnyTypeCode/TAOA.h" +#include "tao/AnyTypeCode/Any.h" #include "ace/Get_Opt.h" ACE_RCSID(AMI_Buffering, client, "$Id$") diff --git a/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc b/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc index a0b617d4f78..bf72e8baca6 100644 --- a/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc +++ b/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Server): taoserver, messaging, ami { +project(*Server): taoserver, ami { Source_Files { timeout_i.cpp timeout_client.cpp @@ -9,7 +9,8 @@ project(*Server): taoserver, messaging, ami { } } -project(*Client): messaging, taoexe, portableserver, ami { +project(*Client): taoserver, ami { + exename = client Source_Files { timeout_i.cpp timeout_client.cpp diff --git a/TAO/tests/AMI_Timeouts/timeout_client.cpp b/TAO/tests/AMI_Timeouts/timeout_client.cpp index 6b19f47ee68..28f7cc360c9 100644 --- a/TAO/tests/AMI_Timeouts/timeout_client.cpp +++ b/TAO/tests/AMI_Timeouts/timeout_client.cpp @@ -14,6 +14,7 @@ #include "timeout_client.h" #include "tao/Messaging/Messaging.h" #include "tao/PolicyC.h" +#include "tao/AnyTypeCode/Any.h" #include "ace/OS_NS_unistd.h" TimeoutClient::TimeoutClient (CORBA::ORB_ptr orb, diff --git a/TAO/tests/Any/Recursive/RecursiveHello.mpc b/TAO/tests/Any/Recursive/RecursiveHello.mpc index 45b716eb3d8..cf2c0ae9656 100644 --- a/TAO/tests/Any/Recursive/RecursiveHello.mpc +++ b/TAO/tests/Any/Recursive/RecursiveHello.mpc @@ -3,8 +3,6 @@ // $Id$ project(*Server): taoserver, valuetype { - idlflags += -GA - Source_Files { Hello.cpp server.cpp @@ -12,11 +10,8 @@ project(*Server): taoserver, valuetype { } project(*Client): taoclient, valuetype, typecodefactory, ifr_client { - idlflags += -GA - Source_Files { TestC.cpp - TestA.cpp client.cpp } } diff --git a/TAO/tests/BiDirectional/BiDirectional.mpc b/TAO/tests/BiDirectional/BiDirectional.mpc index 41e4576ab9a..8f1239bb195 100644 --- a/TAO/tests/BiDirectional/BiDirectional.mpc +++ b/TAO/tests/BiDirectional/BiDirectional.mpc @@ -1,14 +1,15 @@ // -*- MPC -*- // $Id$ -project(*Server): taoserver, minimum_corba, bidir_giop { +project(*Server): taoserver, anytypecode, minimum_corba, bidir_giop { Source_Files { test_i.cpp server.cpp } } -project(*Client): taoexe, portableserver, minimum_corba, bidir_giop { +project(*Client): taoserver, anytypecode, minimum_corba, bidir_giop { + exename = client Source_Files { test_i.cpp client.cpp diff --git a/TAO/tests/BiDirectional/client.cpp b/TAO/tests/BiDirectional/client.cpp index a5cec1f517b..d775aabc942 100644 --- a/TAO/tests/BiDirectional/client.cpp +++ b/TAO/tests/BiDirectional/client.cpp @@ -3,6 +3,7 @@ #include "ace/Get_Opt.h" #include "test_i.h" #include "tao/BiDir_GIOP/BiDirGIOP.h" +#include "tao/AnyTypeCode/Any.h" ACE_RCSID(BiDirectional, client, "$Id$") diff --git a/TAO/tests/BiDirectional/server.cpp b/TAO/tests/BiDirectional/server.cpp index f1a6ae7508a..02f3a672f43 100644 --- a/TAO/tests/BiDirectional/server.cpp +++ b/TAO/tests/BiDirectional/server.cpp @@ -3,6 +3,7 @@ #include "ace/Get_Opt.h" #include "test_i.h" #include "tao/BiDir_GIOP/BiDirGIOP.h" +#include "tao/AnyTypeCode/Any.h" #include "ace/OS_NS_stdio.h" ACE_RCSID(BiDirectional, server, "$Id$") diff --git a/TAO/tests/BiDirectional_MultipleORB/destroy.cpp b/TAO/tests/BiDirectional_MultipleORB/destroy.cpp index 8cdf84b2401..d4b0af3a3b9 100644 --- a/TAO/tests/BiDirectional_MultipleORB/destroy.cpp +++ b/TAO/tests/BiDirectional_MultipleORB/destroy.cpp @@ -19,6 +19,7 @@ #include "tao/corba.h" #include "tao/PortableServer/PortableServer.h" +#include "tao/AnyTypeCode/Any.h" #include "tao/BiDir_GIOP/BiDirGIOP.h" ACE_RCSID(BiDir_Multiple_ORB, destroy, "$Id$") @@ -109,7 +110,7 @@ int main (int argc, char **argv) { int result = 0; - + for (int i=0; i<10; i++) { result = test_with_bidir_poa (argc, argv, "poa_1", 1); diff --git a/TAO/tests/BiDirectional_MultipleORB/destroy.mpc b/TAO/tests/BiDirectional_MultipleORB/destroy.mpc index f57b2c7b1d5..b8dd7761667 100644 --- a/TAO/tests/BiDirectional_MultipleORB/destroy.mpc +++ b/TAO/tests/BiDirectional_MultipleORB/destroy.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project: taoserver, bidir_giop { +project: taoserver, anytypecode, bidir_giop { exename = destroy Source_Files { destroy.cpp diff --git a/TAO/tests/BiDirectional_NestedUpcall/client.cpp b/TAO/tests/BiDirectional_NestedUpcall/client.cpp index 8fb72a19b5a..2944499783f 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/client.cpp +++ b/TAO/tests/BiDirectional_NestedUpcall/client.cpp @@ -4,6 +4,7 @@ #include "test_i.h" #include "ace/High_Res_Timer.h" #include "tao/BiDir_GIOP/BiDirGIOP.h" +#include "tao/AnyTypeCode/Any.h" ACE_RCSID(BiDirectional, client, "$Id$") diff --git a/TAO/tests/BiDirectional_NestedUpcall/server.cpp b/TAO/tests/BiDirectional_NestedUpcall/server.cpp index 0f419ec54fb..ef4c284f576 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/server.cpp +++ b/TAO/tests/BiDirectional_NestedUpcall/server.cpp @@ -3,6 +3,7 @@ #include "ace/Get_Opt.h" #include "test_i.h" #include "tao/BiDir_GIOP/BiDirGIOP.h" +#include "tao/AnyTypeCode/Any.h" #include "ace/OS_NS_stdio.h" ACE_RCSID(BiDirectional, server, "$Id$") diff --git a/TAO/tests/Big_Reply/Big_Reply.mpc b/TAO/tests/Big_Reply/Big_Reply.mpc index aa9caa94b83..59034cf50db 100644 --- a/TAO/tests/Big_Reply/Big_Reply.mpc +++ b/TAO/tests/Big_Reply/Big_Reply.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server): taoserver { + idlflags += -Sa -St Source_Files { Big_Reply_i.cpp server.cpp diff --git a/TAO/tests/Big_Request_Muxing/Client_Task.cpp b/TAO/tests/Big_Request_Muxing/Client_Task.cpp index dc8712a9176..b33119b4e71 100644 --- a/TAO/tests/Big_Request_Muxing/Client_Task.cpp +++ b/TAO/tests/Big_Request_Muxing/Client_Task.cpp @@ -3,6 +3,7 @@ // #include "Client_Task.h" +#include "tao/AnyTypeCode/Any.h" ACE_RCSID(Big_Request_Muxing, Client_Task, "$Id$") diff --git a/TAO/tests/Blocking_Sync_None/client.cpp b/TAO/tests/Blocking_Sync_None/client.cpp index e4a83e7c146..2bff1936b7b 100644 --- a/TAO/tests/Blocking_Sync_None/client.cpp +++ b/TAO/tests/Blocking_Sync_None/client.cpp @@ -2,6 +2,7 @@ #include "TestC.h" #include "tao/Messaging/Messaging.h" +#include "tao/AnyTypeCode/Any.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_sys_time.h" diff --git a/TAO/tests/Bug_1020_Basic_Regression/client.cpp b/TAO/tests/Bug_1020_Basic_Regression/client.cpp index 5cdd7222930..7deb646b538 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/client.cpp +++ b/TAO/tests/Bug_1020_Basic_Regression/client.cpp @@ -5,7 +5,7 @@ #include "tao/Utils/Servant_Var.h" #include "ace/Get_Opt.h" #include "tao/Messaging/Messaging.h" - +#include "tao/AnyTypeCode/Any.h" ACE_RCSID (Bug_1020_Basic_Regression, client, diff --git a/TAO/tests/Bug_1020_Regression/client.cpp b/TAO/tests/Bug_1020_Regression/client.cpp index 0ea73e74cff..63209f90483 100644 --- a/TAO/tests/Bug_1020_Regression/client.cpp +++ b/TAO/tests/Bug_1020_Regression/client.cpp @@ -3,6 +3,7 @@ #include "Echo.h" #include "ORB_Task.h" #include "tao/Messaging/Messaging.h" +#include "tao/AnyTypeCode/Any.h" #include "tao/Utils/Servant_Var.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" diff --git a/TAO/tests/Bug_1269_Regression/client.cpp b/TAO/tests/Bug_1269_Regression/client.cpp index 8b57a413c66..50b19d24f84 100644 --- a/TAO/tests/Bug_1269_Regression/client.cpp +++ b/TAO/tests/Bug_1269_Regression/client.cpp @@ -3,6 +3,7 @@ #include "Echo.h" #include "ORB_Task.h" #include "tao/Messaging/Messaging.h" +#include "tao/AnyTypeCode/Any.h" #include "tao/Utils/Servant_Var.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" diff --git a/TAO/tests/Bug_1270_Regression/client.cpp b/TAO/tests/Bug_1270_Regression/client.cpp index 5bdc3a618fc..8405b2d1c0c 100644 --- a/TAO/tests/Bug_1270_Regression/client.cpp +++ b/TAO/tests/Bug_1270_Regression/client.cpp @@ -3,6 +3,7 @@ #include "Echo.h" #include "ORB_Task.h" #include "tao/Messaging/Messaging.h" +#include "tao/AnyTypeCode/Any.h" #include "tao/Utils/Servant_Var.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" diff --git a/TAO/tests/Bug_1361_Regression/client.cpp b/TAO/tests/Bug_1361_Regression/client.cpp index 6e2540bc11b..76b98781048 100644 --- a/TAO/tests/Bug_1361_Regression/client.cpp +++ b/TAO/tests/Bug_1361_Regression/client.cpp @@ -3,6 +3,7 @@ #include "Echo.h" #include "ORB_Task.h" #include "tao/Messaging/Messaging.h" +#include "tao/AnyTypeCode/Any.h" #include "tao/Utils/Servant_Var.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" diff --git a/TAO/tests/Bug_1476_Regression/Client_Task.cpp b/TAO/tests/Bug_1476_Regression/Client_Task.cpp index d0ad90cebd2..570c96f0935 100644 --- a/TAO/tests/Bug_1476_Regression/Client_Task.cpp +++ b/TAO/tests/Bug_1476_Regression/Client_Task.cpp @@ -4,6 +4,7 @@ #include "Client_Task.h" #include "tao/Messaging/Messaging.h" +#include "tao/AnyTypeCode/Any.h" #include "ace/OS_NS_unistd.h" ACE_RCSID(Bug_1476_Regression, Client_Task, "$Id$") diff --git a/TAO/tests/Bug_1476_Regression/client.cpp b/TAO/tests/Bug_1476_Regression/client.cpp index 56d6e7ae7d3..cc25593ca6f 100644 --- a/TAO/tests/Bug_1476_Regression/client.cpp +++ b/TAO/tests/Bug_1476_Regression/client.cpp @@ -9,6 +9,7 @@ #include "tao/ORB_Core.h" #include "tao/Thread_Lane_Resources.h" #include "tao/PortableServer/PortableServer.h" +#include "tao/AnyTypeCode/Any.h" ACE_RCSID(Bug_1476_Regression, client, "$Id$") diff --git a/TAO/tests/Bug_1482_Regression/client.cpp b/TAO/tests/Bug_1482_Regression/client.cpp index d12c8f99086..78a8635a4e5 100644 --- a/TAO/tests/Bug_1482_Regression/client.cpp +++ b/TAO/tests/Bug_1482_Regression/client.cpp @@ -3,6 +3,7 @@ #include "TestS.h" #include "Client_Task.h" #include "ace/Get_Opt.h" +#include "tao/AnyTypeCode/Any.h" ACE_RCSID(Hello, client, "$Id$") diff --git a/TAO/tests/Bug_1551_Regression/client.cpp b/TAO/tests/Bug_1551_Regression/client.cpp index 3b2c83b6af0..a898cdb3398 100644 --- a/TAO/tests/Bug_1551_Regression/client.cpp +++ b/TAO/tests/Bug_1551_Regression/client.cpp @@ -5,6 +5,7 @@ #include "TestS.h" #include "Client_Task.h" #include "ace/Get_Opt.h" +#include "tao/AnyTypeCode/Any.h" ACE_RCSID(Hello, client, "$Id$") diff --git a/TAO/tests/Bug_1627_Regression/test.mpc b/TAO/tests/Bug_1627_Regression/test.mpc index 76b61adbf38..66bcbf45c86 100644 --- a/TAO/tests/Bug_1627_Regression/test.mpc +++ b/TAO/tests/Bug_1627_Regression/test.mpc @@ -8,7 +8,7 @@ project(Bug_1627_Server): taoserver, iortable { } } -project(Bug_1627_Client): taoclient { +project(Bug_1627_Client): taoclient, anytypecode { Source_Files { TestC.cpp client.cpp diff --git a/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc b/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc index 55faca590f0..1d3d307ea3e 100644 --- a/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc +++ b/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc @@ -8,7 +8,7 @@ project(*Server): taoserver { } } -project(*Client): taoclient, minimum_corba { +project(*Client): taoclient, anytypecode, minimum_corba { Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc b/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc index cc91c43587b..62cffce1ede 100755 --- a/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc +++ b/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc @@ -8,7 +8,7 @@ project(*Server): taoserver, strategies { } } -project(*Client): taoclient { +project(*Client): taoclient, anytypecode { Source_Files { TestC.cpp client.cpp diff --git a/TAO/tests/CDR/CDR.mpc b/TAO/tests/CDR/CDR.mpc index 155d6616a5a..cfbc027a2b2 100644 --- a/TAO/tests/CDR/CDR.mpc +++ b/TAO/tests/CDR/CDR.mpc @@ -17,7 +17,7 @@ project(*Allocator) : taoexe { } } -project(*Basic Types) : taoexe { +project(*Basic Types) : taoexe, anytypecode { exename = basic_types Source_Files { @@ -41,7 +41,7 @@ project(*Octet Sequence) : taoexe { } } -project(*Tc) : taoexe { +project(*Tc) : taoexe, anytypecode { exename = tc Source_Files { diff --git a/TAO/tests/CDR/basic_types.cpp b/TAO/tests/CDR/basic_types.cpp index 656025779a4..a1035e4c150 100644 --- a/TAO/tests/CDR/basic_types.cpp +++ b/TAO/tests/CDR/basic_types.cpp @@ -20,7 +20,7 @@ #include "tao/ORB.h" #include "tao/debug.h" #include "tao/CDR.h" -#include "tao/Any.h" +#include "tao/AnyTypeCode/Any.h" #include "ace/Get_Opt.h" #include "ace/Log_Msg.h" diff --git a/TAO/tests/CDR/tc.cpp b/TAO/tests/CDR/tc.cpp index 6b15445e1d6..9a03f8c161d 100644 --- a/TAO/tests/CDR/tc.cpp +++ b/TAO/tests/CDR/tc.cpp @@ -17,7 +17,8 @@ // // ============================================================================ -#include "tao/TypeCode.h" +#include "tao/AnyTypeCode/TypeCode.h" +#include "tao/AnyTypeCode/TC_Constants_Forward.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/debug.h" diff --git a/TAO/tests/Client_Leaks/Client_Leaks.mpc b/TAO/tests/Client_Leaks/Client_Leaks.mpc index 9d21026afb5..41961bc999f 100644 --- a/TAO/tests/Client_Leaks/Client_Leaks.mpc +++ b/TAO/tests/Client_Leaks/Client_Leaks.mpc @@ -10,7 +10,7 @@ project(*Server): taoserver { } } -project(*Client): taoclient { +project(*Client): taoclient, anytypecode { Source_Files { TestC.cpp Client_Task.cpp @@ -18,7 +18,8 @@ project(*Client): taoclient { } } -project(*Child): taoexe, portableserver { +project(*Child): taoserver { + exename = child Source_Files { Process.cpp child.cpp diff --git a/TAO/tests/CodeSets/simple/CodeSets_simple.mpc b/TAO/tests/CodeSets/simple/CodeSets_simple.mpc index 6e2484872f2..ce9259b4c2c 100644 --- a/TAO/tests/CodeSets/simple/CodeSets_simple.mpc +++ b/TAO/tests/CodeSets/simple/CodeSets_simple.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*client) : taoclient { +project(*client) : taoclient, anytypecode { IDL_Files { simple.idl } diff --git a/TAO/tests/Collocation/Collocation.mpc b/TAO/tests/Collocation/Collocation.mpc index e0eba5a4b63..5a0b503aac4 100644 --- a/TAO/tests/Collocation/Collocation.mpc +++ b/TAO/tests/Collocation/Collocation.mpc @@ -3,7 +3,7 @@ project(*Test Stub): taolib_with_idl { sharedname = Collocation_Test_Stub - idlflags += -Wb,skel_export_macro=Diamond_Export -Wb,stub_export_macro=MY_Stub_Export -Wb,skel_export_include=diamond_export.h -Wb,stub_export_include=stub_export.h -Gd + idlflags += -Wb,skel_export_macro=Diamond_Export -Wb,stub_export_macro=MY_Stub_Export -Wb,skel_export_include=diamond_export.h -Wb,stub_export_include=stub_export.h -Gd -St -Sa dynamicflags = MY_STUB_BUILD_DLL Source_Files { @@ -15,7 +15,7 @@ project(*Diamond) : taolib_with_idl, portableserver { after += Collocation_Test_Stub sharedname = Collocation_Diamond libs += Collocation_Test_Stub - idlflags += -Wb,skel_export_macro=Diamond_Export -Wb,stub_export_macro=MY_Stub_Export -Wb,skel_export_include=diamond_export.h -Wb,stub_export_include=stub_export.h -Gd + idlflags += -Wb,skel_export_macro=Diamond_Export -Wb,stub_export_macro=MY_Stub_Export -Wb,skel_export_include=diamond_export.h -Wb,stub_export_include=stub_export.h -Gd -St -Sa dynamicflags = DIAMOND_BUILD_DLL Source_Files { diff --git a/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp b/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp index 9ad66467fbb..216bcba8cf8 100644 --- a/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp +++ b/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp @@ -3,6 +3,7 @@ // #include "tao/Messaging/Messaging.h" +#include "tao/AnyTypeCode/Any.h" #include "Client_Task.h" #include "TestC.h" diff --git a/TAO/tests/Connection_Timeout/client.cpp b/TAO/tests/Connection_Timeout/client.cpp index 6d01f8d99c7..d1bab792c95 100644 --- a/TAO/tests/Connection_Timeout/client.cpp +++ b/TAO/tests/Connection_Timeout/client.cpp @@ -4,8 +4,9 @@ #include "ace/Get_Opt.h" #include "ace/Profile_Timer.h" #include "tao/Messaging/Messaging.h" +#include "tao/AnyTypeCode/Any.h" -ACE_RCSID(Hello, client, "$Id$") +ACE_RCSID(Connection_Timeout, client, "$Id$") const char *ior = "corbaloc:iiop:192.3.47/10007/RandomObject"; diff --git a/TAO/tests/Crashed_Callback/client.cpp b/TAO/tests/Crashed_Callback/client.cpp index b8a3ccf807b..4f020c7d89c 100644 --- a/TAO/tests/Crashed_Callback/client.cpp +++ b/TAO/tests/Crashed_Callback/client.cpp @@ -3,6 +3,7 @@ #include "Crashed_Callback.h" #include "tao/Messaging/Messaging.h" +#include "tao/AnyTypeCode/Any.h" #include "ace/Get_Opt.h" ACE_RCSID(Crashed_Callback, client, "$Id$") diff --git a/TAO/tests/Crashed_Callback/server.cpp b/TAO/tests/Crashed_Callback/server.cpp index 82b65649f3a..11b8a975a14 100644 --- a/TAO/tests/Crashed_Callback/server.cpp +++ b/TAO/tests/Crashed_Callback/server.cpp @@ -3,6 +3,7 @@ #include "Service.h" #include "tao/Messaging/Messaging.h" +#include "tao/AnyTypeCode/Any.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" diff --git a/TAO/tests/DLL_ORB/DLL_ORB.mpc b/TAO/tests/DLL_ORB/DLL_ORB.mpc index 559d35e4373..f7eb4ab9597 100644 --- a/TAO/tests/DLL_ORB/DLL_ORB.mpc +++ b/TAO/tests/DLL_ORB/DLL_ORB.mpc @@ -1,14 +1,14 @@ // -*- MPC -*- // $Id$ -project(*Test Client Module): taolib_with_idl { +project(*Test Client Module): taolib_with_idl, anytypecode { sharedname = Test_Client_Module dynamicflags = TEST_CLIENT_MODULE_BUILD_DLL Source_Files { TestC.cpp Test_Client_Module.cpp - } + } } project(*Test Server Module) : taolib_with_idl, portableserver { diff --git a/TAO/tests/DynAny_Test/data.cpp b/TAO/tests/DynAny_Test/data.cpp index 9022629b48a..90711bedfc5 100644 --- a/TAO/tests/DynAny_Test/data.cpp +++ b/TAO/tests/DynAny_Test/data.cpp @@ -14,7 +14,7 @@ #include "data.h" #include "ace/Log_Msg.h" -#include "tao/TypeCode.h" +#include "tao/AnyTypeCode/TypeCode.h" #include "tao/PortableServer/PortableServer.h" Data::Data (CORBA::ORB_var orb) diff --git a/TAO/tests/DynAny_Test/data.h b/TAO/tests/DynAny_Test/data.h index e9561c0d63b..50c4053895d 100644 --- a/TAO/tests/DynAny_Test/data.h +++ b/TAO/tests/DynAny_Test/data.h @@ -14,7 +14,7 @@ #include "tao/ORB.h" #include "tao/Object.h" -#include "tao/TC_Constants_Forward.h" +#include "tao/AnyTypeCode/TC_Constants_Forward.h" class Data { diff --git a/TAO/tests/File_IO/File_IO.mpc b/TAO/tests/File_IO/File_IO.mpc index 1a48ef667d1..615787310c6 100644 --- a/TAO/tests/File_IO/File_IO.mpc +++ b/TAO/tests/File_IO/File_IO.mpc @@ -8,7 +8,7 @@ project(*Server): taoserver, pi_server, minimum_corba { } } -project(*Client): taoclient, minimum_corba { +project(*Client): taoclient, anytypecode, minimum_corba { Source_Files { FileC.cpp client.cpp diff --git a/TAO/tests/Forwarding/Forwarding.mpc b/TAO/tests/Forwarding/Forwarding.mpc index 39a1709e261..d3e679e33b7 100644 --- a/TAO/tests/Forwarding/Forwarding.mpc +++ b/TAO/tests/Forwarding/Forwarding.mpc @@ -8,7 +8,7 @@ project(*Server): taoserver, iortable { } } -project(*Client): taoclient { +project(*Client): taoclient, anytypecode { Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/Hello/Hello.mpc b/TAO/tests/Hello/Hello.mpc index 909e1da7029..4f7f1f0064d 100644 --- a/TAO/tests/Hello/Hello.mpc +++ b/TAO/tests/Hello/Hello.mpc @@ -2,8 +2,6 @@ // $Id$ project(*Server): taoserver { - idlflags += -St -Sa - Source_Files { Hello.cpp server.cpp @@ -11,8 +9,6 @@ project(*Server): taoserver { } project(*Client): taoclient { - idlflags += -St -Sa - Source_Files { TestC.cpp client.cpp diff --git a/TAO/tests/IDL_Test/IDL_Test.mpc b/TAO/tests/IDL_Test/IDL_Test.mpc index e135d7f7ff0..4dff9ab5ca5 100644 --- a/TAO/tests/IDL_Test/IDL_Test.mpc +++ b/TAO/tests/IDL_Test/IDL_Test.mpc @@ -3,17 +3,39 @@ project(*Main): taoserver, messaging { exename = main - - idlflags += -GC -GH -Gd -GA IDL_Files { - *.idl + idlflags += -GC -GH -Gd + array.idl + enum_in_struct.idl + full.idl + fwd.idl + gperf.idl + including.idl + interface.idl + included.idl + union.idl + nested_scope.idl + params.idl + reopened_modules.idl + sequence.idl + reopen_include1.idl + reopen_include2.idl } - + + IDL_Files { + idlflags += -GC -GH -Gd -GA + anonymous.idl + constants.idl + generic_object.idl + keywords.idl + pragma.idl + repo_id_mod.idl + typedef.idl + valuetype.idl + } + Source_Files { main.cpp - *C.cpp - *S.cpp - *A.cpp } } diff --git a/TAO/tests/IDL_Test/main.cpp b/TAO/tests/IDL_Test/main.cpp index e18d2b1f03b..2c39344eabf 100644 --- a/TAO/tests/IDL_Test/main.cpp +++ b/TAO/tests/IDL_Test/main.cpp @@ -26,6 +26,7 @@ #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" +#include "tao/AnyTypeCode/Any.h" class hello_i : public virtual POA_hello { diff --git a/TAO/tests/InterOp-Naming/InterOp-Naming.mpc b/TAO/tests/InterOp-Naming/InterOp-Naming.mpc index 6e52261eed8..5604fafaf7b 100644 --- a/TAO/tests/InterOp-Naming/InterOp-Naming.mpc +++ b/TAO/tests/InterOp-Naming/InterOp-Naming.mpc @@ -10,7 +10,7 @@ project(*Server): taoserver, utils, iortable { } } -project(*Client): taoclient { +project(*Client): taoclient, anytypecode { exename = INS_test_client Source_Files { INSC.cpp diff --git a/TAO/tests/MProfile_Connection_Timeout/client.cpp b/TAO/tests/MProfile_Connection_Timeout/client.cpp index f00618c2385..093073beeb9 100644 --- a/TAO/tests/MProfile_Connection_Timeout/client.cpp +++ b/TAO/tests/MProfile_Connection_Timeout/client.cpp @@ -6,6 +6,7 @@ #include "testC.h" #include "tao/TimeBaseC.h" #include "tao/Messaging/Messaging.h" +#include "tao/AnyTypeCode/Any.h" ACE_RCSID(MProfile_Connection_Timeout, client, diff --git a/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc b/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc index 52432fcddbb..e38b68ca361 100644 --- a/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc +++ b/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc @@ -1,21 +1,23 @@ // -*- MPC -*- // $Id$ -project(*Server): taoexe, portableserver, minimum_corba { +project(*Server): taoserver, minimum_corba { Source_Files { test_i.cpp server.cpp } } -project(*Client): taoexe, minimum_corba { +project(*Client): taoclient, anytypecode, minimum_corba { + exename = client Source_Files { testC.cpp client.cpp } } -project(*Manager): taoexe, portableserver, minimum_corba, iormanip { +project(*Manager): taoserver, minimum_corba, iormanip { + exename = manager Source_Files { testC.cpp Servant_Locator.cpp diff --git a/TAO/tests/MT_BiDir/client.cpp b/TAO/tests/MT_BiDir/client.cpp index 24208035c60..23566a7d242 100644 --- a/TAO/tests/MT_BiDir/client.cpp +++ b/TAO/tests/MT_BiDir/client.cpp @@ -4,6 +4,7 @@ #include "Receiver_i.h" #include "SenderC.h" #include "tao/BiDir_GIOP/BiDirGIOP.h" +#include "tao/AnyTypeCode/Any.h" #include "Client_Task.h" ACE_RCSID(BiDirectional, client, "client.cpp,v 1.6 2001/03/30 20:11:05 bala Exp") diff --git a/TAO/tests/MT_BiDir/server.cpp b/TAO/tests/MT_BiDir/server.cpp index 88189b39fc5..7aeeeecdbc8 100644 --- a/TAO/tests/MT_BiDir/server.cpp +++ b/TAO/tests/MT_BiDir/server.cpp @@ -3,6 +3,7 @@ #include "ace/Get_Opt.h" #include "Sender_i.h" #include "tao/BiDir_GIOP/BiDirGIOP.h" +#include "tao/AnyTypeCode/Any.h" #include "Server_Task.h" #include "tao/ORB_Core.h" #include "tao/Thread_Lane_Resources.h" diff --git a/TAO/tests/MT_Client/MT_Client.mpc b/TAO/tests/MT_Client/MT_Client.mpc index 6307a6f623a..a585f7ec595 100644 --- a/TAO/tests/MT_Client/MT_Client.mpc +++ b/TAO/tests/MT_Client/MT_Client.mpc @@ -1,14 +1,14 @@ // -*- MPC -*- // $Id$ -project(*Server): taoexe, portableserver { +project(*Server): taoserver { Source_Files { test_i.cpp server.cpp } } -project(*Client): taoexe { +project(*Client): taoclient { Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/MT_Server/MT_Server.mpc b/TAO/tests/MT_Server/MT_Server.mpc index 6307a6f623a..a585f7ec595 100644 --- a/TAO/tests/MT_Server/MT_Server.mpc +++ b/TAO/tests/MT_Server/MT_Server.mpc @@ -1,14 +1,14 @@ // -*- MPC -*- // $Id$ -project(*Server): taoexe, portableserver { +project(*Server): taoserver { Source_Files { test_i.cpp server.cpp } } -project(*Client): taoexe { +project(*Client): taoclient { Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/MT_Timeout/Client_Task.cpp b/TAO/tests/MT_Timeout/Client_Task.cpp index 865e10abc65..29bb6e0502d 100644 --- a/TAO/tests/MT_Timeout/Client_Task.cpp +++ b/TAO/tests/MT_Timeout/Client_Task.cpp @@ -6,7 +6,7 @@ #include "ace/OS_NS_unistd.h" #include "tao/TimeBaseC.h" #include "tao/Messaging/Messaging.h" - +#include "tao/AnyTypeCode/Any.h" ACE_RCSID(MT_Timeout, Client_Task, "$Id$") diff --git a/TAO/tests/Muxing/Muxing.mpc b/TAO/tests/Muxing/Muxing.mpc index cc83753659f..2824b800b03 100644 --- a/TAO/tests/Muxing/Muxing.mpc +++ b/TAO/tests/Muxing/Muxing.mpc @@ -9,7 +9,7 @@ project(*Server): taoserver { } } -project(*Client): taoclient { +project(*Client): taoclient, anytypecode { Source_Files { TestC.cpp Client_Task.cpp diff --git a/TAO/tests/Native_Exceptions/Native_Exceptions.mpc b/TAO/tests/Native_Exceptions/Native_Exceptions.mpc index 8a82c1975ee..397406b1347 100644 --- a/TAO/tests/Native_Exceptions/Native_Exceptions.mpc +++ b/TAO/tests/Native_Exceptions/Native_Exceptions.mpc @@ -1,16 +1,16 @@ // -*- MPC -*- // $Id$ -project(*Server): taoserver, exceptions { - idlflags = -Ge 0 -Sc +project(*Server): taoserver, anytypecode, exceptions { + idlflags = -Ge 0 -Sc -Sa -St Source_Files { test_i.cpp server.cpp } } -project(*Client): taoclient, exceptions { - idlflags = -Ge 0 -Sc +project(*Client): taoclient, anytypecode, exceptions { + idlflags = -Ge 0 -Sc -Sa -St Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/Nested_Upcall_Crash/client.cpp b/TAO/tests/Nested_Upcall_Crash/client.cpp index 55a9dc1f236..0bafc403012 100644 --- a/TAO/tests/Nested_Upcall_Crash/client.cpp +++ b/TAO/tests/Nested_Upcall_Crash/client.cpp @@ -3,6 +3,7 @@ #include "Client_Peer.h" #include "Clock_Ticks.h" #include "tao/Messaging/Messaging.h" +#include "tao/AnyTypeCode/Any.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" #include "ace/Reactor.h" diff --git a/TAO/tests/Nested_Upcall_Crash/scavenger.cpp b/TAO/tests/Nested_Upcall_Crash/scavenger.cpp index 3e9e053a830..d2b7c7d3981 100644 --- a/TAO/tests/Nested_Upcall_Crash/scavenger.cpp +++ b/TAO/tests/Nested_Upcall_Crash/scavenger.cpp @@ -2,6 +2,7 @@ #include "TestC.h" #include "tao/Messaging/Messaging.h" +#include "tao/AnyTypeCode/Any.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" diff --git a/TAO/tests/Nested_Upcall_Crash/server.cpp b/TAO/tests/Nested_Upcall_Crash/server.cpp index 7bb6378f697..0b7eb0628fe 100644 --- a/TAO/tests/Nested_Upcall_Crash/server.cpp +++ b/TAO/tests/Nested_Upcall_Crash/server.cpp @@ -3,6 +3,7 @@ #include "Server_Peer.h" #include "Clock_Ticks.h" #include "tao/Messaging/Messaging.h" +#include "tao/AnyTypeCode/Any.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" #include "ace/Reactor.h" diff --git a/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc b/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc index a585f7ec595..4c15c26f959 100644 --- a/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc +++ b/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc @@ -8,7 +8,7 @@ project(*Server): taoserver { } } -project(*Client): taoclient { +project(*Client): taoclient, anytypecode { Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/ORT/ORT.mpc b/TAO/tests/ORT/ORT.mpc index 9c288c29f52..461f03a1a7b 100644 --- a/TAO/tests/ORT/ORT.mpc +++ b/TAO/tests/ORT/ORT.mpc @@ -21,7 +21,7 @@ project(Test_ORT_Server): taoserver, objreftemplate, iorinterceptor, pi_server, } -project(Test_ORT_Client): taoclient, interceptors { +project(Test_ORT_Client): taoclient, anytypecode, interceptors { after += Test_ORT_Server IDL_Files { diff --git a/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc b/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc index 4a4d62a720b..fcf4ac7709c 100644 --- a/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc +++ b/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc @@ -7,7 +7,7 @@ project(*Server): taoserver { } } -project(*Client): taoclient { +project(*Client): taoclient, anytypecode { Source_Files { TestC.cpp client.cpp diff --git a/TAO/tests/OctetSeq/OctetSeq.mpc b/TAO/tests/OctetSeq/OctetSeq.mpc index 7df36753283..f022a840487 100644 --- a/TAO/tests/OctetSeq/OctetSeq.mpc +++ b/TAO/tests/OctetSeq/OctetSeq.mpc @@ -8,16 +8,15 @@ project(*Server): taoserver { } } -project(*Client): taoclient { +project(*Client): taoclient, anytypecode { Source_Files { testC.cpp client.cpp } } -project(*OctetSeq): taoexe { +project(*OctetSeq): taoclient, anytypecode { exename = OctetSeq - Source_Files { testC.cpp OctetSeq.cpp diff --git a/TAO/tests/Oneway_Buffering/client.cpp b/TAO/tests/Oneway_Buffering/client.cpp index 33061a3f815..ca1b240ca78 100644 --- a/TAO/tests/Oneway_Buffering/client.cpp +++ b/TAO/tests/Oneway_Buffering/client.cpp @@ -2,7 +2,9 @@ #include "TestC.h" #include "tao/Messaging/Messaging.h" +#include "tao/AnyTypeCode/Any.h" #include "tao/TAOC.h" +#include "tao/AnyTypeCode/TAOA.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_sys_time.h" diff --git a/TAO/tests/POA/Current/Current.mpc b/TAO/tests/POA/Current/Current.mpc index 49fcc0fc6a3..d08e1edbd9d 100644 --- a/TAO/tests/POA/Current/Current.mpc +++ b/TAO/tests/POA/Current/Current.mpc @@ -1,5 +1,6 @@ // -*- MPC -*- // $Id$ -project(POA*): taoexe, portableserver, pi_server { +project(POA*): taoserver, pi_server { + exename = Current } diff --git a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp index 17ad5ce90b5..11d740642cd 100644 --- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp +++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp @@ -21,6 +21,7 @@ #include "ace/Task.h" #include "ace/Auto_Event.h" #include "tao/PortableServer/ServantLocatorC.h" +#include "tao/CDR.h" class test_i : public virtual POA_test @@ -176,7 +177,7 @@ Servant_Locator::postinvoke (const PortableServer::ObjectId &oid, name.in ())); } -void +bool set_nil_servant_manager (PortableServer::POA_ptr poa) { bool succeed = false; @@ -205,9 +206,11 @@ set_nil_servant_manager (PortableServer::POA_ptr poa) ACE_ERROR ((LM_ERROR, "(%t) ERROR, set nil servant manager failed\n")); } + + return succeed; } -void +bool overwrite_servant_manager (PortableServer::POA_ptr poa) { bool succeed = false; @@ -238,11 +241,15 @@ overwrite_servant_manager (PortableServer::POA_ptr poa) ACE_ERROR ((LM_ERROR, "(%t) ERROR, overwrite servant manager failed\n")); } + + return succeed; } int main (int argc, char **argv) { + int retval = 0; + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = @@ -297,14 +304,16 @@ main (int argc, char **argv) ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - set_nil_servant_manager (child_poa.in()); + if (!set_nil_servant_manager (child_poa.in())) + retval = -1; Servant_Locator servant_locator (child_poa.in ()); child_poa->set_servant_manager (&servant_locator ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - overwrite_servant_manager (child_poa.in()); + if (!overwrite_servant_manager (child_poa.in())) + retval = -1; PortableServer::ObjectId_var first_oid = PortableServer::string_to_ObjectId ("first"); @@ -355,9 +364,9 @@ main (int argc, char **argv) ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); - return -1; + retval = -1; } ACE_ENDTRY; - return 0; + return retval; } diff --git a/TAO/tests/POA/Policies/Policies.cpp b/TAO/tests/POA/Policies/Policies.cpp index 77a64c760c1..095c1dca356 100644 --- a/TAO/tests/POA/Policies/Policies.cpp +++ b/TAO/tests/POA/Policies/Policies.cpp @@ -19,7 +19,7 @@ //========================================================================= #include "tao/ORB.h" -#include "tao/Any.h" +#include "tao/AnyTypeCode/Any.h" #include "tao/PortableServer/PortableServer.h" #include "tao/PI_Server/PI_Server.h" diff --git a/TAO/tests/Param_Test/Param_Test.mpc b/TAO/tests/Param_Test/Param_Test.mpc index 3acdda2a21b..6124582c733 100644 --- a/TAO/tests/Param_Test/Param_Test.mpc +++ b/TAO/tests/Param_Test/Param_Test.mpc @@ -2,8 +2,6 @@ // $Id$ project(*Server): taoserver, minimum_corba { - idlflags += -GA - Source_Files { param_test_i.cpp server.cpp @@ -12,7 +10,6 @@ project(*Server): taoserver, minimum_corba { project(*Client): taoserver, minimum_corba, dynamicinterface { exename = client - idlflags += -GA after += Param_Test_Server Source_Files { @@ -62,12 +59,10 @@ project(*Client): taoserver, minimum_corba, dynamicinterface { project(*Anyop): taoserver, minimum_corba { exename = anyop - idlflags += -GA after += Param_Test_Client Source_Files { param_testC.cpp - param_testA.cpp anyop.cpp } } diff --git a/TAO/tests/Param_Test/param_test.idl b/TAO/tests/Param_Test/param_test.idl index a2023cbbede..cf28c1273cc 100644 --- a/TAO/tests/Param_Test/param_test.idl +++ b/TAO/tests/Param_Test/param_test.idl @@ -20,6 +20,7 @@ // ============================================================================ #include <orb.idl> +#include "tao/AnyTypeCode/AnySeq.pidl" interface Coffee { diff --git a/TAO/tests/Policies/Manipulation.cpp b/TAO/tests/Policies/Manipulation.cpp index c6bfc107291..8de5aa8c65f 100644 --- a/TAO/tests/Policies/Manipulation.cpp +++ b/TAO/tests/Policies/Manipulation.cpp @@ -3,6 +3,8 @@ #include "testC.h" #include "tao/Messaging/Messaging.h" +#include "tao/AnyTypeCode/Any.h" +#include "tao/AnyTypeCode/TAOA.h" #include "tao/TAOC.h" #include "tao/Object_T.h" #include "ace/Get_Opt.h" diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp index f28091c7e3e..0086a292ed7 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp @@ -2,8 +2,8 @@ #include "client_interceptors.h" -#include "tao/DynamicC.h" -#include "tao/TypeCode.h" +#include "tao/AnyTypeCode/DynamicC.h" +#include "tao/AnyTypeCode/TypeCode.h" #include "ace/OS_NS_string.h" #include "ace/Log_Msg.h" diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp index a2cfbb32e3a..a11b66691d3 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp @@ -2,8 +2,8 @@ #include "server_interceptors.h" -#include "tao/DynamicC.h" -#include "tao/TypeCode.h" +#include "tao/AnyTypeCode/DynamicC.h" +#include "tao/AnyTypeCode/TypeCode.h" #include "ace/OS_NS_string.h" #include "ace/Log_Msg.h" diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp index 6d580a122d4..927b0f37cc9 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp @@ -3,8 +3,8 @@ #include "interceptors.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" -#include "tao/DynamicC.h" -#include "tao/TypeCode.h" +#include "tao/AnyTypeCode/DynamicC.h" +#include "tao/AnyTypeCode/TypeCode.h" ACE_RCSID (Dynamic, interceptors, diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp index 29eae24ccda..155f0663b5d 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp @@ -3,8 +3,8 @@ #include "client_interceptor.h" #include "testC.h" -#include "tao/DynamicC.h" -#include "tao/TypeCode.h" +#include "tao/AnyTypeCode/DynamicC.h" +#include "tao/AnyTypeCode/TypeCode.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp index 8e072515d51..30bd61bceb8 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp @@ -3,8 +3,8 @@ #include "server_interceptor.h" #include "testC.h" -#include "tao/DynamicC.h" -#include "tao/TypeCode.h" +#include "tao/AnyTypeCode/DynamicC.h" +#include "tao/AnyTypeCode/TypeCode.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/test.idl b/TAO/tests/Portable_Interceptors/ForwardRequest/test.idl index 153cf4559de..0b9ab7f0190 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/test.idl +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/test.idl @@ -13,7 +13,7 @@ */ //============================================================================= -#include "tao/PI_Server/ServerRequestInterceptor.pidl" +#include "tao/PI_Server/PI_Server_include.pidl" module ForwardRequestTest { diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp index b499b5b317e..6cfa38f8bde 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp @@ -3,7 +3,7 @@ #include "ace/Log_Msg.h" -#include "tao/TC_Constants_Forward.h" +#include "tao/AnyTypeCode/TC_Constants_Forward.h" ACE_RCSID (IORInterceptor, FOO_ClientRequestInterceptor, diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc b/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc index 1bdc7d0b821..26777d6f625 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Server): taoserver, iorinterceptor, codecfactory, interceptors { +project(*Server): taoserver, iorinterceptor, interceptors { Source_Files { test_i.cpp FOO_IORInterceptor_ORBInitializer.cpp @@ -10,7 +10,7 @@ project(*Server): taoserver, iorinterceptor, codecfactory, interceptors { } } -project(*Client): taoclient, pi, codecfactory, interceptors { +project(*Client): taoclient, pi, interceptors { Source_Files { testC.cpp FOO_Client_ORBInitializer.cpp diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h index 0e7c09d7d9c..b9cd7bf2c5d 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h @@ -23,6 +23,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/PI_Server/PI_Server.h" +#include "tao/PI/PI.h" #include "tao/PortableInterceptorC.h" #include "tao/LocalObject.h" diff --git a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp index 3763c57bde7..4325478fd98 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp @@ -6,7 +6,7 @@ #include "ClientORBInitializer.h" #include "tao/ORBInitializer_Registry.h" -#include "tao/PICurrentC.h" +#include "tao/PI/PI.h" ACE_RCSID (PICurrent, client, diff --git a/TAO/tests/Portable_Interceptors/PICurrent/test_i.h b/TAO/tests/Portable_Interceptors/PICurrent/test_i.h index eb6e6ab4709..74244723b72 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/test_i.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/test_i.h @@ -19,6 +19,7 @@ #include "testS.h" #include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" /** * @class test_i diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp index 03748c67f6e..495bc24a325 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp @@ -26,7 +26,7 @@ PolicyFactory::create_policy (CORBA::PolicyType type, ACE_THROW_RETURN (CORBA::INTERNAL (), CORBA::Policy::_nil ()); - Policy * p; + Policy * p = 0; ACE_NEW_THROW_EX (p, Policy (val), CORBA::NO_MEMORY ()); diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp index 7d6333c7dff..ee4ed4d118e 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp @@ -3,8 +3,7 @@ #include "Client_Request_Interceptor.h" #include "testC.h" -#include "tao/DynamicC.h" -#include "tao/TypeCode.h" +#include "tao/AnyTypeCode/TypeCode.h" #include "ace/OS_NS_string.h" ACE_RCSID (Request_Interceptor_Flow, diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp index a69f1e25dd9..b6d4260d09b 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp @@ -8,8 +8,7 @@ ACE_RCSID (Request_Interceptor_Flow, #include "testC.h" -#include "tao/DynamicC.h" -#include "tao/TypeCode.h" +#include "tao/AnyTypeCode/TypeCode.h" #include "ace/OS_NS_string.h" Server_Request_Interceptor::Server_Request_Interceptor (const char *name) diff --git a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc index 0662db7fb4e..0f82a323a72 100644 --- a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc +++ b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc @@ -7,8 +7,7 @@ project(*Server): rt_server, minimum_corba { } } -project(*Client): taoexe, minimum_corba { - requires += rt_corba +project(*Client): rt_client, minimum_corba { Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/Policies/Policies.cpp b/TAO/tests/RTCORBA/Policies/Policies.cpp index d33d11b6136..63d97ab4717 100644 --- a/TAO/tests/RTCORBA/Policies/Policies.cpp +++ b/TAO/tests/RTCORBA/Policies/Policies.cpp @@ -20,6 +20,7 @@ #include "tao/ORB.h" #include "tao/RTCORBA/RTCORBA.h" +#include "tao/AnyTypeCode/Any.h" #include "ace/Log_Msg.h" diff --git a/TAO/tests/Reliable_Oneways/client.cpp b/TAO/tests/Reliable_Oneways/client.cpp index a0cce868c6c..ee9b09cd5b9 100644 --- a/TAO/tests/Reliable_Oneways/client.cpp +++ b/TAO/tests/Reliable_Oneways/client.cpp @@ -2,6 +2,7 @@ #include "TestC.h" #include "tao/Messaging/Messaging.h" +#include "tao/AnyTypeCode/Any.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_sys_time.h" diff --git a/TAO/tests/Server_Leaks/Server_Leaks.mpc b/TAO/tests/Server_Leaks/Server_Leaks.mpc index db616ea3e82..6e565915472 100644 --- a/TAO/tests/Server_Leaks/Server_Leaks.mpc +++ b/TAO/tests/Server_Leaks/Server_Leaks.mpc @@ -8,7 +8,7 @@ project(*Server): taoserver { } } -project(*Client): taoclient { +project(*Client): taoclient, anytypecode { Source_Files { TestC.cpp client.cpp diff --git a/TAO/tests/Stack_Recursion/Stack_Recursion.mpc b/TAO/tests/Stack_Recursion/Stack_Recursion.mpc index da6c70d8f42..253a61435dc 100644 --- a/TAO/tests/Stack_Recursion/Stack_Recursion.mpc +++ b/TAO/tests/Stack_Recursion/Stack_Recursion.mpc @@ -11,7 +11,7 @@ project(*Server): taoserver { } } -project(*Client): taoclient { +project(*Client): taoclient, anytypecode { Source_Files { TestC.cpp client.cpp diff --git a/TAO/tests/Timed_Buffered_Oneways/client.cpp b/TAO/tests/Timed_Buffered_Oneways/client.cpp index 48e37d13caa..9878f57d8b8 100644 --- a/TAO/tests/Timed_Buffered_Oneways/client.cpp +++ b/TAO/tests/Timed_Buffered_Oneways/client.cpp @@ -17,6 +17,8 @@ #include "testC.h" #include "tao/Messaging/Messaging.h" +#include "tao/AnyTypeCode/TAOA.h" +#include "tao/AnyTypeCode/Any.h" #include "tao/TAOC.h" #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" diff --git a/TAO/tests/Timeout/client.cpp b/TAO/tests/Timeout/client.cpp index 55d3850f599..7d0ff876ea7 100644 --- a/TAO/tests/Timeout/client.cpp +++ b/TAO/tests/Timeout/client.cpp @@ -3,6 +3,7 @@ #include "testC.h" #include "tao/Messaging/Messaging.h" +#include "tao/AnyTypeCode/Any.h" #include "ace/Get_Opt.h" ACE_RCSID(Timeout, client, "$Id$") diff --git a/TAO/tests/Two_Objects/Two_Objects.mpc b/TAO/tests/Two_Objects/Two_Objects.mpc index 1570ccd0f66..de36db49c6a 100644 --- a/TAO/tests/Two_Objects/Two_Objects.mpc +++ b/TAO/tests/Two_Objects/Two_Objects.mpc @@ -11,7 +11,7 @@ project(*Server): taoserver { } } -project(*Client): taoclient { +project(*Client): taoclient, anytypecode { Source_Files { Two_ObjectsC.cpp client.cpp diff --git a/TAO/tests/Typedef_String_Array/typedef_string_array.mpc b/TAO/tests/Typedef_String_Array/typedef_string_array.mpc index df3587cd81b..3124c65910a 100644 --- a/TAO/tests/Typedef_String_Array/typedef_string_array.mpc +++ b/TAO/tests/Typedef_String_Array/typedef_string_array.mpc @@ -1,14 +1,14 @@ // -*- MPC -*- // $Id$ -project(*server): taoexe, portableserver { +project(*server): taoserver { Source_Files { server.cpp testImpl.cpp } } -project(*client): taoexe { +project(*client): taoclient, anytypecode { Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc b/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc index 79cf0d0b3e1..91fc9d79183 100644 --- a/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc +++ b/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc @@ -8,7 +8,7 @@ project(*Server): taoserver, exceptions { } } -project(*Client): taoclient, exceptions { +project(*Client): taoclient, anytypecode, exceptions { idlflags = -Ge 0 Source_Files { testC.cpp |