diff options
author | elliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-02-12 15:39:42 +0000 |
---|---|---|
committer | elliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-02-12 15:39:42 +0000 |
commit | 2e971b646d06901d49bf6042504e1279abc8178b (patch) | |
tree | 1654251442daf6bed434947e5467432520329a67 | |
parent | 2fc69fdc68315e0557bd4cf9b7a540c9b56fa506 (diff) | |
download | ATCD-2e971b646d06901d49bf6042504e1279abc8178b.tar.gz |
ChangeLogTag: Mon Feb 12 15:32:23 UTC 2007 Chad Elliott <elliott_c@ociweb.com>
72 files changed, 304 insertions, 248 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index cf2d15527cd..5474802dfbf 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,92 @@ +Mon Feb 12 15:32:23 UTC 2007 Chad Elliott <elliott_c@ociweb.com> + + * NEWS: + + Fixed the TAO 1.5.7 version number. + + * examples/Advanced/ch_3/Advanced_ch_3.mpc: + * examples/Buffered_AMI/Buffered_AMI.mpc: + * examples/Callback_Quoter/Callback_Quoter.mpc: + * examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc: + * examples/Kokyu_dsrt_schedulers/fp_example/fp_example.mpc: + * examples/OBV/Typed_Events/Typed_Events.mpc: + * examples/Quoter/Quoter.mpc: + * examples/Simple/bank/bank.mpc: + * examples/Simple/chat/chat.mpc: + * examples/Simple/grid/grid.mpc: + * examples/ior_corbaloc/ior_corbaloc.mpc: + * orbsvcs/examples/Security/Send_File/Security_Send_File.mpc: + * orbsvcs/tests/Bug_2285_Regression/Bug_2285_Regression.mpc: + * orbsvcs/tests/Bug_2316_Regression/Bug_2316_Regression.mpc: + * orbsvcs/tests/Bug_2615_Regression/Bug_2615_Regression.mpc: + * orbsvcs/tests/HTIOP/AMI/HTIOP_AMI.mpc: + * orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc: + * orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc: + * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc: + * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Infrastructure_Controlled.mpc: + * orbsvcs/tests/Notify/Discarding/Discarding.mpc: + * orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc: + * orbsvcs/tests/Notify/Ordering/Ordering.mpc: + * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Seq_Multi_ETCL_Filter.mpc: + * orbsvcs/tests/Notify/Sequence_Multi_Filter/Seq_Multi_Filter.mpc: + * orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc: + * performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc: + * performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc: + * performance-tests/Latency/DII/DII.mpc: + * performance-tests/Memory/Single_Threaded/Memory_Growth.mpc: + * performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc: + * performance-tests/Pluggable/Pluggable.mpc: + * performance-tests/Protocols/Protocols.mpc: + * performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc: + * performance-tests/Sequence_Latency/DII/DII.mpc: + * performance-tests/Sequence_Latency/Deferred/Deferred.mpc: + * performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Conn.mpc: + * performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc: + * performance-tests/Throughput/Throughput.mpc: + * tests/BiDirectional/BiDirectional.mpc: + * tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc: + * tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc: + * tests/Big_Oneways/Big_Oneways.mpc: + * tests/Big_Twoways/Big_Twoways.mpc: + * tests/Bug_1020_Regression/Bug_1020_Regression.mpc: + * tests/Bug_1270_Regression/Bug_1270_Regression.mpc: + * tests/Bug_1361_Regression/Bug_1361_Regression.mpc: + * tests/Bug_2188_Regression/broken.mpc: + * tests/Bug_2417_Regression/Bug_2417_Regression.mpc: + * tests/Client_Leaks/Client_Leaks.mpc: + * tests/File_IO/File_IO.mpc: + * tests/Hang_Shutdown/Hang.mpc: + * tests/ICMG_Any_Bug/Hello.mpc: + * tests/NestedUpcall/Simple/Simple.mpc: + * tests/OBV/Any/OBV_Any.mpc: + * tests/OBV/Simple/OBV_Simple.mpc: + * tests/OctetSeq/OctetSeq.mpc: + * tests/Oneway_Timeouts/test.mpc: + * tests/POA/Persistent_ID/Persistent_ID.mpc: + * tests/Param_Test/Param_Test.mpc: + * tests/Portable_Interceptors/AMI/PI_AMI.mpc: + * tests/Portable_Interceptors/AdvSlot/AdvSlot.mpc: + * tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc: + * tests/Timeout/Timeout.mpc: + * tests/TransportCurrent/IIOP/IIOP.mpc: + * tests/Two_Objects/Two_Objects.mpc: + * tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc: + + Re-arranged the generated source files so that they are at the + beginning (like MPC would do if it were automatically generating + the list of source files). This is required for template + instantiation to work properly for Visual Age 6.0. + + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp: + + Added include files to get AnyTypeCode definitions. + + * tao/Fixed_Array_Argument_T.inl: + + Fixed a typo of a type name in a Visual Age 6.0 specific section + of a C-style cast. + Mon Feb 12 14:48:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * tao/Acceptor_Impl.cpp @@ -6,7 +6,7 @@ PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known) . (JTC) autoconf support for tests and examples subdirectories. -PLANNED CHANGES FOR "TAO-5.5.7" +PLANNED CHANGES FOR "TAO-1.5.7" =============================== . (OO) Coverity error fixes for TAO. diff --git a/TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc b/TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc index 16f24c89b7e..d20f18f86d7 100644 --- a/TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc +++ b/TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc @@ -12,8 +12,8 @@ project(*client) : taoclient, anytypecode { after += *idl requires += corba_messaging source_files { - client.cpp timeC.cpp + client.cpp } IDL_Files { } @@ -22,9 +22,9 @@ project(*client) : taoclient, anytypecode { project(*server) : taoserver { after += *idl source_files { - server.cpp - timeS.cpp timeC.cpp + timeS.cpp + server.cpp } IDL_Files { } diff --git a/TAO/examples/Buffered_AMI/Buffered_AMI.mpc b/TAO/examples/Buffered_AMI/Buffered_AMI.mpc index 5194742ca10..4681a366900 100644 --- a/TAO/examples/Buffered_AMI/Buffered_AMI.mpc +++ b/TAO/examples/Buffered_AMI/Buffered_AMI.mpc @@ -12,10 +12,10 @@ project(*Server): messaging, taoserver, ami { exename = server after += *IDL Source_Files { - test_i.cpp - server.cpp testS.cpp testC.cpp + test_i.cpp + server.cpp } IDL_Files { } @@ -25,9 +25,9 @@ project(*Client): messaging, taoserver, ami { exename = client after += *IDL Source_Files { - client.cpp testS.cpp testC.cpp + client.cpp } IDL_Files { } diff --git a/TAO/examples/Callback_Quoter/Callback_Quoter.mpc b/TAO/examples/Callback_Quoter/Callback_Quoter.mpc index 01387043653..5b96007db67 100644 --- a/TAO/examples/Callback_Quoter/Callback_Quoter.mpc +++ b/TAO/examples/Callback_Quoter/Callback_Quoter.mpc @@ -12,12 +12,12 @@ project(*IDL): taoidldefaults { project(Callback_Quoter notifier): namingexe, utils, avoids_corba_e_micro { after += *IDL Source_Files { + NotifierC.cpp + NotifierS.cpp + ConsumerC.cpp Notifier_i.cpp Notifier_Input_Handler.cpp notifier.cpp - NotifierS.cpp - NotifierC.cpp - ConsumerC.cpp } IDL_Files { } @@ -26,14 +26,14 @@ project(Callback_Quoter notifier): namingexe, utils, avoids_corba_e_micro { project(Callback_Quoter consumer): namingexe, portableserver { after += *IDL Source_Files { + ConsumerC.cpp + ConsumerS.cpp + NotifierC.cpp Consumer_Input_Handler.cpp Consumer_Signal_Handler.cpp Consumer_Handler.cpp consumer.cpp Consumer_i.cpp - ConsumerS.cpp - ConsumerC.cpp - NotifierC.cpp } IDL_Files { } @@ -42,13 +42,13 @@ project(Callback_Quoter consumer): namingexe, portableserver { project(Callback_Quoter supplier): namingexe, portableserver { after += *IDL Source_Files { + ConsumerC.cpp + ConsumerS.cpp + NotifierC.cpp Supplier_i.cpp Supplier_Timer_Handler.cpp supplier.cpp Consumer_i.cpp - ConsumerS.cpp - ConsumerC.cpp - NotifierC.cpp } IDL_Files { } diff --git a/TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc b/TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc index 3172a2ddd7f..02b9580e694 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc +++ b/TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc @@ -13,11 +13,11 @@ project(*Server): messaging, taoserver, ami, namingexe { after += *IDL avoids += ace_for_tao Source_Files { + Web_ServerS.cpp + Web_ServerC.cpp Content_Iterator_i.cpp Iterator_Factory_i.cpp server.cpp - Web_ServerS.cpp - Web_ServerC.cpp } IDL_Files { } @@ -28,10 +28,10 @@ project(*Client): messaging, taoserver, ami, namingexe { after += *IDL avoids += ace_for_tao Source_Files { - client.cpp - Iterator_Handler.cpp Web_ServerS.cpp Web_ServerC.cpp + client.cpp + Iterator_Handler.cpp } IDL_Files { } diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/fp_example.mpc b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/fp_example.mpc index a9d12fa4794..5a74bab0021 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/fp_example.mpc +++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/fp_example.mpc @@ -12,10 +12,10 @@ project(fp_server): kokyu_dsrt_scheduler_server { exename = fp_server after += *IDL Source_Files { + testC.cpp + testS.cpp test_i.cpp server.cpp - testS.cpp - testC.cpp } IDL_Files { } diff --git a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc index d8866966fca..02469a4f9d6 100644 --- a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc +++ b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc @@ -13,12 +13,12 @@ project(*server): taoserver, utils, valuetype, avoids_minimum_corba, avoids_corb exename = server after += *IDL Source_Files { + Event_TypesS.cpp + Event_TypesC.cpp Server_i.cpp Event_Types_impl.cpp ../Simple_util.cpp server.cpp - Event_TypesS.cpp - Event_TypesC.cpp } IDL_Files { } @@ -28,12 +28,12 @@ project(*client): taoserver, utils, valuetype, avoids_minimum_corba, avoids_corb exename = client after += *IDL Source_Files { + Event_TypesS.cpp + Event_TypesC.cpp Client_i.cpp Event_Types_impl.cpp ../Simple_util.cpp client.cpp - Event_TypesS.cpp - Event_TypesC.cpp } IDL_Files { } diff --git a/TAO/examples/Quoter/Quoter.mpc b/TAO/examples/Quoter/Quoter.mpc index 49d1da0a283..a3571740a13 100644 --- a/TAO/examples/Quoter/Quoter.mpc +++ b/TAO/examples/Quoter/Quoter.mpc @@ -11,10 +11,10 @@ project(*IDL): taoidldefaults { project(*server): namingexe, lifecycle, avoids_minimum_corba, utils, avoids_corba_e_micro { after += *IDL Source_Files { + QuoterC.cpp + QuoterS.cpp server.cpp Quoter_i.cpp - QuoterS.cpp - QuoterC.cpp } IDL_Files { } @@ -23,8 +23,8 @@ project(*server): namingexe, lifecycle, avoids_minimum_corba, utils, avoids_corb project(*client): namingexe, lifecycle, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { after += *IDL Source_Files { - client.cpp QuoterC.cpp + client.cpp } IDL_Files { } @@ -33,10 +33,10 @@ project(*client): namingexe, lifecycle, avoids_minimum_corba, avoids_corba_e_com project(*Factory Finder): namingexe, lifecycle, avoids_minimum_corba, utils { after += *IDL Source_Files { + QuoterC.cpp + QuoterS.cpp Factory_Finder.cpp Factory_Finder_i.cpp - QuoterS.cpp - QuoterC.cpp } IDL_Files { } @@ -45,10 +45,10 @@ project(*Factory Finder): namingexe, lifecycle, avoids_minimum_corba, utils { project(*Generic Factory): namingexe, lifecycle, avoids_minimum_corba, utils { after += *IDL Source_Files { + QuoterC.cpp + QuoterS.cpp Generic_Factory.cpp Generic_Factory_i.cpp - QuoterS.cpp - QuoterC.cpp } IDL_Files { } diff --git a/TAO/examples/Simple/bank/bank.mpc b/TAO/examples/Simple/bank/bank.mpc index a8fc2264d0b..911a626883b 100644 --- a/TAO/examples/Simple/bank/bank.mpc +++ b/TAO/examples/Simple/bank/bank.mpc @@ -12,12 +12,12 @@ project(*server): namingexe, iortable, utils, avoids_corba_e_micro { exename = server after += *IDL Source_Files { + BankS.cpp + BankC.cpp Account_i.cpp AccountManager_i.cpp ../Simple_util.cpp server.cpp - BankS.cpp - BankC.cpp } IDL_Files { } diff --git a/TAO/examples/Simple/chat/chat.mpc b/TAO/examples/Simple/chat/chat.mpc index 5b3a353ea50..d8649da64d4 100644 --- a/TAO/examples/Simple/chat/chat.mpc +++ b/TAO/examples/Simple/chat/chat.mpc @@ -14,12 +14,12 @@ project(*server) : taoserver, utils, iortable { IDL_Files { } Source_Files { + BroadcasterC.cpp + BroadcasterS.cpp + ReceiverC.cpp Broadcaster_i.cpp Server_i.cpp server.cpp - BroadcasterS.cpp - BroadcasterC.cpp - ReceiverC.cpp } } @@ -28,11 +28,11 @@ project(*client): taoexe, portableserver, utils { IDL_Files { } Source_Files { + ReceiverC.cpp + ReceiverS.cpp + BroadcasterC.cpp Receiver_i.cpp Client_i.cpp client.cpp - ReceiverS.cpp - ReceiverC.cpp - BroadcasterC.cpp } } diff --git a/TAO/examples/Simple/grid/grid.mpc b/TAO/examples/Simple/grid/grid.mpc index fea24a387e9..b1560d75e3d 100644 --- a/TAO/examples/Simple/grid/grid.mpc +++ b/TAO/examples/Simple/grid/grid.mpc @@ -12,11 +12,11 @@ project(*server): namingexe, iortable, utils, avoids_corba_e_micro { exename = server after += *IDL Source_Files { + GridC.cpp + GridS.cpp Grid_i.cpp server.cpp ../Simple_util.cpp - GridS.cpp - GridC.cpp } IDL_Files { } @@ -26,10 +26,10 @@ project(*client): namingexe, iortable, utils { exename = client after += *IDL Source_Files { + GridC.cpp client.cpp ../Simple_util.cpp Grid_Client_i.cpp - GridC.cpp } IDL_Files { } diff --git a/TAO/examples/ior_corbaloc/ior_corbaloc.mpc b/TAO/examples/ior_corbaloc/ior_corbaloc.mpc index 84647e7b5a1..a7e25194fbc 100644 --- a/TAO/examples/ior_corbaloc/ior_corbaloc.mpc +++ b/TAO/examples/ior_corbaloc/ior_corbaloc.mpc @@ -13,10 +13,10 @@ project(*server): namingexe, portableserver { after += *IDL Source_Files { - status_i.cpp - server.cpp corbalocS.cpp corbalocC.cpp + status_i.cpp + server.cpp } IDL_Files { } @@ -27,9 +27,9 @@ project(*client): namingexe { after += *IDL Source_Files { + corbalocC.cpp ior_corbaloc_client_i.cpp client.cpp - corbalocC.cpp } IDL_Files { } @@ -40,8 +40,8 @@ project(*corbaname client): taoclient { after += *IDL Source_Files { - corbaname_client.cpp corbalocC.cpp + corbaname_client.cpp } IDL_Files { } diff --git a/TAO/orbsvcs/examples/Security/Send_File/Security_Send_File.mpc b/TAO/orbsvcs/examples/Security/Send_File/Security_Send_File.mpc index 7752e40754b..2dd91e44fd5 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/Security_Send_File.mpc +++ b/TAO/orbsvcs/examples/Security/Send_File/Security_Send_File.mpc @@ -11,8 +11,8 @@ project(*Idl) : taoidldefaults { project(*Client) : orbsvcsexe, portableserver { after += *Idl source_files { - client.cpp testC.cpp + client.cpp } IDL_Files { } @@ -21,10 +21,10 @@ project(*Client) : orbsvcsexe, portableserver { project(*Server) : orbsvcsexe, portableserver { after += *Idl source_files { + testC.cpp + testS.cpp server.cpp test_i.cpp - testS.cpp - testC.cpp } IDL_Files { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp index 8f3e53a988f..6c63a849077 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp @@ -7,7 +7,7 @@ #include "tao/AnyTypeCode/TypeCode.h" #include "tao/PI/PI.h" #include "tao/PI_Server/PI_Server.h" -#include "tao/IOP_IORC.h" +#include "tao/AnyTypeCode/IOP_IORA.h" #include "ace/TSS_T.h" ACE_RCSID (EventChannel, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp index 93c0c646e52..f688b10864d 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp @@ -1,6 +1,7 @@ // $Id$ #include "tao/CDR.h" +#include "tao/AnyTypeCode/IOP_IORA.h" #include "orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h" #include "orbsvcs/FTRTC.h" #include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h" diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Bug_2285_Regression.mpc b/TAO/orbsvcs/tests/Bug_2285_Regression/Bug_2285_Regression.mpc index 349374bb355..b13fc2104be 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/Bug_2285_Regression.mpc +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Bug_2285_Regression.mpc @@ -13,10 +13,10 @@ project(*Client): taoserver, ftclientorb { exename = client Source_Files { + TestC.cpp + TestS.cpp client.cpp Hello.cpp - TestS.cpp - TestC.cpp } IDL_Files { } @@ -27,12 +27,12 @@ project (*Server) : taoserver, ftclientorb, pi_server { exename = server Source_Files { + TestC.cpp + TestS.cpp server.cpp Hello.cpp ServerORBInitializer.cpp ServerRequest_Interceptor.cpp - TestS.cpp - TestC.cpp } IDL_Files { } @@ -43,8 +43,8 @@ project(*Client2): taoclient, ftclientorb, iormanip { exename = client2 Source_Files { - client2.cpp TestC.cpp + client2.cpp } IDL_Files { } @@ -55,12 +55,12 @@ project (*Server2) : taoserver, pi_server, ftclientorb { exename = server2 Source_Files { + TestC.cpp + TestS.cpp server2.cpp Hello.cpp ServerORBInitializer2.cpp ServerRequest_Interceptor2.cpp - TestS.cpp - TestC.cpp } IDL_Files { } diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/Bug_2316_Regression.mpc b/TAO/orbsvcs/tests/Bug_2316_Regression/Bug_2316_Regression.mpc index 2b4960fc5cd..15de5d453a6 100644 --- a/TAO/orbsvcs/tests/Bug_2316_Regression/Bug_2316_Regression.mpc +++ b/TAO/orbsvcs/tests/Bug_2316_Regression/Bug_2316_Regression.mpc @@ -13,10 +13,10 @@ project(*Server): orbsvcsexe, portablegroup, portableserver { after += *IDL Source_Files { + TestC.cpp + TestS.cpp Test_impl.cpp server.cpp - TestS.cpp - TestC.cpp } IDL_Files { } @@ -27,8 +27,8 @@ project(*Client): orbsvcsexe, portablegroup { after += *IDL Source_Files { - client.cpp TestC.cpp + client.cpp } IDL_Files { } diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/Bug_2615_Regression.mpc b/TAO/orbsvcs/tests/Bug_2615_Regression/Bug_2615_Regression.mpc index d84909ff31f..39952cd6ebd 100644 --- a/TAO/orbsvcs/tests/Bug_2615_Regression/Bug_2615_Regression.mpc +++ b/TAO/orbsvcs/tests/Bug_2615_Regression/Bug_2615_Regression.mpc @@ -13,8 +13,8 @@ project(*Client): taoserver, ftclientorb { exename = client Source_Files { - client.cpp TestC.cpp + client.cpp } IDL_Files { } @@ -25,12 +25,12 @@ project (*Server) : taoserver, ftclientorb, pi_server { exename = server Source_Files { + TestS.cpp + TestC.cpp server.cpp Hello.cpp ServerORBInitializer2.cpp ServerRequest_Interceptor2.cpp - TestS.cpp - TestC.cpp } IDL_Files { } diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/HTIOP_AMI.mpc b/TAO/orbsvcs/tests/HTIOP/AMI/HTIOP_AMI.mpc index 4dde0b749eb..4a50f2e1f38 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/HTIOP_AMI.mpc +++ b/TAO/orbsvcs/tests/HTIOP/AMI/HTIOP_AMI.mpc @@ -13,10 +13,10 @@ project(*Server): messaging, taoexe, portableserver, ami { after += *idl macros += TEST_OUTPUT_HAS_DLL=0 Source_Files { - Test_Output.cpp - ami_test_i.cpp ami_testS.cpp ami_testC.cpp + Test_Output.cpp + ami_test_i.cpp server.cpp } IDL_Files { @@ -27,10 +27,10 @@ project(*Client): messaging, taoexe, portableserver, ami { after += *idl macros += TEST_OUTPUT_HAS_DLL=0 Source_Files { - Test_Output.cpp - client.cpp ami_testS.cpp ami_testC.cpp + Test_Output.cpp + client.cpp } IDL_Files { } @@ -40,10 +40,10 @@ project(*Simple Client): messaging, taoexe, portableserver, ami { after += *idl macros += TEST_OUTPUT_HAS_DLL=0 Source_Files { - Test_Output.cpp - simple_client.cpp ami_testS.cpp ami_testC.cpp + Test_Output.cpp + simple_client.cpp } IDL_Files { } diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc b/TAO/orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc index a6fec141c7e..b09077d66c7 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc +++ b/TAO/orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc @@ -16,9 +16,9 @@ project(*Server): taoserver, naming, iortable { after += *idl macros += TEST_OUTPUT_HAS_DLL=0 Source_Files { - Test_Output.cpp - TestS.cpp TestC.cpp + TestS.cpp + Test_Output.cpp Hello.cpp server.cpp } @@ -33,8 +33,8 @@ project(*Client): taoclient { after += *idl macros += TEST_OUTPUT_HAS_DLL=0 Source_Files { - Test_Output.cpp TestC.cpp + Test_Output.cpp client.cpp } Header_Files { diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc index c42ffc5651c..e660b75e889 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc +++ b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc @@ -15,10 +15,10 @@ project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoid after += *idl exename = MessengerServer Source_Files { + MessengerC.cpp + MessengerS.cpp Messenger_i.cpp MessengerServer.cpp - MessengerS.cpp - MessengerC.cpp } IDL_Files { } diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc index 91756218ae9..e9ee1a7648c 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc @@ -11,11 +11,11 @@ project(*idl): taoidldefaults { project(*server): orbsvcsexe, portablegroup, loadbalancing, naming, svc_utils { after += *idl Source_Files { + TestC.cpp + TestS.cpp server.cpp LB_server.cpp Basic.cpp - TestS.cpp - TestC.cpp } IDL_Files { } @@ -24,8 +24,8 @@ project(*server): orbsvcsexe, portablegroup, loadbalancing, naming, svc_utils { project(*client): orbsvcsexe, portablegroup, loadbalancing, naming, svc_utils { after += *idl Source_Files { - client.cpp TestC.cpp + client.cpp } IDL_Files { } diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Infrastructure_Controlled.mpc b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Infrastructure_Controlled.mpc index af901a174ec..91abb22789d 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Infrastructure_Controlled.mpc +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Infrastructure_Controlled.mpc @@ -9,14 +9,14 @@ project(*idl): taoidldefaults { project(*Server): loadbalancing { after += *idl Source_Files { + TestC.cpp + TestS.cpp server.cpp LB_server.cpp Simple.cpp Factory.cpp Factory_Map.cpp Factory_Struct.cpp - TestS.cpp - TestC.cpp } IDL_Files { } diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc b/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc index f8e99b34ec2..a2e662bee54 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc +++ b/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc @@ -13,9 +13,9 @@ project(*Ntf Struct Supp): notifytest { after += *idl Source_Files { - Structured_Supplier.cpp goS.cpp goC.cpp + Structured_Supplier.cpp } IDL_Files { } @@ -39,9 +39,9 @@ project(*Ntf Seq Supp): notifytest { after += *idl Source_Files { - Sequence_Supplier.cpp goS.cpp goC.cpp + Sequence_Supplier.cpp } IDL_Files { } diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc b/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc index d576fd2920e..a01418fc4e5 100644 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc @@ -15,9 +15,9 @@ project(*Ntf Struct Supp): notifytest { after += *idl Source_Files { - Structured_Supplier.cpp - goS.cpp goC.cpp + goS.cpp + Structured_Supplier.cpp } IDL_Files { } diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc b/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc index c57d14c1ddc..686a92add20 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc +++ b/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc @@ -13,9 +13,9 @@ project(*Ntf Struct Supp): notifytest { after += *idl Source_Files { - Structured_Supplier.cpp - goS.cpp goC.cpp + goS.cpp + Structured_Supplier.cpp } IDL_Files { } @@ -39,9 +39,9 @@ project(*Ntf Seq Supp): notifytest { after += *idl Source_Files { - Sequence_Supplier.cpp - goS.cpp goC.cpp + goS.cpp + Sequence_Supplier.cpp } IDL_Files { } diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Seq_Multi_ETCL_Filter.mpc b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Seq_Multi_ETCL_Filter.mpc index 5b4145b586f..a66c80a9f27 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Seq_Multi_ETCL_Filter.mpc +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Seq_Multi_ETCL_Filter.mpc @@ -15,9 +15,9 @@ project(*Ntf Seq Supp): notifytest { after += *idl Source_Files { - Sequence_Supplier.cpp goS.cpp goC.cpp + Sequence_Supplier.cpp } IDL_Files { } diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Seq_Multi_Filter.mpc b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Seq_Multi_Filter.mpc index 47c8459df2a..3513a3251b9 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Seq_Multi_Filter.mpc +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Seq_Multi_Filter.mpc @@ -13,9 +13,9 @@ project(*Ntf Seq Supp): notifytest { after += *idl Source_Files { - Sequence_Supplier.cpp - goS.cpp goC.cpp + goS.cpp + Sequence_Supplier.cpp } IDL_Files { } diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc b/TAO/orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc index 76ff20df96e..bee0bed91cb 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc @@ -13,9 +13,9 @@ project(*Ntf Struct Supp): notifytest { after += *idl Source_Files { - Structured_Supplier.cpp - goS.cpp goC.cpp + goS.cpp + Structured_Supplier.cpp } IDL_Files { } diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc index f6828602b80..0795cb6b8ec 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc @@ -13,13 +13,13 @@ project(*IDL): taoidldefaults, strategies { project(*Server): taoexe, utils, portableserver, strategies, avoids_corba_e_micro, avoids_ace_for_tao { after += *IDL Source_Files { + cubitC.cpp + cubitS.cpp RTI_IO.cpp Cubit_i.cpp Cubit_Client.cpp Cubit_Server.cpp server.cpp - cubitS.cpp - cubitC.cpp } IDL_Files { @@ -30,10 +30,10 @@ project(*client): taoexe, portableserver, strategies { after += *IDL avoids += ace_for_tao Source_Files { + cubitC.cpp RTI_IO.cpp Cubit_Client.cpp client.cpp - cubitC.cpp } IDL_Files { @@ -48,13 +48,13 @@ project(*collocation): taoserver, utils, strategies, avoids_corba_e_micro, avoid exename = collocation_test Source_Files { + cubitC.cpp + cubitS.cpp RTI_IO.cpp collocation_test.cpp Cubit_i.cpp Cubit_Client.cpp Cubit_Server.cpp - cubitS.cpp - cubitC.cpp } IDL_Files { diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc b/TAO/performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc index 512c9e74b13..939cd18912a 100644 --- a/TAO/performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc +++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc @@ -11,9 +11,9 @@ project(*AMH_latency_idl): taoidldefaults, amh { project(*AMH latency server): taoserver, strategies, valuetype, amh { after += *AMH_latency_idl Source_Files { - Roundtrip.cpp - TestS.cpp TestC.cpp + TestS.cpp + Roundtrip.cpp server.cpp } IDL_Files { diff --git a/TAO/performance-tests/Latency/DII/DII.mpc b/TAO/performance-tests/Latency/DII/DII.mpc index 3d5ec120dcf..77c1483e4a8 100644 --- a/TAO/performance-tests/Latency/DII/DII.mpc +++ b/TAO/performance-tests/Latency/DII/DII.mpc @@ -11,9 +11,9 @@ project(*latency_idl): taoidldefaults, strategies, avoids_minimum_corba, avoids_ project(*latency server): taoserver, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { after += *latency_idl Source_Files { - Roundtrip.cpp - TestS.cpp TestC.cpp + TestS.cpp + Roundtrip.cpp server.cpp } IDL_Files { diff --git a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc index fb5823d809e..7fa47023a38 100644 --- a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc +++ b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc @@ -12,10 +12,10 @@ project(*idl): taoidldefaults { project(*server): taoserver { after += *idl Source_Files { - Memory_Growth.cpp - server.cpp TestS.cpp TestC.cpp + Memory_Growth.cpp + server.cpp } IDL_Files { } diff --git a/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc b/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc index b95d547dc66..e0e2c10fd07 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc +++ b/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc @@ -15,11 +15,11 @@ project(*server): taoserver { after += *idl Source_Files { + TestS.cpp + TestC.cpp Factory.cpp Simple.cpp server.cpp - TestS.cpp - TestC.cpp } IDL_Files { @@ -44,10 +44,10 @@ project(*collocated): taoserver { after += *idl exename = collocated Source_Files { - Simple.cpp - collocated.cpp TestS.cpp TestC.cpp + Simple.cpp + collocated.cpp } IDL_Files { diff --git a/TAO/performance-tests/Pluggable/Pluggable.mpc b/TAO/performance-tests/Pluggable/Pluggable.mpc index 2981dd161a6..caba1d13456 100644 --- a/TAO/performance-tests/Pluggable/Pluggable.mpc +++ b/TAO/performance-tests/Pluggable/Pluggable.mpc @@ -11,11 +11,11 @@ project(*idl): taoidldefaults { project(*server): taoserver, utils, avoids_corba_e_micro { after += *idl Source_Files { + PP_TestS.cpp + PP_TestC.cpp PP_Test_Server.cpp PP_Test_i.cpp server.cpp - PP_TestS.cpp - PP_TestC.cpp } IDL_Files { } diff --git a/TAO/performance-tests/Protocols/Protocols.mpc b/TAO/performance-tests/Protocols/Protocols.mpc index f5a235aa7de..841b85ed259 100644 --- a/TAO/performance-tests/Protocols/Protocols.mpc +++ b/TAO/performance-tests/Protocols/Protocols.mpc @@ -13,9 +13,9 @@ project(*Receiver): taoserver { after += *IDL exename = receiver Source_Files { - receiver.cpp - testS.cpp testC.cpp + testS.cpp + receiver.cpp } IDL_Files { } @@ -25,9 +25,9 @@ project(*Distributor): rt_server { after += *IDL exename = distributor Source_Files { - distributor.cpp - testS.cpp testC.cpp + testS.cpp + distributor.cpp } IDL_Files { } diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc b/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc index 13a81a456f5..65a9cc6beac 100644 --- a/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc +++ b/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc @@ -11,9 +11,9 @@ project(*RTCorba idl): taoidldefaults { project(*RTCorba server): rt_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { after += *RTCorba_idl Source_Files { - server.cpp - testS.cpp testC.cpp + testS.cpp + server.cpp } IDL_Files { } diff --git a/TAO/performance-tests/Sequence_Latency/DII/DII.mpc b/TAO/performance-tests/Sequence_Latency/DII/DII.mpc index b5adcb751a1..d4f879d4a6f 100644 --- a/TAO/performance-tests/Sequence_Latency/DII/DII.mpc +++ b/TAO/performance-tests/Sequence_Latency/DII/DII.mpc @@ -13,10 +13,10 @@ project(*sequence server): taoserver, strategies, avoids_minimum_corba, avoids_c exename = server Source_Files { + TestC.cpp + TestS.cpp Roundtrip.cpp server.cpp - TestS.cpp - TestC.cpp } IDL_Files { } diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc index 375e7e0cc3b..2fbfd86306b 100644 --- a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc +++ b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc @@ -13,10 +13,10 @@ project(*sequence server): taoserver, strategies, avoids_minimum_corba, avoids_c exename = server Source_Files { - Roundtrip.cpp - server.cpp TestS.cpp TestC.cpp + Roundtrip.cpp + server.cpp } IDL_Files { } diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Conn.mpc b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Conn.mpc index 160d90fec3f..9e690719c57 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Conn.mpc +++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Conn.mpc @@ -11,9 +11,9 @@ project(*sequence_idl): taoidldefaults, strategies { project(*sequence server): taoserver, strategies { after += *sequence_idl Source_Files { - Roundtrip.cpp - TestS.cpp TestC.cpp + TestS.cpp + Roundtrip.cpp server.cpp } IDL_Files { diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc index df4e8aa4ae6..433de27a1d4 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc +++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc @@ -11,9 +11,9 @@ project(*sequence_idl): taoidldefaults, strategies { project(*sequence server): taoserver, strategies { after += *sequence_idl Source_Files { - Roundtrip.cpp - TestS.cpp TestC.cpp + TestS.cpp + Roundtrip.cpp Worker_Thread.cpp server.cpp } diff --git a/TAO/performance-tests/Throughput/Throughput.mpc b/TAO/performance-tests/Throughput/Throughput.mpc index ca5e5b74cac..e0baa06c094 100644 --- a/TAO/performance-tests/Throughput/Throughput.mpc +++ b/TAO/performance-tests/Throughput/Throughput.mpc @@ -11,11 +11,11 @@ project(*idl): taoidldefaults { project(*server): taoserver, strategies { after += *idl Source_Files { + TestC.cpp + TestS.cpp Receiver_Factory.cpp Receiver.cpp server.cpp - TestS.cpp - TestC.cpp } IDL_Files { } diff --git a/TAO/tao/Fixed_Array_Argument_T.inl b/TAO/tao/Fixed_Array_Argument_T.inl index de1d1bfd087..2a90e493d3e 100644 --- a/TAO/tao/Fixed_Array_Argument_T.inl +++ b/TAO/tao/Fixed_Array_Argument_T.inl @@ -17,7 +17,7 @@ In_Fixed_Array_Argument_T (const typename S_forany::_slice_type * x) // doesn't work either). It's not clear if this is // really the right thing to do but the code won't // compile without it. - (S_forany::slice_type *) x + (S_forany::_slice_type *) x #else const_cast<typename S_forany::_slice_type *> (x) #endif /* IBMCPP <= 600 */ diff --git a/TAO/tests/BiDirectional/BiDirectional.mpc b/TAO/tests/BiDirectional/BiDirectional.mpc index bb389945946..976c59d6fe7 100644 --- a/TAO/tests/BiDirectional/BiDirectional.mpc +++ b/TAO/tests/BiDirectional/BiDirectional.mpc @@ -11,10 +11,10 @@ project(*idl): taoidldefaults { project(*Server): taoserver, anytypecode, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro { after += *idl Source_Files { - test_i.cpp - server.cpp testC.cpp testS.cpp + test_i.cpp + server.cpp } IDL_Files { } @@ -24,10 +24,10 @@ project(*Client): taoserver, anytypecode, avoids_minimum_corba, bidir_giop, avoi exename = client after += *idl Source_Files { - test_i.cpp - client.cpp testC.cpp testS.cpp + test_i.cpp + client.cpp } IDL_Files { } diff --git a/TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc b/TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc index a76649bfc17..2617f55d5a4 100644 --- a/TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc +++ b/TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc @@ -11,10 +11,10 @@ project(*idl): taoidldefaults { project(*Server): taoserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro { after += *idl Source_Files { - test_i.cpp - server.cpp testC.cpp testS.cpp + test_i.cpp + server.cpp } IDL_Files { } @@ -23,10 +23,10 @@ project(*Server): taoserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_mi project(*Client): taoexe, portableserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro { after += *idl Source_Files { - test_i.cpp - client.cpp testC.cpp testS.cpp + test_i.cpp + client.cpp } IDL_Files { } diff --git a/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc b/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc index 7d7848bccd9..47e95ecec1e 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc +++ b/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc @@ -11,10 +11,10 @@ project(*idl): taoidldefaults { project(*Server): taoserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro { after += *idl Source_Files { - test_i.cpp - server.cpp testC.cpp testS.cpp + test_i.cpp + server.cpp } IDL_Files { } @@ -23,10 +23,10 @@ project(*Server): taoserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_mi project(*Client): taoexe, portableserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro { after += *idl Source_Files { - test_i.cpp - client.cpp testC.cpp testS.cpp + test_i.cpp + client.cpp } IDL_Files { } diff --git a/TAO/tests/Big_Oneways/Big_Oneways.mpc b/TAO/tests/Big_Oneways/Big_Oneways.mpc index 2bd69013e64..72be50111c2 100644 --- a/TAO/tests/Big_Oneways/Big_Oneways.mpc +++ b/TAO/tests/Big_Oneways/Big_Oneways.mpc @@ -11,11 +11,11 @@ project(*idl): taoidldefaults { project(*Server): taoserver { after += *idl Source_Files { + TestC.cpp + TestS.cpp Coordinator.cpp Session_Control.cpp server.cpp - TestC.cpp - TestS.cpp } IDL_Files { } @@ -24,12 +24,12 @@ project(*Server): taoserver { project(*Client): taoexe, portableserver { after += *idl Source_Files { + TestC.cpp + TestS.cpp Peer.cpp Session.cpp Session_Task.cpp client.cpp - TestC.cpp - TestS.cpp } IDL_Files { } diff --git a/TAO/tests/Big_Twoways/Big_Twoways.mpc b/TAO/tests/Big_Twoways/Big_Twoways.mpc index 2bd69013e64..72be50111c2 100644 --- a/TAO/tests/Big_Twoways/Big_Twoways.mpc +++ b/TAO/tests/Big_Twoways/Big_Twoways.mpc @@ -11,11 +11,11 @@ project(*idl): taoidldefaults { project(*Server): taoserver { after += *idl Source_Files { + TestC.cpp + TestS.cpp Coordinator.cpp Session_Control.cpp server.cpp - TestC.cpp - TestS.cpp } IDL_Files { } @@ -24,12 +24,12 @@ project(*Server): taoserver { project(*Client): taoexe, portableserver { after += *idl Source_Files { + TestC.cpp + TestS.cpp Peer.cpp Session.cpp Session_Task.cpp client.cpp - TestC.cpp - TestS.cpp } IDL_Files { } diff --git a/TAO/tests/Bug_1020_Regression/Bug_1020_Regression.mpc b/TAO/tests/Bug_1020_Regression/Bug_1020_Regression.mpc index 33bc4b81e31..a3e88a6accd 100644 --- a/TAO/tests/Bug_1020_Regression/Bug_1020_Regression.mpc +++ b/TAO/tests/Bug_1020_Regression/Bug_1020_Regression.mpc @@ -11,12 +11,12 @@ project(*idl): taoidldefaults { project(*Server): taoserver, messaging { after += *idl Source_Files { + TestC.cpp + TestS.cpp ORB_Task.cpp Server_i.cpp Server_Task.cpp server.cpp - TestC.cpp - TestS.cpp } IDL_Files { } @@ -25,11 +25,11 @@ project(*Server): taoserver, messaging { project(*Client): taoexe, messaging { after += *idl Source_Files { + TestC.cpp + TestS.cpp Echo.cpp ORB_Task.cpp client.cpp - TestC.cpp - TestS.cpp } IDL_Files { } diff --git a/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc b/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc index 02d77667b22..fadcb8f6726 100644 --- a/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc +++ b/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc @@ -11,11 +11,11 @@ project(*idl): taoidldefaults { project(*Server): taoserver, messaging { after += *idl Source_Files { + TestC.cpp + TestS.cpp Echo_Caller.cpp Server_Timer.cpp server.cpp - TestC.cpp - TestS.cpp } IDL_Files { } @@ -24,10 +24,10 @@ project(*Server): taoserver, messaging { project(*Client): taoclient, messaging { after += *idl Source_Files { - Echo.cpp - client.cpp TestC.cpp TestS.cpp + Echo.cpp + client.cpp } IDL_Files { } @@ -36,9 +36,9 @@ project(*Client): taoclient, messaging { project(*Shutdown): taoexe, messaging { after += *idl Source_Files { - shutdown.cpp TestC.cpp TestS.cpp + shutdown.cpp } IDL_Files { } diff --git a/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc b/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc index 0dc5224babf..466c1faab7c 100644 --- a/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc +++ b/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc @@ -11,12 +11,12 @@ project(*idl): taoidldefaults { project(*Server): taoserver, messaging { after += *idl Source_Files { + TestC.cpp + TestS.cpp Server_Thread_Pool.cpp Echo_Caller.cpp ORB_Task.cpp server.cpp - TestC.cpp - TestS.cpp } IDL_Files { } @@ -25,11 +25,11 @@ project(*Server): taoserver, messaging { project(*Client): taoclient, messaging { after += *idl Source_Files { + TestC.cpp + TestS.cpp Echo.cpp ORB_Task.cpp client.cpp - TestC.cpp - TestS.cpp } IDL_Files { } @@ -38,9 +38,9 @@ project(*Client): taoclient, messaging { project(*Shutdown): taoexe, messaging { after += *idl Source_Files { - shutdown.cpp TestC.cpp TestS.cpp + shutdown.cpp } IDL_Files { } diff --git a/TAO/tests/Bug_2188_Regression/broken.mpc b/TAO/tests/Bug_2188_Regression/broken.mpc index cd6b7d77bc3..d9d85d6c1b8 100644 --- a/TAO/tests/Bug_2188_Regression/broken.mpc +++ b/TAO/tests/Bug_2188_Regression/broken.mpc @@ -11,9 +11,9 @@ project(*idl): taoidldefaults { project(*Server): taoserver { after += *idl Source_Files { - broken_i.cpp brokenC.cpp brokenS.cpp + broken_i.cpp server.cpp } IDL_Files { diff --git a/TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc b/TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc index e2bd6d206cd..5d7caaa5af8 100644 --- a/TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc +++ b/TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc @@ -12,10 +12,10 @@ project(*idl): taoidldefaults, anytypecode { project(*Server): taoserver, messaging, threads { after += *idl Source_Files { - publisher_impl.cpp - publisherS.cpp publisherC.cpp + publisherS.cpp subscriberC.cpp + publisher_impl.cpp server.cpp } IDL_Files { @@ -26,10 +26,10 @@ project(*Client): taoserver, threads { exename = client after += *idl Source_Files { - subscriber_impl.cpp - subscriberS.cpp subscriberC.cpp + subscriberS.cpp publisherC.cpp + subscriber_impl.cpp client.cpp } IDL_Files { diff --git a/TAO/tests/Client_Leaks/Client_Leaks.mpc b/TAO/tests/Client_Leaks/Client_Leaks.mpc index 6bc40e6725e..b261a907e44 100644 --- a/TAO/tests/Client_Leaks/Client_Leaks.mpc +++ b/TAO/tests/Client_Leaks/Client_Leaks.mpc @@ -11,15 +11,13 @@ project(*idl): taoidldefaults { project(*Server): taoserver { after += *idl Source_Files { + TestC.cpp + TestS.cpp Process_Factory.cpp Startup_Callback.cpp Server_Task.cpp server.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } IDL_Files { } } @@ -27,12 +25,10 @@ project(*Server): taoserver { project(*Client): taoclient, anytypecode { after += *idl Source_Files { + TestC.cpp Client_Task.cpp client.cpp } - Source_Files { - TestC.cpp - } IDL_Files { } } @@ -42,12 +38,10 @@ project(*Child): taoserver { after += *idl after += *Client Source_Files { - Process.cpp - child.cpp - } - Source_Files { TestC.cpp TestS.cpp + Process.cpp + child.cpp } IDL_Files { } diff --git a/TAO/tests/File_IO/File_IO.mpc b/TAO/tests/File_IO/File_IO.mpc index 194e99a4b04..4d98684d36e 100644 --- a/TAO/tests/File_IO/File_IO.mpc +++ b/TAO/tests/File_IO/File_IO.mpc @@ -11,12 +11,10 @@ project(*idl): taoidldefaults { project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { after += *idl Source_Files { - File_i.cpp - server.cpp - } - Source_Files { FileC.cpp FileS.cpp + File_i.cpp + server.cpp } IDL_Files { } @@ -26,10 +24,8 @@ project(*Client): taoclient, anytypecode, avoids_minimum_corba, avoids_corba_e_c after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { FileC.cpp + client.cpp } IDL_Files { } diff --git a/TAO/tests/Hang_Shutdown/Hang.mpc b/TAO/tests/Hang_Shutdown/Hang.mpc index bbebd287918..60a67b14c88 100644 --- a/TAO/tests/Hang_Shutdown/Hang.mpc +++ b/TAO/tests/Hang_Shutdown/Hang.mpc @@ -11,9 +11,9 @@ project(*idl): taoidldefaults { project(*Server): taoserver { after += *idl Source_Files { - server.cpp - TestS.cpp TestC.cpp + TestS.cpp + server.cpp } IDL_Files { } diff --git a/TAO/tests/ICMG_Any_Bug/Hello.mpc b/TAO/tests/ICMG_Any_Bug/Hello.mpc index d22d23a1041..704df71ad6f 100644 --- a/TAO/tests/ICMG_Any_Bug/Hello.mpc +++ b/TAO/tests/ICMG_Any_Bug/Hello.mpc @@ -13,11 +13,11 @@ project(ICMG_Any_Bug_Hello_IDL): taoidldefaults { project(ICMG_Any_Bug_Hello_Server): taoserver { after += ICMG_Any_Bug_Hello_IDL Source_Files { + TestS.cpp + TestC.cpp Hello.cpp HelloWorld.cpp server.cpp - TestS.cpp - TestC.cpp } IDL_Files { } diff --git a/TAO/tests/NestedUpcall/Simple/Simple.mpc b/TAO/tests/NestedUpcall/Simple/Simple.mpc index 06a89698d66..fa21574183c 100644 --- a/TAO/tests/NestedUpcall/Simple/Simple.mpc +++ b/TAO/tests/NestedUpcall/Simple/Simple.mpc @@ -11,12 +11,10 @@ project(*Nested_Upcall_Idl): taoidldefaults { project(*Nested_Upcall_Server): taoexe, portableserver { after += *Nested_Upcall_Idl Source_Files { - server_i.cpp - server.cpp - } - Source_Files { testC.cpp testS.cpp + server_i.cpp + server.cpp } IDL_Files { } @@ -26,12 +24,10 @@ project(*Nested_Upcall_Client): taoexe, portableserver { after += *Nested_Upcall_Idl after += *Nested_Upcall_Server Source_Files { - client_i.cpp - client.cpp - } - Source_Files { testC.cpp testS.cpp + client_i.cpp + client.cpp } IDL_Files { } diff --git a/TAO/tests/OBV/Any/OBV_Any.mpc b/TAO/tests/OBV/Any/OBV_Any.mpc index f930c31a9d5..2abb441e87a 100644 --- a/TAO/tests/OBV/Any/OBV_Any.mpc +++ b/TAO/tests/OBV/Any/OBV_Any.mpc @@ -11,12 +11,10 @@ project(*idl): taoidldefaults, valuetype { project(*Server): taoexe, portableserver, valuetype { after += *idl Source_Files { - AnyS_impl.cpp - server.cpp - } - Source_Files { AnyC.cpp AnyS.cpp + AnyS_impl.cpp + server.cpp } IDL_Files { } @@ -26,10 +24,8 @@ project(*Client): taoexe, valuetype { after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { AnyC.cpp + client.cpp } IDL_Files { } diff --git a/TAO/tests/OBV/Simple/OBV_Simple.mpc b/TAO/tests/OBV/Simple/OBV_Simple.mpc index 661a72fb220..0e9f2963d62 100644 --- a/TAO/tests/OBV/Simple/OBV_Simple.mpc +++ b/TAO/tests/OBV/Simple/OBV_Simple.mpc @@ -13,11 +13,11 @@ project(*server): taoserver, utils, valuetype { exename = server after += *IDL Source_Files { + OBVS.cpp + OBVC.cpp Server_i.cpp OBV_impl.cpp server.cpp - OBVS.cpp - OBVC.cpp } IDL_Files { } @@ -27,11 +27,11 @@ project(*client): taoserver, utils, valuetype { exename = client after += *IDL Source_Files { + OBVS.cpp + OBVC.cpp Client_i.cpp OBV_impl.cpp client.cpp - OBVS.cpp - OBVC.cpp } IDL_Files { } diff --git a/TAO/tests/OctetSeq/OctetSeq.mpc b/TAO/tests/OctetSeq/OctetSeq.mpc index ddad93f5747..210815c2ac8 100644 --- a/TAO/tests/OctetSeq/OctetSeq.mpc +++ b/TAO/tests/OctetSeq/OctetSeq.mpc @@ -12,10 +12,10 @@ project(*Server): taoserver { avoids += ace_for_tao after += *idl Source_Files { - test_i.cpp - server.cpp testS.cpp testC.cpp + test_i.cpp + server.cpp } IDL_Files { } diff --git a/TAO/tests/Oneway_Timeouts/test.mpc b/TAO/tests/Oneway_Timeouts/test.mpc index 2ff1d62ad2d..7563dc9d021 100644 --- a/TAO/tests/Oneway_Timeouts/test.mpc +++ b/TAO/tests/Oneway_Timeouts/test.mpc @@ -5,8 +5,8 @@ project (*client) : taoexe, messaging, portableserver, strategies { exename = client after = *server source_files { - client.cpp TestC.cpp + client.cpp } header_files { TestC.h @@ -17,9 +17,9 @@ project (*client) : taoexe, messaging, portableserver, strategies { project (*server) : taoserver, messaging, strategies { source_files { - server.cpp - TestS.cpp TestC.cpp + TestS.cpp + server.cpp } header_files { TestS.h diff --git a/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc b/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc index da50f0ec27f..015c644c121 100644 --- a/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc +++ b/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc @@ -11,11 +11,9 @@ project(POA_IDL*): taoidldefaults { project(POA_server*): taoserver, avoids_corba_e_micro { after += POA_IDL* Source_Files { - server.cpp - } - Source_Files { testC.cpp testS.cpp + server.cpp } IDL_Files { } @@ -26,10 +24,8 @@ project(POA_client*): taoserver { after += POA_IDL* after += POA_server* Source_Files { - client.cpp - } - Source_Files { testC.cpp + client.cpp } IDL_Files { } diff --git a/TAO/tests/Param_Test/Param_Test.mpc b/TAO/tests/Param_Test/Param_Test.mpc index 26a4dfa50d7..868b62e939c 100644 --- a/TAO/tests/Param_Test/Param_Test.mpc +++ b/TAO/tests/Param_Test/Param_Test.mpc @@ -12,9 +12,9 @@ project(*idl): taoidldefaults { project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { after += *idl Source_Files { - param_test_i.cpp param_testS.cpp param_testC.cpp + param_test_i.cpp server.cpp } IDL_Files { diff --git a/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc b/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc index 2e1954944aa..b6358d7d003 100644 --- a/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc +++ b/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc @@ -12,15 +12,13 @@ project(*Client) : taoserver, ami, pi, interceptors { exename = client after += *idl source_files { + TestC.cpp + TestS.cpp client.cpp Client_Interceptor.cpp Client_ORBInitializer.cpp Echo_Handler.cpp } - source_files { - TestC.cpp - TestS.cpp - } IDL_Files { } } @@ -30,15 +28,13 @@ project(*server) : taoserver, ami, pi_server, interceptors { after += *idl after += *Client source_files { + TestC.cpp + TestS.cpp server.cpp Server_Interceptor.cpp Server_ORBInitializer.cpp Echo.cpp } - source_files { - TestC.cpp - TestS.cpp - } IDL_Files { } } diff --git a/TAO/tests/Portable_Interceptors/AdvSlot/AdvSlot.mpc b/TAO/tests/Portable_Interceptors/AdvSlot/AdvSlot.mpc index 375ecea5930..329a7bf2abd 100644 --- a/TAO/tests/Portable_Interceptors/AdvSlot/AdvSlot.mpc +++ b/TAO/tests/Portable_Interceptors/AdvSlot/AdvSlot.mpc @@ -9,8 +9,8 @@ project(*idl): taoidldefaults { project(*Server): taoserver, pi_server { after += *idl Source_Files { - StateTransferS.cpp StateTransferC.cpp + StateTransferS.cpp server.cpp } IDL_Files { diff --git a/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc b/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc index 083f7252710..92db4d3ae99 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc +++ b/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc @@ -11,9 +11,9 @@ project(*idl): taoidldefaults { project(*Server): rt_server { after += *idl Source_Files { - server.cpp - testS.cpp testC.cpp + testS.cpp + server.cpp } IDL_Files { } diff --git a/TAO/tests/Timeout/Timeout.mpc b/TAO/tests/Timeout/Timeout.mpc index 3cba6c3a497..0c95ddf25e6 100644 --- a/TAO/tests/Timeout/Timeout.mpc +++ b/TAO/tests/Timeout/Timeout.mpc @@ -11,9 +11,9 @@ project(*idl): taoidldefaults { project(*Server): taoserver { after += *idl Source_Files { - test_i.cpp - testS.cpp testC.cpp + testS.cpp + test_i.cpp server.cpp } IDL_Files { diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP.mpc b/TAO/tests/TransportCurrent/IIOP/IIOP.mpc index 2764b8c6131..59b05e674ae 100644 --- a/TAO/tests/TransportCurrent/IIOP/IIOP.mpc +++ b/TAO/tests/TransportCurrent/IIOP/IIOP.mpc @@ -13,11 +13,11 @@ project(*Server): taoserver, tc_iiop, pi_server { } Source_Files { + IIOP_Tester.cpp server.cpp Current_Test_Impl.cpp IIOP_Server_Request_Interceptor.cpp IIOP_Server_Main.cpp - IIOP_Tester.cpp } IDL_Files { @@ -36,8 +36,8 @@ project(*Client): taoclient, tc_iiop, dynamicinterface { } Source_Files { - client.cpp IIOP_Tester.cpp + client.cpp } IDL_Files { diff --git a/TAO/tests/Two_Objects/Two_Objects.mpc b/TAO/tests/Two_Objects/Two_Objects.mpc index 5df5e080f97..3f4af7ac7b9 100644 --- a/TAO/tests/Two_Objects/Two_Objects.mpc +++ b/TAO/tests/Two_Objects/Two_Objects.mpc @@ -11,16 +11,14 @@ project(*idl): taoidldefaults { project(*Server): taoserver { after += *idl Source_Files { + Two_ObjectsC.cpp + Two_ObjectsS.cpp worker.cpp First_i.cpp Second_i.cpp Object_Factory_i.cpp server.cpp } - Source_Files { - Two_ObjectsC.cpp - Two_ObjectsS.cpp - } IDL_Files { } } @@ -29,10 +27,8 @@ project(*Client): taoclient, anytypecode { after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { Two_ObjectsC.cpp + client.cpp } IDL_Files { } diff --git a/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc b/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc index 86d7e71517d..f07c72a056d 100644 --- a/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc +++ b/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc @@ -11,11 +11,9 @@ project(*idl): taoidldefaults { project(*Server): taoserver { after += *idl Source_Files { - server.cpp - } - Source_Files { testC.cpp testS.cpp + server.cpp } IDL_Files { } @@ -24,10 +22,8 @@ project(*Server): taoserver { project(*Client): taoclient, anytypecode { after += *idl Source_Files { - client.cpp - } - Source_Files { testC.cpp + client.cpp } IDL_Files { } |