diff options
Diffstat (limited to 'TAO')
308 files changed, 3116 insertions, 2949 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 83b70d852e8..a6a6320c70b 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,649 +1,3 @@ -Fri Nov 24 14:04:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/Sequence_Unit_Tests/Bounded_String.cpp: - Updated because of string sequence changes earlier today - -Fri Nov 24 13:45:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/Portable_Interceptors/PICurrent/client.cpp: - Added a test for bugzilla 2656 - - * tao/Stub.cpp (get_policy_overrides): - When policies is zero, return an empty sequence instead of - a nill pointer. This fixes bugzilla 2656. Thanks to - Richard Ridgway <Richard_Ridgway at ml dot com> for - delevering the test extension and the patch for this file. - -Fri Nov 24 13:43:44 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * configure.ac: - - Configure Bug_2615_Regression unit test. - - * orbsvcs/tests/Makefile.am: - - Regenerated to include Bug_2615_Regression subdirectory. - - * orbsvcs/tests/Bug_2615_Regression/Makefile.am: - - New file, Makefile.am for new-ish unit test. - -Fri Nov 24 13:39:13 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * configure.ac: - - Configure RTCORBA Quoter tutorial. - - * docs/tutorials/Quoter/Makefile.am - - Regenerated to include RTCORBA subdirectory. - - * docs/tutorials/Quoter/RTCORBA/Makefile.am - - New file, Makefile.am for new-ish tutorial. - -Fri Nov 24 13:24:56 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * performance-tests/Cubit/TAO/DII_Cubit/Makefile.am: - * performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am: - - Regenerated. - -Fri Nov 24 13:21:52 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * configure.ac: - - Added AM_CONDITIONAL for BUILD_STL and BUILD_BOOST, so we can - generate Makefile.am's with these options. Default to false, - until we can write feature tests for these options. - -Fri Nov 24 13:21:00 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * orbsvcs/orbsvcs/Makefile.am: - - Regenerated. - - * orbsvcs/orbsvcs/ec_typed_events_skel.mpb: - - Removed *S_T.inl files from the Inline_Files section. - -Fri Nov 24 13:19:24 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * tao/Makefile.am: - - Regenerated. - - * tao/Strategies.mpc: - - Clear PIDL_Files section as the Strategies *.pidl files are - processed within the IDL_Files section, and this results in - duplicate entries. - -Fri Nov 24 09:32:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tao/Bounded_Basic_String_Sequence_T.h: - * tao/Unbounded_Basic_String_Sequence_T.h: - Moved these templates from TAO::details to TAO namespace because - we are going to move these templates directly - - * tao/Bounded_String_Sequence_T.h: - * tao/Bounded_Wstring_Sequence_T.h: - * tao/Unbounded_String_Sequence_T.h: - * tao/Unbounded_Wstring_Sequence_T.h: - Removed, not used anymore, the IDL compiler uses the basic string - sequence directly. - - * TAO_IDL/be/be_visitor_template_export.cpp: - Removed special handling for (w)string sequences - - * TAO_IDL/be/be_sequence.cpp: - Changed generation to use basic string sequence template directly - - * tao/Sequence_T.h: - * tao/tao.mpc: - Removed the files that got removed - - * tao/Unbounded_Sequence_CDR_T.h: - * tao/Bounded_Sequence_CDR_T.h: - Updated because of the move of the basic string sequence files - from TAO::details to TAO - -Fri Nov 24 06:28:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tao/tao.mpc: - Don't use -Gse for ULongLongSeq at this moment, vc8 seems to - have a problem with this file - -Thu Nov 23 14:51:05 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * tao/Makefile.am: - - Regenerated. - -Thu Nov 23 14:20:33 UTC 2006 Simon McQueen <sm@prismtech.com> - - * orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp: - - (Hopefully) fix Borland warning. - -Thu Nov 23 14:15:47 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * orbsvcs/orbsvcs/Makefile.am: - - Regenerated. - - * orbsvcs/orbsvcs/CosEvent.mpc: - - Removed *S_T.inl files from the Inline_Files section. - -Thu Nov 23 13:08:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tao/tao.mpc: - Readded -Gse again - - * TAO_IDL/be/be_codegen.cpp: - Fixed wrong comment in A.h generation - - * TAO_IDL/be/be_interface.cpp: - Const improvement - - * TAO_IDL/be/be_visitor_component/component_cs.cpp: - Removed some unneeded c-style casts - - * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp: - Small code change to define the local variable and assign - it on the same line. - - * TAO_IDL/be/be_visitor_template_export.cpp: - Added special handling for octet/wstring and string sequences. - Removed generation of long comment why we explicitly - export the base templates, not usefull in generated code - - * TAO_IDL/util/utl_global.cpp: - Removed spaces. - - * tao/PolicyC.cpp: - Removed not needed Borland pragma option - -Thu Nov 23 12:01:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tao/tao.mpc: - Removed -Gse for the sequence files, causes some problems - on the scoreboard. - -Thu Nov 23 11:11:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * Release: - Changed TAO_ACE* to TAO_*mwc. That prevents that the TAO_ACE*.sln - files are added twice to the tar archive. This fixes bug 2680 - -Thu Nov 23 10:57:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/Bug_2669_Regression/Child.idl: - * tests/Bug_2669_Regression/client.cpp: - Added a regression for bug 2714 which hasn't been fixed yet. - -Thu Nov 23 07:41:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tao/tao.mpc: - Simplified the idlflags to put the common flags for all pidl files - at the top of this file. Added regeneration of OctetSeq.pidl - and UShortSeq.pidl, these can now be regenerated using the new - -Gse option which is enabled for all sequence files - - * tao/OctetSeqC.{h,cpp}: - * tao/UShortSeqC.{h,cpp}: - * tao/OctetSeqS.h: - * tao/UShortSeqS.h: - * tao/AnyTypeCode/OctetSeqA.{h,cpp}: - * tao/AnyTypeCode/UShortSeqA.{h,cpp}: - * tao/diffs/OctetSeq.diff: - * tao/diffs/UShortSeq.diff: - Removed all these files, they are not regenerated as part of the - build. - - * tao/OctetSeq.pidl: - * tao/UShortSeq.pidl: - Removed remark about applying a diff - -Thu Nov 23 06:47:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc: - Also don't build the server when ace_for_tao is enabled - - * performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc: - Don't build in ace_for_tao - -Thu Nov 23 03:20:04 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * orbsvcs/orbsvcs/Makefile.am: - - Regenerated. - - * orbsvcs/orbsvcs/CosTrading.mpc: - * orbsvcs/orbsvcs/RTEventLogAdmin.mpc: - * orbsvcs/orbsvcs/CosNotification.mpc: - * orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc: - * orbsvcs/orbsvcs/DsLogAdmin.mpc: - * orbsvcs/orbsvcs/CosNaming_Skel.mpc: - * orbsvcs/orbsvcs/DsEventLogAdmin.mpc: - * orbsvcs/orbsvcs/CosProperty.mpc: - - Removed *S_T.* files from the Header_Files, Inline_Files, and - Template_Files sections, cooresponding to the recent change to - orbsvcslib.mpb which removed -GT from the command line options - passed to tao_idl. - -Thu Nov 23 01:05:04 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp: - Fix typo in ACE_Get_Opt option specification which made it - impossible to specify the number of threads. - -Wed Nov 22 22:20:12 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * TAO_IDL/Makefile.am: - - Regenerated. - -Wed Nov 22 20:29:03 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * orbsvcs/orbsvcs/Makefile.am: - - Regenerated. - -Wed Nov 22 20:18:50 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * TAO_IDL/be/be_visitor_template_export.cpp: - * TAO_IDL/be_include/be_visitor_template_export.h: - - New files, defining a new visitor that optionally - generates an explicit export of the template base class - of the C++ class generated for an IDL sequence. This - visitor is triggered by the new command line option - described below, and is intended as a workaround for a - bug in Visual Studio. This fixes bugzilla 2703. - - * TAO_IDL/be/be_visitor_root.cpp: - * TAO_IDL/be/be_visitor_root/root.cpp: - * TAO_IDL/be/be_global.cpp: - * TAO_IDL/be_include/be_global.h: - - - Added new command line option -Gse that will trigger the - generation of an explicit export described above. - - - Fixed call to lookup_by_name() when it is used to locate - CCMObject in the AST and store it for future access in - the backend global data class. An additional argument - was recently added to lookup_by_name() and should have - been used in this call but wasn't. Thanks to Johnny - Willemsen <jwillemsen@remedy.nl> for reporting the - resulting incorrect code generation in the copy - constructor for components. This fixes bugzilla 2724. - - * TAO_IDL/be/be_interface.cpp: - - Cosmetic changes. - - * docs/releasenotes/index.html: - * docs/compiler.html: - - Updated IDL compiler documentation with the new command line - option. - -Wed Nov 22 19:17:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * orbsvcs/orbsvcs/CosEvent.mpc: - * orbsvcs/orbsvcs/RTEvent.mpc: - Add -GT to the idlflags because we have some examples that use - the TIE files from these services - -Wed Nov 22 18:50:59 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * orbsvcs/orbsvcs/Log/Log_i.cpp: - - Now the infinate recursion problem has been resolved, we invoke - TAO_LogMgr_i::create_log_reference() from TAO_Log_i::init() and - stash it away in a member variable. This allows us to remove - the code that lazily obtained the object reference within the - active data path of the server. - - * orbsvcs/orbsvcs/Log/LogMgr_i.cpp: - - Changed TAO_LogMgr_i::create_log_reference() to use - _unchecked_narrow() while narrowing the object reference. This - avoids the infinite recursion which occured with _narrow() when - this was called by the servant activator's incarnate() method. - - -Wed Nov 22 18:48:02 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp: - - Remove extraneous ACE_DEBUG's in destructor. - -Wed Nov 22 18:42:53 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * orbsvcs/examples/Log/Event/run_test.pl: - * orbsvcs/examples/Log/RTEvent/run_test.pl: - * orbsvcs/examples/Log/Notify/run_test.pl: - - Increase timeout so that test passes on slower systems. - -Wed Nov 22 15:38:40 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * tao/Version.h: - - Remove extraneous whitespace from TAO_VERSION macro definition. - -Wed Nov 22 15:14:51 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * orbsvcs/orbsvcs/Makefile.am: - * orbsvcs/performance-tests/RTEvent/lib/Makefile.am: - * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am: - * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am: - * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am: - * orbsvcs/tests/Event/Makefile.am: - * orbsvcs/tests/Simple_Naming/Makefile.am: - * orbsvcs/tests/ImplRepo/Makefile.am: - * orbsvcs/tests/EC_Custom_Marshal/Makefile.am: - * orbsvcs/tests/Trading/Makefile.am: - * orbsvcs/tests/BiDir_CORBALOC/Makefile.am: - * orbsvcs/tests/Bug_2377_Regression/Makefile.am: - * orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am: - * orbsvcs/tests/Redundant_Naming/Makefile.am: - * orbsvcs/tests/Interoperable_Naming/Makefile.am: - * orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am: - * orbsvcs/tests/Notify/lib/Makefile.am: - * orbsvcs/tests/FT_App/Makefile.am: - * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am: - * orbsvcs/ImplRepo_Service/Makefile.am: - * orbsvcs/examples/CosEC/TypedSimple/Makefile.am: - * orbsvcs/examples/CosEC/Factory/Makefile.am: - * orbsvcs/examples/LoadBalancing/Makefile.am: - * tao/Makefile.am: - * docs/tutorials/Quoter/idl/Makefile.am: - * performance-tests/Sequence_Latency/DSI/Makefile.am: - * performance-tests/Sequence_Latency/Deferred/Makefile.am: - * performance-tests/Sequence_Latency/Thread_Pool/Makefile.am: - * performance-tests/Sequence_Latency/Single_Threaded/Makefile.am: - * performance-tests/Sequence_Latency/DII/Makefile.am: - * performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am: - * performance-tests/Sequence_Latency/AMI/Makefile.am: - * performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am: - * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am: - * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am: - * performance-tests/Callback/Makefile.am: - * performance-tests/Latency/DSI/Makefile.am: - * performance-tests/Latency/Deferred/Makefile.am: - * performance-tests/Latency/Thread_Pool/Makefile.am: - * performance-tests/Latency/Single_Threaded/Makefile.am: - * performance-tests/Latency/DII/Makefile.am: - * performance-tests/Latency/AMH_Single_Threaded/Makefile.am: - * performance-tests/Latency/AMI/Makefile.am: - * performance-tests/Latency/Thread_Per_Connection/Makefile.am: - * performance-tests/Cubit/TAO/MT_Cubit/Makefile.am: - * performance-tests/Cubit/TAO/DII_Cubit/Makefile.am: - * performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am: - * performance-tests/Throughput/Makefile.am: - * examples/POA/TIE/Makefile.am: - * examples/Kokyu_dsrt_schedulers/Makefile.am: - * examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am: - * examples/RTScheduling/MIF_Scheduler/Makefile.am: - * examples/CSD_Strategy/ThreadPool6/Makefile.am: - * examples/RTCORBA/Activity/Makefile.am: - * examples/AMH/Sink_Server/Makefile.am: - * examples/mfc/Makefile.am: - * examples/AMI/FL_Callback/Makefile.am: - * examples/PluggableUDP/tests/Basic/Makefile.am: - * examples/PluggableUDP/tests/Performance/Makefile.am: - * examples/PluggableUDP/tests/SimplePerformance/Makefile.am: - - Regenerated. - -Wed Nov 22 12:34:29 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp: - * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl: - * orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp: - * orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp: - * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h: - * orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h: - * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp: - * orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h: - * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl: - * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h: - * orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h: - * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp: - * orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp: - * orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h: - * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h: - * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h: - * orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp: - * orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h: - * orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp: - * orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h: - * orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp: - * orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h: - * orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp: - * orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp: - * orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h: - * orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h: - * orbsvcs/tests/Bug_2137_Regression/README: - * orbsvcs/tests/Bug_2137_Regression/client.cpp: - * orbsvcs/tests/Bug_2137_Regression/Bug_2137_Regression.mpc: - * orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h: - * orbsvcs/tests/Bug_2248_Regression/test.idl: - * orbsvcs/tests/Bug_2248_Regression/server.cpp: - * orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp: - * orbsvcs/tests/Bug_2248_Regression/README: - * orbsvcs/tests/Bug_2248_Regression/client.cpp: - * orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h: - * orbsvcs/tests/Bug_2248_Regression/client.h: - * orbsvcs/tests/Bug_2248_Regression/test_i.cpp: - * orbsvcs/tests/Bug_2248_Regression/tests.idl: - * orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc: - * orbsvcs/tests/Bug_2248_Regression/Client_i.h: - * orbsvcs/tests/Bug_2248_Regression/test_i.h: - * orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp: - * orbsvcs/tests/Bug_2247_Regression/Manager.h: - * orbsvcs/tests/Bug_2247_Regression/test.idl: - * orbsvcs/tests/Bug_2247_Regression/server.cpp: - * orbsvcs/tests/Bug_2247_Regression/test_i.cpp: - * orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc: - * orbsvcs/tests/Bug_2247_Regression/Manager.cpp: - * orbsvcs/tests/Bug_2247_Regression/Client_i.h: - * orbsvcs/tests/Bug_2247_Regression/README: - * orbsvcs/tests/Bug_2247_Regression/test_i.h: - * orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp: - * orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp: - * orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h: - * orbsvcs/Logging_Service/Event_Logging_Service/README: - * orbsvcs/Logging_Service/RTEvent_Logging_Service/README: - * orbsvcs/Logging_Service/Notify_Logging_Service/README: - * tao/PortableServer/Servant_var.inl: - * tao/PortableServer/Servant_var.cpp: - * tao/PortableServer/Servant_var.h: - * tao/Incoming_Message_Stack.inl: - * tao/Incoming_Message_Stack.h: - * tests/Bug_2222_Regression/test.cpp: - * tests/Bug_2222_Regression/Bug_2222_Regression.mpc: - * tests/Bug_2222_Regression/TestCase.idl: - * tests/Bug_2222_Regression/TestType.idl: - * tests/Bug_2144_Regression/test.cpp: - * tests/Bug_2144_Regression/Bug_2144_Regression.mpc: - * tests/Bug_2144_Regression/test.idl: - * tests/Bug_2144_Regression/README: - * tests/QtTests/client.cpp: - * tests/QtTests/client.h: - * tests/QtTests/test.idl: - * tests/QtTests/server.cpp: - * tests/QtTests/test_i.cpp: - * tests/QtTests/test_i.h: - * tests/Bug_2375_Regression/test.cpp: - * tests/Bug_2375_Regression/test.idl: - * tests/Bug_2375_Regression/Bug_2375_Regression.mpc: - * tests/Bug_2375_Regression/README: - * tests/Bug_1812_Regression/test.cpp: - * tests/Bug_1812_Regression/Bug_1812_Regession.mpc: - * tests/Bug_1812_Regression/Test.idl: - * tests/MProfile_Forwarding/Servant_Locator.cpp: - * tests/MProfile_Forwarding/test.idl: - * tests/MProfile_Forwarding/server.cpp: - * tests/MProfile_Forwarding/test_i.inl: - * tests/MProfile_Forwarding/Servant_Locator.h: - * tests/Permanent_Forward/Permanent_Forward.mpc: - * tests/Permanent_Forward/README: - * tests/Permanent_Forward/StubTest.cpp: - * tests/ICMG_Any_Bug/client.cpp: - * tests/ICMG_Any_Bug/HelloWorld.h: - * tests/ICMG_Any_Bug/Hello.cpp: - * tests/ICMG_Any_Bug/server.cpp: - * tests/ICMG_Any_Bug/Hello.h: - * tests/Bug_2183_Regression/client.cpp: - * tests/Bug_2183_Regression/Hello.cpp: - * tests/Bug_2183_Regression/Test.idl: - * tests/Bug_2183_Regression/server.cpp: - * tests/Bug_2183_Regression/Bug_2183_Regression.mpc: - * tests/Bug_2183_Regression/Hello.h: - * tests/Bug_2183_Regression/README: - * tests/IDL_Test/array_only.idl: - * tests/Bug_1813_Regression/test.cpp: - * tests/Bug_1813_Regression/Bug_1813_Regession.mpc: - * tests/Bug_1813_Regression/Test.idl: - * examples/RTCORBA/Activity/Job.idl: - * examples/RTCORBA/Activity/README: - * examples/Load_Balancing_persistent/Identity_i.cpp: - * examples/Load_Balancing_persistent/Load_Balancing_Service.h: - * examples/Load_Balancing_persistent/Identity_i.h: - * examples/Load_Balancing_persistent/README: - * examples/Load_Balancing_persistent/Load_Balancer_i.cpp: - * examples/Load_Balancing_persistent/Identity.idl: - * examples/Load_Balancing_persistent/Identity_Server.cpp: - * examples/Load_Balancing_persistent/Load_Balancer_i.h: - * examples/Load_Balancing_persistent/Identity_Server.h: - * examples/Load_Balancing_persistent/Identity_Client.cpp: - * examples/Load_Balancing_persistent/Identity_Client.h: - * examples/Load_Balancing_persistent/Load_Balancer.idl: - * examples/Load_Balancing_persistent/Load_Balancing_Service.cpp: - - Removed svn:executable property. - -Wed Nov 22 11:51:49 UTC 2006 Simon McQueen <sm@prismtech.com> - - * orbsvcs/IFR_Service/IFR_Server.cpp: - * orbsvcs/IFR_Service/IFR_Service.cpp: - * orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp: - * orbsvcs/orbsvcs/IFRService/Options.cpp: - - Make IFR exit when it receives an invalid startup option and improve - usage message. Fixes bugzilla #2720. - -Wed Nov 22 11:39:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tao/FlResource/FlResource_Factory.cpp: - * tao/FlResource/FlResource_Factory.h: - * tao/QtResource/QtResource_Factory.cpp: - * tao/QtResource/QtResource_Factory.h: - * tao/TkResource/TkResource_Factory.cpp: - * tao/TkResource/TkResource_Factory.h: - * tao/XtResource/XtResource_Factory.cpp: - * tao/XtResource/XtResource_Factory.h: - Updated these files because the reactors they use are moved - to their own directories in ACE. - -Wed Nov 22 10:54:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tao/Strategies.mpc: - Now build with ace_for_tao but derive from core_strategies - - * tao/tao.mpc: - Added new HTTP files and moved all sequence.pidl files to one - group because soon they all will get a special tao_idl argument - to be used. - - * tao/TAO_Internal.cpp: - * tao/default_resource.cpp: - Added HTTP - - * tao/GUIResource_Factory.{h,cpp}: - Changed dynamically_allocated_reactor to bool - - * tao/ORB_Core.{h,cpp,inl}: - Changed has_shutdown to a real bool - - * tao/Valuetype/ValueBase.h: - Doxygen improvement - -Wed Nov 22 10:23:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * performance-tests/Callback/Callback.mpc: - * performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc: - * performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc: - * performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc: - * performance-tests/Latency/Collocation/Collocation.mpc: - * performance-tests/Latency/Deferred/Deferred.mpc: - * performance-tests/Latency/DII/DII.mpc: - * performance-tests/Latency/DSI/DSI.mpc: - * performance-tests/Latency/Single_Threaded/Single_Threaded.mpc: - * performance-tests/Sequence_Latency/AMH_Single_Threaded/Single_Threaded.mpc: - * performance-tests/Sequence_Latency/Deferred/Deferred.mpc: - * performance-tests/Sequence_Latency/DII/DII.mpc: - * performance-tests/Sequence_Latency/DSI/DSI.mpc: - * performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc: - * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc: - Explicitly add avoids += ace_for_tao to these projects. At this - moment they are not build because the strategies library is not - available with ace_for_tao, but this is something I will change - but besides strategies these projects do use some ACE classes - which are not available in the ace_for_tao configuration - - * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp: - Const improvement - - * orbsvcs/tests/Event/UDP/Consumer.cpp: - * orbsvcs/tests/Event/UDP/receiver.cpp: - * orbsvcs/tests/Event/UDP/Supplier.cpp: - * orbsvcs/tests/Event/UDP/Supplier.h: - * orbsvcs/tests/Event/UDP/Test.idl: - Extended this test and reproduced the bug we had in CIAO. This - test now will fail until Jeff Parsons commits some related - valuetype changes. - -Wed Nov 22 10:17:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * Release: - Removed dsw files - - * docs/ORBEndpoint.html: - Added reuse_addr to the list of options, request has been made - to OCI to check and extend the documentation of this option - which has been available starting TAO 1.4.8 - - * TAO_IDL/be/be_codegen.cpp: - Removed check for IFR_Client, we do have an empty A.h file for - the IFR_Client files now - - * TAO_IDL/be/be_global.cpp: - Updated help of -GA - - * tao/AnyTypeCode/NVList.cpp: - Use true/false - - * tao/HTTP_Client.{h,cpp}: - * tao/HTTP_Handler.{h,cpp}: - * tao/HTTP_Parser.{h,cpp}: - New files to support http:/ as IOR format. Fixes bugzilla bugs - 2670 and 372 - - * tao/IIOP_Acceptor.cpp: - Removed check for priority, that is gone already a long time and - this takes footprint. - - * tao/Stub.cpp: - Const changes and removed TAO_Synchronous_Cancellation_Required which - doesn't seem used at all. - Mon Nov 20 08:16:34 2006 Simon McQueen <sm@prismtech.com> * TAO version 1.5.4 released. @@ -8,16 +8,6 @@ PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known) . (Remedy) Add support for CORBA/e compact and micro -PLANNED CHANGES FOR "TAO-5.5.5" -=============================== -* (OO) Coverity error fixes for TAO. -* (OO) Remove exception specifications from ORB mediated operations (C++ - mapping requirement). -* (OO) Various other fixes that have been piling up. - -USER VISIBLE CHANGES BETWEEN TAO-1.5.4 and TAO-1.5.5 -==================================================== - USER VISIBLE CHANGES BETWEEN TAO-1.5.3 and TAO-1.5.4 ==================================================== diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM index f99940e1c23..a89c32cfbce 100644 --- a/TAO/PROBLEM-REPORT-FORM +++ b/TAO/PROBLEM-REPORT-FORM @@ -43,7 +43,7 @@ To: tao-bugs@cs.wustl.edu Subject: [area]: [synopsis] - TAO VERSION: 1.5.4 + TAO VERSION: 1.5.3 ACE VERSION: 5.5.4 HOST MACHINE and OPERATING SYSTEM: @@ -59,7 +59,7 @@ Subject: [area]: [synopsis] THE $ACE_ROOT/include/makeinclude/platform_macros.GNU FILE [if you use a link to a platform-specific file, simply state which one (unless this isn't used in this case, e.g., with Microsoft Visual - C++)]: + C++)]: CONTENTS OF $ACE_ROOT/bin/MakeProjectCreator/config/default.features (used by MPC when you generate your own makefiles): diff --git a/TAO/Release b/TAO/Release index a54e31d890b..9e124881936 100644 --- a/TAO/Release +++ b/TAO/Release @@ -21,7 +21,7 @@ CONTROLLED_FILES = \ TAO/Release \ TAO/TAO-INSTALL.html \ TAO/TAO.mwc \ - TAO/TAO_*.mwc \ + TAO/TAO_ACE* \ TAO/TAO_IDL \ TAO/VERSION \ TAO/configure.ac \ @@ -39,6 +39,7 @@ CONTROLLED_FILES = \ RELEASE_FILES = $(addprefix ACE_wrappers/,$(CONTROLLED_FILES)) \ ACE_wrappers/TAO/TAO-INSTALL \ ACE_wrappers/TAO/GNUmake* \ + ACE_wrappers/TAO/*.dsw \ ACE_wrappers/TAO/*.sln \ ACE_wrappers/TAO/*.bor \ ACE_wrappers/TAO/Makefile.in \ diff --git a/TAO/TAO_IDL/Makefile.am b/TAO/TAO_IDL/Makefile.am index 14b1bb21208..9c3f6e976d0 100644 --- a/TAO/TAO_IDL/Makefile.am +++ b/TAO/TAO_IDL/Makefile.am @@ -253,7 +253,6 @@ libTAO_IDL_BE_la_SOURCES = \ be/be_visitor_sequence.cpp \ be/be_visitor_structure.cpp \ be/be_visitor_structure_fwd.cpp \ - be/be_visitor_template_export.cpp \ be/be_visitor_traits.cpp \ be/be_visitor_typecode.cpp \ be/be_visitor_typedef.cpp \ @@ -341,7 +340,6 @@ noinst_HEADERS += \ be_include/be_visitor_sequence.h \ be_include/be_visitor_structure.h \ be_include/be_visitor_structure_fwd.h \ - be_include/be_visitor_template_export.h \ be_include/be_visitor_traits.h \ be_include/be_visitor_typecode.h \ be_include/be_visitor_typedef.h \ diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index 36dafafec75..e5b567283fb 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -849,12 +849,12 @@ TAO_CodeGen::start_anyop_header (const char *fname) const char *tao_prefix = ""; ACE_CString pidl_checker (idl_global->filename ()->get_string ()); - bool const got_tao_pidl = + bool const got_pidl = (pidl_checker.substr (pidl_checker.length () - 5) == ".pidl"); // If we're here and we have a .pidl file, we need to generate - // the *C.h include from the tao library. - if (got_tao_pidl) + // the *A.h include from the AnyTypeCode library. + if (got_pidl) { tao_prefix = "tao/"; } @@ -1704,7 +1704,10 @@ TAO_CodeGen::gen_stub_hdr_includes (void) ACE_CString pidl_checker (idl_name); bool got_pidl = - (pidl_checker.substr (pidl_checker.length () - 5) == ".pidl"); + (pidl_checker.substr (pidl_checker.length () - 5) == ".pidl") + && (pidl_checker.find ("IFR_Client") == ACE_CString::npos); + // We can't use the -GA option on IFR_Client .pidl files, + // because there are decls inside interfaces. // If we're here and we have a .pidl file, we need to generate // the *A.h include from the AnyTypeCode library. diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp index 7db39ced0c5..46b004d62ac 100644 --- a/TAO/TAO_IDL/be/be_global.cpp +++ b/TAO/TAO_IDL/be/be_global.cpp @@ -112,8 +112,7 @@ BE_GlobalData::BE_GlobalData (void) gen_client_stub_ (true), gen_server_skeleton_ (true), gen_local_iface_anyops_ (true), - use_clonable_in_args_ (false), - gen_template_export_ (false) + use_clonable_in_args_ (false) { } @@ -851,18 +850,6 @@ BE_GlobalData::use_clonable_in_args (void) const return this->use_clonable_in_args_; } -bool -BE_GlobalData::gen_template_export (void) const -{ - return this->gen_template_export_; -} - -void -BE_GlobalData::gen_template_export (bool val) -{ - this->gen_template_export_ = val; -} - const char* BE_GlobalData::anyop_header_ending (void) const { @@ -1307,8 +1294,6 @@ BE_GlobalData::ccmobject (void) AST_Decl *d = idl_global->scopes ().top_non_null ()->lookup_by_name (&sn, - true, - true, true); sn.destroy (); @@ -1988,11 +1973,6 @@ BE_GlobalData::parse_args (long &i, char **av) // Smart proxies. be_global->gen_smart_proxies (true); } - else if (av[i][3] == 'e') - { - // Explicit sequence base class template export. - be_global->gen_template_export (true); - } else { ACE_ERROR (( @@ -2637,18 +2617,14 @@ BE_GlobalData::usage (void) const )); ACE_DEBUG (( LM_DEBUG, - ACE_TEXT (" -GA\t\t\tgenerate Any operator and type codes in *A.{h,cpp}") - ACE_TEXT (" (generated in *C.{h,cpp} by default)\n") + ACE_TEXT (" -GA\t\t\tgenerate Any operator and type code bodies in *A.cpp") + ACE_TEXT (" (generated in *C.cpp by default)\n") )); ACE_DEBUG (( LM_DEBUG, ACE_TEXT (" -Guc\t\t\tgenerate uninlined constant if declared ") - ACE_TEXT ("in a module (inlined by default)\n") - )); - ACE_DEBUG (( - LM_DEBUG, - ACE_TEXT (" -Gse\t\t\tgenerate explicit export of sequence's ") - ACE_TEXT ("template base class (not generated by default)\n") + ACE_TEXT ("in a module") + ACE_TEXT (" (inlined by default)\n") )); ACE_DEBUG (( LM_DEBUG, diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index 816cb87badb..6fc79e08fe7 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -502,8 +502,7 @@ be_interface::gen_def_ctors_helper (be_interface* node, } else { - *os << ", " << be_global->impl_class_prefix () - << base->flat_name () + *os << ", " << be_global->impl_class_prefix () << base->flat_name () << be_global->impl_class_suffix () << " ()"; } } @@ -763,8 +762,8 @@ Pure_Virtual_Regenerator::emit (be_interface *derived_interface, if (d->accept (this->visitor_) == -1) { ACE_ERROR_RETURN ((LM_ERROR, - "(%N:%l) Pure_Virtual_Regenerator::emit - " - "visit base interface operation failed\n"), + "(%N:%l) Pure_Virtual_Regenerator::emit - " + "visit base interface operation failed\n"), -1); } @@ -922,8 +921,7 @@ be_interface::gen_operation_table (const char *flat_name, // interface. // Retrieve the singleton instance to the outstream factory. - TAO_OutStream_Factory *factory = - TAO_OUTSTREAM_FACTORY::instance (); + TAO_OutStream_Factory *factory = TAO_OUTSTREAM_FACTORY::instance (); // Get a new instance for the temp file. TAO_OutStream *os = factory->make_outstream (); @@ -1293,8 +1291,7 @@ be_interface::gen_collocated_skel_body (be_interface *derived, *os << be_nl << be_nl << "ACE_INLINE void" << be_nl << derived->full_direct_proxy_impl_name () - << "::" << prefix << d->local_name () << " (" - << be_idt << be_idt_nl + << "::" << prefix << d->local_name () << " (" << be_idt << be_idt_nl << "TAO_Abstract_ServantBase *servant," << be_nl << "TAO::Argument ** args," << be_nl << "int num_args" << env_decl << be_uidt_nl @@ -1305,8 +1302,7 @@ be_interface::gen_collocated_skel_body (be_interface *derived, *os << be_uidt_nl << "{" << be_idt_nl << ancestor->full_direct_proxy_impl_name () - << "::" << prefix << d->local_name () << " (" - << be_idt << be_idt_nl + << "::" << prefix << d->local_name () << " (" << be_idt << be_idt_nl << "servant," << be_nl << "args," << be_nl << "num_args" << env_arg << be_uidt_nl @@ -1384,8 +1380,8 @@ be_interface::traverse_inheritance_graph (be_interface::tao_code_emitter gen, if (insert_queue.enqueue_tail (this) == -1) { ACE_ERROR_RETURN ((LM_ERROR, - "(%N:%l) be_interface::traverse_inheritance_graph" - " - error generating entries\n"), + "(%N:%l) be_interface::traverse_inheritance_graph - " + "error generating entries\n"), -1); } @@ -1428,7 +1424,7 @@ be_interface::traverse_inheritance_graph ( { (void) this->insert_non_dup (base); - long const n_supports = base->n_supports (); + long n_supports = base->n_supports (); AST_Interface **supports = base->supports (); for (long j = 0; j < n_supports; ++j) @@ -1657,14 +1653,11 @@ be_interface::gen_gperf_lookup_methods (const char *flat_name) "fclose"), -1); } - + // Open the temp file. #if defined (ACE_OPENVMS) - ACE_HANDLE input = ::open (tao_cg->gperf_input_filename (), - O_RDONLY, - "shr=get,put,upd", - "ctx=rec", - "fop=dfw"); + ACE_HANDLE input = ::open(tao_cg->gperf_input_filename(), O_RDONLY, + "shr=get,put,upd", "ctx=rec", "fop=dfw"); #else ACE_HANDLE input = ACE::open_temp_file (tao_cg->gperf_input_filename (), O_RDONLY); @@ -1689,20 +1682,14 @@ be_interface::gen_gperf_lookup_methods (const char *flat_name) // this, remember to update the file offset to the correct location. #if defined (ACE_OPENVMS) - char* gperfOutput = tempnam (0, "idl_"); - - if (gperfOutput == 0) + char* gperfOutput = tempnam(NULL, "idl_"); + if (gperfOutput == NULL) { - ACE_OS::close (input); - ACE_ERROR_RETURN ((LM_ERROR, "failed to allocate memory\n"), -1); + ACE_OS::close(input); + ACE_ERROR_RETURN ((LM_ERROR, "failed to allocate memory\n"), -1); } - - ACE_HANDLE output = ::open (gperfOutput, - O_WRONLY | O_CREAT | O_EXCL, - ACE_DEFAULT_FILE_PERMS , - "shr=get,put,upd", - "ctx=rec", - "fop=dfw"); + ACE_HANDLE output = ::open(gperfOutput, O_WRONLY | O_CREAT | O_EXCL, + ACE_DEFAULT_FILE_PERMS , "shr=get,put,upd", "ctx=rec", "fop=dfw"); #else ACE_HANDLE output = ACE_OS::open (this->strategy_->get_out_stream_fname (), O_WRONLY | O_APPEND); @@ -1798,8 +1785,7 @@ be_interface::gen_gperf_lookup_methods (const char *flat_name) default: ACE_ERROR ((LM_ERROR, - "tao_idl:ERROR:%N:%l:Unknown " - "Operation Lookup Strategy\n")); + "tao_idl:ERROR:%N:%l:Unknown Operation Lookup Strategy\n")); result = -1; } @@ -1820,8 +1806,7 @@ be_interface::gen_gperf_lookup_methods (const char *flat_name) else if (process.wait () == -1) { ACE_ERROR ((LM_ERROR, - "Error:%p:Error on waiting for " - "completion of gperf program.\n", + "Error:%p:Error on waiting for completion of gperf program.\n", "process.wait")); result = -1; @@ -1829,7 +1814,7 @@ be_interface::gen_gperf_lookup_methods (const char *flat_name) // Adjust the file offset to the EOF for the server skeleton // file. - ACE_OS::fseek (this->strategy_->get_out_stream ()->file (), + ACE_OS::fseek (this->strategy_->get_out_stream()->file (), 0, SEEK_END); } @@ -1837,15 +1822,13 @@ be_interface::gen_gperf_lookup_methods (const char *flat_name) ACE_OS::close (output); ACE_OS::close (input); -#if defined (ACE_OPENVMS) - ACE_OS::unlink(tao_cg->gperf_input_filename ()); - process_options.release_handles (); - +#if defined(ACE_OPENVMS) + ACE_OS::unlink(tao_cg->gperf_input_filename()); + process_options.release_handles(); if (result != -1) { FILE* gperfOutputFile; - gperfOutputFile = ::fopen (gperfOutput, "r"); - + gperfOutputFile = ::fopen(gperfOutput, "r"); if (gperfOutputFile == 0) { ACE_ERROR ((LM_ERROR, @@ -1855,28 +1838,24 @@ be_interface::gen_gperf_lookup_methods (const char *flat_name) } else { - FILE* out = this->strategy_->get_out_stream ()->file (); + FILE* out = this->strategy_->get_out_stream()->file(); int c; - while ((c = fgetc(gperfOutputFile)) != EOF) { - fputc (c, out); + fputc(c, out); } - - if (ferror (gperfOutputFile) || ferror (out)) + if (ferror(gperfOutputFile) || ferror(out)) { ACE_ERROR ((LM_ERROR, "Error:%p:Couldn't open gperf output file\n", "get/put")); result = -1; } - - fclose (gperfOutputFile); + fclose(gperfOutputFile); } } - - ACE_OS::unlink (gperfOutput); - free (gperfOutput); + ACE_OS::unlink(gperfOutput); + free(gperfOutput); #endif /* ACE_OPENVMS */ return result; @@ -1963,9 +1942,9 @@ be_interface::gen_skel_helper (be_interface *derived, if (ancestor->nmembers () > 0) { // If there are elements in ancestor scope i.e., any operations and - // attributes defined by "ancestor", become methods on the derived - // class which call the corresponding method of the base class by - // doing the proper casting. + // attributes defined by "ancestor", become methods on the derived class + // which call the corresponding method of the base class by doing the + // proper casting. for (UTL_ScopeActiveIterator si (ancestor, UTL_Scope::IK_decls); !si.is_done (); @@ -1976,10 +1955,10 @@ be_interface::gen_skel_helper (be_interface *derived, if (d->node_type () == AST_Decl::NT_op) { - *os << be_nl << be_nl - << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ - << be_nl << be_nl; + *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl + << "// " << __FILE__ << ":" << __LINE__; + + *os << be_nl << be_nl; if (os->stream_type () == TAO_OutStream::TAO_SVR_HDR) { @@ -2203,8 +2182,7 @@ be_interface::gen_colloc_op_decl_helper (be_interface *derived, // Generate the static method corresponding to // this method. *os << "static void" << be_nl - << "_set_" << d->local_name () << " (" - << be_idt << be_idt_nl + << "_set_" << d->local_name () << " (" << be_idt << be_idt_nl << "TAO_Abstract_ServantBase *servant, " << be_nl << "TAO::Argument ** args," << be_nl << "int num_args" << env_dflts << be_uidt_nl @@ -2456,7 +2434,7 @@ be_interface::destroy (void) delete this->strategy_; this->strategy_ = 0; } - + // Call the destroy methods of our base classes. this->AST_Interface::destroy (); this->be_scope::destroy (); @@ -2479,8 +2457,7 @@ be_interface::next_state (TAO_CodeGen::CG_STATE current_state, } int -be_interface::has_extra_code_generation ( - TAO_CodeGen::CG_STATE current_state) +be_interface::has_extra_code_generation (TAO_CodeGen::CG_STATE current_state) { return this->strategy_->has_extra_code_generation (current_state); } @@ -2512,7 +2489,7 @@ be_interface::has_mixed_parentage (void) } AST_Decl::NodeType nt = this->node_type (); - + if (AST_Decl::NT_component == nt || AST_Decl::NT_home == nt) { return 0; diff --git a/TAO/TAO_IDL/be/be_sequence.cpp b/TAO/TAO_IDL/be/be_sequence.cpp index fb8131c0c32..57e3185c11b 100644 --- a/TAO/TAO_IDL/be/be_sequence.cpp +++ b/TAO/TAO_IDL/be/be_sequence.cpp @@ -467,7 +467,7 @@ be_sequence::instance_name () if (this->unbounded ()) { ACE_OS::sprintf (namebuf, - "TAO::unbounded_basic_string_sequence<char>"); + "TAO::unbounded_string_sequence"); } else { @@ -481,7 +481,7 @@ be_sequence::instance_name () if (this->unbounded ()) { ACE_OS::sprintf (namebuf, - "TAO::unbounded_basic_string_sequence<CORBA::WChar>"); + "TAO::unbounded_wstring_sequence"); } else { @@ -587,11 +587,11 @@ be_sequence::gen_base_class_name (TAO_OutStream *os, case be_sequence::MNG_STRING: if (this->unbounded ()) { - *os << "TAO::unbounded_basic_string_sequence<char>"; + *os << "TAO::unbounded_string_sequence"; } else { - *os << "TAO::bounded_basic_string_sequence<char, " + *os << "TAO::bounded_string_sequence<" << this->max_size ()->ev ()->u.ulval << ">"; } @@ -599,11 +599,11 @@ be_sequence::gen_base_class_name (TAO_OutStream *os, case be_sequence::MNG_WSTRING: if (this->unbounded ()) { - *os << "TAO::unbounded_basic_string_sequence<CORBA::WChar>"; + *os << "TAO::unbounded_wstring_sequence"; } else { - *os << "TAO::bounded_basic_string_sequence<CORBA::WChar, " + *os << "TAO::bounded_wstring_sequence<" << this->max_size ()->ev ()->u.ulval << ">"; } diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp index 0c77523309d..4e8cc346e23 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp @@ -248,7 +248,7 @@ be_visitor_component_cs::visit_component (be_component *node) while (ancestor != 0) { *os << "!ACE_OS::strcmp (" << be_idt << be_idt_nl - << "value," << be_nl + << "(char *)value," << be_nl << "\"" << ancestor->repoID () << "\"" << be_uidt_nl << ") ||" << be_uidt_nl; @@ -256,7 +256,7 @@ be_visitor_component_cs::visit_component (be_component *node) } *os << "!ACE_OS::strcmp (" << be_idt << be_idt_nl - << "value," << be_nl + << "(char *)value," << be_nl << "\"IDL:omg.org/Components/CCMObject:1.0\"" << be_uidt_nl << ")" << be_uidt << be_uidt_nl << " )" << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_root.cpp b/TAO/TAO_IDL/be/be_visitor_root.cpp index b88712b67f5..3cee0de1265 100644 --- a/TAO/TAO_IDL/be/be_visitor_root.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root.cpp @@ -59,7 +59,6 @@ #include "be_visitor_home.h" #include "be_visitor_traits.h" #include "be_visitor_arg_traits.h" -#include "be_visitor_template_export.h" #include "be_visitor_context.h" #include "be_visitor_root/root.cpp" diff --git a/TAO/TAO_IDL/be/be_visitor_root/root.cpp b/TAO/TAO_IDL/be/be_visitor_root/root.cpp index 74b1174c595..44ae5a92566 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root.cpp @@ -272,8 +272,8 @@ int be_visitor_root::visit_root (be_root *node) { case TAO_CodeGen::TAO_ROOT_CH: { - be_visitor_traits traits_visitor (&ctx); - status = node->accept (&traits_visitor); + be_visitor_traits visitor (&ctx); + status = node->accept (&visitor); if (status == -1) { @@ -283,21 +283,6 @@ int be_visitor_root::visit_root (be_root *node) "failed to generate traits\n"), -1); } - - if (be_global->gen_template_export ()) - { - be_visitor_template_export export_visitor (&ctx); - status = node->accept (&export_visitor); - - if (status == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - "(%N:%l) be_visitor_root::" - "visit_root - " - "failed to export templates\n"), - -1); - } - } } break; diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp index 7752e68912a..265e0b8261e 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp @@ -55,11 +55,12 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) return 0; } + be_type *bt = 0; TAO_OutStream *os = this->ctx_->stream (); // Retrieve the base type since we may need to do some code // generation for the base type. - be_type *bt = be_type::narrow_from_decl (node->base_type ()); + bt = be_type::narrow_from_decl (node->base_type ()); if (bt == 0) { @@ -73,7 +74,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) bt->seen_in_sequence (true); AST_Decl::NodeType nt = bt->node_type (); - // If our base type is an anonymous sequence, we must create a name + // If our base type is an anonymouse sequence, we must create a name // and generate a class declaration for it as well. if (nt == AST_Decl::NT_sequence) { diff --git a/TAO/TAO_IDL/be/be_visitor_template_export.cpp b/TAO/TAO_IDL/be/be_visitor_template_export.cpp deleted file mode 100644 index 6fb14458121..00000000000 --- a/TAO/TAO_IDL/be/be_visitor_template_export.cpp +++ /dev/null @@ -1,151 +0,0 @@ -//============================================================================= -/** -* @file be_visitor_template_export.cpp -* -* $Id$ -* -* This visitor generates template instantiations with export macro -* -* @author Jeff Parsons <j.parsons@vanderbilt.edu> -*/ -//============================================================================= - -#include "be_visitor_template_export.h" -#include "be_visitor_context.h" -#include "be_root.h" -#include "be_module.h" -#include "be_typedef.h" -#include "be_sequence.h" -#include "be_extern.h" -#include "be_helper.h" -#include "be_predefined_type.h" - -ACE_RCSID (be, - be_visitor_template_export, - "$Id$") - -be_visitor_template_export::be_visitor_template_export ( - be_visitor_context *ctx) - : be_visitor_scope (ctx) -{ -} - -be_visitor_template_export::~be_visitor_template_export (void) -{ -} - -int -be_visitor_template_export::visit_root (be_root *node) -{ - TAO_OutStream *os = this->ctx_->stream (); - - *os << "// TAO_IDL - Generated from " << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; - - *os << "#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT"; - - if (this->visit_scope (node) == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - "be_visitor_template_export::" - "visit_root - visit scope failed\n"), - -1); - } - - *os << be_nl << "#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */"; - - return 0; -} - -int -be_visitor_template_export::visit_module (be_module *node) -{ - if (this->visit_scope (node) == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - "be_visitor_template_export::" - "visit_module - visit scope failed\n"), - -1); - } - - return 0; -} - -int -be_visitor_template_export::visit_sequence (be_sequence *node) -{ - TAO_OutStream *os = this->ctx_->stream (); - - be_type *bt = be_type::narrow_from_decl (node->base_type ()); - - // TAO provides extensions for octet sequences, first find out if - // the base type is an octet (or an alias for octet). - be_predefined_type *predef = 0; - - if (bt->base_node_type () == AST_Type::NT_pre_defined) - { - be_typedef* alias = - be_typedef::narrow_from_decl (bt); - - if (alias == 0) - { - predef = be_predefined_type::narrow_from_decl (bt); - } - else - { - predef = - be_predefined_type::narrow_from_decl ( - alias->primitive_base_type () - ); - } - } - - // When it is a sequence add a special guard - if (predef != 0 && predef->pt () == AST_PredefinedType::PT_octet - && node->unbounded ()) - { - *os << "\n#if (TAO_NO_COPY_OCTET_SEQUENCES == 0)"; - } - - *os << be_idt << be_nl - << "template class " << be_global->stub_export_macro () - << " "; - - if (node->gen_base_class_name (os, "", this->ctx_->scope ()) == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - "(%N:%l) be_visitor_template_export::" - "visit_sequence - " - "Base class name generation failed\n"), - -1); - } - - *os << ";" << be_uidt; - - if (predef != 0 && predef->pt () == AST_PredefinedType::PT_octet - && node->unbounded ()) - { - *os << "\n#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 0 */"; - } - - return 0; -} - -int -be_visitor_template_export::visit_typedef (be_typedef *node) -{ - this->ctx_->alias (node); - be_type *bt = node->primitive_base_type (); - - if (bt->accept (this) == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - "be_visitor_template_export::" - "visit_typedef - " - "visit base type failed\n"), - -1); - } - - this->ctx_->alias (0); - return 0; -} diff --git a/TAO/TAO_IDL/be_include/be_global.h b/TAO/TAO_IDL/be_include/be_global.h index 24ee713d4c5..f29df3a6175 100644 --- a/TAO/TAO_IDL/be_include/be_global.h +++ b/TAO/TAO_IDL/be_include/be_global.h @@ -329,12 +329,6 @@ public: bool use_clonable_in_args (void) const; // Get the clonable_in_args setting. - bool gen_template_export (void) const; - // Get the gen_seq_template_export_ member. - - void gen_template_export (bool val); - // Set the gen_seq_template_export_ member. - const char* anyop_header_ending (void) const; // Get the anyop_header_ending. @@ -794,10 +788,6 @@ private: bool use_clonable_in_args_; // Use in_clonable_arg_val instead of in_arg_val? - - bool gen_template_export_; - // Generate explicit export for Visual Studio bug workaround, - // needed only in TAO basic sequence *C.h files. }; #endif /* _BE_GLOBAL_H */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_template_export.h b/TAO/TAO_IDL/be_include/be_visitor_template_export.h deleted file mode 100644 index 1f74232c376..00000000000 --- a/TAO/TAO_IDL/be_include/be_visitor_template_export.h +++ /dev/null @@ -1,57 +0,0 @@ -// -// $Id$ -// - -/* -*- c++ -*- */ -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// be_visitor_template_export.h -// -// = DESCRIPTION -// This visitor generates an explicit export of a sequence's -// template base class. It is conditionally launched by a -// command line option and is motivated by a bug in Visual -// Studio C++ (.NET 2002, .NET 2003, and Express 2005), documented in -// http://support.microsoft.com/default.aspx?scid=kb;en-us;309801 -// -// = AUTHOR -// Jeff Parsons <j.parsons@vanderbilt.edu> -// -// ============================================================================ - -#ifndef TAO_BE_VISITOR_TEMPLATE_EXPORT_H -#define TAO_BE_VISITOR_TEMPLATE_EXPORT_H - -#include "be_visitor_scope.h" - -class AST_Interface; - -class be_visitor_template_export : public be_visitor_scope -{ - // - // = TITLE - // be_visitor_template_export - // - // = DESCRIPTION - // Generates sequence template base class export instantiation. - // -public: - be_visitor_template_export (be_visitor_context *ctx); - - virtual ~be_visitor_template_export (void); - - virtual int visit_root (be_root *node); - - virtual int visit_module (be_module *node); - - virtual int visit_typedef (be_typedef *node); - - virtual int visit_sequence (be_sequence *node); -}; - - -#endif // TAO_BE_VISITOR_TEMPLATE_EXPORT_H diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp index bf5b7830f06..7fdb80ce9f0 100644 --- a/TAO/TAO_IDL/util/utl_global.cpp +++ b/TAO/TAO_IDL/util/utl_global.cpp @@ -1538,7 +1538,7 @@ IDL_GlobalData::fini (void) delete this->pd_root; this->pd_root = 0; } - + delete this->pd_err; this->pd_err = 0; delete this->pd_gen; @@ -1621,7 +1621,7 @@ IDL_GlobalData::create_uses_multiple_stuff ( if (d == 0) { - // This would happen if we haven't included Components.idl. + // This would happen if we haven't included Componennts.idl. idl_global->err ()->lookup_error (&scoped_name); return; } @@ -1795,7 +1795,7 @@ IDL_GlobalData::add_dcps_data_key (const char* id, const char* key) { // Search the map for the type. DCPS_Data_Type_Info* newinfo = 0; - + if (this->dcps_type_info_map_.find (id, newinfo) == 0) { // Add the new key field to the type. @@ -1807,7 +1807,7 @@ IDL_GlobalData::add_dcps_data_key (const char* id, const char* key) ACE_ERROR((LM_ERROR, ACE_TEXT ("missing previous #pragma DCPS_DATA_TYPE\n"))); } - + return false; } diff --git a/TAO/configure.ac b/TAO/configure.ac index 3b20a6a8273..121b35fa944 100644 --- a/TAO/configure.ac +++ b/TAO/configure.ac @@ -170,8 +170,6 @@ AM_CONDITIONAL(BUILD_EC_TYPED_EVENTS, true) AM_CONDITIONAL(BUILD_WFMO, false) AM_CONDITIONAL(BUILD_WINNT, false) AM_CONDITIONAL(BUILD_WXWINDOWS, false) -AM_CONDITIONAL(BUILD_STL, false) -AM_CONDITIONAL(BUILD_BOOST, false) ACE_ENABLE_ACEXML ACE_ENABLE_SSL @@ -202,7 +200,6 @@ AC_CONFIG_FILES([ docs/tutorials/Quoter/Makefile docs/tutorials/Quoter/Naming_Service/Makefile docs/tutorials/Quoter/On_Demand_Activation/Makefile - docs/tutorials/Quoter/RTCORBA/Makefile docs/tutorials/Quoter/RT_Event_Service/Makefile docs/tutorials/Quoter/Simple/Client/Makefile docs/tutorials/Quoter/Simple/Impl-Repo/Makefile @@ -450,7 +447,6 @@ if test $tao_build_tests = yes; then orbsvcs/tests/Bug_2287_Regression/Makefile orbsvcs/tests/Bug_2316_Regression/Makefile orbsvcs/tests/Bug_2377_Regression/Makefile - orbsvcs/tests/Bug_2615_Regression/Makefile orbsvcs/tests/Concurrency/Makefile orbsvcs/tests/CosEvent/Basic/Makefile orbsvcs/tests/CosEvent/Makefile diff --git a/TAO/docs/ORBEndpoint.html b/TAO/docs/ORBEndpoint.html index e776a0706e9..881f8e4804f 100644 --- a/TAO/docs/ORBEndpoint.html +++ b/TAO/docs/ORBEndpoint.html @@ -345,25 +345,6 @@ that should be put into generated IORs. </TD> </TR> - <TR> - <TD> - <CODE>reuse_addr</CODE> - </TD> - <TD> - <CODE>TAO 1.4.8</CODE> - </TD> - <TD> - The <CODE>reuse_addr</CODE> option allows one to - specify the reuse_addr flag. - <P> - The format for <CODE>ORBEndpoint</CODE> with the - <CODE>reuse_addr</CODE> option is: - <BLOCKQUOTE> - <CODE>-ORBEndpoint iiop://[</CODE><I>local_hostname</I><CODE>]:</CODE><I ->port</I><CODE>/reuse_addr=</CODE><I>overridden_reuse_addr</I> - </BLOCKQUOTE> - </TD> - </TR> </TABLE> <P> diff --git a/TAO/docs/compiler.html b/TAO/docs/compiler.html index e36ee1db9dd..9b6c8bb50b1 100644 --- a/TAO/docs/compiler.html +++ b/TAO/docs/compiler.html @@ -705,15 +705,6 @@ also receives other options that are specific to it.<p> or a valuetype never are - neither case is affected by this option.</td> </tr> - <tr><a name="Gse"> - <td><tt>-Gse</tt></td> - - <td>Generate explicit export of sequence's template base class</td> - <td>Occasionally needed as a workaround for a bug in Visual Studio - (.NET 2002, .NET 2003 and Express 2005) where the template - instantiation used for the base class isn't automatically exported</td> - </tr> - <tr> <td><tt>-GI</tt></td> @@ -880,7 +871,7 @@ also receives other options that are specific to it.<p> <td><tt>-Sorb</tt></td> <td>Suppress generation of the ORB.h include.</td> - <td>This option is useful when regenerating pidl files in the core + <td>This option is usefull when regenerating pidl files in the core TAO libs to prevent cyclic includes;</td> </tr> diff --git a/TAO/docs/releasenotes/index.html b/TAO/docs/releasenotes/index.html index 2c2a7068950..f39f07d7995 100644 --- a/TAO/docs/releasenotes/index.html +++ b/TAO/docs/releasenotes/index.html @@ -285,7 +285,7 @@ WFMO_Reactor_Test, Timer_Cancellation_Test</ul> <h3> <a NAME="idl"></a>IDL Compiler</h3> Point of contact: <a href="mailto:j.parsons@vanderbilt.edu">Jeff Parsons</a> -<p>Current status: (As of November 13, 2006.) +<p>Current status: (As of May 4, 2006.) <ul> <li> Generated code closely follows the C++ Mapping specified in the latest @@ -677,15 +677,6 @@ all skeleton files, including TIE class files, if generated. Overrides Uninlined all generated TIE class code, since inlining could potentially cause a problem for RTTI.</li> -<li> -Added new command line option <tt>-Gse</tt> that causes generation of -an explicit export of each sequence's template base class. This is -occasionally necessary as a workaround for a bug in Visual Studio -(.NET 2002, .NET 2003 and Express 2005) where the template instantiation -used for the base class isn't automatically exported. See -<a href="http://support.microsoft.com/default.aspx?scid=kb;en-us;309801"> -KB 309801</a> for more info</li> - </ul> <h4> @@ -708,9 +699,7 @@ have been found. One is to change the declaration of foo to be <p>and this has been done in all cases we could find in the IDL compiler source code. Another way to avoid the problem is to change the Release project Optimization setting to 'Minimize Size'. Reportedly the problem -has been fixed in MSVC version 7.0. - -</ul> +has been fixed in MSVC version 7.0.</ul> <h4> Future work:</h4> diff --git a/TAO/docs/tutorials/Quoter/Makefile.am b/TAO/docs/tutorials/Quoter/Makefile.am index 83aa0ad74b0..5b97a6880f9 100644 --- a/TAO/docs/tutorials/Quoter/Makefile.am +++ b/TAO/docs/tutorials/Quoter/Makefile.am @@ -12,9 +12,10 @@ SUBDIRS = \ AMI \ Event_Service \ On_Demand_Activation \ - RTCORBA \ RT_Event_Service \ idl \ Simple \ Naming_Service +# RTCORBA + diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Makefile.am b/TAO/docs/tutorials/Quoter/RTCORBA/Makefile.am deleted file mode 100644 index 506c1d551a1..00000000000 --- a/TAO/docs/tutorials/Quoter/RTCORBA/Makefile.am +++ /dev/null @@ -1,249 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -CLEANFILES = -noinst_PROGRAMS = -BUILT_SOURCES = - -## Makefile.RTCORBA_Quoter_Common.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -BUILT_SOURCES += \ - DistributorC.cpp \ - DistributorC.h \ - DistributorC.inl \ - DistributorS.inl - -CLEANFILES += \ - Distributor-stamp \ - DistributorC.cpp \ - DistributorC.h \ - DistributorC.inl \ - DistributorS.inl - -DistributorC.cpp DistributorC.h DistributorC.inl DistributorS.inl: Distributor-stamp - -Distributor-stamp: $(srcdir)/Distributor.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,stub_export_macro=RTCORBA_Quoter_Common_Export -Wb,stub_export_include=Common_Export.h $(srcdir)/Distributor.idl - @touch $@ - -BUILT_SOURCES += \ - BrokerC.cpp \ - BrokerC.h \ - BrokerC.inl \ - BrokerS.inl - -CLEANFILES += \ - Broker-stamp \ - BrokerC.cpp \ - BrokerC.h \ - BrokerC.inl \ - BrokerS.inl - -BrokerC.cpp BrokerC.h BrokerC.inl BrokerS.inl: Broker-stamp - -Broker-stamp: $(srcdir)/Broker.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,stub_export_macro=RTCORBA_Quoter_Common_Export -Wb,stub_export_include=Common_Export.h $(srcdir)/Broker.idl - @touch $@ - -BUILT_SOURCES += \ - CommonC.cpp \ - CommonC.h \ - CommonC.inl \ - CommonS.h \ - CommonS.inl - -CLEANFILES += \ - Common-stamp \ - CommonC.cpp \ - CommonC.h \ - CommonC.inl \ - CommonS.h \ - CommonS.inl - -CommonC.cpp CommonC.h CommonC.inl CommonS.h CommonS.inl: Common-stamp - -Common-stamp: $(srcdir)/Common.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,stub_export_macro=RTCORBA_Quoter_Common_Export -Wb,stub_export_include=Common_Export.h $(srcdir)/Common.idl - @touch $@ - -noinst_LTLIBRARIES = libRTCORBA_Quoter_Common.la - -libRTCORBA_Quoter_Common_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DRTCORBA_QUOTER_COMMON_BUILD_DLL - -libRTCORBA_Quoter_Common_la_SOURCES = \ - BrokerC.cpp \ - CommonC.cpp \ - DistributorC.cpp \ - Stock_PriorityMapping.cpp - -noinst_HEADERS = \ - Broker.idl \ - BrokerC.h \ - BrokerC.inl \ - BrokerS.inl \ - Common.idl \ - CommonC.h \ - CommonC.inl \ - CommonS.h \ - CommonS.inl \ - Distributor.idl \ - DistributorC.h \ - DistributorC.inl \ - DistributorS.inl \ - Stock_PriorityMapping.h - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.RTCORBA_Quoter_Admin.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA -if BUILD_STL - -noinst_PROGRAMS += Admin - -Admin_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs - -Admin_SOURCES = \ - Admin.cpp - -Admin_LDADD = \ - libRTCORBA_Quoter_Common.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_STL -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.RTCORBA_Quoter_Broker.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA -if BUILD_STL - -noinst_PROGRAMS += Broker - -Broker_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs - -Broker_SOURCES = \ - Broker.cpp \ - BrokerS.cpp \ - Broker_i.cpp \ - CommonS.cpp \ - StockNameConsumer_i.cpp \ - BrokerS.h \ - Broker_i.h \ - StockNameConsumer_i.h \ - Stock_Database.h - -Broker_LDADD = \ - libRTCORBA_Quoter_Common.la \ - $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_STL -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.RTCORBA_Quoter_Distributor.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA -if BUILD_STL - -noinst_PROGRAMS += Distributor - -Distributor_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs - -Distributor_SOURCES = \ - CommonS.cpp \ - Distributor.cpp \ - DistributorS.cpp \ - Distributor_i.cpp \ - DistributorS.h \ - Distributor_i.h \ - Stock_Database.h - -Distributor_LDADD = \ - libRTCORBA_Quoter_Common.la \ - $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_STL -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/docs/tutorials/Quoter/idl/Makefile.am b/TAO/docs/tutorials/Quoter/idl/Makefile.am index efeaa4c7ba3..1d75d7fcd6d 100644 --- a/TAO/docs/tutorials/Quoter/idl/Makefile.am +++ b/TAO/docs/tutorials/Quoter/idl/Makefile.am @@ -29,7 +29,8 @@ BUILT_SOURCES = \ QuoterS.h \ QuoterS.inl \ QuoterS_T.cpp \ - QuoterS_T.h + QuoterS_T.h \ + QuoterS_T.inl CLEANFILES = \ Quoter-stamp \ @@ -40,9 +41,10 @@ CLEANFILES = \ QuoterS.h \ QuoterS.inl \ QuoterS_T.cpp \ - QuoterS_T.h + QuoterS_T.h \ + QuoterS_T.inl -QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl QuoterS_T.cpp QuoterS_T.h: Quoter-stamp +QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl QuoterS_T.cpp QuoterS_T.h QuoterS_T.inl: Quoter-stamp Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=QUOTER_COMMON_Export -Wb,export_include=quoter_common_export.h -GT $(srcdir)/Quoter.idl @@ -69,6 +71,7 @@ noinst_HEADERS = \ QuoterS.inl \ QuoterS_T.cpp \ QuoterS_T.h \ + QuoterS_T.inl \ quoter_common_export.h endif BUILD_EXCEPTIONS diff --git a/TAO/examples/AMH/Sink_Server/Makefile.am b/TAO/examples/AMH/Sink_Server/Makefile.am index 26c05fd1362..858aba8073b 100644 --- a/TAO/examples/AMH/Sink_Server/Makefile.am +++ b/TAO/examples/AMH/Sink_Server/Makefile.am @@ -57,6 +57,7 @@ endif BUILD_CORBA_MESSAGING if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -84,6 +85,7 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING @@ -91,6 +93,7 @@ endif BUILD_CORBA_MESSAGING if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += mt_server @@ -125,6 +128,7 @@ mt_server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING @@ -132,6 +136,7 @@ endif BUILD_CORBA_MESSAGING if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += st_server @@ -164,6 +169,7 @@ st_server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING diff --git a/TAO/examples/AMI/FL_Callback/Makefile.am b/TAO/examples/AMI/FL_Callback/Makefile.am index c5917c33839..17503e782aa 100644 --- a/TAO/examples/AMI/FL_Callback/Makefile.am +++ b/TAO/examples/AMI/FL_Callback/Makefile.am @@ -60,6 +60,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += peer @@ -87,6 +88,7 @@ peer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool6/Makefile.am index f19420b6733..29aafc58035 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool6/Makefile.am +++ b/TAO/examples/CSD_Strategy/ThreadPool6/Makefile.am @@ -33,7 +33,8 @@ BUILT_SOURCES += \ FooS.h \ FooS.inl \ FooS_T.cpp \ - FooS_T.h + FooS_T.h \ + FooS_T.inl CLEANFILES += \ Foo-stamp \ @@ -44,9 +45,10 @@ CLEANFILES += \ FooS.h \ FooS.inl \ FooS_T.cpp \ - FooS_T.h + FooS_T.h \ + FooS_T.inl -FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h: Foo-stamp +FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -GT $(srcdir)/Foo.idl @@ -72,6 +74,7 @@ server_main_SOURCES = \ FooS.h \ FooS.inl \ FooS_T.h \ + FooS_T.inl \ Foo_i.h \ OrbShutdownTask.h \ ServerApp.h diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Makefile.am b/TAO/examples/Kokyu_dsrt_schedulers/Makefile.am index d7490b7044b..af97c3d6c24 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/Makefile.am +++ b/TAO/examples/Kokyu_dsrt_schedulers/Makefile.am @@ -34,95 +34,125 @@ BUILT_SOURCES += \ FP_SchedulingC.cpp \ FP_SchedulingC.h \ FP_SchedulingC.inl \ - FP_SchedulingS.inl + FP_SchedulingS.inl \ + FP_SchedulingS_T.cpp \ + FP_SchedulingS_T.h \ + FP_SchedulingS_T.inl CLEANFILES += \ FP_Scheduling-stamp \ FP_SchedulingC.cpp \ FP_SchedulingC.h \ FP_SchedulingC.inl \ - FP_SchedulingS.inl + FP_SchedulingS.inl \ + FP_SchedulingS_T.cpp \ + FP_SchedulingS_T.h \ + FP_SchedulingS_T.inl -FP_SchedulingC.cpp FP_SchedulingC.h FP_SchedulingC.inl FP_SchedulingS.inl: FP_Scheduling-stamp +FP_SchedulingC.cpp FP_SchedulingC.h FP_SchedulingC.inl FP_SchedulingS.inl FP_SchedulingS_T.cpp FP_SchedulingS_T.h FP_SchedulingS_T.inl: FP_Scheduling-stamp FP_Scheduling-stamp: $(srcdir)/FP_Scheduling.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/FP_Scheduling.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/FP_Scheduling.idl @touch $@ BUILT_SOURCES += \ MIF_SchedulingC.cpp \ MIF_SchedulingC.h \ MIF_SchedulingC.inl \ - MIF_SchedulingS.inl + MIF_SchedulingS.inl \ + MIF_SchedulingS_T.cpp \ + MIF_SchedulingS_T.h \ + MIF_SchedulingS_T.inl CLEANFILES += \ MIF_Scheduling-stamp \ MIF_SchedulingC.cpp \ MIF_SchedulingC.h \ MIF_SchedulingC.inl \ - MIF_SchedulingS.inl + MIF_SchedulingS.inl \ + MIF_SchedulingS_T.cpp \ + MIF_SchedulingS_T.h \ + MIF_SchedulingS_T.inl -MIF_SchedulingC.cpp MIF_SchedulingC.h MIF_SchedulingC.inl MIF_SchedulingS.inl: MIF_Scheduling-stamp +MIF_SchedulingC.cpp MIF_SchedulingC.h MIF_SchedulingC.inl MIF_SchedulingS.inl MIF_SchedulingS_T.cpp MIF_SchedulingS_T.h MIF_SchedulingS_T.inl: MIF_Scheduling-stamp MIF_Scheduling-stamp: $(srcdir)/MIF_Scheduling.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/MIF_Scheduling.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/MIF_Scheduling.idl @touch $@ BUILT_SOURCES += \ Kokyu_qosC.cpp \ Kokyu_qosC.h \ Kokyu_qosC.inl \ - Kokyu_qosS.inl + Kokyu_qosS.inl \ + Kokyu_qosS_T.cpp \ + Kokyu_qosS_T.h \ + Kokyu_qosS_T.inl CLEANFILES += \ Kokyu_qos-stamp \ Kokyu_qosC.cpp \ Kokyu_qosC.h \ Kokyu_qosC.inl \ - Kokyu_qosS.inl + Kokyu_qosS.inl \ + Kokyu_qosS_T.cpp \ + Kokyu_qosS_T.h \ + Kokyu_qosS_T.inl -Kokyu_qosC.cpp Kokyu_qosC.h Kokyu_qosC.inl Kokyu_qosS.inl: Kokyu_qos-stamp +Kokyu_qosC.cpp Kokyu_qosC.h Kokyu_qosC.inl Kokyu_qosS.inl Kokyu_qosS_T.cpp Kokyu_qosS_T.h Kokyu_qosS_T.inl: Kokyu_qos-stamp Kokyu_qos-stamp: $(srcdir)/Kokyu_qos.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/Kokyu_qos.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/Kokyu_qos.idl @touch $@ BUILT_SOURCES += \ MUF_SchedulingC.cpp \ MUF_SchedulingC.h \ MUF_SchedulingC.inl \ - MUF_SchedulingS.inl + MUF_SchedulingS.inl \ + MUF_SchedulingS_T.cpp \ + MUF_SchedulingS_T.h \ + MUF_SchedulingS_T.inl CLEANFILES += \ MUF_Scheduling-stamp \ MUF_SchedulingC.cpp \ MUF_SchedulingC.h \ MUF_SchedulingC.inl \ - MUF_SchedulingS.inl + MUF_SchedulingS.inl \ + MUF_SchedulingS_T.cpp \ + MUF_SchedulingS_T.h \ + MUF_SchedulingS_T.inl -MUF_SchedulingC.cpp MUF_SchedulingC.h MUF_SchedulingC.inl MUF_SchedulingS.inl: MUF_Scheduling-stamp +MUF_SchedulingC.cpp MUF_SchedulingC.h MUF_SchedulingC.inl MUF_SchedulingS.inl MUF_SchedulingS_T.cpp MUF_SchedulingS_T.h MUF_SchedulingS_T.inl: MUF_Scheduling-stamp MUF_Scheduling-stamp: $(srcdir)/MUF_Scheduling.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/MUF_Scheduling.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/MUF_Scheduling.idl @touch $@ BUILT_SOURCES += \ EDF_SchedulingC.cpp \ EDF_SchedulingC.h \ EDF_SchedulingC.inl \ - EDF_SchedulingS.inl + EDF_SchedulingS.inl \ + EDF_SchedulingS_T.cpp \ + EDF_SchedulingS_T.h \ + EDF_SchedulingS_T.inl CLEANFILES += \ EDF_Scheduling-stamp \ EDF_SchedulingC.cpp \ EDF_SchedulingC.h \ EDF_SchedulingC.inl \ - EDF_SchedulingS.inl + EDF_SchedulingS.inl \ + EDF_SchedulingS_T.cpp \ + EDF_SchedulingS_T.h \ + EDF_SchedulingS_T.inl -EDF_SchedulingC.cpp EDF_SchedulingC.h EDF_SchedulingC.inl EDF_SchedulingS.inl: EDF_Scheduling-stamp +EDF_SchedulingC.cpp EDF_SchedulingC.h EDF_SchedulingC.inl EDF_SchedulingS.inl EDF_SchedulingS_T.cpp EDF_SchedulingS_T.h EDF_SchedulingS_T.inl: EDF_Scheduling-stamp EDF_Scheduling-stamp: $(srcdir)/EDF_Scheduling.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/EDF_Scheduling.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/EDF_Scheduling.idl @touch $@ noinst_LTLIBRARIES = libKokyu_DSRT_Schedulers.la @@ -154,26 +184,41 @@ noinst_HEADERS = \ EDF_SchedulingC.h \ EDF_SchedulingC.inl \ EDF_SchedulingS.inl \ + EDF_SchedulingS_T.cpp \ + EDF_SchedulingS_T.h \ + EDF_SchedulingS_T.inl \ FP_Scheduler.h \ FP_Scheduling.idl \ FP_SchedulingC.h \ FP_SchedulingC.inl \ FP_SchedulingS.inl \ + FP_SchedulingS_T.cpp \ + FP_SchedulingS_T.h \ + FP_SchedulingS_T.inl \ Kokyu_dsrt_schedulers_export.h \ Kokyu_qos.idl \ Kokyu_qosC.h \ Kokyu_qosC.inl \ Kokyu_qosS.inl \ + Kokyu_qosS_T.cpp \ + Kokyu_qosS_T.h \ + Kokyu_qosS_T.inl \ MIF_Scheduler.h \ MIF_Scheduling.idl \ MIF_SchedulingC.h \ MIF_SchedulingC.inl \ MIF_SchedulingS.inl \ + MIF_SchedulingS_T.cpp \ + MIF_SchedulingS_T.h \ + MIF_SchedulingS_T.inl \ MUF_Scheduler.h \ MUF_Scheduling.idl \ MUF_SchedulingC.h \ MUF_SchedulingC.inl \ MUF_SchedulingS.inl \ + MUF_SchedulingS_T.cpp \ + MUF_SchedulingS_T.h \ + MUF_SchedulingS_T.inl \ Task_Stats.h \ Task_Stats.inl \ utils.h diff --git a/TAO/examples/Load_Balancing_persistent/Identity.idl b/TAO/examples/Load_Balancing_persistent/Identity.idl index f16f5e410eb..f16f5e410eb 100644..100755 --- a/TAO/examples/Load_Balancing_persistent/Identity.idl +++ b/TAO/examples/Load_Balancing_persistent/Identity.idl diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp index 0ffc8625639..0ffc8625639 100644..100755 --- a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp +++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.h b/TAO/examples/Load_Balancing_persistent/Identity_Client.h index 94565ef6278..94565ef6278 100644..100755 --- a/TAO/examples/Load_Balancing_persistent/Identity_Client.h +++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.h diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp index 772a2092ada..772a2092ada 100644..100755 --- a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp +++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.h b/TAO/examples/Load_Balancing_persistent/Identity_Server.h index 36cdc386f62..36cdc386f62 100644..100755 --- a/TAO/examples/Load_Balancing_persistent/Identity_Server.h +++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.h diff --git a/TAO/examples/Load_Balancing_persistent/Identity_i.cpp b/TAO/examples/Load_Balancing_persistent/Identity_i.cpp index 5c8d6b0b57d..5c8d6b0b57d 100644..100755 --- a/TAO/examples/Load_Balancing_persistent/Identity_i.cpp +++ b/TAO/examples/Load_Balancing_persistent/Identity_i.cpp diff --git a/TAO/examples/Load_Balancing_persistent/Identity_i.h b/TAO/examples/Load_Balancing_persistent/Identity_i.h index 3712d79c9f1..3712d79c9f1 100644..100755 --- a/TAO/examples/Load_Balancing_persistent/Identity_i.h +++ b/TAO/examples/Load_Balancing_persistent/Identity_i.h diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer.idl b/TAO/examples/Load_Balancing_persistent/Load_Balancer.idl index 5b7cfa3b61a..5b7cfa3b61a 100644..100755 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancer.idl +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer.idl diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp index f5d171a3b4f..f5d171a3b4f 100644..100755 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h index 119c2ccb0e0..119c2ccb0e0 100644..100755 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp index ec94198bcc1..ec94198bcc1 100644..100755 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h index 0ea8c460e6d..0ea8c460e6d 100644..100755 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h diff --git a/TAO/examples/Load_Balancing_persistent/README b/TAO/examples/Load_Balancing_persistent/README index df36a00bb81..df36a00bb81 100644..100755 --- a/TAO/examples/Load_Balancing_persistent/README +++ b/TAO/examples/Load_Balancing_persistent/README diff --git a/TAO/examples/POA/TIE/Makefile.am b/TAO/examples/POA/TIE/Makefile.am index 8b8d721720f..92816bf4cef 100644 --- a/TAO/examples/POA/TIE/Makefile.am +++ b/TAO/examples/POA/TIE/Makefile.am @@ -28,7 +28,8 @@ BUILT_SOURCES = \ testS.h \ testS.inl \ testS_T.cpp \ - testS_T.h + testS_T.h \ + testS_T.inl CLEANFILES = \ test-stamp \ @@ -39,9 +40,10 @@ CLEANFILES = \ testS.h \ testS.inl \ testS_T.cpp \ - testS_T.h + testS_T.h \ + testS_T.inl -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h: test-stamp +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -GT $(srcdir)/test.idl diff --git a/TAO/examples/PluggableUDP/tests/Basic/Makefile.am b/TAO/examples/PluggableUDP/tests/Basic/Makefile.am index 44b3a3ecdd4..4d6ba7e98be 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/Makefile.am +++ b/TAO/examples/PluggableUDP/tests/Basic/Makefile.am @@ -50,6 +50,7 @@ noinst_HEADERS = \ ## Makefile.Basic_Client.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -75,11 +76,13 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Makefile.Basic_Server.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -105,6 +108,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. diff --git a/TAO/examples/PluggableUDP/tests/Performance/Makefile.am b/TAO/examples/PluggableUDP/tests/Performance/Makefile.am index 5b7f0afd688..6eac6f166ee 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/Makefile.am +++ b/TAO/examples/PluggableUDP/tests/Performance/Makefile.am @@ -50,6 +50,7 @@ noinst_HEADERS = \ ## Makefile.Performance_Client.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -75,11 +76,13 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Makefile.Performance_Server.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -103,6 +106,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile.am b/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile.am index 4ed0a438f46..8a3b94450fe 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile.am +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile.am @@ -50,6 +50,7 @@ noinst_HEADERS = \ ## Makefile.SimplePerformance_Client.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -71,11 +72,13 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Makefile.SimplePerformance_Server.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -99,6 +102,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. diff --git a/TAO/examples/RTCORBA/Activity/Job.idl b/TAO/examples/RTCORBA/Activity/Job.idl index 67c6efa531b..67c6efa531b 100644..100755 --- a/TAO/examples/RTCORBA/Activity/Job.idl +++ b/TAO/examples/RTCORBA/Activity/Job.idl diff --git a/TAO/examples/RTCORBA/Activity/Makefile.am b/TAO/examples/RTCORBA/Activity/Makefile.am index 833a52cf82b..9af559c9777 100644 --- a/TAO/examples/RTCORBA/Activity/Makefile.am +++ b/TAO/examples/RTCORBA/Activity/Makefile.am @@ -28,7 +28,10 @@ BUILT_SOURCES = \ JobC.inl \ JobS.cpp \ JobS.h \ - JobS.inl + JobS.inl \ + JobS_T.cpp \ + JobS_T.h \ + JobS_T.inl CLEANFILES = \ Job-stamp \ @@ -37,12 +40,15 @@ CLEANFILES = \ JobC.inl \ JobS.cpp \ JobS.h \ - JobS.inl + JobS.inl \ + JobS_T.cpp \ + JobS_T.h \ + JobS_T.inl -JobC.cpp JobC.h JobC.inl JobS.cpp JobS.h JobS.inl: Job-stamp +JobC.cpp JobC.h JobC.inl JobS.cpp JobS.h JobS.inl JobS_T.cpp JobS_T.h JobS_T.inl: Job-stamp Job-stamp: $(srcdir)/Job.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Job.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/Job.idl @touch $@ noinst_PROGRAMS = activity @@ -72,6 +78,8 @@ activity_SOURCES = \ JobC.inl \ JobS.h \ JobS.inl \ + JobS_T.h \ + JobS_T.inl \ Job_i.h \ POA_Holder.h \ Periodic_Task.h \ diff --git a/TAO/examples/RTCORBA/Activity/README b/TAO/examples/RTCORBA/Activity/README index 32264d094e1..32264d094e1 100644..100755 --- a/TAO/examples/RTCORBA/Activity/README +++ b/TAO/examples/RTCORBA/Activity/README diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am index d5499f9d563..8a5c656f75f 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am @@ -65,7 +65,7 @@ CLEANFILES = \ ../FP_SchedulingC.cpp ../FP_SchedulingC.h ../FP_SchedulingC.inl: ../FP_Scheduling-stamp ../FP_Scheduling-stamp: $(srcdir)/../FP_Scheduling.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -SS -St -o .. $(srcdir)/../FP_Scheduling.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -SS -St -o .. $(srcdir)/../FP_Scheduling.idl @touch $@ noinst_PROGRAMS += test diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.am b/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.am index 9c8e9e5b777..bc663a92bfc 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.am +++ b/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.am @@ -65,7 +65,7 @@ CLEANFILES = \ ../MIF_SchedulingC.cpp ../MIF_SchedulingC.h ../MIF_SchedulingC.inl: ../MIF_Scheduling-stamp ../MIF_Scheduling-stamp: $(srcdir)/../MIF_Scheduling.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -SS -St -o .. $(srcdir)/../MIF_Scheduling.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -SS -St -o .. $(srcdir)/../MIF_Scheduling.idl @touch $@ noinst_PROGRAMS += test diff --git a/TAO/examples/mfc/Makefile.am b/TAO/examples/mfc/Makefile.am index 66fd3a7554b..329cfb4872b 100644 --- a/TAO/examples/mfc/Makefile.am +++ b/TAO/examples/mfc/Makefile.am @@ -26,7 +26,10 @@ BUILT_SOURCES = \ w32_testC.h \ w32_testC.inl \ w32_testS.h \ - w32_testS.inl + w32_testS.inl \ + w32_testS_T.cpp \ + w32_testS_T.h \ + w32_testS_T.inl CLEANFILES = \ w32_test-stamp \ @@ -34,12 +37,15 @@ CLEANFILES = \ w32_testC.h \ w32_testC.inl \ w32_testS.h \ - w32_testS.inl + w32_testS.inl \ + w32_testS_T.cpp \ + w32_testS_T.h \ + w32_testS_T.inl -w32_testC.cpp w32_testC.h w32_testC.inl w32_testS.h w32_testS.inl: w32_test-stamp +w32_testC.cpp w32_testC.h w32_testC.inl w32_testS.h w32_testS.inl w32_testS_T.cpp w32_testS_T.h w32_testS_T.inl: w32_test-stamp w32_test-stamp: $(srcdir)/w32_test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,pch_include=StdAfx.h $(srcdir)/w32_test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,pch_include=StdAfx.h $(srcdir)/w32_test.idl @touch $@ noinst_PROGRAMS = client @@ -58,7 +64,9 @@ client_SOURCES = \ w32_testC.h \ w32_testC.inl \ w32_testS.h \ - w32_testS.inl + w32_testS.inl \ + w32_testS_T.h \ + w32_testS_T.inl client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp index 03fc838db47..03fc838db47 100644..100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h index 0901c34e63b..0901c34e63b 100644..100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp index bd2d2d8d059..bd2d2d8d059 100644..100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h index 253421fe577..253421fe577 100644..100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp index 5a08f15d6d9..5a08f15d6d9 100644..100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h index 4ba96cdee31..4ba96cdee31 100644..100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp index 3f101f27dea..3f101f27dea 100644..100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h index fe174448fb2..fe174448fb2 100644..100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp index 4606008727c..4606008727c 100644..100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h index 6b2e263ee85..6b2e263ee85 100644..100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h diff --git a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp index d6947d62727..505afb05051 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp +++ b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp @@ -4,7 +4,7 @@ #include "IFR_Service.h" #include "tao/Environment.h" -ACE_RCSID (IFR_Service, +ACE_RCSID (IFR_Service, IFR_Server, "$Id$") @@ -19,7 +19,7 @@ main (int argc, char *argv[]) int status = server.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (status != 0) + if (status == -1) { return 1; } diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp index cf0d1c13b3c..327ecfa4ae2 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp +++ b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp @@ -40,7 +40,7 @@ IFR_Service::init (int argc, result = this->my_ifr_server_.init_with_orb (argc, argv, this->orb_.in ()); - if (result != 0) + if (result == -1) { return result; } diff --git a/TAO/orbsvcs/ImplRepo_Service/Makefile.am b/TAO/orbsvcs/ImplRepo_Service/Makefile.am index 49c472b7f5c..0bfcff9c810 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Makefile.am +++ b/TAO/orbsvcs/ImplRepo_Service/Makefile.am @@ -32,7 +32,10 @@ BUILT_SOURCES += \ ImR_ActivatorC.inl \ ImR_ActivatorS.cpp \ ImR_ActivatorS.h \ - ImR_ActivatorS.inl + ImR_ActivatorS.inl \ + ImR_ActivatorS_T.cpp \ + ImR_ActivatorS_T.h \ + ImR_ActivatorS_T.inl CLEANFILES += \ ImR_Activator-stamp \ @@ -41,12 +44,15 @@ CLEANFILES += \ ImR_ActivatorC.inl \ ImR_ActivatorS.cpp \ ImR_ActivatorS.h \ - ImR_ActivatorS.inl + ImR_ActivatorS.inl \ + ImR_ActivatorS_T.cpp \ + ImR_ActivatorS_T.h \ + ImR_ActivatorS_T.inl -ImR_ActivatorC.cpp ImR_ActivatorC.h ImR_ActivatorC.inl ImR_ActivatorS.cpp ImR_ActivatorS.h ImR_ActivatorS.inl: ImR_Activator-stamp +ImR_ActivatorC.cpp ImR_ActivatorC.h ImR_ActivatorC.inl ImR_ActivatorS.cpp ImR_ActivatorS.h ImR_ActivatorS.inl ImR_ActivatorS_T.cpp ImR_ActivatorS_T.h ImR_ActivatorS_T.inl: ImR_Activator-stamp ImR_Activator-stamp: $(srcdir)/ImR_Activator.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=ActivatorIDL_Export -Wb,export_include=activator_idl_export.h $(srcdir)/ImR_Activator.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=ActivatorIDL_Export -Wb,export_include=activator_idl_export.h $(srcdir)/ImR_Activator.idl @touch $@ noinst_LTLIBRARIES += libTAO_ImR_Activator_IDL.la @@ -70,6 +76,9 @@ noinst_HEADERS += \ ImR_ActivatorC.inl \ ImR_ActivatorS.h \ ImR_ActivatorS.inl \ + ImR_ActivatorS_T.cpp \ + ImR_ActivatorS_T.h \ + ImR_ActivatorS_T.inl \ activator_idl_export.h endif BUILD_EXCEPTIONS @@ -85,7 +94,10 @@ BUILT_SOURCES += \ ImR_LocatorC.inl \ ImR_LocatorS.cpp \ ImR_LocatorS.h \ - ImR_LocatorS.inl + ImR_LocatorS.inl \ + ImR_LocatorS_T.cpp \ + ImR_LocatorS_T.h \ + ImR_LocatorS_T.inl CLEANFILES += \ ImR_Locator-stamp \ @@ -94,12 +106,15 @@ CLEANFILES += \ ImR_LocatorC.inl \ ImR_LocatorS.cpp \ ImR_LocatorS.h \ - ImR_LocatorS.inl + ImR_LocatorS.inl \ + ImR_LocatorS_T.cpp \ + ImR_LocatorS_T.h \ + ImR_LocatorS_T.inl -ImR_LocatorC.cpp ImR_LocatorC.h ImR_LocatorC.inl ImR_LocatorS.cpp ImR_LocatorS.h ImR_LocatorS.inl: ImR_Locator-stamp +ImR_LocatorC.cpp ImR_LocatorC.h ImR_LocatorC.inl ImR_LocatorS.cpp ImR_LocatorS.h ImR_LocatorS.inl ImR_LocatorS_T.cpp ImR_LocatorS_T.h ImR_LocatorS_T.inl: ImR_Locator-stamp ImR_Locator-stamp: $(srcdir)/ImR_Locator.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=LocatorIDL_Export -Wb,export_include=locator_idl_export.h $(srcdir)/ImR_Locator.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=LocatorIDL_Export -Wb,export_include=locator_idl_export.h $(srcdir)/ImR_Locator.idl @touch $@ BUILT_SOURCES += \ @@ -108,7 +123,10 @@ BUILT_SOURCES += \ AsyncStartupWaiterC.inl \ AsyncStartupWaiterS.cpp \ AsyncStartupWaiterS.h \ - AsyncStartupWaiterS.inl + AsyncStartupWaiterS.inl \ + AsyncStartupWaiterS_T.cpp \ + AsyncStartupWaiterS_T.h \ + AsyncStartupWaiterS_T.inl CLEANFILES += \ AsyncStartupWaiter-stamp \ @@ -117,12 +135,15 @@ CLEANFILES += \ AsyncStartupWaiterC.inl \ AsyncStartupWaiterS.cpp \ AsyncStartupWaiterS.h \ - AsyncStartupWaiterS.inl + AsyncStartupWaiterS.inl \ + AsyncStartupWaiterS_T.cpp \ + AsyncStartupWaiterS_T.h \ + AsyncStartupWaiterS_T.inl -AsyncStartupWaiterC.cpp AsyncStartupWaiterC.h AsyncStartupWaiterC.inl AsyncStartupWaiterS.cpp AsyncStartupWaiterS.h AsyncStartupWaiterS.inl: AsyncStartupWaiter-stamp +AsyncStartupWaiterC.cpp AsyncStartupWaiterC.h AsyncStartupWaiterC.inl AsyncStartupWaiterS.cpp AsyncStartupWaiterS.h AsyncStartupWaiterS.inl AsyncStartupWaiterS_T.cpp AsyncStartupWaiterS_T.h AsyncStartupWaiterS_T.inl: AsyncStartupWaiter-stamp AsyncStartupWaiter-stamp: $(srcdir)/AsyncStartupWaiter.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=LocatorIDL_Export -Wb,export_include=locator_idl_export.h -GH $(srcdir)/AsyncStartupWaiter.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=LocatorIDL_Export -Wb,export_include=locator_idl_export.h -GH $(srcdir)/AsyncStartupWaiter.idl @touch $@ noinst_LTLIBRARIES += libTAO_ImR_Locator_IDL.la @@ -148,11 +169,17 @@ noinst_HEADERS += \ AsyncStartupWaiterC.inl \ AsyncStartupWaiterS.h \ AsyncStartupWaiterS.inl \ + AsyncStartupWaiterS_T.cpp \ + AsyncStartupWaiterS_T.h \ + AsyncStartupWaiterS_T.inl \ ImR_Locator.idl \ ImR_LocatorC.h \ ImR_LocatorC.inl \ ImR_LocatorS.h \ ImR_LocatorS.inl \ + ImR_LocatorS_T.cpp \ + ImR_LocatorS_T.h \ + ImR_LocatorS_T.inl \ locator_idl_export.h endif BUILD_EXCEPTIONS diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/README b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/README index 4977a7bac72..4977a7bac72 100644..100755 --- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/README +++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/README diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp index 12b4c5d8d87..fd898bddc31 100644 --- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp @@ -73,7 +73,7 @@ Notify_Logging_Service::init_ORB (int& argc, char *argv [] int Notify_Logging_Service::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:o:p:t:x")); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:o:p:t::x")); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/README b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/README index 282768d11e9..282768d11e9 100644..100755 --- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/README +++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/README diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/README b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/README index 9f49da0c078..9f49da0c078 100644..100755 --- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/README +++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/README diff --git a/TAO/orbsvcs/examples/CosEC/Factory/Makefile.am b/TAO/orbsvcs/examples/CosEC/Factory/Makefile.am index d2fdc5dc95d..2894f41bdad 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/Makefile.am +++ b/TAO/orbsvcs/examples/CosEC/Factory/Makefile.am @@ -28,7 +28,10 @@ BUILT_SOURCES = \ CosEventChannelFactoryC.inl \ CosEventChannelFactoryS.cpp \ CosEventChannelFactoryS.h \ - CosEventChannelFactoryS.inl + CosEventChannelFactoryS.inl \ + CosEventChannelFactoryS_T.cpp \ + CosEventChannelFactoryS_T.h \ + CosEventChannelFactoryS_T.inl CLEANFILES = \ CosEventChannelFactory-stamp \ @@ -37,12 +40,15 @@ CLEANFILES = \ CosEventChannelFactoryC.inl \ CosEventChannelFactoryS.cpp \ CosEventChannelFactoryS.h \ - CosEventChannelFactoryS.inl + CosEventChannelFactoryS.inl \ + CosEventChannelFactoryS_T.cpp \ + CosEventChannelFactoryS_T.h \ + CosEventChannelFactoryS_T.inl -CosEventChannelFactoryC.cpp CosEventChannelFactoryC.h CosEventChannelFactoryC.inl CosEventChannelFactoryS.cpp CosEventChannelFactoryS.h CosEventChannelFactoryS.inl: CosEventChannelFactory-stamp +CosEventChannelFactoryC.cpp CosEventChannelFactoryC.h CosEventChannelFactoryC.inl CosEventChannelFactoryS.cpp CosEventChannelFactoryS.h CosEventChannelFactoryS.inl CosEventChannelFactoryS_T.cpp CosEventChannelFactoryS_T.h CosEventChannelFactoryS_T.inl: CosEventChannelFactory-stamp CosEventChannelFactory-stamp: $(srcdir)/CosEventChannelFactory.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/CosEventChannelFactory.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/CosEventChannelFactory.idl @touch $@ diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Makefile.am b/TAO/orbsvcs/examples/CosEC/TypedSimple/Makefile.am index 1c4870b680c..cdeaf1f73d1 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Makefile.am +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Makefile.am @@ -29,7 +29,10 @@ BUILT_SOURCES = \ CountryC.inl \ CountryS.cpp \ CountryS.h \ - CountryS.inl + CountryS.inl \ + CountryS_T.cpp \ + CountryS_T.h \ + CountryS_T.inl CLEANFILES = \ Country-stamp \ @@ -38,12 +41,15 @@ CLEANFILES = \ CountryC.inl \ CountryS.cpp \ CountryS.h \ - CountryS.inl + CountryS.inl \ + CountryS_T.cpp \ + CountryS_T.h \ + CountryS_T.inl -CountryC.cpp CountryC.h CountryC.inl CountryS.cpp CountryS.h CountryS.inl: Country-stamp +CountryC.cpp CountryC.h CountryC.inl CountryS.cpp CountryS.h CountryS.inl CountryS_T.cpp CountryS_T.h CountryS_T.inl: Country-stamp Country-stamp: $(srcdir)/Country.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Country.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/Country.idl @touch $@ noinst_PROGRAMS += Consumer @@ -66,6 +72,8 @@ Consumer_SOURCES = \ CountryC.inl \ CountryS.h \ CountryS.inl \ + CountryS_T.h \ + CountryS_T.inl \ Country_i.h Consumer_LDADD = \ diff --git a/TAO/orbsvcs/examples/LoadBalancing/Makefile.am b/TAO/orbsvcs/examples/LoadBalancing/Makefile.am index 0d578e08d3d..9fe1648da4b 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/Makefile.am +++ b/TAO/orbsvcs/examples/LoadBalancing/Makefile.am @@ -54,6 +54,7 @@ endif BUILD_EXCEPTIONS ## Makefile.LoadBalancing_Client.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -78,6 +79,7 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Makefile.LoadBalancing_Server.am diff --git a/TAO/orbsvcs/examples/Log/Event/run_test.pl b/TAO/orbsvcs/examples/Log/Event/run_test.pl index d3dde9786cb..7b6f56957aa 100755 --- a/TAO/orbsvcs/examples/Log/Event/run_test.pl +++ b/TAO/orbsvcs/examples/Log/Event/run_test.pl @@ -49,7 +49,7 @@ print STDERR "Starting Supplier\n"; $supplier->Spawn (); -$supplier->WaitKill (10); +$supplier->WaitKill (5); $consumer->Kill (); diff --git a/TAO/orbsvcs/examples/Log/Notify/run_test.pl b/TAO/orbsvcs/examples/Log/Notify/run_test.pl index 21b91a1f8db..a2809b7cf73 100755 --- a/TAO/orbsvcs/examples/Log/Notify/run_test.pl +++ b/TAO/orbsvcs/examples/Log/Notify/run_test.pl @@ -49,7 +49,7 @@ print STDERR "Starting Supplier\n"; $supplier->Spawn (); -$supplier->WaitKill (10); +$supplier->WaitKill (5); $consumer->Kill (); diff --git a/TAO/orbsvcs/examples/Log/RTEvent/run_test.pl b/TAO/orbsvcs/examples/Log/RTEvent/run_test.pl index 7ed19029904..3caf2a63534 100755 --- a/TAO/orbsvcs/examples/Log/RTEvent/run_test.pl +++ b/TAO/orbsvcs/examples/Log/RTEvent/run_test.pl @@ -49,7 +49,7 @@ print STDERR "Starting Supplier\n"; $supplier->Spawn (); -$supplier->WaitKill (10); +$supplier->WaitKill (5); $consumer->Kill (); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent.mpc b/TAO/orbsvcs/orbsvcs/CosEvent.mpc index 5535f522485..c3666a5ddfe 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/CosEvent.mpc @@ -2,7 +2,7 @@ project (CosEvent_IDL) : orbsvcslib, core, minimum_corba, ec_typed_events_idl, tao_versioning_idl_defaults { custom_only = 1 - idlflags += -GT -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h + idlflags += -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h IDL_Files { CosEventComm.idl @@ -73,6 +73,8 @@ project (CosEvent_Skel) : orbsvcslib, core, minimum_corba, event, portableserver Inline_Files { CosEventCommS.inl CosEventChannelAdminS.inl + CosEventCommS_T.inl + CosEventChannelAdminS_T.inl } Template_Files { diff --git a/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc b/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc index 6783e7eb032..c5859a1c573 100644 --- a/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc +++ b/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc @@ -15,14 +15,17 @@ project(CosNaming_Skel) : orbsvcslib, core, naming, portableserver { Header_Files { CosNamingS.h + CosNamingS_T.h Naming/naming_skel_export.h } Inline_Files { CosNamingS.inl + CosNamingS_T.inl } Template_Files { + CosNamingS_T.cpp } Pkgconfig_Files { diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.mpc b/TAO/orbsvcs/orbsvcs/CosNotification.mpc index 9d24318164b..87fab05f21c 100644 --- a/TAO/orbsvcs/orbsvcs/CosNotification.mpc +++ b/TAO/orbsvcs/orbsvcs/CosNotification.mpc @@ -91,6 +91,14 @@ project(CosNotification_Skel) : orbsvcslib, core, notification, event_skel, port CosNotifyChannelAdminS.h NotifyExtS.h Event_ForwarderS.h + + CosNotificationS_T.h + CosNotifyCommS_T.h + CosNotifyFilterS_T.h + CosNotifyChannelAdminS_T.h + NotifyExtS_T.h + Event_ForwarderS_T.h + Notify/notify_skel_export.h } @@ -101,9 +109,22 @@ project(CosNotification_Skel) : orbsvcslib, core, notification, event_skel, port CosNotifyChannelAdminS.inl NotifyExtS.inl Event_ForwarderS.inl + + CosNotificationS_T.inl + CosNotifyCommS_T.inl + CosNotifyFilterS_T.inl + CosNotifyChannelAdminS_T.inl + NotifyExtS_T.inl + Event_ForwarderS_T.inl } Template_Files { + CosNotificationS_T.cpp + CosNotifyCommS_T.cpp + CosNotifyFilterS_T.cpp + CosNotifyChannelAdminS_T.cpp + NotifyExtS_T.cpp + Event_ForwarderS_T.cpp } Pkgconfig_Files { diff --git a/TAO/orbsvcs/orbsvcs/CosProperty.mpc b/TAO/orbsvcs/orbsvcs/CosProperty.mpc index db06a594bc6..cc73a0a5fc8 100644 --- a/TAO/orbsvcs/orbsvcs/CosProperty.mpc +++ b/TAO/orbsvcs/orbsvcs/CosProperty.mpc @@ -65,16 +65,22 @@ project(CosProperty_Skel) : orbsvcslib, core, property, portableserver { Header_Files { CosPropertyS.h + CosPropertyS_T.h CosPropertyServiceS.h + CosPropertyServiceS_T.h Property/property_skel_export.h } Inline_Files { CosPropertyS.inl + CosPropertyS_T.inl CosPropertyServiceS.inl + CosPropertyServiceS_T.inl } Template_Files { + CosPropertyS_T.cpp + CosPropertyServiceS_T.cpp } Pkgconfig_Files { diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.mpc b/TAO/orbsvcs/orbsvcs/CosTrading.mpc index ba24c9a0354..ef436ac2479 100644 --- a/TAO/orbsvcs/orbsvcs/CosTrading.mpc +++ b/TAO/orbsvcs/orbsvcs/CosTrading.mpc @@ -73,6 +73,11 @@ project(CosTrading_Skel) : orbsvcslib, core, trading, portableserver { CosTradingS.h CosTradingReposS.h CosTradingDynamicS.h + + CosTradingS_T.h + CosTradingReposS_T.h + CosTradingDynamicS_T.h + Trader/trading_skel_export.h } @@ -80,9 +85,16 @@ project(CosTrading_Skel) : orbsvcslib, core, trading, portableserver { CosTradingS.inl CosTradingReposS.inl CosTradingDynamicS.inl + + CosTradingS_T.inl + CosTradingReposS_T.inl + CosTradingDynamicS_T.inl } Template_Files { + CosTradingS_T.cpp + CosTradingReposS_T.cpp + CosTradingDynamicS_T.cpp } Pkgconfig_Files { diff --git a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc index 15b45c4fcfb..4322406dedc 100644 --- a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc @@ -59,14 +59,17 @@ project(DsEventLogAdmin_Skel) : orbsvcslib, core, dseventlogadmin, dslogadmin_sk Header_Files { DsEventLogAdminS.h + DsEventLogAdminS_T.h Log/eventlog_skel_export.h } Inline_Files { DsEventLogAdminS.inl + DsEventLogAdminS_T.inl } Template_Files { + DsEventLogAdminS_T.cpp } Pkgconfig_Files { diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc index 081a2bdcce6..d0d9a4dea5e 100644 --- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc @@ -66,15 +66,24 @@ project(DsLogAdmin_Skel) : orbsvcslib, core, dslogadmin, portableserver { Header_Files { DsLogAdminS.h DsLogNotificationS.h + + DsLogAdminS_T.h + DsLogNotificationS_T.h + Log/log_skel_export.h } Inline_Files { DsLogAdminS.inl DsLogNotificationS.inl + + DsLogAdminS_T.inl + DsLogNotificationS_T.inl } Template_Files { + DsLogAdminS_T.cpp + DsLogNotificationS_T.cpp } Pkgconfig_Files { diff --git a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc index c9a6ce539c0..bf66701ee09 100644 --- a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc @@ -60,14 +60,17 @@ project(DsNotifyLogAdmin_Skel) : orbsvcslib, core, dsnotifylogadmin, dseventloga Header_Files { DsNotifyLogAdminS.h + DsNotifyLogAdminS_T.h Log/notifylog_skel_export.h } Inline_Files { DsNotifyLogAdminS.inl + DsNotifyLogAdminS_T.inl } Template_Files { + DsNotifyLogAdminS_T.cpp } Pkgconfig_Files { diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp index 03c5ff717fc..31e779720b7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp @@ -585,7 +585,7 @@ TAO_ECG_CDR_Message_Receiver::Mcast_Header::read (char *header, } // Validate. - size_t const data_bytes_received = + size_t data_bytes_received = bytes_received - TAO_ECG_CDR_Message_Sender::ECG_HEADER_SIZE; if (this->request_size < this->fragment_size diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h index c0383c99cbc..c0383c99cbc 100644..100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp index 852e1c2c97b..852e1c2c97b 100644..100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h index 7ee620338b9..7ee620338b9 100644..100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp index 638639dfb10..638639dfb10 100644..100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h index a1bbf81174e..a1bbf81174e 100644..100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl index 637356ff8ec..637356ff8ec 100644..100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp index 7adfd628330..7adfd628330 100644..100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h index c6b8c863e6f..c6b8c863e6f 100644..100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp index 77b99f3035a..77b99f3035a 100644..100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h index 0e2711ed429..0e2711ed429 100644..100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp index e1c8fcea33b..e1c8fcea33b 100644..100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h index 2ae22af9f48..2ae22af9f48 100644..100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h index 6019cdc8f70..6019cdc8f70 100644..100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl index 21dfaed4af7..21dfaed4af7 100644..100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp index be4448486c8..be4448486c8 100644..100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h index 7c57a64a2c2..7c57a64a2c2 100644..100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp index d9c87c1d884..a5e914dcf87 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp @@ -87,14 +87,12 @@ TAO_IFR_Service_Loader::create_object (CORBA::ORB_ptr orb, result = this->ifr_server_.init_with_orb (argc, argv, orb); - if (result != 0) + if (result == -1) { - ACE_THROW_RETURN (CORBA::BAD_PARAM (0, - CORBA::COMPLETED_NO), - CORBA::Object::_nil ()); + return CORBA::Object::_nil (); } - return CORBA::Object::_nil (); + return 0; } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp index 64e07b77dbc..26f71866bfd 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp @@ -73,13 +73,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) " [-l]" " [-m] <0|1>" " [-p]" - " [-b] <persistence_file>\n\n" - " -o <filename> Output service IOR to <filename>\n" - " -r Persist contents in the win32 registry\n" - " -l Enable locking (off by default)\n" - " -m <0|1> Enable multicast discovery of this service\n" - " -p Persist contents using a memory mapped file\n" - " -b <filename> Used with the file persistence option. Specifies the storage file name.\n" + " [-b] <persistence_file>" "\n", argv [0]), 1); diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp index 8f2b14ce9a7..be3c8479585 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp @@ -76,7 +76,9 @@ TAO_Hash_LogRecordStore::TAO_Hash_LogRecordStore ( TAO_Hash_LogRecordStore::~TAO_Hash_LogRecordStore (void) { + ACE_DEBUG((LM_DEBUG, "TAO_Hash_LogRecordStore::~TAO_Hash_LogRecordStore ()\n")); this->iterator_poa_->destroy (1, 0); + ACE_DEBUG((LM_DEBUG, "TAO_Hash_LogRecordStore::~TAO_Hash_LogRecordStore ()\n")); } int diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp index 1eec7779189..23bb04d2ea1 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp @@ -142,11 +142,8 @@ TAO_LogMgr_i::create_log_reference (DsLogAdmin::LogId id ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); - // Use _unchecked_narrow() because this may be called from a servant - // activator's incarnate() method. A plain _narrow() will result in - // infinate recursion. DsLogAdmin::Log_var log = - DsLogAdmin::Log::_unchecked_narrow (obj.in () ACE_ENV_ARG_PARAMETER); + DsLogAdmin::Log::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); return log._retn(); diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp index 4cbbd3b86b2..263ef5d7ebc 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp @@ -45,9 +45,13 @@ TAO_Log_i::TAO_Log_i (CORBA::ORB_ptr orb, void TAO_Log_i::init (ACE_ENV_SINGLE_ARG_DECL) { +#if 0 + // @@ Calling create_log_reference () here leads to an infinate loop. + // When this is fixed, this can be enabled. this->log_ = logmgr_i_.create_log_reference (this->logid_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; +#endif this->recordstore_ = logmgr_i_.get_log_record_store (this->logid_ ACE_ENV_ARG_PARAMETER); @@ -185,6 +189,16 @@ TAO_Log_i::set_log_qos (const DsLogAdmin::QoSList &qos if (notifier_) { + // @@ Calling create_log_reference () in the ctor or in ::init() + // leads to an infinate loop. This should be removed when that + // is fixed. + if (CORBA::is_nil (this->log_.in ())) + { + this->log_ = logmgr_i_.create_log_reference (this->logid_ + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; + } + notifier_->quality_of_service_value_change (this->log_.in (), this->logid_, old_qos.in (), @@ -244,6 +258,16 @@ TAO_Log_i::set_max_record_life (CORBA::ULong life if (notifier_) { + // @@ Calling create_log_reference () in the ctor or in ::init() + // leads to an infinate loop. This should be removed when that + // is fixed. + if (CORBA::is_nil (this->log_.in ())) + { + this->log_ = logmgr_i_.create_log_reference (this->logid_ + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; + } + notifier_->max_record_life_value_change (this->log_.in (), this->logid_, old_life, @@ -309,6 +333,16 @@ TAO_Log_i::set_max_size (CORBA::ULongLong size if (notifier_) { + // @@ Calling create_log_reference () in the ctor or in ::init() + // leads to an infinate loop. This should be removed when that + // is fixed. + if (CORBA::is_nil (this->log_.in ())) + { + this->log_ = logmgr_i_.create_log_reference (this->logid_ + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; + } + notifier_->max_log_size_value_change (this->log_.in (), this->logid_, old_size, @@ -410,6 +444,16 @@ TAO_Log_i::set_log_full_action (DsLogAdmin::LogFullActionType action if (notifier_) { + // @@ Calling create_log_reference () in the ctor or in ::init() + // leads to an infinate loop. This should be removed when that + // is fixed. + if (CORBA::is_nil (this->log_.in ())) + { + this->log_ = logmgr_i_.create_log_reference (this->logid_ + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; + } + notifier_->log_full_action_value_change (this->log_.in (), this->logid_, old_action, @@ -481,6 +525,16 @@ TAO_Log_i::set_administrative_state (DsLogAdmin::AdministrativeState state if (notifier_) { + // @@ Calling create_log_reference () in the ctor or in ::init() + // leads to an infinate loop. This should be removed when that + // is fixed. + if (CORBA::is_nil (this->log_.in ())) + { + this->log_ = logmgr_i_.create_log_reference (this->logid_ + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; + } + notifier_->administrative_state_change (this->log_.in (), this->logid_, state @@ -534,6 +588,16 @@ TAO_Log_i::set_forwarding_state (DsLogAdmin::ForwardingState state if (notifier_) { + // @@ Calling create_log_reference () in the ctor or in ::init() + // leads to an infinate loop. This should be removed when that + // is fixed. + if (CORBA::is_nil (this->log_.in ())) + { + this->log_ = logmgr_i_.create_log_reference (this->logid_ + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; + } + notifier_->forwarding_state_change (this->log_.in (), this->logid_, state @@ -604,6 +668,16 @@ TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval if (notifier_) { + // @@ Calling create_log_reference () in the ctor or in ::init() + // leads to an infinate loop. This should be removed when that + // is fixed. + if (CORBA::is_nil (this->log_.in ())) + { + this->log_ = logmgr_i_.create_log_reference (this->logid_ + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; + } + if (interval.start != old_interval.start) { notifier_->start_time_value_change (this->log_.in (), @@ -726,6 +800,16 @@ TAO_Log_i::set_capacity_alarm_thresholds (const if (notifier_) { + // @@ Calling create_log_reference () in the ctor or in ::init() + // leads to an infinate loop. This should be removed when that + // is fixed. + if (CORBA::is_nil (this->log_.in ())) + { + this->log_ = logmgr_i_.create_log_reference (this->logid_ + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; + } + notifier_->capacity_alarm_threshold_value_change (this->log_.in (), this->logid_, old_threshs.in (), @@ -807,6 +891,16 @@ TAO_Log_i::set_week_mask (const DsLogAdmin::WeekMask &masks if (notifier_) { + // @@ Calling create_log_reference () in the ctor or in ::init() + // leads to an infinate loop. This should be removed when that + // is fixed. + if (CORBA::is_nil (this->log_.in ())) + { + this->log_ = logmgr_i_.create_log_reference (this->logid_ + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; + } + notifier_->week_mask_value_change (this->log_.in (), this->logid_, old_masks.in (), @@ -1340,6 +1434,16 @@ TAO_Log_i::check_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_DECL) ? DsLogNotification::critical : DsLogNotification::minor); + // @@ Calling create_log_reference () in the ctor or in ::init() + // leads to an infinate loop. This should be removed when that + // is fixed. + if (CORBA::is_nil (this->log_.in ())) + { + this->log_ = logmgr_i_.create_log_reference (this->logid_ + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; + } + notifier_->threshold_alarm ( this->log_.in (), logid_, @@ -1394,8 +1498,8 @@ TAO_Log_i::reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_DECL) ACE_CHECK; const CORBA::UShort percent = - static_cast<CORBA::UShort> (((double) ACE_UINT64_DBLCAST_ADAPTER (current_size * 100U)) / - (double) ACE_UINT64_DBLCAST_ADAPTER (max_size)); + static_cast<CORBA::UShort> ((((double) ACE_UINT64_DBLCAST_ADAPTER (current_size * 100U)) / + (double) ACE_UINT64_DBLCAST_ADAPTER (max_size))); this->current_threshold_ = 0; diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am index 2908bec02fa..b3dffa87a21 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.am +++ b/TAO/orbsvcs/orbsvcs/Makefile.am @@ -34,7 +34,10 @@ BUILT_SOURCES += \ CosNamingC.inl \ CosNamingS.cpp \ CosNamingS.h \ - CosNamingS.inl + CosNamingS.inl \ + CosNamingS_T.cpp \ + CosNamingS_T.h \ + CosNamingS_T.inl CLEANFILES += \ CosNaming-stamp \ @@ -43,12 +46,15 @@ CLEANFILES += \ CosNamingC.inl \ CosNamingS.cpp \ CosNamingS.h \ - CosNamingS.inl + CosNamingS.inl \ + CosNamingS_T.cpp \ + CosNamingS_T.h \ + CosNamingS_T.inl -CosNamingC.cpp CosNamingC.h CosNamingC.inl CosNamingS.cpp CosNamingS.h CosNamingS.inl: CosNaming-stamp +CosNamingC.cpp CosNamingC.h CosNamingC.inl CosNamingS.cpp CosNamingS.h CosNamingS.inl CosNamingS_T.cpp CosNamingS_T.h CosNamingS_T.inl: CosNaming-stamp CosNaming-stamp: $(srcdir)/CosNaming.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h $(srcdir)/CosNaming.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h $(srcdir)/CosNaming.idl @touch $@ @@ -116,7 +122,10 @@ BUILT_SOURCES += \ CosPropertyC.inl \ CosPropertyS.cpp \ CosPropertyS.h \ - CosPropertyS.inl + CosPropertyS.inl \ + CosPropertyS_T.cpp \ + CosPropertyS_T.h \ + CosPropertyS_T.inl CLEANFILES += \ CosProperty-stamp \ @@ -125,12 +134,15 @@ CLEANFILES += \ CosPropertyC.inl \ CosPropertyS.cpp \ CosPropertyS.h \ - CosPropertyS.inl + CosPropertyS.inl \ + CosPropertyS_T.cpp \ + CosPropertyS_T.h \ + CosPropertyS_T.inl -CosPropertyC.cpp CosPropertyC.h CosPropertyC.inl CosPropertyS.cpp CosPropertyS.h CosPropertyS.inl: CosProperty-stamp +CosPropertyC.cpp CosPropertyC.h CosPropertyC.inl CosPropertyS.cpp CosPropertyS.h CosPropertyS.inl CosPropertyS_T.cpp CosPropertyS_T.h CosPropertyS_T.inl: CosProperty-stamp CosProperty-stamp: $(srcdir)/CosProperty.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Property_Export -Wb,stub_export_include=orbsvcs/Property/property_export.h -Wb,skel_export_macro=TAO_Property_Skel_Export -Wb,skel_export_include=orbsvcs/Property/property_skel_export.h $(srcdir)/CosProperty.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Property_Export -Wb,stub_export_include=orbsvcs/Property/property_export.h -Wb,skel_export_macro=TAO_Property_Skel_Export -Wb,skel_export_include=orbsvcs/Property/property_skel_export.h $(srcdir)/CosProperty.idl @touch $@ BUILT_SOURCES += \ @@ -139,7 +151,10 @@ BUILT_SOURCES += \ CosPropertyServiceC.inl \ CosPropertyServiceS.cpp \ CosPropertyServiceS.h \ - CosPropertyServiceS.inl + CosPropertyServiceS.inl \ + CosPropertyServiceS_T.cpp \ + CosPropertyServiceS_T.h \ + CosPropertyServiceS_T.inl CLEANFILES += \ CosPropertyService-stamp \ @@ -148,12 +163,15 @@ CLEANFILES += \ CosPropertyServiceC.inl \ CosPropertyServiceS.cpp \ CosPropertyServiceS.h \ - CosPropertyServiceS.inl + CosPropertyServiceS.inl \ + CosPropertyServiceS_T.cpp \ + CosPropertyServiceS_T.h \ + CosPropertyServiceS_T.inl -CosPropertyServiceC.cpp CosPropertyServiceC.h CosPropertyServiceC.inl CosPropertyServiceS.cpp CosPropertyServiceS.h CosPropertyServiceS.inl: CosPropertyService-stamp +CosPropertyServiceC.cpp CosPropertyServiceC.h CosPropertyServiceC.inl CosPropertyServiceS.cpp CosPropertyServiceS.h CosPropertyServiceS.inl CosPropertyServiceS_T.cpp CosPropertyServiceS_T.h CosPropertyServiceS_T.inl: CosPropertyService-stamp CosPropertyService-stamp: $(srcdir)/CosPropertyService.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Property_Export -Wb,stub_export_include=orbsvcs/Property/property_export.h -Wb,skel_export_macro=TAO_Property_Skel_Export -Wb,skel_export_include=orbsvcs/Property/property_skel_export.h $(srcdir)/CosPropertyService.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Property_Export -Wb,stub_export_include=orbsvcs/Property/property_export.h -Wb,skel_export_macro=TAO_Property_Skel_Export -Wb,skel_export_include=orbsvcs/Property/property_skel_export.h $(srcdir)/CosPropertyService.idl @touch $@ @@ -244,8 +262,14 @@ libTAO_CosProperty_Skel_la_LIBADD = \ nobase_include_HEADERS += \ CosPropertyS.h \ CosPropertyS.inl \ + CosPropertyS_T.cpp \ + CosPropertyS_T.h \ + CosPropertyS_T.inl \ CosPropertyServiceS.h \ CosPropertyServiceS.inl \ + CosPropertyServiceS_T.cpp \ + CosPropertyServiceS_T.h \ + CosPropertyServiceS_T.inl \ Property/property_skel_export.h pkgconfig_DATA += \ @@ -322,7 +346,9 @@ BUILT_SOURCES += \ AVStreamsC.inl \ AVStreamsS.cpp \ AVStreamsS.h \ - AVStreamsS.inl + AVStreamsS.inl \ + AVStreamsS_T.cpp \ + AVStreamsS_T.inl CLEANFILES += \ AVStreams-stamp \ @@ -331,12 +357,14 @@ CLEANFILES += \ AVStreamsC.inl \ AVStreamsS.cpp \ AVStreamsS.h \ - AVStreamsS.inl + AVStreamsS.inl \ + AVStreamsS_T.cpp \ + AVStreamsS_T.inl -AVStreamsC.cpp AVStreamsC.h AVStreamsC.inl AVStreamsS.cpp AVStreamsS.h AVStreamsS.inl: AVStreams-stamp +AVStreamsC.cpp AVStreamsC.h AVStreamsC.inl AVStreamsS.cpp AVStreamsS.h AVStreamsS.inl AVStreamsS_T.cpp AVStreamsS_T.inl: AVStreams-stamp AVStreams-stamp: $(srcdir)/AVStreams.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/AVStreams.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/AVStreams.idl @touch $@ BUILT_SOURCES += \ @@ -345,7 +373,9 @@ BUILT_SOURCES += \ Null_MediaCtrlC.inl \ Null_MediaCtrlS.cpp \ Null_MediaCtrlS.h \ - Null_MediaCtrlS.inl + Null_MediaCtrlS.inl \ + Null_MediaCtrlS_T.cpp \ + Null_MediaCtrlS_T.inl CLEANFILES += \ Null_MediaCtrl-stamp \ @@ -354,12 +384,14 @@ CLEANFILES += \ Null_MediaCtrlC.inl \ Null_MediaCtrlS.cpp \ Null_MediaCtrlS.h \ - Null_MediaCtrlS.inl + Null_MediaCtrlS.inl \ + Null_MediaCtrlS_T.cpp \ + Null_MediaCtrlS_T.inl -Null_MediaCtrlC.cpp Null_MediaCtrlC.h Null_MediaCtrlC.inl Null_MediaCtrlS.cpp Null_MediaCtrlS.h Null_MediaCtrlS.inl: Null_MediaCtrl-stamp +Null_MediaCtrlC.cpp Null_MediaCtrlC.h Null_MediaCtrlC.inl Null_MediaCtrlS.cpp Null_MediaCtrlS.h Null_MediaCtrlS.inl Null_MediaCtrlS_T.cpp Null_MediaCtrlS_T.inl: Null_MediaCtrl-stamp Null_MediaCtrl-stamp: $(srcdir)/Null_MediaCtrl.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/Null_MediaCtrl.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/Null_MediaCtrl.idl @touch $@ BUILT_SOURCES += \ @@ -368,7 +400,9 @@ BUILT_SOURCES += \ sfpC.inl \ sfpS.cpp \ sfpS.h \ - sfpS.inl + sfpS.inl \ + sfpS_T.cpp \ + sfpS_T.inl CLEANFILES += \ sfp-stamp \ @@ -377,12 +411,14 @@ CLEANFILES += \ sfpC.inl \ sfpS.cpp \ sfpS.h \ - sfpS.inl + sfpS.inl \ + sfpS_T.cpp \ + sfpS_T.inl -sfpC.cpp sfpC.h sfpC.inl sfpS.cpp sfpS.h sfpS.inl: sfp-stamp +sfpC.cpp sfpC.h sfpC.inl sfpS.cpp sfpS.h sfpS.inl sfpS_T.cpp sfpS_T.inl: sfp-stamp sfp-stamp: $(srcdir)/sfp.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/sfp.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/sfp.idl @touch $@ lib_LTLIBRARIES += libTAO_AV.la @@ -480,16 +516,22 @@ nobase_include_HEADERS += \ AVStreamsC.inl \ AVStreamsS.h \ AVStreamsS.inl \ + AVStreamsS_T.cpp \ + AVStreamsS_T.inl \ Null_MediaCtrl.idl \ Null_MediaCtrlC.h \ Null_MediaCtrlC.inl \ Null_MediaCtrlS.h \ Null_MediaCtrlS.inl \ + Null_MediaCtrlS_T.cpp \ + Null_MediaCtrlS_T.inl \ sfp.idl \ sfpC.h \ sfpC.inl \ sfpS.h \ - sfpS.inl + sfpS.inl \ + sfpS_T.cpp \ + sfpS_T.inl endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS @@ -508,7 +550,10 @@ BUILT_SOURCES += \ CosConcurrencyControlC.inl \ CosConcurrencyControlS.cpp \ CosConcurrencyControlS.h \ - CosConcurrencyControlS.inl + CosConcurrencyControlS.inl \ + CosConcurrencyControlS_T.cpp \ + CosConcurrencyControlS_T.h \ + CosConcurrencyControlS_T.inl CLEANFILES += \ CosConcurrencyControl-stamp \ @@ -517,12 +562,15 @@ CLEANFILES += \ CosConcurrencyControlC.inl \ CosConcurrencyControlS.cpp \ CosConcurrencyControlS.h \ - CosConcurrencyControlS.inl + CosConcurrencyControlS.inl \ + CosConcurrencyControlS_T.cpp \ + CosConcurrencyControlS_T.h \ + CosConcurrencyControlS_T.inl -CosConcurrencyControlC.cpp CosConcurrencyControlC.h CosConcurrencyControlC.inl CosConcurrencyControlS.cpp CosConcurrencyControlS.h CosConcurrencyControlS.inl: CosConcurrencyControl-stamp +CosConcurrencyControlC.cpp CosConcurrencyControlC.h CosConcurrencyControlC.inl CosConcurrencyControlS.cpp CosConcurrencyControlS.h CosConcurrencyControlS.inl CosConcurrencyControlS_T.cpp CosConcurrencyControlS_T.h CosConcurrencyControlS_T.inl: CosConcurrencyControl-stamp CosConcurrencyControl-stamp: $(srcdir)/CosConcurrencyControl.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Concurrency_Export -Wb,stub_export_include=orbsvcs/Concurrency/concurrency_export.h -Wb,skel_export_macro=TAO_Concurrency_Skel_Export -Wb,skel_export_include=orbsvcs/Concurrency/concurrency_skel_export.h $(srcdir)/CosConcurrencyControl.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Concurrency_Export -Wb,stub_export_include=orbsvcs/Concurrency/concurrency_export.h -Wb,skel_export_macro=TAO_Concurrency_Skel_Export -Wb,skel_export_include=orbsvcs/Concurrency/concurrency_skel_export.h $(srcdir)/CosConcurrencyControl.idl @touch $@ @@ -691,7 +739,10 @@ BUILT_SOURCES += \ CosTypedEventCommC.inl \ CosTypedEventCommS.cpp \ CosTypedEventCommS.h \ - CosTypedEventCommS.inl + CosTypedEventCommS.inl \ + CosTypedEventCommS_T.cpp \ + CosTypedEventCommS_T.h \ + CosTypedEventCommS_T.inl CLEANFILES += \ CosTypedEventComm-stamp \ @@ -700,12 +751,15 @@ CLEANFILES += \ CosTypedEventCommC.inl \ CosTypedEventCommS.cpp \ CosTypedEventCommS.h \ - CosTypedEventCommS.inl + CosTypedEventCommS.inl \ + CosTypedEventCommS_T.cpp \ + CosTypedEventCommS_T.h \ + CosTypedEventCommS_T.inl -CosTypedEventCommC.cpp CosTypedEventCommC.h CosTypedEventCommC.inl CosTypedEventCommS.cpp CosTypedEventCommS.h CosTypedEventCommS.inl: CosTypedEventComm-stamp +CosTypedEventCommC.cpp CosTypedEventCommC.h CosTypedEventCommC.inl CosTypedEventCommS.cpp CosTypedEventCommS.h CosTypedEventCommS.inl CosTypedEventCommS_T.cpp CosTypedEventCommS_T.h CosTypedEventCommS_T.inl: CosTypedEventComm-stamp CosTypedEventComm-stamp: $(srcdir)/CosTypedEventComm.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosTypedEventComm.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosTypedEventComm.idl @touch $@ BUILT_SOURCES += \ @@ -714,7 +768,10 @@ BUILT_SOURCES += \ CosTypedEventChannelAdminC.inl \ CosTypedEventChannelAdminS.cpp \ CosTypedEventChannelAdminS.h \ - CosTypedEventChannelAdminS.inl + CosTypedEventChannelAdminS.inl \ + CosTypedEventChannelAdminS_T.cpp \ + CosTypedEventChannelAdminS_T.h \ + CosTypedEventChannelAdminS_T.inl CLEANFILES += \ CosTypedEventChannelAdmin-stamp \ @@ -723,12 +780,15 @@ CLEANFILES += \ CosTypedEventChannelAdminC.inl \ CosTypedEventChannelAdminS.cpp \ CosTypedEventChannelAdminS.h \ - CosTypedEventChannelAdminS.inl + CosTypedEventChannelAdminS.inl \ + CosTypedEventChannelAdminS_T.cpp \ + CosTypedEventChannelAdminS_T.h \ + CosTypedEventChannelAdminS_T.inl -CosTypedEventChannelAdminC.cpp CosTypedEventChannelAdminC.h CosTypedEventChannelAdminC.inl CosTypedEventChannelAdminS.cpp CosTypedEventChannelAdminS.h CosTypedEventChannelAdminS.inl: CosTypedEventChannelAdmin-stamp +CosTypedEventChannelAdminC.cpp CosTypedEventChannelAdminC.h CosTypedEventChannelAdminC.inl CosTypedEventChannelAdminS.cpp CosTypedEventChannelAdminS.h CosTypedEventChannelAdminS.inl CosTypedEventChannelAdminS_T.cpp CosTypedEventChannelAdminS_T.h CosTypedEventChannelAdminS_T.inl: CosTypedEventChannelAdmin-stamp CosTypedEventChannelAdmin-stamp: $(srcdir)/CosTypedEventChannelAdmin.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosTypedEventChannelAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosTypedEventChannelAdmin.idl @touch $@ BUILT_SOURCES += \ @@ -739,7 +799,8 @@ BUILT_SOURCES += \ CosEventCommS.h \ CosEventCommS.inl \ CosEventCommS_T.cpp \ - CosEventCommS_T.h + CosEventCommS_T.h \ + CosEventCommS_T.inl CLEANFILES += \ CosEventComm-stamp \ @@ -750,12 +811,13 @@ CLEANFILES += \ CosEventCommS.h \ CosEventCommS.inl \ CosEventCommS_T.cpp \ - CosEventCommS_T.h + CosEventCommS_T.h \ + CosEventCommS_T.inl -CosEventCommC.cpp CosEventCommC.h CosEventCommC.inl CosEventCommS.cpp CosEventCommS.h CosEventCommS.inl CosEventCommS_T.cpp CosEventCommS_T.h: CosEventComm-stamp +CosEventCommC.cpp CosEventCommC.h CosEventCommC.inl CosEventCommS.cpp CosEventCommS.h CosEventCommS.inl CosEventCommS_T.cpp CosEventCommS_T.h CosEventCommS_T.inl: CosEventComm-stamp CosEventComm-stamp: $(srcdir)/CosEventComm.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GT -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosEventComm.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosEventComm.idl @touch $@ BUILT_SOURCES += \ @@ -766,7 +828,8 @@ BUILT_SOURCES += \ CosEventChannelAdminS.h \ CosEventChannelAdminS.inl \ CosEventChannelAdminS_T.cpp \ - CosEventChannelAdminS_T.h + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.inl CLEANFILES += \ CosEventChannelAdmin-stamp \ @@ -777,12 +840,13 @@ CLEANFILES += \ CosEventChannelAdminS.h \ CosEventChannelAdminS.inl \ CosEventChannelAdminS_T.cpp \ - CosEventChannelAdminS_T.h + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.inl -CosEventChannelAdminC.cpp CosEventChannelAdminC.h CosEventChannelAdminC.inl CosEventChannelAdminS.cpp CosEventChannelAdminS.h CosEventChannelAdminS.inl CosEventChannelAdminS_T.cpp CosEventChannelAdminS_T.h: CosEventChannelAdmin-stamp +CosEventChannelAdminC.cpp CosEventChannelAdminC.h CosEventChannelAdminC.inl CosEventChannelAdminS.cpp CosEventChannelAdminS.h CosEventChannelAdminS.inl CosEventChannelAdminS_T.cpp CosEventChannelAdminS_T.h CosEventChannelAdminS_T.inl: CosEventChannelAdmin-stamp CosEventChannelAdmin-stamp: $(srcdir)/CosEventChannelAdmin.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GT -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosEventChannelAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosEventChannelAdmin.idl @touch $@ @@ -861,7 +925,9 @@ BUILT_SOURCES += \ TimeBaseC.inl \ TimeBaseS.cpp \ TimeBaseS.h \ - TimeBaseS.inl + TimeBaseS.inl \ + TimeBaseS_T.cpp \ + TimeBaseS_T.inl CLEANFILES += \ TimeBase-stamp \ @@ -870,12 +936,14 @@ CLEANFILES += \ TimeBaseC.inl \ TimeBaseS.cpp \ TimeBaseS.h \ - TimeBaseS.inl + TimeBaseS.inl \ + TimeBaseS_T.cpp \ + TimeBaseS_T.inl -TimeBaseC.cpp TimeBaseC.h TimeBaseC.inl TimeBaseS.cpp TimeBaseS.h TimeBaseS.inl: TimeBase-stamp +TimeBaseC.cpp TimeBaseC.h TimeBaseC.inl TimeBaseS.cpp TimeBaseS.h TimeBaseS.inl TimeBaseS_T.cpp TimeBaseS_T.inl: TimeBase-stamp TimeBase-stamp: $(srcdir)/TimeBase.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/TimeBase.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/TimeBase.idl @touch $@ BUILT_SOURCES += \ @@ -884,7 +952,9 @@ BUILT_SOURCES += \ RtecBaseC.inl \ RtecBaseS.cpp \ RtecBaseS.h \ - RtecBaseS.inl + RtecBaseS.inl \ + RtecBaseS_T.cpp \ + RtecBaseS_T.inl CLEANFILES += \ RtecBase-stamp \ @@ -893,12 +963,14 @@ CLEANFILES += \ RtecBaseC.inl \ RtecBaseS.cpp \ RtecBaseS.h \ - RtecBaseS.inl + RtecBaseS.inl \ + RtecBaseS_T.cpp \ + RtecBaseS_T.inl -RtecBaseC.cpp RtecBaseC.h RtecBaseC.inl RtecBaseS.cpp RtecBaseS.h RtecBaseS.inl: RtecBase-stamp +RtecBaseC.cpp RtecBaseC.h RtecBaseC.inl RtecBaseS.cpp RtecBaseS.h RtecBaseS.inl RtecBaseS_T.cpp RtecBaseS_T.inl: RtecBase-stamp RtecBase-stamp: $(srcdir)/RtecBase.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/RtecBase.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/RtecBase.idl @touch $@ lib_LTLIBRARIES += libTAO_Svc_Utils.la @@ -937,12 +1009,16 @@ nobase_include_HEADERS += \ RtecBaseC.inl \ RtecBaseS.h \ RtecBaseS.inl \ + RtecBaseS_T.cpp \ + RtecBaseS_T.inl \ Shutdown_Utilities.h \ TimeBase.idl \ TimeBaseC.h \ TimeBaseC.inl \ TimeBaseS.h \ TimeBaseS.inl \ + TimeBaseS_T.cpp \ + TimeBaseS_T.inl \ Time_Utilities.h \ Time_Utilities.inl \ svc_utils_export.h @@ -1001,18 +1077,22 @@ nobase_include_HEADERS += \ CosEventChannelAdminS.inl \ CosEventChannelAdminS_T.cpp \ CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.inl \ CosEventCommS.h \ CosEventCommS.inl \ CosEventCommS_T.cpp \ CosEventCommS_T.h \ + CosEventCommS_T.inl \ CosTypedEventChannelAdminS.h \ CosTypedEventChannelAdminS.inl \ CosTypedEventChannelAdminS_T.cpp \ CosTypedEventChannelAdminS_T.h \ + CosTypedEventChannelAdminS_T.inl \ CosTypedEventCommS.h \ CosTypedEventCommS.inl \ CosTypedEventCommS_T.cpp \ - CosTypedEventCommS_T.h + CosTypedEventCommS_T.h \ + CosTypedEventCommS_T.inl pkgconfig_DATA += \ TAO_CosEvent_Skel.pc @@ -1167,7 +1247,10 @@ BUILT_SOURCES += \ CosLifeCycleC.inl \ CosLifeCycleS.cpp \ CosLifeCycleS.h \ - CosLifeCycleS.inl + CosLifeCycleS.inl \ + CosLifeCycleS_T.cpp \ + CosLifeCycleS_T.h \ + CosLifeCycleS_T.inl CLEANFILES += \ CosLifeCycle-stamp \ @@ -1176,12 +1259,15 @@ CLEANFILES += \ CosLifeCycleC.inl \ CosLifeCycleS.cpp \ CosLifeCycleS.h \ - CosLifeCycleS.inl + CosLifeCycleS.inl \ + CosLifeCycleS_T.cpp \ + CosLifeCycleS_T.h \ + CosLifeCycleS_T.inl -CosLifeCycleC.cpp CosLifeCycleC.h CosLifeCycleC.inl CosLifeCycleS.cpp CosLifeCycleS.h CosLifeCycleS.inl: CosLifeCycle-stamp +CosLifeCycleC.cpp CosLifeCycleC.h CosLifeCycleC.inl CosLifeCycleS.cpp CosLifeCycleS.h CosLifeCycleS.inl CosLifeCycleS_T.cpp CosLifeCycleS_T.h CosLifeCycleS_T.inl: CosLifeCycle-stamp CosLifeCycle-stamp: $(srcdir)/CosLifeCycle.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h $(srcdir)/CosLifeCycle.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h $(srcdir)/CosLifeCycle.idl @touch $@ BUILT_SOURCES += \ @@ -1190,7 +1276,10 @@ BUILT_SOURCES += \ LifeCycleServiceC.inl \ LifeCycleServiceS.cpp \ LifeCycleServiceS.h \ - LifeCycleServiceS.inl + LifeCycleServiceS.inl \ + LifeCycleServiceS_T.cpp \ + LifeCycleServiceS_T.h \ + LifeCycleServiceS_T.inl CLEANFILES += \ LifeCycleService-stamp \ @@ -1199,12 +1288,15 @@ CLEANFILES += \ LifeCycleServiceC.inl \ LifeCycleServiceS.cpp \ LifeCycleServiceS.h \ - LifeCycleServiceS.inl + LifeCycleServiceS.inl \ + LifeCycleServiceS_T.cpp \ + LifeCycleServiceS_T.h \ + LifeCycleServiceS_T.inl -LifeCycleServiceC.cpp LifeCycleServiceC.h LifeCycleServiceC.inl LifeCycleServiceS.cpp LifeCycleServiceS.h LifeCycleServiceS.inl: LifeCycleService-stamp +LifeCycleServiceC.cpp LifeCycleServiceC.h LifeCycleServiceC.inl LifeCycleServiceS.cpp LifeCycleServiceS.h LifeCycleServiceS.inl LifeCycleServiceS_T.cpp LifeCycleServiceS_T.h LifeCycleServiceS_T.inl: LifeCycleService-stamp LifeCycleService-stamp: $(srcdir)/LifeCycleService.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h $(srcdir)/LifeCycleService.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h $(srcdir)/LifeCycleService.idl @touch $@ lib_LTLIBRARIES += libTAO_CosLifeCycle.la @@ -1240,11 +1332,17 @@ nobase_include_HEADERS += \ CosLifeCycleC.inl \ CosLifeCycleS.h \ CosLifeCycleS.inl \ + CosLifeCycleS_T.cpp \ + CosLifeCycleS_T.h \ + CosLifeCycleS_T.inl \ LifeCycleService.idl \ LifeCycleServiceC.h \ LifeCycleServiceC.inl \ LifeCycleServiceS.h \ - LifeCycleServiceS.inl + LifeCycleServiceS.inl \ + LifeCycleServiceS_T.cpp \ + LifeCycleServiceS_T.h \ + LifeCycleServiceS_T.inl pkgconfig_DATA += \ TAO_CosLifeCycle.pc @@ -1273,7 +1371,9 @@ BUILT_SOURCES += \ miopC.inl \ miopS.cpp \ miopS.h \ - miopS.inl + miopS.inl \ + miopS_T.cpp \ + miopS_T.inl CLEANFILES += \ miop-stamp \ @@ -1282,31 +1382,35 @@ CLEANFILES += \ miopC.inl \ miopS.cpp \ miopS.h \ - miopS.inl + miopS.inl \ + miopS_T.cpp \ + miopS_T.inl -miopC.cpp miopC.h miopC.inl miopS.cpp miopS.h miopS.inl: miop-stamp +miopC.cpp miopC.h miopC.inl miopS.cpp miopS.h miopS.inl miopS_T.cpp miopS_T.inl: miop-stamp miop-stamp: $(srcdir)/miop.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h $(srcdir)/miop.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h $(srcdir)/miop.idl @touch $@ BUILT_SOURCES += \ PortableGroup_Simple_DSC.cpp \ PortableGroup_Simple_DSC.h \ PortableGroup_Simple_DSC.inl \ - PortableGroup_Simple_DSS.inl + PortableGroup_Simple_DSS.inl \ + PortableGroup_Simple_DSS_T.inl CLEANFILES += \ PortableGroup_Simple_DS-stamp \ PortableGroup_Simple_DSC.cpp \ PortableGroup_Simple_DSC.h \ PortableGroup_Simple_DSC.inl \ - PortableGroup_Simple_DSS.inl + PortableGroup_Simple_DSS.inl \ + PortableGroup_Simple_DSS_T.inl -PortableGroup_Simple_DSC.cpp PortableGroup_Simple_DSC.h PortableGroup_Simple_DSC.inl PortableGroup_Simple_DSS.inl: PortableGroup_Simple_DS-stamp +PortableGroup_Simple_DSC.cpp PortableGroup_Simple_DSC.h PortableGroup_Simple_DSC.inl PortableGroup_Simple_DSS.inl PortableGroup_Simple_DSS_T.inl: PortableGroup_Simple_DS-stamp PortableGroup_Simple_DS-stamp: $(srcdir)/PortableGroup_Simple_DS.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h $(srcdir)/PortableGroup_Simple_DS.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h $(srcdir)/PortableGroup_Simple_DS.idl @touch $@ BUILT_SOURCES += \ @@ -1315,7 +1419,9 @@ BUILT_SOURCES += \ PortableGroupC.inl \ PortableGroupS.cpp \ PortableGroupS.h \ - PortableGroupS.inl + PortableGroupS.inl \ + PortableGroupS_T.cpp \ + PortableGroupS_T.inl CLEANFILES += \ PortableGroup-stamp \ @@ -1324,12 +1430,14 @@ CLEANFILES += \ PortableGroupC.inl \ PortableGroupS.cpp \ PortableGroupS.h \ - PortableGroupS.inl + PortableGroupS.inl \ + PortableGroupS_T.cpp \ + PortableGroupS_T.inl -PortableGroupC.cpp PortableGroupC.h PortableGroupC.inl PortableGroupS.cpp PortableGroupS.h PortableGroupS.inl: PortableGroup-stamp +PortableGroupC.cpp PortableGroupC.h PortableGroupC.inl PortableGroupS.cpp PortableGroupS.h PortableGroupS.inl PortableGroupS_T.cpp PortableGroupS_T.inl: PortableGroup-stamp PortableGroup-stamp: $(srcdir)/PortableGroup.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h -GC $(srcdir)/PortableGroup.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h -GC $(srcdir)/PortableGroup.idl @touch $@ lib_LTLIBRARIES += libTAO_PortableGroup.la @@ -1451,15 +1559,20 @@ nobase_include_HEADERS += \ PortableGroupC.inl \ PortableGroupS.h \ PortableGroupS.inl \ + PortableGroupS_T.cpp \ + PortableGroupS_T.inl \ PortableGroup_Simple_DS.idl \ PortableGroup_Simple_DSC.h \ PortableGroup_Simple_DSC.inl \ PortableGroup_Simple_DSS.inl \ + PortableGroup_Simple_DSS_T.inl \ miop.idl \ miopC.h \ miopC.inl \ miopS.h \ - miopS.inl + miopS.inl \ + miopS_T.cpp \ + miopS_T.inl pkgconfig_DATA += \ TAO_PortableGroup.pc @@ -1490,7 +1603,10 @@ BUILT_SOURCES += \ CosLoadBalancingC.inl \ CosLoadBalancingS.cpp \ CosLoadBalancingS.h \ - CosLoadBalancingS.inl + CosLoadBalancingS.inl \ + CosLoadBalancingS_T.cpp \ + CosLoadBalancingS_T.h \ + CosLoadBalancingS_T.inl CLEANFILES += \ CosLoadBalancing-stamp \ @@ -1499,12 +1615,15 @@ CLEANFILES += \ CosLoadBalancingC.inl \ CosLoadBalancingS.cpp \ CosLoadBalancingS.h \ - CosLoadBalancingS.inl + CosLoadBalancingS.inl \ + CosLoadBalancingS_T.cpp \ + CosLoadBalancingS_T.h \ + CosLoadBalancingS_T.inl -CosLoadBalancingC.cpp CosLoadBalancingC.h CosLoadBalancingC.inl CosLoadBalancingS.cpp CosLoadBalancingS.h CosLoadBalancingS.inl: CosLoadBalancing-stamp +CosLoadBalancingC.cpp CosLoadBalancingC.h CosLoadBalancingC.inl CosLoadBalancingS.cpp CosLoadBalancingS.h CosLoadBalancingS.inl CosLoadBalancingS_T.cpp CosLoadBalancingS_T.h CosLoadBalancingS_T.inl: CosLoadBalancing-stamp CosLoadBalancing-stamp: $(srcdir)/CosLoadBalancing.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GC -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/CosLoadBalancing.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -GC -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/CosLoadBalancing.idl @touch $@ BUILT_SOURCES += \ @@ -1512,7 +1631,9 @@ BUILT_SOURCES += \ LB_ORTC.h \ LB_ORTC.inl \ LB_ORTS.h \ - LB_ORTS.inl + LB_ORTS.inl \ + LB_ORTS_T.h \ + LB_ORTS_T.inl CLEANFILES += \ LB_ORT-stamp \ @@ -1520,12 +1641,14 @@ CLEANFILES += \ LB_ORTC.h \ LB_ORTC.inl \ LB_ORTS.h \ - LB_ORTS.inl + LB_ORTS.inl \ + LB_ORTS_T.h \ + LB_ORTS_T.inl -LB_ORTC.cpp LB_ORTC.h LB_ORTC.inl LB_ORTS.h LB_ORTS.inl: LB_ORT-stamp +LB_ORTC.cpp LB_ORTC.h LB_ORTC.inl LB_ORTS.h LB_ORTS.inl LB_ORTS_T.h LB_ORTS_T.inl: LB_ORT-stamp LB_ORT-stamp: $(srcdir)/LB_ORT.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GC -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/LB_ORT.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -GC -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/LB_ORT.idl @touch $@ lib_LTLIBRARIES += libTAO_CosLoadBalancing.la @@ -1590,11 +1713,16 @@ nobase_include_HEADERS += \ CosLoadBalancingC.inl \ CosLoadBalancingS.h \ CosLoadBalancingS.inl \ + CosLoadBalancingS_T.cpp \ + CosLoadBalancingS_T.h \ + CosLoadBalancingS_T.inl \ LB_ORT.idl \ LB_ORTC.h \ LB_ORTC.inl \ LB_ORTS.h \ LB_ORTS.inl \ + LB_ORTS_T.h \ + LB_ORTS_T.inl \ LoadBalancing/LB_CPU_Load_Average_Monitor.h \ LoadBalancing/LB_CPU_Utilization_Monitor.h \ LoadBalancing/LB_ClientComponent.h \ @@ -1670,6 +1798,9 @@ libTAO_CosNaming_Skel_la_LIBADD = \ nobase_include_HEADERS += \ CosNamingS.h \ CosNamingS.inl \ + CosNamingS_T.cpp \ + CosNamingS_T.h \ + CosNamingS_T.inl \ Naming/naming_skel_export.h pkgconfig_DATA += \ @@ -1781,7 +1912,10 @@ BUILT_SOURCES += \ CosNotificationC.inl \ CosNotificationS.cpp \ CosNotificationS.h \ - CosNotificationS.inl + CosNotificationS.inl \ + CosNotificationS_T.cpp \ + CosNotificationS_T.h \ + CosNotificationS_T.inl CLEANFILES += \ CosNotification-stamp \ @@ -1790,12 +1924,15 @@ CLEANFILES += \ CosNotificationC.inl \ CosNotificationS.cpp \ CosNotificationS.h \ - CosNotificationS.inl + CosNotificationS.inl \ + CosNotificationS_T.cpp \ + CosNotificationS_T.h \ + CosNotificationS_T.inl -CosNotificationC.cpp CosNotificationC.h CosNotificationC.inl CosNotificationS.cpp CosNotificationS.h CosNotificationS.inl: CosNotification-stamp +CosNotificationC.cpp CosNotificationC.h CosNotificationC.inl CosNotificationS.cpp CosNotificationS.h CosNotificationS.inl CosNotificationS_T.cpp CosNotificationS_T.h CosNotificationS_T.inl: CosNotification-stamp CosNotification-stamp: $(srcdir)/CosNotification.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotification.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotification.idl @touch $@ BUILT_SOURCES += \ @@ -1804,7 +1941,10 @@ BUILT_SOURCES += \ CosNotifyCommC.inl \ CosNotifyCommS.cpp \ CosNotifyCommS.h \ - CosNotifyCommS.inl + CosNotifyCommS.inl \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.inl CLEANFILES += \ CosNotifyComm-stamp \ @@ -1813,12 +1953,15 @@ CLEANFILES += \ CosNotifyCommC.inl \ CosNotifyCommS.cpp \ CosNotifyCommS.h \ - CosNotifyCommS.inl + CosNotifyCommS.inl \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.inl -CosNotifyCommC.cpp CosNotifyCommC.h CosNotifyCommC.inl CosNotifyCommS.cpp CosNotifyCommS.h CosNotifyCommS.inl: CosNotifyComm-stamp +CosNotifyCommC.cpp CosNotifyCommC.h CosNotifyCommC.inl CosNotifyCommS.cpp CosNotifyCommS.h CosNotifyCommS.inl CosNotifyCommS_T.cpp CosNotifyCommS_T.h CosNotifyCommS_T.inl: CosNotifyComm-stamp CosNotifyComm-stamp: $(srcdir)/CosNotifyComm.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyComm.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyComm.idl @touch $@ BUILT_SOURCES += \ @@ -1827,7 +1970,10 @@ BUILT_SOURCES += \ CosNotifyFilterC.inl \ CosNotifyFilterS.cpp \ CosNotifyFilterS.h \ - CosNotifyFilterS.inl + CosNotifyFilterS.inl \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.inl CLEANFILES += \ CosNotifyFilter-stamp \ @@ -1836,12 +1982,15 @@ CLEANFILES += \ CosNotifyFilterC.inl \ CosNotifyFilterS.cpp \ CosNotifyFilterS.h \ - CosNotifyFilterS.inl + CosNotifyFilterS.inl \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.inl -CosNotifyFilterC.cpp CosNotifyFilterC.h CosNotifyFilterC.inl CosNotifyFilterS.cpp CosNotifyFilterS.h CosNotifyFilterS.inl: CosNotifyFilter-stamp +CosNotifyFilterC.cpp CosNotifyFilterC.h CosNotifyFilterC.inl CosNotifyFilterS.cpp CosNotifyFilterS.h CosNotifyFilterS.inl CosNotifyFilterS_T.cpp CosNotifyFilterS_T.h CosNotifyFilterS_T.inl: CosNotifyFilter-stamp CosNotifyFilter-stamp: $(srcdir)/CosNotifyFilter.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyFilter.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyFilter.idl @touch $@ BUILT_SOURCES += \ @@ -1850,7 +1999,10 @@ BUILT_SOURCES += \ CosNotifyChannelAdminC.inl \ CosNotifyChannelAdminS.cpp \ CosNotifyChannelAdminS.h \ - CosNotifyChannelAdminS.inl + CosNotifyChannelAdminS.inl \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.inl CLEANFILES += \ CosNotifyChannelAdmin-stamp \ @@ -1859,12 +2011,15 @@ CLEANFILES += \ CosNotifyChannelAdminC.inl \ CosNotifyChannelAdminS.cpp \ CosNotifyChannelAdminS.h \ - CosNotifyChannelAdminS.inl + CosNotifyChannelAdminS.inl \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.inl -CosNotifyChannelAdminC.cpp CosNotifyChannelAdminC.h CosNotifyChannelAdminC.inl CosNotifyChannelAdminS.cpp CosNotifyChannelAdminS.h CosNotifyChannelAdminS.inl: CosNotifyChannelAdmin-stamp +CosNotifyChannelAdminC.cpp CosNotifyChannelAdminC.h CosNotifyChannelAdminC.inl CosNotifyChannelAdminS.cpp CosNotifyChannelAdminS.h CosNotifyChannelAdminS.inl CosNotifyChannelAdminS_T.cpp CosNotifyChannelAdminS_T.h CosNotifyChannelAdminS_T.inl: CosNotifyChannelAdmin-stamp CosNotifyChannelAdmin-stamp: $(srcdir)/CosNotifyChannelAdmin.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyChannelAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyChannelAdmin.idl @touch $@ BUILT_SOURCES += \ @@ -1873,7 +2028,10 @@ BUILT_SOURCES += \ NotifyExtC.inl \ NotifyExtS.cpp \ NotifyExtS.h \ - NotifyExtS.inl + NotifyExtS.inl \ + NotifyExtS_T.cpp \ + NotifyExtS_T.h \ + NotifyExtS_T.inl CLEANFILES += \ NotifyExt-stamp \ @@ -1882,12 +2040,15 @@ CLEANFILES += \ NotifyExtC.inl \ NotifyExtS.cpp \ NotifyExtS.h \ - NotifyExtS.inl + NotifyExtS.inl \ + NotifyExtS_T.cpp \ + NotifyExtS_T.h \ + NotifyExtS_T.inl -NotifyExtC.cpp NotifyExtC.h NotifyExtC.inl NotifyExtS.cpp NotifyExtS.h NotifyExtS.inl: NotifyExt-stamp +NotifyExtC.cpp NotifyExtC.h NotifyExtC.inl NotifyExtS.cpp NotifyExtS.h NotifyExtS.inl NotifyExtS_T.cpp NotifyExtS_T.h NotifyExtS_T.inl: NotifyExt-stamp NotifyExt-stamp: $(srcdir)/NotifyExt.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/NotifyExt.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/NotifyExt.idl @touch $@ BUILT_SOURCES += \ @@ -1896,7 +2057,10 @@ BUILT_SOURCES += \ Event_ForwarderC.inl \ Event_ForwarderS.cpp \ Event_ForwarderS.h \ - Event_ForwarderS.inl + Event_ForwarderS.inl \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.inl CLEANFILES += \ Event_Forwarder-stamp \ @@ -1905,12 +2069,15 @@ CLEANFILES += \ Event_ForwarderC.inl \ Event_ForwarderS.cpp \ Event_ForwarderS.h \ - Event_ForwarderS.inl + Event_ForwarderS.inl \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.inl -Event_ForwarderC.cpp Event_ForwarderC.h Event_ForwarderC.inl Event_ForwarderS.cpp Event_ForwarderS.h Event_ForwarderS.inl: Event_Forwarder-stamp +Event_ForwarderC.cpp Event_ForwarderC.h Event_ForwarderC.inl Event_ForwarderS.cpp Event_ForwarderS.h Event_ForwarderS.inl Event_ForwarderS_T.cpp Event_ForwarderS_T.h Event_ForwarderS_T.inl: Event_Forwarder-stamp Event_Forwarder-stamp: $(srcdir)/Event_Forwarder.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/Event_Forwarder.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/Event_Forwarder.idl @touch $@ @@ -2082,17 +2249,35 @@ libTAO_CosNotification_Skel_la_LIBADD = \ nobase_include_HEADERS += \ CosNotificationS.h \ CosNotificationS.inl \ + CosNotificationS_T.cpp \ + CosNotificationS_T.h \ + CosNotificationS_T.inl \ CosNotifyChannelAdminS.h \ CosNotifyChannelAdminS.inl \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.inl \ CosNotifyCommS.h \ CosNotifyCommS.inl \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.inl \ CosNotifyFilterS.h \ CosNotifyFilterS.inl \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.inl \ Event_ForwarderS.h \ Event_ForwarderS.inl \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.inl \ Notify/notify_skel_export.h \ NotifyExtS.h \ - NotifyExtS.inl + NotifyExtS.inl \ + NotifyExtS_T.cpp \ + NotifyExtS_T.h \ + NotifyExtS_T.inl pkgconfig_DATA += \ TAO_CosNotification_Skel.pc @@ -2416,7 +2601,8 @@ BUILT_SOURCES += \ TimeServiceC.inl \ TimeServiceS.cpp \ TimeServiceS.h \ - TimeServiceS.inl + TimeServiceS.inl \ + TimeServiceS_T.cpp CLEANFILES += \ TimeService-stamp \ @@ -2425,12 +2611,13 @@ CLEANFILES += \ TimeServiceC.inl \ TimeServiceS.cpp \ TimeServiceS.h \ - TimeServiceS.inl + TimeServiceS.inl \ + TimeServiceS_T.cpp -TimeServiceC.cpp TimeServiceC.h TimeServiceC.inl TimeServiceS.cpp TimeServiceS.h TimeServiceS.inl: TimeService-stamp +TimeServiceC.cpp TimeServiceC.h TimeServiceC.inl TimeServiceS.cpp TimeServiceS.h TimeServiceS.inl TimeServiceS_T.cpp: TimeService-stamp TimeService-stamp: $(srcdir)/TimeService.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Time_Export -Wb,export_include=orbsvcs/Time/time_export.h $(srcdir)/TimeService.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Time_Export -Wb,export_include=orbsvcs/Time/time_export.h $(srcdir)/TimeService.idl @touch $@ lib_LTLIBRARIES += libTAO_CosTime.la @@ -2474,7 +2661,8 @@ nobase_include_HEADERS += \ TimeServiceC.h \ TimeServiceC.inl \ TimeServiceS.h \ - TimeServiceS.inl + TimeServiceS.inl \ + TimeServiceS_T.cpp pkgconfig_DATA += \ TAO_CosTime.pc @@ -2502,7 +2690,10 @@ BUILT_SOURCES += \ CosTradingC.inl \ CosTradingS.cpp \ CosTradingS.h \ - CosTradingS.inl + CosTradingS.inl \ + CosTradingS_T.cpp \ + CosTradingS_T.h \ + CosTradingS_T.inl CLEANFILES += \ CosTrading-stamp \ @@ -2511,12 +2702,15 @@ CLEANFILES += \ CosTradingC.inl \ CosTradingS.cpp \ CosTradingS.h \ - CosTradingS.inl + CosTradingS.inl \ + CosTradingS_T.cpp \ + CosTradingS_T.h \ + CosTradingS_T.inl -CosTradingC.cpp CosTradingC.h CosTradingC.inl CosTradingS.cpp CosTradingS.h CosTradingS.inl: CosTrading-stamp +CosTradingC.cpp CosTradingC.h CosTradingC.inl CosTradingS.cpp CosTradingS.h CosTradingS.inl CosTradingS_T.cpp CosTradingS_T.h CosTradingS_T.inl: CosTrading-stamp CosTrading-stamp: $(srcdir)/CosTrading.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTrading.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTrading.idl @touch $@ BUILT_SOURCES += \ @@ -2525,7 +2719,10 @@ BUILT_SOURCES += \ CosTradingReposC.inl \ CosTradingReposS.cpp \ CosTradingReposS.h \ - CosTradingReposS.inl + CosTradingReposS.inl \ + CosTradingReposS_T.cpp \ + CosTradingReposS_T.h \ + CosTradingReposS_T.inl CLEANFILES += \ CosTradingRepos-stamp \ @@ -2534,12 +2731,15 @@ CLEANFILES += \ CosTradingReposC.inl \ CosTradingReposS.cpp \ CosTradingReposS.h \ - CosTradingReposS.inl + CosTradingReposS.inl \ + CosTradingReposS_T.cpp \ + CosTradingReposS_T.h \ + CosTradingReposS_T.inl -CosTradingReposC.cpp CosTradingReposC.h CosTradingReposC.inl CosTradingReposS.cpp CosTradingReposS.h CosTradingReposS.inl: CosTradingRepos-stamp +CosTradingReposC.cpp CosTradingReposC.h CosTradingReposC.inl CosTradingReposS.cpp CosTradingReposS.h CosTradingReposS.inl CosTradingReposS_T.cpp CosTradingReposS_T.h CosTradingReposS_T.inl: CosTradingRepos-stamp CosTradingRepos-stamp: $(srcdir)/CosTradingRepos.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTradingRepos.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTradingRepos.idl @touch $@ BUILT_SOURCES += \ @@ -2548,7 +2748,10 @@ BUILT_SOURCES += \ CosTradingDynamicC.inl \ CosTradingDynamicS.cpp \ CosTradingDynamicS.h \ - CosTradingDynamicS.inl + CosTradingDynamicS.inl \ + CosTradingDynamicS_T.cpp \ + CosTradingDynamicS_T.h \ + CosTradingDynamicS_T.inl CLEANFILES += \ CosTradingDynamic-stamp \ @@ -2557,12 +2760,15 @@ CLEANFILES += \ CosTradingDynamicC.inl \ CosTradingDynamicS.cpp \ CosTradingDynamicS.h \ - CosTradingDynamicS.inl + CosTradingDynamicS.inl \ + CosTradingDynamicS_T.cpp \ + CosTradingDynamicS_T.h \ + CosTradingDynamicS_T.inl -CosTradingDynamicC.cpp CosTradingDynamicC.h CosTradingDynamicC.inl CosTradingDynamicS.cpp CosTradingDynamicS.h CosTradingDynamicS.inl: CosTradingDynamic-stamp +CosTradingDynamicC.cpp CosTradingDynamicC.h CosTradingDynamicC.inl CosTradingDynamicS.cpp CosTradingDynamicS.h CosTradingDynamicS.inl CosTradingDynamicS_T.cpp CosTradingDynamicS_T.h CosTradingDynamicS_T.inl: CosTradingDynamic-stamp CosTradingDynamic-stamp: $(srcdir)/CosTradingDynamic.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTradingDynamic.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTradingDynamic.idl @touch $@ @@ -2659,10 +2865,19 @@ libTAO_CosTrading_Skel_la_LIBADD = \ nobase_include_HEADERS += \ CosTradingDynamicS.h \ CosTradingDynamicS.inl \ + CosTradingDynamicS_T.cpp \ + CosTradingDynamicS_T.h \ + CosTradingDynamicS_T.inl \ CosTradingReposS.h \ CosTradingReposS.inl \ + CosTradingReposS_T.cpp \ + CosTradingReposS_T.h \ + CosTradingReposS_T.inl \ CosTradingS.h \ CosTradingS.inl \ + CosTradingS_T.cpp \ + CosTradingS_T.h \ + CosTradingS_T.inl \ Trader/trading_skel_export.h pkgconfig_DATA += \ @@ -2776,7 +2991,10 @@ BUILT_SOURCES += \ DsLogAdminC.inl \ DsLogAdminS.cpp \ DsLogAdminS.h \ - DsLogAdminS.inl + DsLogAdminS.inl \ + DsLogAdminS_T.cpp \ + DsLogAdminS_T.h \ + DsLogAdminS_T.inl CLEANFILES += \ DsLogAdmin-stamp \ @@ -2785,12 +3003,15 @@ CLEANFILES += \ DsLogAdminC.inl \ DsLogAdminS.cpp \ DsLogAdminS.h \ - DsLogAdminS.inl + DsLogAdminS.inl \ + DsLogAdminS_T.cpp \ + DsLogAdminS_T.h \ + DsLogAdminS_T.inl -DsLogAdminC.cpp DsLogAdminC.h DsLogAdminC.inl DsLogAdminS.cpp DsLogAdminS.h DsLogAdminS.inl: DsLogAdmin-stamp +DsLogAdminC.cpp DsLogAdminC.h DsLogAdminC.inl DsLogAdminS.cpp DsLogAdminS.h DsLogAdminS.inl DsLogAdminS_T.cpp DsLogAdminS_T.h DsLogAdminS_T.inl: DsLogAdmin-stamp DsLogAdmin-stamp: $(srcdir)/DsLogAdmin.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h $(srcdir)/DsLogAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h $(srcdir)/DsLogAdmin.idl @touch $@ BUILT_SOURCES += \ @@ -2799,7 +3020,10 @@ BUILT_SOURCES += \ DsLogNotificationC.inl \ DsLogNotificationS.cpp \ DsLogNotificationS.h \ - DsLogNotificationS.inl + DsLogNotificationS.inl \ + DsLogNotificationS_T.cpp \ + DsLogNotificationS_T.h \ + DsLogNotificationS_T.inl CLEANFILES += \ DsLogNotification-stamp \ @@ -2808,12 +3032,15 @@ CLEANFILES += \ DsLogNotificationC.inl \ DsLogNotificationS.cpp \ DsLogNotificationS.h \ - DsLogNotificationS.inl + DsLogNotificationS.inl \ + DsLogNotificationS_T.cpp \ + DsLogNotificationS_T.h \ + DsLogNotificationS_T.inl -DsLogNotificationC.cpp DsLogNotificationC.h DsLogNotificationC.inl DsLogNotificationS.cpp DsLogNotificationS.h DsLogNotificationS.inl: DsLogNotification-stamp +DsLogNotificationC.cpp DsLogNotificationC.h DsLogNotificationC.inl DsLogNotificationS.cpp DsLogNotificationS.h DsLogNotificationS.inl DsLogNotificationS_T.cpp DsLogNotificationS_T.h DsLogNotificationS_T.inl: DsLogNotification-stamp DsLogNotification-stamp: $(srcdir)/DsLogNotification.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h $(srcdir)/DsLogNotification.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h $(srcdir)/DsLogNotification.idl @touch $@ @@ -2883,7 +3110,10 @@ BUILT_SOURCES += \ DsEventLogAdminC.inl \ DsEventLogAdminS.cpp \ DsEventLogAdminS.h \ - DsEventLogAdminS.inl + DsEventLogAdminS.inl \ + DsEventLogAdminS_T.cpp \ + DsEventLogAdminS_T.h \ + DsEventLogAdminS_T.inl CLEANFILES += \ DsEventLogAdmin-stamp \ @@ -2892,12 +3122,15 @@ CLEANFILES += \ DsEventLogAdminC.inl \ DsEventLogAdminS.cpp \ DsEventLogAdminS.h \ - DsEventLogAdminS.inl + DsEventLogAdminS.inl \ + DsEventLogAdminS_T.cpp \ + DsEventLogAdminS_T.h \ + DsEventLogAdminS_T.inl -DsEventLogAdminC.cpp DsEventLogAdminC.h DsEventLogAdminC.inl DsEventLogAdminS.cpp DsEventLogAdminS.h DsEventLogAdminS.inl: DsEventLogAdmin-stamp +DsEventLogAdminC.cpp DsEventLogAdminC.h DsEventLogAdminC.inl DsEventLogAdminS.cpp DsEventLogAdminS.h DsEventLogAdminS.inl DsEventLogAdminS_T.cpp DsEventLogAdminS_T.h DsEventLogAdminS_T.inl: DsEventLogAdmin-stamp DsEventLogAdmin-stamp: $(srcdir)/DsEventLogAdmin.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_EventLog_Export -Wb,stub_export_include=orbsvcs/Log/eventlog_export.h -Wb,skel_export_macro=TAO_EventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/eventlog_skel_export.h $(srcdir)/DsEventLogAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_EventLog_Export -Wb,stub_export_include=orbsvcs/Log/eventlog_export.h -Wb,skel_export_macro=TAO_EventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/eventlog_skel_export.h $(srcdir)/DsEventLogAdmin.idl @touch $@ @@ -2988,8 +3221,14 @@ libTAO_DsLogAdmin_Skel_la_LIBADD = \ nobase_include_HEADERS += \ DsLogAdminS.h \ DsLogAdminS.inl \ + DsLogAdminS_T.cpp \ + DsLogAdminS_T.h \ + DsLogAdminS_T.inl \ DsLogNotificationS.h \ DsLogNotificationS.inl \ + DsLogNotificationS_T.cpp \ + DsLogNotificationS_T.h \ + DsLogNotificationS_T.inl \ Log/log_skel_export.h pkgconfig_DATA += \ @@ -3130,6 +3369,9 @@ libTAO_DsEventLogAdmin_Skel_la_LIBADD = \ nobase_include_HEADERS += \ DsEventLogAdminS.h \ DsEventLogAdminS.inl \ + DsEventLogAdminS_T.cpp \ + DsEventLogAdminS_T.h \ + DsEventLogAdminS_T.inl \ Log/eventlog_skel_export.h pkgconfig_DATA += \ @@ -3231,7 +3473,10 @@ BUILT_SOURCES += \ DsNotifyLogAdminC.inl \ DsNotifyLogAdminS.cpp \ DsNotifyLogAdminS.h \ - DsNotifyLogAdminS.inl + DsNotifyLogAdminS.inl \ + DsNotifyLogAdminS_T.cpp \ + DsNotifyLogAdminS_T.h \ + DsNotifyLogAdminS_T.inl CLEANFILES += \ DsNotifyLogAdmin-stamp \ @@ -3240,12 +3485,15 @@ CLEANFILES += \ DsNotifyLogAdminC.inl \ DsNotifyLogAdminS.cpp \ DsNotifyLogAdminS.h \ - DsNotifyLogAdminS.inl + DsNotifyLogAdminS.inl \ + DsNotifyLogAdminS_T.cpp \ + DsNotifyLogAdminS_T.h \ + DsNotifyLogAdminS_T.inl -DsNotifyLogAdminC.cpp DsNotifyLogAdminC.h DsNotifyLogAdminC.inl DsNotifyLogAdminS.cpp DsNotifyLogAdminS.h DsNotifyLogAdminS.inl: DsNotifyLogAdmin-stamp +DsNotifyLogAdminC.cpp DsNotifyLogAdminC.h DsNotifyLogAdminC.inl DsNotifyLogAdminS.cpp DsNotifyLogAdminS.h DsNotifyLogAdminS.inl DsNotifyLogAdminS_T.cpp DsNotifyLogAdminS_T.h DsNotifyLogAdminS_T.inl: DsNotifyLogAdmin-stamp DsNotifyLogAdmin-stamp: $(srcdir)/DsNotifyLogAdmin.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_NotifyLog_Export -Wb,stub_export_include=orbsvcs/Log/notifylog_export.h -Wb,skel_export_macro=TAO_NotifyLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/notifylog_skel_export.h $(srcdir)/DsNotifyLogAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_NotifyLog_Export -Wb,stub_export_include=orbsvcs/Log/notifylog_export.h -Wb,skel_export_macro=TAO_NotifyLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/notifylog_skel_export.h $(srcdir)/DsNotifyLogAdmin.idl @touch $@ @@ -3346,6 +3594,9 @@ libTAO_DsNotifyLogAdmin_Skel_la_LIBADD = \ nobase_include_HEADERS += \ DsNotifyLogAdminS.h \ DsNotifyLogAdminS.inl \ + DsNotifyLogAdminS_T.cpp \ + DsNotifyLogAdminS_T.h \ + DsNotifyLogAdminS_T.inl \ Log/notifylog_skel_export.h pkgconfig_DATA += \ @@ -3445,7 +3696,10 @@ BUILT_SOURCES += \ FT_CORBA_ORBC.inl \ FT_CORBA_ORBS.cpp \ FT_CORBA_ORBS.h \ - FT_CORBA_ORBS.inl + FT_CORBA_ORBS.inl \ + FT_CORBA_ORBS_T.cpp \ + FT_CORBA_ORBS_T.h \ + FT_CORBA_ORBS_T.inl CLEANFILES += \ FT_CORBA_ORB-stamp \ @@ -3454,12 +3708,15 @@ CLEANFILES += \ FT_CORBA_ORBC.inl \ FT_CORBA_ORBS.cpp \ FT_CORBA_ORBS.h \ - FT_CORBA_ORBS.inl + FT_CORBA_ORBS.inl \ + FT_CORBA_ORBS_T.cpp \ + FT_CORBA_ORBS_T.h \ + FT_CORBA_ORBS_T.inl -FT_CORBA_ORBC.cpp FT_CORBA_ORBC.h FT_CORBA_ORBC.inl FT_CORBA_ORBS.cpp FT_CORBA_ORBS.h FT_CORBA_ORBS.inl: FT_CORBA_ORB-stamp +FT_CORBA_ORBC.cpp FT_CORBA_ORBC.h FT_CORBA_ORBC.inl FT_CORBA_ORBS.cpp FT_CORBA_ORBS.h FT_CORBA_ORBS.inl FT_CORBA_ORBS_T.cpp FT_CORBA_ORBS_T.h FT_CORBA_ORBS_T.inl: FT_CORBA_ORB-stamp FT_CORBA_ORB-stamp: $(srcdir)/FT_CORBA_ORB.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,skel_export_include=tao/PortableServer/PolicyS.h -Wb,export_macro=TAO_FT_ORB_Utils_Export -Wb,export_include=orbsvcs/FaultTolerance/FT_ORB_Utils_export.h $(srcdir)/FT_CORBA_ORB.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,skel_export_include=tao/PortableServer/PolicyS.h -Wb,export_macro=TAO_FT_ORB_Utils_Export -Wb,export_include=orbsvcs/FaultTolerance/FT_ORB_Utils_export.h $(srcdir)/FT_CORBA_ORB.idl @touch $@ lib_LTLIBRARIES += libTAO_FTORB_Utils.la @@ -3495,12 +3752,14 @@ libTAO_FTORB_Utils_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.cpp \ FT_CORBA_ORB.idl \ FT_CORBA_ORBC.h \ FT_CORBA_ORBC.inl \ FT_CORBA_ORBS.h \ FT_CORBA_ORBS.inl \ + FT_CORBA_ORBS_T.cpp \ + FT_CORBA_ORBS_T.h \ + FT_CORBA_ORBS_T.inl \ FaultTolerance/FT_IOGR_Property.h \ FaultTolerance/FT_IOGR_Property.inl \ FaultTolerance/FT_ORB_Utils_export.h @@ -3583,7 +3842,7 @@ CLEANFILES += \ RtecDefaultEventDataC.cpp RtecDefaultEventDataC.h RtecDefaultEventDataC.inl RtecDefaultEventDataS_T.cpp: RtecDefaultEventData-stamp RtecDefaultEventData-stamp: $(srcdir)/RtecDefaultEventData.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GT -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecDefaultEventData.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecDefaultEventData.idl @touch $@ BUILT_SOURCES += \ @@ -3602,7 +3861,7 @@ CLEANFILES += \ RtecEventCommC.cpp RtecEventCommC.h RtecEventCommC.inl RtecEventCommS_T.cpp: RtecEventComm-stamp RtecEventComm-stamp: $(srcdir)/RtecEventComm.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GT -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecEventComm.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecEventComm.idl @touch $@ BUILT_SOURCES += \ @@ -3621,7 +3880,7 @@ CLEANFILES += \ RtecEventChannelAdminC.cpp RtecEventChannelAdminC.h RtecEventChannelAdminC.inl RtecEventChannelAdminS_T.cpp: RtecEventChannelAdmin-stamp RtecEventChannelAdmin-stamp: $(srcdir)/RtecEventChannelAdmin.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GT -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecEventChannelAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecEventChannelAdmin.idl @touch $@ BUILT_SOURCES += \ @@ -3640,7 +3899,7 @@ CLEANFILES += \ RtecUDPAdminC.cpp RtecUDPAdminC.h RtecUDPAdminC.inl RtecUDPAdminS_T.cpp: RtecUDPAdmin-stamp RtecUDPAdmin-stamp: $(srcdir)/RtecUDPAdmin.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GT -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecUDPAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecUDPAdmin.idl @touch $@ lib_LTLIBRARIES += libTAO_RTEvent.la @@ -4020,7 +4279,10 @@ BUILT_SOURCES += \ FTRTC.inl \ FTRTS.cpp \ FTRTS.h \ - FTRTS.inl + FTRTS.inl \ + FTRTS_T.cpp \ + FTRTS_T.h \ + FTRTS_T.inl CLEANFILES += \ FTRT-stamp \ @@ -4029,12 +4291,15 @@ CLEANFILES += \ FTRTC.inl \ FTRTS.cpp \ FTRTS.h \ - FTRTS.inl + FTRTS.inl \ + FTRTS_T.cpp \ + FTRTS_T.h \ + FTRTS_T.inl -FTRTC.cpp FTRTC.h FTRTC.inl FTRTS.cpp FTRTS.h FTRTS.inl: FTRT-stamp +FTRTC.cpp FTRTC.h FTRTC.inl FTRTS.cpp FTRTS.h FTRTS.inl FTRTS_T.cpp FTRTS_T.h FTRTS_T.inl: FTRT-stamp FTRT-stamp: $(srcdir)/FTRT.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT.idl @touch $@ BUILT_SOURCES += \ @@ -4043,7 +4308,10 @@ BUILT_SOURCES += \ FtRtecEventCommC.inl \ FtRtecEventCommS.cpp \ FtRtecEventCommS.h \ - FtRtecEventCommS.inl + FtRtecEventCommS.inl \ + FtRtecEventCommS_T.cpp \ + FtRtecEventCommS_T.h \ + FtRtecEventCommS_T.inl CLEANFILES += \ FtRtecEventComm-stamp \ @@ -4052,12 +4320,15 @@ CLEANFILES += \ FtRtecEventCommC.inl \ FtRtecEventCommS.cpp \ FtRtecEventCommS.h \ - FtRtecEventCommS.inl + FtRtecEventCommS.inl \ + FtRtecEventCommS_T.cpp \ + FtRtecEventCommS_T.h \ + FtRtecEventCommS_T.inl -FtRtecEventCommC.cpp FtRtecEventCommC.h FtRtecEventCommC.inl FtRtecEventCommS.cpp FtRtecEventCommS.h FtRtecEventCommS.inl: FtRtecEventComm-stamp +FtRtecEventCommC.cpp FtRtecEventCommC.h FtRtecEventCommC.inl FtRtecEventCommS.cpp FtRtecEventCommS.h FtRtecEventCommS.inl FtRtecEventCommS_T.cpp FtRtecEventCommS_T.h FtRtecEventCommS_T.inl: FtRtecEventComm-stamp FtRtecEventComm-stamp: $(srcdir)/FtRtecEventComm.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FtRtecEventComm.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FtRtecEventComm.idl @touch $@ BUILT_SOURCES += \ @@ -4066,7 +4337,10 @@ BUILT_SOURCES += \ FTRT_GroupManagerC.inl \ FTRT_GroupManagerS.cpp \ FTRT_GroupManagerS.h \ - FTRT_GroupManagerS.inl + FTRT_GroupManagerS.inl \ + FTRT_GroupManagerS_T.cpp \ + FTRT_GroupManagerS_T.h \ + FTRT_GroupManagerS_T.inl CLEANFILES += \ FTRT_GroupManager-stamp \ @@ -4075,12 +4349,15 @@ CLEANFILES += \ FTRT_GroupManagerC.inl \ FTRT_GroupManagerS.cpp \ FTRT_GroupManagerS.h \ - FTRT_GroupManagerS.inl + FTRT_GroupManagerS.inl \ + FTRT_GroupManagerS_T.cpp \ + FTRT_GroupManagerS_T.h \ + FTRT_GroupManagerS_T.inl -FTRT_GroupManagerC.cpp FTRT_GroupManagerC.h FTRT_GroupManagerC.inl FTRT_GroupManagerS.cpp FTRT_GroupManagerS.h FTRT_GroupManagerS.inl: FTRT_GroupManager-stamp +FTRT_GroupManagerC.cpp FTRT_GroupManagerC.h FTRT_GroupManagerC.inl FTRT_GroupManagerS.cpp FTRT_GroupManagerS.h FTRT_GroupManagerS.inl FTRT_GroupManagerS_T.cpp FTRT_GroupManagerS_T.h FTRT_GroupManagerS_T.inl: FTRT_GroupManager-stamp FTRT_GroupManager-stamp: $(srcdir)/FTRT_GroupManager.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT_GroupManager.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT_GroupManager.idl @touch $@ BUILT_SOURCES += \ @@ -4089,7 +4366,10 @@ BUILT_SOURCES += \ FtRtecEventChannelAdminC.inl \ FtRtecEventChannelAdminS.cpp \ FtRtecEventChannelAdminS.h \ - FtRtecEventChannelAdminS.inl + FtRtecEventChannelAdminS.inl \ + FtRtecEventChannelAdminS_T.cpp \ + FtRtecEventChannelAdminS_T.h \ + FtRtecEventChannelAdminS_T.inl CLEANFILES += \ FtRtecEventChannelAdmin-stamp \ @@ -4098,12 +4378,15 @@ CLEANFILES += \ FtRtecEventChannelAdminC.inl \ FtRtecEventChannelAdminS.cpp \ FtRtecEventChannelAdminS.h \ - FtRtecEventChannelAdminS.inl + FtRtecEventChannelAdminS.inl \ + FtRtecEventChannelAdminS_T.cpp \ + FtRtecEventChannelAdminS_T.h \ + FtRtecEventChannelAdminS_T.inl -FtRtecEventChannelAdminC.cpp FtRtecEventChannelAdminC.h FtRtecEventChannelAdminC.inl FtRtecEventChannelAdminS.cpp FtRtecEventChannelAdminS.h FtRtecEventChannelAdminS.inl: FtRtecEventChannelAdmin-stamp +FtRtecEventChannelAdminC.cpp FtRtecEventChannelAdminC.h FtRtecEventChannelAdminC.inl FtRtecEventChannelAdminS.cpp FtRtecEventChannelAdminS.h FtRtecEventChannelAdminS.inl FtRtecEventChannelAdminS_T.cpp FtRtecEventChannelAdminS_T.h FtRtecEventChannelAdminS_T.inl: FtRtecEventChannelAdmin-stamp FtRtecEventChannelAdmin-stamp: $(srcdir)/FtRtecEventChannelAdmin.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h $(srcdir)/FtRtecEventChannelAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h $(srcdir)/FtRtecEventChannelAdmin.idl @touch $@ lib_LTLIBRARIES += libTAO_FtRtEvent.la @@ -4159,11 +4442,17 @@ nobase_include_HEADERS += \ FTRTC.inl \ FTRTS.h \ FTRTS.inl \ + FTRTS_T.cpp \ + FTRTS_T.h \ + FTRTS_T.inl \ FTRT_GroupManager.idl \ FTRT_GroupManagerC.h \ FTRT_GroupManagerC.inl \ FTRT_GroupManagerS.h \ FTRT_GroupManagerS.inl \ + FTRT_GroupManagerS_T.cpp \ + FTRT_GroupManagerS_T.h \ + FTRT_GroupManagerS_T.inl \ FtRtEvent/Utils/FTEC_Gateway.h \ FtRtEvent/Utils/FTEC_Gateway.inl \ FtRtEvent/Utils/Log.h \ @@ -4177,11 +4466,17 @@ nobase_include_HEADERS += \ FtRtecEventChannelAdminC.inl \ FtRtecEventChannelAdminS.h \ FtRtecEventChannelAdminS.inl \ + FtRtecEventChannelAdminS_T.cpp \ + FtRtecEventChannelAdminS_T.h \ + FtRtecEventChannelAdminS_T.inl \ FtRtecEventComm.idl \ FtRtecEventCommC.h \ FtRtecEventCommC.inl \ FtRtecEventCommS.h \ - FtRtecEventCommS.inl + FtRtecEventCommS.inl \ + FtRtecEventCommS_T.cpp \ + FtRtecEventCommS_T.h \ + FtRtecEventCommS_T.inl endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS @@ -4468,7 +4763,9 @@ BUILT_SOURCES += \ FT_CORBAC.inl \ FT_CORBAS.cpp \ FT_CORBAS.h \ - FT_CORBAS.inl + FT_CORBAS.inl \ + FT_CORBAS_T.cpp \ + FT_CORBAS_T.inl CLEANFILES += \ FT_CORBA-stamp \ @@ -4477,12 +4774,14 @@ CLEANFILES += \ FT_CORBAC.inl \ FT_CORBAS.cpp \ FT_CORBAS.h \ - FT_CORBAS.inl + FT_CORBAS.inl \ + FT_CORBAS_T.cpp \ + FT_CORBAS_T.inl -FT_CORBAC.cpp FT_CORBAC.h FT_CORBAC.inl FT_CORBAS.cpp FT_CORBAS.h FT_CORBAS.inl: FT_CORBA-stamp +FT_CORBAC.cpp FT_CORBAC.h FT_CORBAC.inl FT_CORBAS.cpp FT_CORBAS.h FT_CORBAS.inl FT_CORBAS_T.cpp FT_CORBAS_T.inl: FT_CORBA-stamp FT_CORBA-stamp: $(srcdir)/FT_CORBA.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_CORBA.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_CORBA.idl @touch $@ BUILT_SOURCES += \ @@ -4491,7 +4790,9 @@ BUILT_SOURCES += \ FT_ReplicaC.inl \ FT_ReplicaS.cpp \ FT_ReplicaS.h \ - FT_ReplicaS.inl + FT_ReplicaS.inl \ + FT_ReplicaS_T.cpp \ + FT_ReplicaS_T.inl CLEANFILES += \ FT_Replica-stamp \ @@ -4500,12 +4801,14 @@ CLEANFILES += \ FT_ReplicaC.inl \ FT_ReplicaS.cpp \ FT_ReplicaS.h \ - FT_ReplicaS.inl + FT_ReplicaS.inl \ + FT_ReplicaS_T.cpp \ + FT_ReplicaS_T.inl -FT_ReplicaC.cpp FT_ReplicaC.h FT_ReplicaC.inl FT_ReplicaS.cpp FT_ReplicaS.h FT_ReplicaS.inl: FT_Replica-stamp +FT_ReplicaC.cpp FT_ReplicaC.h FT_ReplicaC.inl FT_ReplicaS.cpp FT_ReplicaS.h FT_ReplicaS.inl FT_ReplicaS_T.cpp FT_ReplicaS_T.inl: FT_Replica-stamp FT_Replica-stamp: $(srcdir)/FT_Replica.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Replica.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Replica.idl @touch $@ BUILT_SOURCES += \ @@ -4514,7 +4817,9 @@ BUILT_SOURCES += \ FT_NotifierC.inl \ FT_NotifierS.cpp \ FT_NotifierS.h \ - FT_NotifierS.inl + FT_NotifierS.inl \ + FT_NotifierS_T.cpp \ + FT_NotifierS_T.inl CLEANFILES += \ FT_Notifier-stamp \ @@ -4523,12 +4828,14 @@ CLEANFILES += \ FT_NotifierC.inl \ FT_NotifierS.cpp \ FT_NotifierS.h \ - FT_NotifierS.inl + FT_NotifierS.inl \ + FT_NotifierS_T.cpp \ + FT_NotifierS_T.inl -FT_NotifierC.cpp FT_NotifierC.h FT_NotifierC.inl FT_NotifierS.cpp FT_NotifierS.h FT_NotifierS.inl: FT_Notifier-stamp +FT_NotifierC.cpp FT_NotifierC.h FT_NotifierC.inl FT_NotifierS.cpp FT_NotifierS.h FT_NotifierS.inl FT_NotifierS_T.cpp FT_NotifierS_T.inl: FT_Notifier-stamp FT_Notifier-stamp: $(srcdir)/FT_Notifier.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Notifier.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Notifier.idl @touch $@ BUILT_SOURCES += \ @@ -4537,7 +4844,9 @@ BUILT_SOURCES += \ FT_FaultDetectorFactoryC.inl \ FT_FaultDetectorFactoryS.cpp \ FT_FaultDetectorFactoryS.h \ - FT_FaultDetectorFactoryS.inl + FT_FaultDetectorFactoryS.inl \ + FT_FaultDetectorFactoryS_T.cpp \ + FT_FaultDetectorFactoryS_T.inl CLEANFILES += \ FT_FaultDetectorFactory-stamp \ @@ -4546,12 +4855,14 @@ CLEANFILES += \ FT_FaultDetectorFactoryC.inl \ FT_FaultDetectorFactoryS.cpp \ FT_FaultDetectorFactoryS.h \ - FT_FaultDetectorFactoryS.inl + FT_FaultDetectorFactoryS.inl \ + FT_FaultDetectorFactoryS_T.cpp \ + FT_FaultDetectorFactoryS_T.inl -FT_FaultDetectorFactoryC.cpp FT_FaultDetectorFactoryC.h FT_FaultDetectorFactoryC.inl FT_FaultDetectorFactoryS.cpp FT_FaultDetectorFactoryS.h FT_FaultDetectorFactoryS.inl: FT_FaultDetectorFactory-stamp +FT_FaultDetectorFactoryC.cpp FT_FaultDetectorFactoryC.h FT_FaultDetectorFactoryC.inl FT_FaultDetectorFactoryS.cpp FT_FaultDetectorFactoryS.h FT_FaultDetectorFactoryS.inl FT_FaultDetectorFactoryS_T.cpp FT_FaultDetectorFactoryS_T.inl: FT_FaultDetectorFactory-stamp FT_FaultDetectorFactory-stamp: $(srcdir)/FT_FaultDetectorFactory.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_FaultDetectorFactory.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_FaultDetectorFactory.idl @touch $@ BUILT_SOURCES += \ @@ -4560,7 +4871,9 @@ BUILT_SOURCES += \ FT_ReplicationManagerC.inl \ FT_ReplicationManagerS.cpp \ FT_ReplicationManagerS.h \ - FT_ReplicationManagerS.inl + FT_ReplicationManagerS.inl \ + FT_ReplicationManagerS_T.cpp \ + FT_ReplicationManagerS_T.inl CLEANFILES += \ FT_ReplicationManager-stamp \ @@ -4569,12 +4882,14 @@ CLEANFILES += \ FT_ReplicationManagerC.inl \ FT_ReplicationManagerS.cpp \ FT_ReplicationManagerS.h \ - FT_ReplicationManagerS.inl + FT_ReplicationManagerS.inl \ + FT_ReplicationManagerS_T.cpp \ + FT_ReplicationManagerS_T.inl -FT_ReplicationManagerC.cpp FT_ReplicationManagerC.h FT_ReplicationManagerC.inl FT_ReplicationManagerS.cpp FT_ReplicationManagerS.h FT_ReplicationManagerS.inl: FT_ReplicationManager-stamp +FT_ReplicationManagerC.cpp FT_ReplicationManagerC.h FT_ReplicationManagerC.inl FT_ReplicationManagerS.cpp FT_ReplicationManagerS.h FT_ReplicationManagerS.inl FT_ReplicationManagerS_T.cpp FT_ReplicationManagerS_T.inl: FT_ReplicationManager-stamp FT_ReplicationManager-stamp: $(srcdir)/FT_ReplicationManager.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_ReplicationManager.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_ReplicationManager.idl @touch $@ lib_LTLIBRARIES += libTAO_FaultTolerance.la @@ -4629,26 +4944,36 @@ nobase_include_HEADERS += \ FT_CORBAC.inl \ FT_CORBAS.h \ FT_CORBAS.inl \ + FT_CORBAS_T.cpp \ + FT_CORBAS_T.inl \ FT_FaultDetectorFactory.idl \ FT_FaultDetectorFactoryC.h \ FT_FaultDetectorFactoryC.inl \ FT_FaultDetectorFactoryS.h \ FT_FaultDetectorFactoryS.inl \ + FT_FaultDetectorFactoryS_T.cpp \ + FT_FaultDetectorFactoryS_T.inl \ FT_Notifier.idl \ FT_NotifierC.h \ FT_NotifierC.inl \ FT_NotifierS.h \ FT_NotifierS.inl \ + FT_NotifierS_T.cpp \ + FT_NotifierS_T.inl \ FT_Replica.idl \ FT_ReplicaC.h \ FT_ReplicaC.inl \ FT_ReplicaS.h \ FT_ReplicaS.inl \ + FT_ReplicaS_T.cpp \ + FT_ReplicaS_T.inl \ FT_ReplicationManager.idl \ FT_ReplicationManagerC.h \ FT_ReplicationManagerC.inl \ FT_ReplicationManagerS.h \ FT_ReplicationManagerS.inl \ + FT_ReplicationManagerS_T.cpp \ + FT_ReplicationManagerS_T.inl \ FaultTolerance/fault_tol_export.h pkgconfig_DATA += \ @@ -4692,7 +5017,7 @@ CLEANFILES += \ HTIOPC.cpp HTIOPC.h HTIOPC.inl HTIOPS.h: HTIOP-stamp HTIOP-stamp: $(srcdir)/HTIOP.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=HTIOP_Export -Wb,export_include=orbsvcs/HTIOP/HTIOP_Export.h -SS $(srcdir)/HTIOP.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=HTIOP_Export -Wb,export_include=orbsvcs/HTIOP/HTIOP_Export.h -SS $(srcdir)/HTIOP.idl @touch $@ BUILT_SOURCES += \ @@ -4709,7 +5034,7 @@ CLEANFILES += \ HTIOP/htiop_endpointsC.cpp HTIOP/htiop_endpointsC.h HTIOP/htiop_endpointsS.h: HTIOP/htiop_endpoints-stamp HTIOP/htiop_endpoints-stamp: $(srcdir)/HTIOP/htiop_endpoints.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=HTIOP_Export -Wb,export_include=orbsvcs/HTIOP/HTIOP_Export.h -SS -Sci -Gp -Gd -Ge 1 -Sa -Sorb -o HTIOP $(srcdir)/HTIOP/htiop_endpoints.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=HTIOP_Export -Wb,export_include=orbsvcs/HTIOP/HTIOP_Export.h -SS -Sci -Gp -Gd -Ge 1 -Sa -Sorb -o HTIOP $(srcdir)/HTIOP/htiop_endpoints.pidl @touch $@ lib_LTLIBRARIES += libTAO_HTIOP.la @@ -4994,7 +5319,10 @@ BUILT_SOURCES += \ RTEventLogAdminC.inl \ RTEventLogAdminS.cpp \ RTEventLogAdminS.h \ - RTEventLogAdminS.inl + RTEventLogAdminS.inl \ + RTEventLogAdminS_T.cpp \ + RTEventLogAdminS_T.h \ + RTEventLogAdminS_T.inl CLEANFILES += \ RTEventLogAdmin-stamp \ @@ -5003,12 +5331,15 @@ CLEANFILES += \ RTEventLogAdminC.inl \ RTEventLogAdminS.cpp \ RTEventLogAdminS.h \ - RTEventLogAdminS.inl + RTEventLogAdminS.inl \ + RTEventLogAdminS_T.cpp \ + RTEventLogAdminS_T.h \ + RTEventLogAdminS_T.inl -RTEventLogAdminC.cpp RTEventLogAdminC.h RTEventLogAdminC.inl RTEventLogAdminS.cpp RTEventLogAdminS.h RTEventLogAdminS.inl: RTEventLogAdmin-stamp +RTEventLogAdminC.cpp RTEventLogAdminC.h RTEventLogAdminC.inl RTEventLogAdminS.cpp RTEventLogAdminS.h RTEventLogAdminS.inl RTEventLogAdminS_T.cpp RTEventLogAdminS_T.h RTEventLogAdminS_T.inl: RTEventLogAdmin-stamp RTEventLogAdmin-stamp: $(srcdir)/RTEventLogAdmin.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEventLog_Export -Wb,stub_export_include=orbsvcs/Log/rteventlog_export.h -Wb,skel_export_macro=TAO_RTEventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/rteventlog_skel_export.h $(srcdir)/RTEventLogAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEventLog_Export -Wb,stub_export_include=orbsvcs/Log/rteventlog_export.h -Wb,skel_export_macro=TAO_RTEventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/rteventlog_skel_export.h $(srcdir)/RTEventLogAdmin.idl @touch $@ @@ -5084,7 +5415,10 @@ BUILT_SOURCES += \ RtecSchedulerC.inl \ RtecSchedulerS.cpp \ RtecSchedulerS.h \ - RtecSchedulerS.inl + RtecSchedulerS.inl \ + RtecSchedulerS_T.cpp \ + RtecSchedulerS_T.h \ + RtecSchedulerS_T.inl CLEANFILES += \ RtecScheduler-stamp \ @@ -5093,12 +5427,15 @@ CLEANFILES += \ RtecSchedulerC.inl \ RtecSchedulerS.cpp \ RtecSchedulerS.h \ - RtecSchedulerS.inl + RtecSchedulerS.inl \ + RtecSchedulerS_T.cpp \ + RtecSchedulerS_T.h \ + RtecSchedulerS_T.inl -RtecSchedulerC.cpp RtecSchedulerC.h RtecSchedulerC.inl RtecSchedulerS.cpp RtecSchedulerS.h RtecSchedulerS.inl: RtecScheduler-stamp +RtecSchedulerC.cpp RtecSchedulerC.h RtecSchedulerC.inl RtecSchedulerS.cpp RtecSchedulerS.h RtecSchedulerS.inl RtecSchedulerS_T.cpp RtecSchedulerS_T.h RtecSchedulerS_T.inl: RtecScheduler-stamp RtecScheduler-stamp: $(srcdir)/RtecScheduler.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=orbsvcs/Sched/sched_export.h $(srcdir)/RtecScheduler.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=orbsvcs/Sched/sched_export.h $(srcdir)/RtecScheduler.idl @touch $@ lib_LTLIBRARIES += libTAO_RTSched.la @@ -5143,6 +5480,9 @@ nobase_include_HEADERS += \ RtecSchedulerC.inl \ RtecSchedulerS.h \ RtecSchedulerS.inl \ + RtecSchedulerS_T.cpp \ + RtecSchedulerS_T.h \ + RtecSchedulerS_T.inl \ Runtime_Scheduler.h \ Sched/Config_Scheduler.h \ Sched/DynSched.h \ @@ -5206,7 +5546,10 @@ libTAO_RTEventLogAdmin_Skel_la_LIBADD = \ nobase_include_HEADERS += \ Log/rteventlog_skel_export.h \ RTEventLogAdminS.h \ - RTEventLogAdminS.inl + RTEventLogAdminS.inl \ + RTEventLogAdminS_T.cpp \ + RTEventLogAdminS_T.h \ + RTEventLogAdminS_T.inl pkgconfig_DATA += \ TAO_RTEventLogAdmin_Skel.pc @@ -5493,57 +5836,63 @@ BUILT_SOURCES += \ CSIC.cpp \ CSIC.h \ CSIC.inl \ - CSIS.inl + CSIS.inl \ + CSIS_T.inl CLEANFILES += \ CSI-stamp \ CSIC.cpp \ CSIC.h \ CSIC.inl \ - CSIS.inl + CSIS.inl \ + CSIS_T.inl -CSIC.cpp CSIC.h CSIC.inl CSIS.inl: CSI-stamp +CSIC.cpp CSIC.h CSIC.inl CSIS.inl CSIS_T.inl: CSI-stamp CSI-stamp: $(srcdir)/CSI.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSI.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSI.idl @touch $@ BUILT_SOURCES += \ CSIIOPC.cpp \ CSIIOPC.h \ CSIIOPC.inl \ - CSIIOPS.inl + CSIIOPS.inl \ + CSIIOPS_T.inl CLEANFILES += \ CSIIOP-stamp \ CSIIOPC.cpp \ CSIIOPC.h \ CSIIOPC.inl \ - CSIIOPS.inl + CSIIOPS.inl \ + CSIIOPS_T.inl -CSIIOPC.cpp CSIIOPC.h CSIIOPC.inl CSIIOPS.inl: CSIIOP-stamp +CSIIOPC.cpp CSIIOPC.h CSIIOPC.inl CSIIOPS.inl CSIIOPS_T.inl: CSIIOP-stamp CSIIOP-stamp: $(srcdir)/CSIIOP.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSIIOP.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSIIOP.idl @touch $@ BUILT_SOURCES += \ GSSUPC.cpp \ GSSUPC.h \ GSSUPC.inl \ - GSSUPS.inl + GSSUPS.inl \ + GSSUPS_T.inl CLEANFILES += \ GSSUP-stamp \ GSSUPC.cpp \ GSSUPC.h \ GSSUPC.inl \ - GSSUPS.inl + GSSUPS.inl \ + GSSUPS_T.inl -GSSUPC.cpp GSSUPC.h GSSUPC.inl GSSUPS.inl: GSSUP-stamp +GSSUPC.cpp GSSUPC.h GSSUPC.inl GSSUPS.inl GSSUPS_T.inl: GSSUP-stamp GSSUP-stamp: $(srcdir)/GSSUP.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/GSSUP.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/GSSUP.idl @touch $@ BUILT_SOURCES += \ @@ -5552,7 +5901,9 @@ BUILT_SOURCES += \ SecurityC.inl \ SecurityS.cpp \ SecurityS.h \ - SecurityS.inl + SecurityS.inl \ + SecurityS_T.cpp \ + SecurityS_T.inl CLEANFILES += \ Security-stamp \ @@ -5561,12 +5912,14 @@ CLEANFILES += \ SecurityC.inl \ SecurityS.cpp \ SecurityS.h \ - SecurityS.inl + SecurityS.inl \ + SecurityS_T.cpp \ + SecurityS_T.inl -SecurityC.cpp SecurityC.h SecurityC.inl SecurityS.cpp SecurityS.h SecurityS.inl: Security-stamp +SecurityC.cpp SecurityC.h SecurityC.inl SecurityS.cpp SecurityS.h SecurityS.inl SecurityS_T.cpp SecurityS_T.inl: Security-stamp Security-stamp: $(srcdir)/Security.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/Security.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/Security.idl @touch $@ BUILT_SOURCES += \ @@ -5575,7 +5928,9 @@ BUILT_SOURCES += \ SecurityLevel1C.inl \ SecurityLevel1S.cpp \ SecurityLevel1S.h \ - SecurityLevel1S.inl + SecurityLevel1S.inl \ + SecurityLevel1S_T.cpp \ + SecurityLevel1S_T.inl CLEANFILES += \ SecurityLevel1-stamp \ @@ -5584,12 +5939,14 @@ CLEANFILES += \ SecurityLevel1C.inl \ SecurityLevel1S.cpp \ SecurityLevel1S.h \ - SecurityLevel1S.inl + SecurityLevel1S.inl \ + SecurityLevel1S_T.cpp \ + SecurityLevel1S_T.inl -SecurityLevel1C.cpp SecurityLevel1C.h SecurityLevel1C.inl SecurityLevel1S.cpp SecurityLevel1S.h SecurityLevel1S.inl: SecurityLevel1-stamp +SecurityLevel1C.cpp SecurityLevel1C.h SecurityLevel1C.inl SecurityLevel1S.cpp SecurityLevel1S.h SecurityLevel1S.inl SecurityLevel1S_T.cpp SecurityLevel1S_T.inl: SecurityLevel1-stamp SecurityLevel1-stamp: $(srcdir)/SecurityLevel1.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel1.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel1.idl @touch $@ BUILT_SOURCES += \ @@ -5598,7 +5955,9 @@ BUILT_SOURCES += \ SecurityLevel2C.inl \ SecurityLevel2S.cpp \ SecurityLevel2S.h \ - SecurityLevel2S.inl + SecurityLevel2S.inl \ + SecurityLevel2S_T.cpp \ + SecurityLevel2S_T.inl CLEANFILES += \ SecurityLevel2-stamp \ @@ -5607,31 +5966,35 @@ CLEANFILES += \ SecurityLevel2C.inl \ SecurityLevel2S.cpp \ SecurityLevel2S.h \ - SecurityLevel2S.inl + SecurityLevel2S.inl \ + SecurityLevel2S_T.cpp \ + SecurityLevel2S_T.inl -SecurityLevel2C.cpp SecurityLevel2C.h SecurityLevel2C.inl SecurityLevel2S.cpp SecurityLevel2S.h SecurityLevel2S.inl: SecurityLevel2-stamp +SecurityLevel2C.cpp SecurityLevel2C.h SecurityLevel2C.inl SecurityLevel2S.cpp SecurityLevel2S.h SecurityLevel2S.inl SecurityLevel2S_T.cpp SecurityLevel2S_T.inl: SecurityLevel2-stamp SecurityLevel2-stamp: $(srcdir)/SecurityLevel2.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel2.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel2.idl @touch $@ BUILT_SOURCES += \ SecurityLevel3C.cpp \ SecurityLevel3C.h \ SecurityLevel3C.inl \ - SecurityLevel3S.inl + SecurityLevel3S.inl \ + SecurityLevel3S_T.inl CLEANFILES += \ SecurityLevel3-stamp \ SecurityLevel3C.cpp \ SecurityLevel3C.h \ SecurityLevel3C.inl \ - SecurityLevel3S.inl + SecurityLevel3S.inl \ + SecurityLevel3S_T.inl -SecurityLevel3C.cpp SecurityLevel3C.h SecurityLevel3C.inl SecurityLevel3S.inl: SecurityLevel3-stamp +SecurityLevel3C.cpp SecurityLevel3C.h SecurityLevel3C.inl SecurityLevel3S.inl SecurityLevel3S_T.inl: SecurityLevel3-stamp SecurityLevel3-stamp: $(srcdir)/SecurityLevel3.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel3.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel3.idl @touch $@ lib_LTLIBRARIES += libTAO_Security.la @@ -5692,11 +6055,14 @@ nobase_include_HEADERS += \ CSIIOPC.h \ CSIIOPC.inl \ CSIIOPS.inl \ + CSIIOPS_T.inl \ CSIS.inl \ + CSIS_T.inl \ GSSUP.idl \ GSSUPC.h \ GSSUPC.inl \ GSSUPS.inl \ + GSSUPS_T.inl \ Security.idl \ Security/CSI_Utils.h \ Security/SL2_EstablishTrustPolicy.h \ @@ -5723,17 +6089,24 @@ nobase_include_HEADERS += \ SecurityLevel1C.inl \ SecurityLevel1S.h \ SecurityLevel1S.inl \ + SecurityLevel1S_T.cpp \ + SecurityLevel1S_T.inl \ SecurityLevel2.idl \ SecurityLevel2C.h \ SecurityLevel2C.inl \ SecurityLevel2S.h \ SecurityLevel2S.inl \ + SecurityLevel2S_T.cpp \ + SecurityLevel2S_T.inl \ SecurityLevel3.idl \ SecurityLevel3C.h \ SecurityLevel3C.inl \ SecurityLevel3S.inl \ + SecurityLevel3S_T.inl \ SecurityS.h \ - SecurityS.inl + SecurityS.inl \ + SecurityS_T.cpp \ + SecurityS_T.inl endif BUILD_INTERCEPTORS endif BUILD_EXCEPTIONS @@ -5766,7 +6139,7 @@ CLEANFILES += \ SSLIOPC.cpp SSLIOPC.h SSLIOPC.inl SSLIOPS.h: SSLIOP-stamp SSLIOP-stamp: $(srcdir)/SSLIOP.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h -SS $(srcdir)/SSLIOP.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h -SS $(srcdir)/SSLIOP.idl @touch $@ BUILT_SOURCES += \ @@ -5783,7 +6156,7 @@ CLEANFILES += \ SSLIOP/ssl_endpointsC.cpp SSLIOP/ssl_endpointsC.h SSLIOP/ssl_endpointsS.h: SSLIOP/ssl_endpoints-stamp SSLIOP/ssl_endpoints-stamp: $(srcdir)/SSLIOP/ssl_endpoints.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h -SS -Sci -Gp -Gd -Ge 1 -Sa -Sorb -o SSLIOP $(srcdir)/SSLIOP/ssl_endpoints.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h -SS -Sci -Gp -Gd -Ge 1 -Sa -Sorb -o SSLIOP $(srcdir)/SSLIOP/ssl_endpoints.pidl @touch $@ lib_LTLIBRARIES += libTAO_SSLIOP.la diff --git a/TAO/orbsvcs/orbsvcs/RTEvent.mpc b/TAO/orbsvcs/orbsvcs/RTEvent.mpc index f69a0dbe774..f1dd98291a5 100644 --- a/TAO/orbsvcs/orbsvcs/RTEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTEvent.mpc @@ -3,7 +3,7 @@ project(RTEvent) : orbsvcslib, core, svc_utils, tao_versioning_idl_defaults { sharedname = TAO_RTEvent - idlflags += -GT -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h + idlflags += -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h dynamicflags = TAO_RTEVENT_BUILD_DLL tagchecks += RTEvent diff --git a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc index 7e767cdd80f..5ecee5826dd 100644 --- a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc @@ -58,14 +58,17 @@ project(RTEventLogAdmin_Skel) : orbsvcslib, core, rteventlogadmin, dslogadmin_sk Header_Files { RTEventLogAdminS.h + RTEventLogAdminS_T.h Log/rteventlog_skel_export.h } Inline_Files { RTEventLogAdminS.inl + RTEventLogAdminS_T.inl } Template_Files { + RTEventLogAdminS_T.cpp } Pkgconfig_Files { diff --git a/TAO/orbsvcs/orbsvcs/ec_typed_events_skel.mpb b/TAO/orbsvcs/orbsvcs/ec_typed_events_skel.mpb index b5316d32dab..1b0832a570b 100644 --- a/TAO/orbsvcs/orbsvcs/ec_typed_events_skel.mpb +++ b/TAO/orbsvcs/orbsvcs/ec_typed_events_skel.mpb @@ -20,6 +20,9 @@ feature(ec_typed_events) { Inline_Files { CosTypedEventCommS.inl CosTypedEventChannelAdminS.inl + + CosTypedEventCommS_T.inl + CosTypedEventChannelAdminS_T.inl } Template_Files { diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc index 1ae76ad9d3e..beaad418d56 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc @@ -9,7 +9,7 @@ project(*Performance_IDL): loadbalancing, strategies { project(*Performance_Server): loadbalancing, pi_server, strategies { after += *Performance_IDL - avoids += ace_for_tao + Source_Files { server.cpp Roundtrip.cpp @@ -26,7 +26,7 @@ project(*Performance_Server): loadbalancing, pi_server, strategies { project(*Performance_Client): loadbalancing, strategies { after += *Performance_IDL - avoids += ace_for_tao + Source_Files { TestC.cpp client.cpp diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am index 61e35c2cd04..185294e39ea 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am @@ -23,6 +23,7 @@ noinst_PROGRAMS = if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO BUILT_SOURCES = \ TestC.cpp \ @@ -30,7 +31,10 @@ BUILT_SOURCES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl + TestS.inl \ + TestS_T.cpp \ + TestS_T.h \ + TestS_T.inl CLEANFILES = \ Test-stamp \ @@ -39,18 +43,22 @@ CLEANFILES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl + TestS.inl \ + TestS_T.cpp \ + TestS_T.h \ + TestS_T.inl -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/Test.idl @touch $@ noinst_HEADERS = \ Test.idl +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am index da600689ce1..f1dde6bf6fc 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am @@ -31,7 +31,10 @@ BUILT_SOURCES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl + TestS.inl \ + TestS_T.cpp \ + TestS_T.h \ + TestS_T.inl CLEANFILES = \ Test-stamp \ @@ -40,12 +43,15 @@ CLEANFILES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl + TestS.inl \ + TestS_T.cpp \ + TestS_T.h \ + TestS_T.inl -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/Test.idl @touch $@ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am index 0696fdb5845..579cda5cb6a 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am @@ -31,7 +31,10 @@ BUILT_SOURCES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl + TestS.inl \ + TestS_T.cpp \ + TestS_T.h \ + TestS_T.inl CLEANFILES = \ Test-stamp \ @@ -40,12 +43,15 @@ CLEANFILES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl + TestS.inl \ + TestS_T.cpp \ + TestS_T.h \ + TestS_T.inl -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/Test.idl @touch $@ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am index 112eb29e3d3..cb72a401638 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am @@ -30,7 +30,10 @@ BUILT_SOURCES = \ Federated_TestC.inl \ Federated_TestS.cpp \ Federated_TestS.h \ - Federated_TestS.inl + Federated_TestS.inl \ + Federated_TestS_T.cpp \ + Federated_TestS_T.h \ + Federated_TestS_T.inl CLEANFILES = \ Federated_Test-stamp \ @@ -39,12 +42,15 @@ CLEANFILES = \ Federated_TestC.inl \ Federated_TestS.cpp \ Federated_TestS.h \ - Federated_TestS.inl + Federated_TestS.inl \ + Federated_TestS_T.cpp \ + Federated_TestS_T.h \ + Federated_TestS_T.inl -Federated_TestC.cpp Federated_TestC.h Federated_TestC.inl Federated_TestS.cpp Federated_TestS.h Federated_TestS.inl: Federated_Test-stamp +Federated_TestC.cpp Federated_TestC.h Federated_TestC.inl Federated_TestS.cpp Federated_TestS.h Federated_TestS.inl Federated_TestS_T.cpp Federated_TestS_T.h Federated_TestS_T.inl: Federated_Test-stamp Federated_Test-stamp: $(srcdir)/Federated_Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_RTEC_Perf_Export -Wb,export_include=rtec_perf_export.h $(srcdir)/Federated_Test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,export_macro=TAO_RTEC_Perf_Export -Wb,export_include=rtec_perf_export.h $(srcdir)/Federated_Test.idl @touch $@ noinst_LTLIBRARIES = libTAO_RTEC_Perf.la @@ -107,6 +113,9 @@ noinst_HEADERS = \ Federated_TestC.inl \ Federated_TestS.h \ Federated_TestS.inl \ + Federated_TestS_T.cpp \ + Federated_TestS_T.h \ + Federated_TestS_T.inl \ Implicit_Deactivator.h \ Implicit_Deactivator.inl \ Loopback.h \ diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am b/TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am index 01ff3e4365d..2e8d0086aa8 100644 --- a/TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am +++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am @@ -27,7 +27,10 @@ BUILT_SOURCES = \ TimeModuleC.inl \ TimeModuleS.cpp \ TimeModuleS.h \ - TimeModuleS.inl + TimeModuleS.inl \ + TimeModuleS_T.cpp \ + TimeModuleS_T.h \ + TimeModuleS_T.inl CLEANFILES = \ TimeModule-stamp \ @@ -36,12 +39,15 @@ CLEANFILES = \ TimeModuleC.inl \ TimeModuleS.cpp \ TimeModuleS.h \ - TimeModuleS.inl + TimeModuleS.inl \ + TimeModuleS_T.cpp \ + TimeModuleS_T.h \ + TimeModuleS_T.inl -TimeModuleC.cpp TimeModuleC.h TimeModuleC.inl TimeModuleS.cpp TimeModuleS.h TimeModuleS.inl: TimeModule-stamp +TimeModuleC.cpp TimeModuleC.h TimeModuleC.inl TimeModuleS.cpp TimeModuleS.h TimeModuleS.inl TimeModuleS_T.cpp TimeModuleS_T.h TimeModuleS_T.inl: TimeModule-stamp TimeModule-stamp: $(srcdir)/TimeModule.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/TimeModule.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/TimeModule.idl @touch $@ noinst_PROGRAMS = TimeServer @@ -61,7 +67,9 @@ TimeServer_SOURCES = \ TimeModuleC.h \ TimeModuleC.inl \ TimeModuleS.h \ - TimeModuleS.inl + TimeModuleS.inl \ + TimeModuleS_T.h \ + TimeModuleS_T.inl TimeServer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ diff --git a/TAO/orbsvcs/tests/Bug_2137_Regression/Bug_2137_Regression.mpc b/TAO/orbsvcs/tests/Bug_2137_Regression/Bug_2137_Regression.mpc index b357718f9d3..b357718f9d3 100644..100755 --- a/TAO/orbsvcs/tests/Bug_2137_Regression/Bug_2137_Regression.mpc +++ b/TAO/orbsvcs/tests/Bug_2137_Regression/Bug_2137_Regression.mpc diff --git a/TAO/orbsvcs/tests/Bug_2137_Regression/README b/TAO/orbsvcs/tests/Bug_2137_Regression/README index 67181578d9e..67181578d9e 100644..100755 --- a/TAO/orbsvcs/tests/Bug_2137_Regression/README +++ b/TAO/orbsvcs/tests/Bug_2137_Regression/README diff --git a/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp index 46148e21dee..46148e21dee 100644..100755 --- a/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc b/TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc index cfeafb2ed12..cfeafb2ed12 100644..100755 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h b/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h index 50efe0c1099..50efe0c1099 100644..100755 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp index 74d54ebda92..74d54ebda92 100644..100755 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h index 81760e158f4..81760e158f4 100644..100755 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/README b/TAO/orbsvcs/tests/Bug_2247_Regression/README index b2cda70e18d..b2cda70e18d 100644..100755 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/README +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/README diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp index d597ec0d27d..d597ec0d27d 100644..100755 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/test.idl b/TAO/orbsvcs/tests/Bug_2247_Regression/test.idl index ecca7fffd42..ecca7fffd42 100644..100755 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/test.idl +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/test.idl diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp index 6264149b61e..6264149b61e 100644..100755 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h index f00ae655410..f00ae655410 100644..100755 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc b/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc index ce7afec6555..ce7afec6555 100644..100755 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h b/TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h index b4eb64b13e5..b4eb64b13e5 100644..100755 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/README b/TAO/orbsvcs/tests/Bug_2248_Regression/README index 20a95c0bb35..20a95c0bb35 100644..100755 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/README +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/README diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp index 8a557179c7c..8a557179c7c 100644..100755 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h index 5c8103cd14f..5c8103cd14f 100644..100755 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp index 69617231383..69617231383 100644..100755 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h index c9a8151677a..c9a8151677a 100644..100755 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp index 0d6a828940b..0d6a828940b 100644..100755 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.h b/TAO/orbsvcs/tests/Bug_2248_Regression/client.h index 1bf9b049712..1bf9b049712 100644..100755 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.h +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.h diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp index 60f306ac782..60f306ac782 100644..100755 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/test.idl b/TAO/orbsvcs/tests/Bug_2248_Regression/test.idl index f1ba468adb1..f1ba468adb1 100644..100755 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/test.idl +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/test.idl diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp index c3cc5424921..c3cc5424921 100644..100755 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h index 09da165bd14..09da165bd14 100644..100755 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/tests.idl b/TAO/orbsvcs/tests/Bug_2248_Regression/tests.idl index a1be42b8619..a1be42b8619 100644..100755 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/tests.idl +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/tests.idl diff --git a/TAO/orbsvcs/tests/Bug_2377_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2377_Regression/Makefile.am index 06f10909d11..cc54d21323c 100644 --- a/TAO/orbsvcs/tests/Bug_2377_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_2377_Regression/Makefile.am @@ -28,7 +28,10 @@ BUILT_SOURCES = \ HelloC.inl \ HelloS.cpp \ HelloS.h \ - HelloS.inl + HelloS.inl \ + HelloS_T.cpp \ + HelloS_T.h \ + HelloS_T.inl CLEANFILES = \ Hello-stamp \ @@ -37,12 +40,15 @@ CLEANFILES = \ HelloC.inl \ HelloS.cpp \ HelloS.h \ - HelloS.inl + HelloS.inl \ + HelloS_T.cpp \ + HelloS_T.h \ + HelloS_T.inl -HelloC.cpp HelloC.h HelloC.inl HelloS.cpp HelloS.h HelloS.inl: Hello-stamp +HelloC.cpp HelloC.h HelloC.inl HelloS.cpp HelloS.h HelloS.inl HelloS_T.cpp HelloS_T.h HelloS_T.inl: Hello-stamp Hello-stamp: $(srcdir)/Hello.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Hello.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/Hello.idl @touch $@ noinst_PROGRAMS = uipmc_test @@ -62,7 +68,9 @@ uipmc_test_SOURCES = \ HelloC.h \ HelloC.inl \ HelloS.h \ - HelloS.inl + HelloS.inl \ + HelloS_T.h \ + HelloS_T.inl uipmc_test_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2615_Regression/Makefile.am deleted file mode 100644 index 980d96d2d7a..00000000000 --- a/TAO/orbsvcs/tests/Bug_2615_Regression/Makefile.am +++ /dev/null @@ -1,153 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Bug_2615_Regression_IDL.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - - -noinst_HEADERS = \ - Test.idl - -## Makefile.Bug_2615_Regression_Client.am - -if BUILD_ACE_UUID -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs - -client_SOURCES = \ - TestC.cpp \ - client.cpp \ - Hello.h \ - ServerORBInitializer2.h \ - ServerRequest_Interceptor2.h - -client_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_ACE_UUID - -## Makefile.Bug_2615_Regression_Server.am - -if BUILD_ACE_UUID -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs - -server_SOURCES = \ - Hello.cpp \ - ServerORBInitializer2.cpp \ - ServerRequest_Interceptor2.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h \ - ServerORBInitializer2.h \ - ServerRequest_Interceptor2.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_ACE_UUID - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am index 154be214702..614a67934e4 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am @@ -29,7 +29,10 @@ BUILT_SOURCES = \ dataC.inl \ dataS.cpp \ dataS.h \ - dataS.inl + dataS.inl \ + dataS_T.cpp \ + dataS_T.h \ + dataS_T.inl CLEANFILES = \ data-stamp \ @@ -38,12 +41,15 @@ CLEANFILES = \ dataC.inl \ dataS.cpp \ dataS.h \ - dataS.inl + dataS.inl \ + dataS_T.cpp \ + dataS_T.h \ + dataS_T.inl -dataC.cpp dataC.h dataC.inl dataS.cpp dataS.h dataS.inl: data-stamp +dataC.cpp dataC.h dataC.inl dataS.cpp dataS.h dataS.inl dataS_T.cpp dataS_T.h dataS_T.inl: data-stamp data-stamp: $(srcdir)/data.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/data.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/data.idl @touch $@ diff --git a/TAO/orbsvcs/tests/Event/Makefile.am b/TAO/orbsvcs/tests/Event/Makefile.am index 7663a0d02bd..547cb9d11b8 100644 --- a/TAO/orbsvcs/tests/Event/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Makefile.am @@ -11,8 +11,9 @@ SUBDIRS = \ Mcast \ ThreadFlags \ - UDP \ lib \ Performance \ Basic +# SUBDIRS += \ +# UDP diff --git a/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp b/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp index 42a1a23e8db..efdc33730e2 100644 --- a/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp +++ b/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp @@ -102,7 +102,7 @@ Consumer::push (const RtecEventComm::EventSet& events if (this->valuetype_) { - Hello::ValueTypeData * test_data = 0; + ValueTypeData * test_data = 0; if (events[i].data.any_value >>= test_data) { ACE_DEBUG ((LM_DEBUG, "Consumer (%P|%t): Received message <%d>: %s\n", diff --git a/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp b/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp index 8cdb64a3ca5..9a1888df558 100644 --- a/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp +++ b/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp @@ -4,6 +4,8 @@ #include "orbsvcs/RtecEventChannelAdminS.h" #include "orbsvcs/Event_Service_Constants.h" +#include "TestC.h" + ACE_RCSID (EC_Examples, Supplier, "$Id$") @@ -65,12 +67,6 @@ Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL) } void -Supplier::insert_into_any (CORBA::Any& any, Components::EventBase* vb) -{ - any <<= vb; -} - -void Supplier::perform_push (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY @@ -87,10 +83,10 @@ Supplier::perform_push (ACE_ENV_SINGLE_ARG_DECL) if (this->valuetype_) { - OBV_Hello::ValueTypeData * test_data = 0; - ACE_NEW (test_data, OBV_Hello::ValueTypeData ()); + OBV_ValueTypeData * test_data = 0; + ACE_NEW (test_data, OBV_ValueTypeData ()); test_data->data ("ACE/TAO/CIAO"); - insert_into_any (event[0].data.any_value, test_data); + event[0].data.any_value <<= test_data; } else { diff --git a/TAO/orbsvcs/tests/Event/UDP/Supplier.h b/TAO/orbsvcs/tests/Event/UDP/Supplier.h index 6f8b9b1310b..eae15e57257 100644 --- a/TAO/orbsvcs/tests/Event/UDP/Supplier.h +++ b/TAO/orbsvcs/tests/Event/UDP/Supplier.h @@ -19,7 +19,6 @@ #include "orbsvcs/RtecEventCommS.h" #include "orbsvcs/RtecEventChannelAdminC.h" -#include "TestC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -56,8 +55,6 @@ public: // The skeleton methods. private: - void insert_into_any (CORBA::Any& any, Components::EventBase* vb); - RtecEventChannelAdmin::ProxyPushConsumer_var proxy_; // The proxy diff --git a/TAO/orbsvcs/tests/Event/UDP/Test.idl b/TAO/orbsvcs/tests/Event/UDP/Test.idl index fc1724d9993..fc7e50d4fd2 100644 --- a/TAO/orbsvcs/tests/Event/UDP/Test.idl +++ b/TAO/orbsvcs/tests/Event/UDP/Test.idl @@ -3,17 +3,9 @@ #ifndef TAO_RTEC_MCAST_TEST_IDL #define TAO_RTEC_MCAST_TEST_IDL -module Components +valuetype ValueTypeData { - abstract valuetype EventBase {}; -}; - -module Hello -{ - valuetype ValueTypeData : Components::EventBase - { - public string data; - }; + public string data; }; #endif /* TAO_RTEC_MCAST_TEST_IDL */ diff --git a/TAO/orbsvcs/tests/Event/UDP/receiver.cpp b/TAO/orbsvcs/tests/Event/UDP/receiver.cpp index 30a675ede38..3a6906100b6 100644 --- a/TAO/orbsvcs/tests/Event/UDP/receiver.cpp +++ b/TAO/orbsvcs/tests/Event/UDP/receiver.cpp @@ -64,9 +64,9 @@ main (int argc, char* argv[]) if (valuetype) { - Hello::ValueTypeData_init *vb_factory = 0; + ValueTypeData_init *vb_factory = 0; ACE_NEW_RETURN (vb_factory, - Hello::ValueTypeData_init, + ValueTypeData_init, 1); // supplied by mapping orb->register_value_factory (vb_factory->tao_repository_id (), diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp index 16f1f70eee4..16f1f70eee4 100644..100755 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp diff --git a/TAO/orbsvcs/tests/FT_App/Makefile.am b/TAO/orbsvcs/tests/FT_App/Makefile.am index 14f926b0d04..75d5da6667d 100644 --- a/TAO/orbsvcs/tests/FT_App/Makefile.am +++ b/TAO/orbsvcs/tests/FT_App/Makefile.am @@ -84,7 +84,10 @@ BUILT_SOURCES = \ FT_TestReplicaC.inl \ FT_TestReplicaS.cpp \ FT_TestReplicaS.h \ - FT_TestReplicaS.inl + FT_TestReplicaS.inl \ + FT_TestReplicaS_T.cpp \ + FT_TestReplicaS_T.h \ + FT_TestReplicaS_T.inl CLEANFILES = \ FT_TestReplica-stamp \ @@ -93,12 +96,15 @@ CLEANFILES = \ FT_TestReplicaC.inl \ FT_TestReplicaS.cpp \ FT_TestReplicaS.h \ - FT_TestReplicaS.inl + FT_TestReplicaS.inl \ + FT_TestReplicaS_T.cpp \ + FT_TestReplicaS_T.h \ + FT_TestReplicaS_T.inl -FT_TestReplicaC.cpp FT_TestReplicaC.h FT_TestReplicaC.inl FT_TestReplicaS.cpp FT_TestReplicaS.h FT_TestReplicaS.inl: FT_TestReplica-stamp +FT_TestReplicaC.cpp FT_TestReplicaC.h FT_TestReplicaC.inl FT_TestReplicaS.cpp FT_TestReplicaS.h FT_TestReplicaS.inl FT_TestReplicaS_T.cpp FT_TestReplicaS_T.h FT_TestReplicaS_T.inl: FT_TestReplica-stamp FT_TestReplica-stamp: $(srcdir)/FT_TestReplica.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/FT_TestReplica.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/FT_TestReplica.idl @touch $@ diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp index 12357cb9297..12357cb9297 100644..100755 --- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp +++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h index 6b45d786a6e..6b45d786a6e 100644..100755 --- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h +++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h diff --git a/TAO/orbsvcs/tests/ImplRepo/Makefile.am b/TAO/orbsvcs/tests/ImplRepo/Makefile.am index bc4e9efe1ab..8bc8fd330d4 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Makefile.am +++ b/TAO/orbsvcs/tests/ImplRepo/Makefile.am @@ -18,10 +18,12 @@ TAO_ROOT = $(top_srcdir) SUBDIRS = \ . \ - Bug_2604_Regression \ NameService \ scale +# SUBDIRS += \ +# Bug_2604_Regression + noinst_PROGRAMS = ## Makefile.airplane_idl.am diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/Makefile.am b/TAO/orbsvcs/tests/Interoperable_Naming/Makefile.am index 47912a98ba5..c2157937015 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/Makefile.am +++ b/TAO/orbsvcs/tests/Interoperable_Naming/Makefile.am @@ -27,7 +27,10 @@ BUILT_SOURCES = \ Web_ServerC.inl \ Web_ServerS.cpp \ Web_ServerS.h \ - Web_ServerS.inl + Web_ServerS.inl \ + Web_ServerS_T.cpp \ + Web_ServerS_T.h \ + Web_ServerS_T.inl CLEANFILES = \ Web_Server-stamp \ @@ -36,12 +39,15 @@ CLEANFILES = \ Web_ServerC.inl \ Web_ServerS.cpp \ Web_ServerS.h \ - Web_ServerS.inl + Web_ServerS.inl \ + Web_ServerS_T.cpp \ + Web_ServerS_T.h \ + Web_ServerS_T.inl -Web_ServerC.cpp Web_ServerC.h Web_ServerC.inl Web_ServerS.cpp Web_ServerS.h Web_ServerS.inl: Web_Server-stamp +Web_ServerC.cpp Web_ServerC.h Web_ServerC.inl Web_ServerS.cpp Web_ServerS.h Web_ServerS.inl Web_ServerS_T.cpp Web_ServerS_T.h Web_ServerS_T.inl: Web_Server-stamp Web_Server-stamp: $(srcdir)/Web_Server.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Web_Server.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/Web_Server.idl @touch $@ noinst_PROGRAMS = client @@ -63,6 +69,8 @@ client_SOURCES = \ Web_ServerC.inl \ Web_ServerS.h \ Web_ServerS.inl \ + Web_ServerS_T.h \ + Web_ServerS_T.inl \ ncontextext_client_i.h client_LDADD = \ diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am index 7d26c2c8a17..5a006b464f6 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am @@ -29,7 +29,10 @@ BUILT_SOURCES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl + TestS.inl \ + TestS_T.cpp \ + TestS_T.h \ + TestS_T.inl CLEANFILES = \ Test-stamp \ @@ -38,12 +41,15 @@ CLEANFILES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl + TestS.inl \ + TestS_T.cpp \ + TestS_T.h \ + TestS_T.inl -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/Test.idl @touch $@ noinst_PROGRAMS = server @@ -69,7 +75,9 @@ server_SOURCES = \ TestC.h \ TestC.inl \ TestS.h \ - TestS.inl + TestS.inl \ + TestS_T.h \ + TestS_T.inl server_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ diff --git a/TAO/orbsvcs/tests/Makefile.am b/TAO/orbsvcs/tests/Makefile.am index 190f83a7841..77d54729310 100644 --- a/TAO/orbsvcs/tests/Makefile.am +++ b/TAO/orbsvcs/tests/Makefile.am @@ -23,7 +23,6 @@ SUBDIRS = \ Bug_2287_Regression \ Bug_2316_Regression \ Bug_2377_Regression \ - Bug_2615_Regression \ Concurrency \ CosEvent \ EC_Custom_Marshal \ @@ -55,3 +54,4 @@ SUBDIRS = \ ior_corbaname \ tests_svc_loader +# Bug_2615_Regression diff --git a/TAO/orbsvcs/tests/Notify/lib/Makefile.am b/TAO/orbsvcs/tests/Notify/lib/Makefile.am index 95cadebe495..9cd8939544f 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/lib/Makefile.am @@ -28,7 +28,10 @@ BUILT_SOURCES = \ Activation_ManagerC.inl \ Activation_ManagerS.cpp \ Activation_ManagerS.h \ - Activation_ManagerS.inl + Activation_ManagerS.inl \ + Activation_ManagerS_T.cpp \ + Activation_ManagerS_T.h \ + Activation_ManagerS_T.inl CLEANFILES = \ Activation_Manager-stamp \ @@ -37,12 +40,15 @@ CLEANFILES = \ Activation_ManagerC.inl \ Activation_ManagerS.cpp \ Activation_ManagerS.h \ - Activation_ManagerS.inl + Activation_ManagerS.inl \ + Activation_ManagerS_T.cpp \ + Activation_ManagerS_T.h \ + Activation_ManagerS_T.inl -Activation_ManagerC.cpp Activation_ManagerC.h Activation_ManagerC.inl Activation_ManagerS.cpp Activation_ManagerS.h Activation_ManagerS.inl: Activation_Manager-stamp +Activation_ManagerC.cpp Activation_ManagerC.h Activation_ManagerC.inl Activation_ManagerS.cpp Activation_ManagerS.h Activation_ManagerS.inl Activation_ManagerS_T.cpp Activation_ManagerS_T.h Activation_ManagerS_T.inl: Activation_Manager-stamp Activation_Manager-stamp: $(srcdir)/Activation_Manager.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Activation_Manager.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/Activation_Manager.idl @touch $@ noinst_LTLIBRARIES = libTAO_NotifyTests.la @@ -102,6 +108,9 @@ noinst_HEADERS = \ Activation_ManagerC.inl \ Activation_ManagerS.h \ Activation_ManagerS.inl \ + Activation_ManagerS_T.cpp \ + Activation_ManagerS_T.h \ + Activation_ManagerS_T.inl \ Application_Command.h \ Command.h \ Command_Builder.h \ diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am index 6a9006c0599..fcabd44fe32 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am @@ -18,6 +18,7 @@ TAO_ROOT = $(top_srcdir) if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS = Throughput @@ -59,6 +60,7 @@ Throughput_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING diff --git a/TAO/orbsvcs/tests/Redundant_Naming/Makefile.am b/TAO/orbsvcs/tests/Redundant_Naming/Makefile.am index 8d2aa8811df..332ca6ceeca 100644 --- a/TAO/orbsvcs/tests/Redundant_Naming/Makefile.am +++ b/TAO/orbsvcs/tests/Redundant_Naming/Makefile.am @@ -27,7 +27,10 @@ BUILT_SOURCES = \ test_objectC.inl \ test_objectS.cpp \ test_objectS.h \ - test_objectS.inl + test_objectS.inl \ + test_objectS_T.cpp \ + test_objectS_T.h \ + test_objectS_T.inl CLEANFILES = \ test_object-stamp \ @@ -36,12 +39,15 @@ CLEANFILES = \ test_objectC.inl \ test_objectS.cpp \ test_objectS.h \ - test_objectS.inl + test_objectS.inl \ + test_objectS_T.cpp \ + test_objectS_T.h \ + test_objectS_T.inl -test_objectC.cpp test_objectC.h test_objectC.inl test_objectS.cpp test_objectS.h test_objectS.inl: test_object-stamp +test_objectC.cpp test_objectC.h test_objectC.inl test_objectS.cpp test_objectS.h test_objectS.inl test_objectS_T.cpp test_objectS_T.h test_objectS_T.inl: test_object-stamp test_object-stamp: $(srcdir)/test_object.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/test_object.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/test_object.idl @touch $@ noinst_PROGRAMS = client @@ -61,7 +67,9 @@ client_SOURCES = \ test_objectC.h \ test_objectC.inl \ test_objectS.h \ - test_objectS.inl + test_objectS.inl \ + test_objectS_T.h \ + test_objectS_T.inl client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am index 6449d071767..16579cdac4c 100644 --- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am +++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am @@ -27,7 +27,10 @@ BUILT_SOURCES = \ test_objectC.inl \ test_objectS.cpp \ test_objectS.h \ - test_objectS.inl + test_objectS.inl \ + test_objectS_T.cpp \ + test_objectS_T.h \ + test_objectS_T.inl CLEANFILES = \ test_object-stamp \ @@ -36,12 +39,15 @@ CLEANFILES = \ test_objectC.inl \ test_objectS.cpp \ test_objectS.h \ - test_objectS.inl + test_objectS.inl \ + test_objectS_T.cpp \ + test_objectS_T.h \ + test_objectS_T.inl -test_objectC.cpp test_objectC.h test_objectC.inl test_objectS.cpp test_objectS.h test_objectS.inl: test_object-stamp +test_objectC.cpp test_objectC.h test_objectC.inl test_objectS.cpp test_objectS.h test_objectS.inl test_objectS_T.cpp test_objectS_T.h test_objectS_T.inl: test_object-stamp test_object-stamp: $(srcdir)/test_object.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/test_object.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/test_object.idl @touch $@ noinst_PROGRAMS = client @@ -62,7 +68,9 @@ client_SOURCES = \ test_objectC.h \ test_objectC.inl \ test_objectS.h \ - test_objectS.inl + test_objectS.inl \ + test_objectS_T.h \ + test_objectS_T.inl client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ diff --git a/TAO/orbsvcs/tests/Simple_Naming/Makefile.am b/TAO/orbsvcs/tests/Simple_Naming/Makefile.am index 3aad555260f..a0db8b90c16 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/Makefile.am +++ b/TAO/orbsvcs/tests/Simple_Naming/Makefile.am @@ -27,7 +27,10 @@ BUILT_SOURCES = \ test_objectC.inl \ test_objectS.cpp \ test_objectS.h \ - test_objectS.inl + test_objectS.inl \ + test_objectS_T.cpp \ + test_objectS_T.h \ + test_objectS_T.inl CLEANFILES = \ test_object-stamp \ @@ -36,12 +39,15 @@ CLEANFILES = \ test_objectC.inl \ test_objectS.cpp \ test_objectS.h \ - test_objectS.inl + test_objectS.inl \ + test_objectS_T.cpp \ + test_objectS_T.h \ + test_objectS_T.inl -test_objectC.cpp test_objectC.h test_objectC.inl test_objectS.cpp test_objectS.h test_objectS.inl: test_object-stamp +test_objectC.cpp test_objectC.h test_objectC.inl test_objectS.cpp test_objectS.h test_objectS.inl test_objectS_T.cpp test_objectS_T.h test_objectS_T.inl: test_object-stamp test_object-stamp: $(srcdir)/test_object.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/test_object.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/test_object.idl @touch $@ noinst_PROGRAMS = client @@ -62,7 +68,9 @@ client_SOURCES = \ test_objectC.h \ test_objectC.inl \ test_objectS.h \ - test_objectS.inl + test_objectS.inl \ + test_objectS_T.h \ + test_objectS_T.inl client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ diff --git a/TAO/orbsvcs/tests/Trading/Makefile.am b/TAO/orbsvcs/tests/Trading/Makefile.am index ef94122afda..4f692d0fb2a 100644 --- a/TAO/orbsvcs/tests/Trading/Makefile.am +++ b/TAO/orbsvcs/tests/Trading/Makefile.am @@ -28,7 +28,10 @@ BUILT_SOURCES = \ TTestC.inl \ TTestS.cpp \ TTestS.h \ - TTestS.inl + TTestS.inl \ + TTestS_T.cpp \ + TTestS_T.h \ + TTestS_T.inl CLEANFILES = \ TTest-stamp \ @@ -37,12 +40,15 @@ CLEANFILES = \ TTestC.inl \ TTestS.cpp \ TTestS.h \ - TTestS.inl + TTestS.inl \ + TTestS_T.cpp \ + TTestS_T.h \ + TTestS_T.inl -TTestC.cpp TTestC.h TTestC.inl TTestS.cpp TTestS.h TTestS.inl: TTest-stamp +TTestC.cpp TTestC.h TTestC.inl TTestS.cpp TTestS.h TTestS.inl TTestS_T.cpp TTestS_T.h TTestS_T.inl: TTest-stamp TTest-stamp: $(srcdir)/TTest.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -I..\..\.. -I..\..\..\orbsvcs -Wb,export_macro=TAO_TTest_Export -Wb,export_include=ttest_export.h $(srcdir)/TTest.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -I..\..\.. -I..\..\..\orbsvcs -Wb,export_macro=TAO_TTest_Export -Wb,export_include=ttest_export.h $(srcdir)/TTest.idl @touch $@ noinst_LTLIBRARIES = libTTest.la @@ -76,6 +82,9 @@ noinst_HEADERS = \ TTestC.inl \ TTestS.h \ TTestS.inl \ + TTestS_T.cpp \ + TTestS_T.h \ + TTestS_T.inl \ ttest_export.h endif BUILD_EXCEPTIONS diff --git a/TAO/performance-tests/Callback/Callback.mpc b/TAO/performance-tests/Callback/Callback.mpc index 55764d4ae3a..9357cab7408 100644 --- a/TAO/performance-tests/Callback/Callback.mpc +++ b/TAO/performance-tests/Callback/Callback.mpc @@ -10,7 +10,6 @@ project(*Perf_IDL): taoidldefaults, strategies { project(*server): taoserver, messaging, strategies { after += *Perf_IDL - avoids += ace_for_tao Source_Files { Server_i.cpp server.cpp @@ -23,7 +22,6 @@ project(*server): taoserver, messaging, strategies { project(*client): taoexe, messaging, portableserver, strategies { after += *Perf_IDL - avoids += ace_for_tao Source_Files { Callback_i.cpp client.cpp diff --git a/TAO/performance-tests/Callback/Makefile.am b/TAO/performance-tests/Callback/Makefile.am index 8eb56829ab7..b054061b45f 100644 --- a/TAO/performance-tests/Callback/Makefile.am +++ b/TAO/performance-tests/Callback/Makefile.am @@ -21,6 +21,7 @@ noinst_PROGRAMS = ## Makefile.Callback_Perf_IDL.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO BUILT_SOURCES = \ callbackC.cpp \ @@ -49,6 +50,7 @@ callback-stamp: $(srcdir)/callback.idl $(TAO_IDL_DEP) noinst_HEADERS = \ callback.idl +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Makefile.Callback_Client.am diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc b/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc index 3d6ccc86d5f..c0c97e91f12 100644 --- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc +++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc @@ -3,7 +3,6 @@ project(*client): taoexe, portableserver, strategies, dynamicinterface, minimum_corba { after += IDL_Cubit_Server - avoids += ace_for_tao idlflags += -Gd Source_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 b6f0ceda21a..fb8d3c5430a 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc @@ -12,7 +12,7 @@ project(*IDL): taoidldefaults, strategies { project(*Server): taoexe, utils, portableserver, strategies { after += *IDL - avoids += ace_for_tao + Source_Files { RTI_IO.cpp Cubit_i.cpp @@ -29,7 +29,7 @@ project(*Server): taoexe, utils, portableserver, strategies { project(*client): taoexe, portableserver, strategies { after += *IDL - avoids += ace_for_tao + Source_Files { RTI_IO.cpp Cubit_Client.cpp @@ -41,9 +41,9 @@ project(*client): taoexe, portableserver, strategies { } } -project(*collocation): taoserver, utils, strategies { +project(*collocation): taoexe, utils, portableserver, strategies { after += *IDL - avoids += ace_for_tao + // Note : You can't just prepend collocation/ to the exename // to get it to ouput to that directory. It won't go // to the right place on some platforms. (Windows) diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am index 5bae77a0af9..2285263f2ab 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am @@ -21,6 +21,7 @@ noinst_PROGRAMS = ## Makefile.IDL_Cubit_IDL.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO BUILT_SOURCES = \ cubitC.cpp \ @@ -49,6 +50,7 @@ cubit-stamp: $(srcdir)/cubit.idl $(TAO_IDL_DEP) noinst_HEADERS = \ cubit.idl +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Makefile.IDL_Cubit_Client.am diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc b/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc index 4ad1b1fe271..d5cc27cdc06 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc @@ -27,7 +27,7 @@ project(*server): taoexe, utils, portableserver, strategies { project(*client): taoexe, utils, portableserver, strategies { after += *IDL - avoids += ace_for_tao + Source_Files { Timer.cpp Globals.cpp diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am index 0254eb4a88a..1da3c7e2ddc 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am @@ -21,6 +21,7 @@ noinst_PROGRAMS = ## Makefile.MT_Cubit_IDL.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO BUILT_SOURCES = \ cubitC.cpp \ @@ -49,6 +50,7 @@ cubit-stamp: $(srcdir)/cubit.idl $(TAO_IDL_DEP) noinst_HEADERS = \ cubit.idl +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Makefile.MT_Cubit_Client.am @@ -98,6 +100,7 @@ endif BUILD_EXCEPTIONS ## Makefile.MT_Cubit_Server.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -131,6 +134,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am b/TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am index 5bfedf58470..882ffaca7b4 100644 --- a/TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am +++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am @@ -91,6 +91,7 @@ endif BUILD_CORBA_MESSAGING if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -118,6 +119,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING 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..55d3be2527c 100644 --- a/TAO/performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc +++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc @@ -22,7 +22,6 @@ project(*AMH latency server): taoserver, strategies, valuetype, amh { project(*AMH latency client): taoclient, strategies, valuetype, amh { after += *AMH_latency_idl - avoids += ace_for_tao Source_Files { TestC.cpp client.cpp diff --git a/TAO/performance-tests/Latency/AMI/Makefile.am b/TAO/performance-tests/Latency/AMI/Makefile.am index 191481ab92c..9cc174f9ad0 100644 --- a/TAO/performance-tests/Latency/AMI/Makefile.am +++ b/TAO/performance-tests/Latency/AMI/Makefile.am @@ -60,6 +60,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -87,6 +88,7 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -96,6 +98,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -125,6 +128,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/performance-tests/Latency/Collocation/Collocation.mpc b/TAO/performance-tests/Latency/Collocation/Collocation.mpc index b9f851bf3c2..ea188cdcef5 100644 --- a/TAO/performance-tests/Latency/Collocation/Collocation.mpc +++ b/TAO/performance-tests/Latency/Collocation/Collocation.mpc @@ -1,5 +1,4 @@ // $Id$ project(Latency*): taoserver, strategies { exename = Collocated_Test - avoids += ace_for_tao } diff --git a/TAO/performance-tests/Latency/DII/DII.mpc b/TAO/performance-tests/Latency/DII/DII.mpc index cc7c7fc9da0..3ba347e0274 100644 --- a/TAO/performance-tests/Latency/DII/DII.mpc +++ b/TAO/performance-tests/Latency/DII/DII.mpc @@ -22,7 +22,6 @@ project(*latency server): taoserver, strategies, minimum_corba { project(*latency client): taoclient, strategies, dynamicinterface, minimum_corba { after += *latency_idl - avoids += ace_for_tao Source_Files { TestC.cpp client.cpp diff --git a/TAO/performance-tests/Latency/DII/Makefile.am b/TAO/performance-tests/Latency/DII/Makefile.am index 9b42af13b86..e73d3183a18 100644 --- a/TAO/performance-tests/Latency/DII/Makefile.am +++ b/TAO/performance-tests/Latency/DII/Makefile.am @@ -21,6 +21,7 @@ noinst_PROGRAMS = ## Makefile.DII_Latency_Idl.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO BUILT_SOURCES = \ TestC.cpp \ @@ -49,6 +50,7 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Makefile.DII_Latency_Client.am @@ -89,6 +91,7 @@ endif BUILD_CORBA_MESSAGING ## Makefile.DII_Latency_Server.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -112,6 +115,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. diff --git a/TAO/performance-tests/Latency/DSI/DSI.mpc b/TAO/performance-tests/Latency/DSI/DSI.mpc index b1e6a525ae5..aec58c1431c 100644 --- a/TAO/performance-tests/Latency/DSI/DSI.mpc +++ b/TAO/performance-tests/Latency/DSI/DSI.mpc @@ -13,7 +13,7 @@ project(*latency server): taoserver, strategies, dynamicinterface, minimum_corba } project(*latency client): taoclient, strategies, minimum_corba { - avoids += ace_for_tao + Source_Files { TestC.cpp client.cpp diff --git a/TAO/performance-tests/Latency/DSI/Makefile.am b/TAO/performance-tests/Latency/DSI/Makefile.am index 3e2f556250c..f032fc88f86 100644 --- a/TAO/performance-tests/Latency/DSI/Makefile.am +++ b/TAO/performance-tests/Latency/DSI/Makefile.am @@ -73,6 +73,7 @@ endif BUILD_EXCEPTIONS if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -99,6 +100,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING diff --git a/TAO/performance-tests/Latency/Deferred/Deferred.mpc b/TAO/performance-tests/Latency/Deferred/Deferred.mpc index edc3efefc87..9e35337054a 100644 --- a/TAO/performance-tests/Latency/Deferred/Deferred.mpc +++ b/TAO/performance-tests/Latency/Deferred/Deferred.mpc @@ -22,7 +22,6 @@ project(*latency server): taoserver, strategies, minimum_corba { project(*latency client): taoclient, strategies, dynamicinterface, minimum_corba { after += *latency_idl - avoids += ace_for_tao Source_Files { TestC.cpp client.cpp diff --git a/TAO/performance-tests/Latency/Deferred/Makefile.am b/TAO/performance-tests/Latency/Deferred/Makefile.am index 7ac3a7f5603..7aaf227ea50 100644 --- a/TAO/performance-tests/Latency/Deferred/Makefile.am +++ b/TAO/performance-tests/Latency/Deferred/Makefile.am @@ -21,6 +21,7 @@ noinst_PROGRAMS = ## Makefile.Deferred_Latency_Idl.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO BUILT_SOURCES = \ TestC.cpp \ @@ -49,6 +50,7 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Makefile.Deferred_Latency_Client.am @@ -89,6 +91,7 @@ endif BUILD_CORBA_MESSAGING ## Makefile.Deferred_Latency_Server.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -112,6 +115,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. diff --git a/TAO/performance-tests/Latency/Single_Threaded/Makefile.am b/TAO/performance-tests/Latency/Single_Threaded/Makefile.am index ddf08bd925c..4af5155bcaf 100644 --- a/TAO/performance-tests/Latency/Single_Threaded/Makefile.am +++ b/TAO/performance-tests/Latency/Single_Threaded/Makefile.am @@ -21,6 +21,7 @@ noinst_PROGRAMS = ## Makefile.Single_Threaded_Latency_Idl.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO BUILT_SOURCES = \ TestC.cpp \ @@ -49,6 +50,7 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Makefile.Single_Threaded_Latency_Client.am @@ -81,6 +83,7 @@ endif BUILD_EXCEPTIONS ## Makefile.Single_Threaded_Latency_Server.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -104,6 +107,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. diff --git a/TAO/performance-tests/Latency/Single_Threaded/Single_Threaded.mpc b/TAO/performance-tests/Latency/Single_Threaded/Single_Threaded.mpc index 699b18e36ac..993e2a46d4b 100644 --- a/TAO/performance-tests/Latency/Single_Threaded/Single_Threaded.mpc +++ b/TAO/performance-tests/Latency/Single_Threaded/Single_Threaded.mpc @@ -22,7 +22,6 @@ project(*latency server): taoserver, strategies { project(*latency client): taoclient, strategies { after += *latency_idl - avoids += ace_for_tao Source_Files { TestC.cpp client.cpp diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am b/TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am index bfbdc4cda79..b0861f20e36 100644 --- a/TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am +++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am @@ -21,6 +21,7 @@ noinst_PROGRAMS = ## Makefile.Thread_Per_Connection_Latency_Idl.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO BUILT_SOURCES = \ TestC.cpp \ @@ -49,11 +50,13 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Makefile.Thread_Per_Connection_Latency_Client.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -75,11 +78,13 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Makefile.Thread_Per_Connection_Latency_Server.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -103,6 +108,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. diff --git a/TAO/performance-tests/Latency/Thread_Pool/Makefile.am b/TAO/performance-tests/Latency/Thread_Pool/Makefile.am index 22b18de2053..a7753977ac6 100644 --- a/TAO/performance-tests/Latency/Thread_Pool/Makefile.am +++ b/TAO/performance-tests/Latency/Thread_Pool/Makefile.am @@ -21,6 +21,7 @@ noinst_PROGRAMS = ## Makefile.Thread_Pool_Latency_Idl.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO BUILT_SOURCES = \ TestC.cpp \ @@ -49,11 +50,13 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Makefile.Thread_Pool_Latency_Client.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -75,11 +78,13 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Makefile.Thread_Pool_Latency_Server.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -105,6 +110,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am index b0fee8ddf9a..1dec009c5ae 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am @@ -19,6 +19,7 @@ noinst_PROGRAMS = if BUILD_EXCEPTIONS if BUILD_RT_CORBA +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -44,6 +45,7 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA endif BUILD_EXCEPTIONS @@ -51,6 +53,7 @@ endif BUILD_EXCEPTIONS if BUILD_EXCEPTIONS if BUILD_RT_CORBA +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -77,6 +80,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA endif BUILD_EXCEPTIONS diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am index f6dd942c4b7..1a5046e4b48 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am @@ -19,6 +19,7 @@ noinst_PROGRAMS = if BUILD_EXCEPTIONS if BUILD_RT_CORBA +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -44,6 +45,7 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA endif BUILD_EXCEPTIONS @@ -51,6 +53,7 @@ endif BUILD_EXCEPTIONS if BUILD_EXCEPTIONS if BUILD_RT_CORBA +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -77,6 +80,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA endif BUILD_EXCEPTIONS diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am index bca282e100c..45b8368e39b 100644 --- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am @@ -91,6 +91,7 @@ endif BUILD_CORBA_MESSAGING if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -118,6 +119,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Single_Threaded.mpc b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Single_Threaded.mpc index 7fdc182014e..d92af709ed0 100644 --- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Single_Threaded.mpc +++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Single_Threaded.mpc @@ -22,7 +22,6 @@ project(*AMH sequence server): taoserver, strategies, valuetype, amh { project(*AMH sequence client): taoclient, strategies, valuetype, amh { after += *AMH_sequence_idl - avoids += ace_for_tao Source_Files { TestC.cpp client.cpp diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Makefile.am b/TAO/performance-tests/Sequence_Latency/AMI/Makefile.am index ec7671dd37e..edab5db3ce2 100644 --- a/TAO/performance-tests/Sequence_Latency/AMI/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/AMI/Makefile.am @@ -60,6 +60,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -87,6 +88,7 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -96,6 +98,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -125,6 +128,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/performance-tests/Sequence_Latency/DII/DII.mpc b/TAO/performance-tests/Sequence_Latency/DII/DII.mpc index 6d4e82b25bf..2a49e587b0a 100644 --- a/TAO/performance-tests/Sequence_Latency/DII/DII.mpc +++ b/TAO/performance-tests/Sequence_Latency/DII/DII.mpc @@ -24,7 +24,6 @@ project(*sequence server): taoserver, strategies, minimum_corba { project(*sequence client): taoserver, strategies, dynamicinterface, minimum_corba { after += *sequence_idl - avoids += ace_for_tao exename = client Source_Files { diff --git a/TAO/performance-tests/Sequence_Latency/DII/Makefile.am b/TAO/performance-tests/Sequence_Latency/DII/Makefile.am index c4b602c5564..d7a100868c0 100644 --- a/TAO/performance-tests/Sequence_Latency/DII/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/DII/Makefile.am @@ -21,6 +21,7 @@ noinst_PROGRAMS = ## Makefile.DII_Sequence_Idl.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO BUILT_SOURCES = \ TestC.cpp \ @@ -49,6 +50,7 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Makefile.DII_Sequence_Client.am @@ -89,6 +91,7 @@ endif BUILD_CORBA_MESSAGING ## Makefile.DII_Sequence_Server.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -112,6 +115,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. diff --git a/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc b/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc index 8344d3de55a..09868b8bab8 100644 --- a/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc +++ b/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc @@ -20,7 +20,6 @@ project(*sequence server) : taoserver, strategies, dynamicinterface, minimum_cor } project(*sequence client): taoclient, strategies, minimum_corba { after += *idl - avoids += ace_for_tao Source_Files { TestC.cpp client.cpp diff --git a/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am b/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am index 955de4b9d07..b915c223793 100644 --- a/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am @@ -21,6 +21,7 @@ noinst_PROGRAMS = ## Makefile.DSI_Idl.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO BUILT_SOURCES = \ TestC.cpp \ @@ -49,6 +50,7 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Makefile.DSI_Sequence_Client.am @@ -82,6 +84,7 @@ endif BUILD_EXCEPTIONS if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -109,6 +112,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc index 0f4daed743a..2a49e587b0a 100644 --- a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc +++ b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc @@ -24,7 +24,7 @@ project(*sequence server): taoserver, strategies, minimum_corba { project(*sequence client): taoserver, strategies, dynamicinterface, minimum_corba { after += *sequence_idl - avoids += ace_for_tao + exename = client Source_Files { TestC.cpp diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am b/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am index 33389b28d49..3ce4ed022ba 100644 --- a/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am @@ -21,6 +21,7 @@ noinst_PROGRAMS = ## Makefile.Deferred_Sequence_Idl.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO BUILT_SOURCES = \ TestC.cpp \ @@ -49,6 +50,7 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Makefile.Deferred_Sequence_Client.am @@ -89,6 +91,7 @@ endif BUILD_CORBA_MESSAGING ## Makefile.Deferred_Sequence_Server.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -112,6 +115,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am index dae50152c20..3da2ff49147 100644 --- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am @@ -21,6 +21,7 @@ noinst_PROGRAMS = ## Makefile.Single_Threaded_Sequence_Idl.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO BUILT_SOURCES = \ TestC.cpp \ @@ -49,6 +50,7 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Makefile.Single_Threaded_Sequence_Client.am @@ -81,6 +83,7 @@ endif BUILD_EXCEPTIONS ## Makefile.Single_Threaded_Sequence_Server.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -104,6 +107,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc index fae260ec562..9cb41beface 100644 --- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc +++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc @@ -22,7 +22,6 @@ project(*sequence server) : taoserver, strategies { project(*sequence client): taoclient, strategies { after += *sequence_idl - avoids += ace_for_tao Source_Files { TestC.cpp client.cpp diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am index 4206bb43ca8..bbf58ecc0b0 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am @@ -21,6 +21,7 @@ noinst_PROGRAMS = ## Makefile.Thread_Per_Conn_Sequence_Idl.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO BUILT_SOURCES = \ TestC.cpp \ @@ -49,11 +50,13 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Makefile.Thread_Per_Conn_Sequence_Client.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -75,11 +78,13 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Makefile.Thread_Per_Conn_Sequence_Server.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -103,6 +108,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am index fe523d61a7f..b91afb9c247 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am @@ -21,6 +21,7 @@ noinst_PROGRAMS = ## Makefile.Thread_Pool_Sequence_Idl.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO BUILT_SOURCES = \ TestC.cpp \ @@ -49,11 +50,13 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Makefile.Thread_Pool_Sequence_Client.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -75,11 +78,13 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Makefile.Thread_Pool_Sequence_Server.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -105,6 +110,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. diff --git a/TAO/performance-tests/Throughput/Makefile.am b/TAO/performance-tests/Throughput/Makefile.am index 8c1b7d7a447..eaaf48bf5bd 100644 --- a/TAO/performance-tests/Throughput/Makefile.am +++ b/TAO/performance-tests/Throughput/Makefile.am @@ -50,6 +50,7 @@ noinst_HEADERS = \ ## Makefile.Throughput_Client.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -71,11 +72,13 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Makefile.Throughput_Server.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -101,6 +104,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. diff --git a/TAO/tao/AnyTypeCode/NVList.cpp b/TAO/tao/AnyTypeCode/NVList.cpp index 56528db0c81..0a0b9ef54ee 100644 --- a/TAO/tao/AnyTypeCode/NVList.cpp +++ b/TAO/tao/AnyTypeCode/NVList.cpp @@ -490,11 +490,11 @@ CORBA::NVList::_lazy_has_arguments (void) const { if (this->incoming_ != 0) { - return this->incoming_->length () <= 1 ? false : true; + return this->incoming_->length () == 0 ? 0 : 1; } else { - return this->count () <= 1 ? false : true; + return this->count () == 0 ? 0 : 1; } } diff --git a/TAO/tao/AnyTypeCode/OctetSeqA.cpp b/TAO/tao/AnyTypeCode/OctetSeqA.cpp new file mode 100644 index 00000000000..dd6b7864968 --- /dev/null +++ b/TAO/tao/AnyTypeCode/OctetSeqA.cpp @@ -0,0 +1,146 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +#include "tao/AnyTypeCode/OctetSeqA.h" +#include "tao/AnyTypeCode/Null_RefCount_Policy.h" +#include "tao/AnyTypeCode/TypeCode_Constants.h" +#include "tao/AnyTypeCode/Alias_TypeCode_Static.h" +#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h" +#include "tao/CDR.h" +#include "tao/AnyTypeCode/Any.h" +#include "tao/AnyTypeCode/Any_Dual_Impl_T.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +// TAO_IDL - Generated from +// be\be_visitor_typecode/alias_typecode.cpp:50 + + + +// TAO_IDL - Generated from +// be\be_visitor_typecode/typecode_defn.cpp:937 + + +#ifndef _TAO_TYPECODE_CORBA_OctetSeq_GUARD +#define _TAO_TYPECODE_CORBA_OctetSeq_GUARD +namespace TAO +{ + namespace TypeCode + { + TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *, + TAO::Null_RefCount_Policy> + CORBA_OctetSeq_0 ( + CORBA::tk_sequence, + &CORBA::_tc_octet, + 0U); + + ::CORBA::TypeCode_ptr const tc_CORBA_OctetSeq_0 = + &CORBA_OctetSeq_0; + + } +} + + +#endif /* _TAO_TYPECODE_CORBA_OctetSeq_GUARD */ + +static TAO::TypeCode::Alias<char const *, + CORBA::TypeCode_ptr const *, + TAO::Null_RefCount_Policy> + _tao_tc_CORBA_OctetSeq ( + CORBA::tk_alias, + "IDL:omg.org/CORBA/OctetSeq:1.0", + "OctetSeq", + &TAO::TypeCode::tc_CORBA_OctetSeq_0); + +namespace CORBA +{ + ::CORBA::TypeCode_ptr const _tc_OctetSeq = + &_tao_tc_CORBA_OctetSeq; +} + + + +// TAO_IDL - Generated from +// be\be_visitor_sequence/any_op_cs.cpp:54 + + +// Copying insertion. +void operator<<= ( + CORBA::Any &_tao_any, + const CORBA::OctetSeq &_tao_elem + ) +{ + TAO::Any_Dual_Impl_T<CORBA::OctetSeq>::insert_copy ( + _tao_any, + CORBA::OctetSeq::_tao_any_destructor, + TAO::TypeCode::tc_CORBA_OctetSeq_0, + _tao_elem + ); +} + +// Non-copying insertion. +void operator<<= ( + CORBA::Any &_tao_any, + CORBA::OctetSeq *_tao_elem + ) +{ + TAO::Any_Dual_Impl_T<CORBA::OctetSeq>::insert ( + _tao_any, + CORBA::OctetSeq::_tao_any_destructor, + TAO::TypeCode::tc_CORBA_OctetSeq_0, + _tao_elem + ); +} + +// Extraction to non-const pointer (deprecated). +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + CORBA::OctetSeq *&_tao_elem + ) +{ + return _tao_any >>= const_cast< + const CORBA::OctetSeq *&> ( + _tao_elem + ); +} + +// Extraction to const pointer. +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + const CORBA::OctetSeq *&_tao_elem + ) +{ + return + TAO::Any_Dual_Impl_T<CORBA::OctetSeq>::extract ( + _tao_any, + CORBA::OctetSeq::_tao_any_destructor, + TAO::TypeCode::tc_CORBA_OctetSeq_0, + _tao_elem + ); +} + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/OctetSeqA.h b/TAO/tao/AnyTypeCode/OctetSeqA.h new file mode 100644 index 00000000000..8b94976cb20 --- /dev/null +++ b/TAO/tao/AnyTypeCode/OctetSeqA.h @@ -0,0 +1,71 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +// TAO_IDL - Generated from +// be\be_codegen.cpp:788 + +#ifndef _TAO_IDL_ANYTYPECODE_OCTETSEQA_H_ +#define _TAO_IDL_ANYTYPECODE_OCTETSEQA_H_ + +#include /**/ "ace/pre.h" + +#include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" +#include "tao/OctetSeqC.h" + + +// TAO_IDL - Generated from +// be\be_visitor_module/module_ch.cpp:59 + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +namespace CORBA +{ + + // TAO_IDL - Generated from + // be\be_visitor_typecode/typecode_decl.cpp:49 + + extern TAO_AnyTypeCode_Export ::CORBA::TypeCode_ptr const _tc_OctetSeq; + +// TAO_IDL - Generated from +// be\be_visitor_module/module_ch.cpp:86 + +} // module CORBA + +// TAO_IDL - Generated from +// be\be_visitor_sequence/any_op_ch.cpp:53 + +TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, const CORBA::OctetSeq &); // copying version +TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::OctetSeq*); // noncopying version +TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OctetSeq *&); // deprecated +TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::OctetSeq *&); + +TAO_END_VERSIONED_NAMESPACE_DECL + +#include /**/ "ace/post.h" + +#endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/UShortSeqA.cpp b/TAO/tao/AnyTypeCode/UShortSeqA.cpp new file mode 100644 index 00000000000..582d15d69d0 --- /dev/null +++ b/TAO/tao/AnyTypeCode/UShortSeqA.cpp @@ -0,0 +1,146 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +#include "tao/AnyTypeCode/UShortSeqA.h" +#include "tao/AnyTypeCode/Null_RefCount_Policy.h" +#include "tao/AnyTypeCode/TypeCode_Constants.h" +#include "tao/AnyTypeCode/Alias_TypeCode_Static.h" +#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h" +#include "tao/CDR.h" +#include "tao/AnyTypeCode/Any.h" +#include "tao/AnyTypeCode/Any_Dual_Impl_T.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +// TAO_IDL - Generated from +// be\be_visitor_typecode/alias_typecode.cpp:50 + + + +// TAO_IDL - Generated from +// be\be_visitor_typecode/typecode_defn.cpp:937 + + +#ifndef _TAO_TYPECODE_CORBA_UShortSeq_GUARD +#define _TAO_TYPECODE_CORBA_UShortSeq_GUARD +namespace TAO +{ + namespace TypeCode + { + TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *, + TAO::Null_RefCount_Policy> + CORBA_UShortSeq_0 ( + CORBA::tk_sequence, + &CORBA::_tc_ushort, + 0U); + + ::CORBA::TypeCode_ptr const tc_CORBA_UShortSeq_0 = + &CORBA_UShortSeq_0; + + } +} + + +#endif /* _TAO_TYPECODE_CORBA_UShortSeq_GUARD */ + +static TAO::TypeCode::Alias<char const *, + CORBA::TypeCode_ptr const *, + TAO::Null_RefCount_Policy> + _tao_tc_CORBA_UShortSeq ( + CORBA::tk_alias, + "IDL:omg.org/CORBA/UShortSeq:1.0", + "UShortSeq", + &TAO::TypeCode::tc_CORBA_UShortSeq_0); + +namespace CORBA +{ + ::CORBA::TypeCode_ptr const _tc_UShortSeq = + &_tao_tc_CORBA_UShortSeq; +} + + + +// TAO_IDL - Generated from +// be\be_visitor_sequence/any_op_cs.cpp:54 + + +// Copying insertion. +void operator<<= ( + CORBA::Any &_tao_any, + const CORBA::UShortSeq &_tao_elem + ) +{ + TAO::Any_Dual_Impl_T<CORBA::UShortSeq>::insert_copy ( + _tao_any, + CORBA::UShortSeq::_tao_any_destructor, + TAO::TypeCode::tc_CORBA_UShortSeq_0, + _tao_elem + ); +} + +// Non-copying insertion. +void operator<<= ( + CORBA::Any &_tao_any, + CORBA::UShortSeq *_tao_elem + ) +{ + TAO::Any_Dual_Impl_T<CORBA::UShortSeq>::insert ( + _tao_any, + CORBA::UShortSeq::_tao_any_destructor, + TAO::TypeCode::tc_CORBA_UShortSeq_0, + _tao_elem + ); +} + +// Extraction to non-const pointer (deprecated). +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + CORBA::UShortSeq *&_tao_elem + ) +{ + return _tao_any >>= const_cast< + const CORBA::UShortSeq *&> ( + _tao_elem + ); +} + +// Extraction to const pointer. +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + const CORBA::UShortSeq *&_tao_elem + ) +{ + return + TAO::Any_Dual_Impl_T<CORBA::UShortSeq>::extract ( + _tao_any, + CORBA::UShortSeq::_tao_any_destructor, + TAO::TypeCode::tc_CORBA_UShortSeq_0, + _tao_elem + ); +} + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/UShortSeqA.h b/TAO/tao/AnyTypeCode/UShortSeqA.h new file mode 100644 index 00000000000..824246509de --- /dev/null +++ b/TAO/tao/AnyTypeCode/UShortSeqA.h @@ -0,0 +1,112 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +// TAO_IDL - Generated from +// be\be_codegen.cpp:153 + +#ifndef _TAO_IDL_ORIG_USHORTSEQA_H_ +#define _TAO_IDL_ORIG_USHORTSEQA_H_ + +#include /**/ "ace/pre.h" + + +#include "ace/config-all.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" +#include "tao/UShortSeqC.h" + +#if defined (TAO_EXPORT_MACRO) +#undef TAO_EXPORT_MACRO +#endif +#define TAO_EXPORT_MACRO TAO_AnyTypeCode_Export + +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4250) +#endif /* _MSC_VER */ + +#if defined (__BORLANDC__) +#pragma option push -w-rvl -w-rch -w-ccc -w-inl +#endif /* __BORLANDC__ */ + +// TAO_IDL - Generated from +// be\be_visitor_module/module_ch.cpp:48 + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +namespace CORBA +{ + + // TAO_IDL - Generated from + // be\be_visitor_typecode/typecode_decl.cpp:44 + + extern TAO_AnyTypeCode_Export ::CORBA::TypeCode_ptr const _tc_UShortSeq; + +// TAO_IDL - Generated from +// be\be_visitor_module/module_ch.cpp:66 + +} // module CORBA + +// TAO_IDL - Generated from +// be\be_visitor_traits.cpp:61 + +// Traits specializations. +namespace TAO +{ +} + +// TAO_IDL - Generated from +// be\be_visitor_sequence/any_op_ch.cpp:52 + +TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, const CORBA::UShortSeq &); // copying version +TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::UShortSeq*); // noncopying version +TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::UShortSeq *&); // deprecated +TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::UShortSeq *&); + +// TAO_IDL - Generated from +// be\be_codegen.cpp:955 + +TAO_END_VERSIONED_NAMESPACE_DECL + +#if defined(_MSC_VER) +#pragma warning(pop) +#endif /* _MSC_VER */ + +#if defined (__BORLANDC__) +#pragma option pop +#endif /* __BORLANDC__ */ + +#include /**/ "ace/post.h" + +#endif /* ifndef */ + + diff --git a/TAO/tao/Bounded_Basic_String_Sequence_T.h b/TAO/tao/Bounded_Basic_String_Sequence_T.h index a1078da179e..da573662bc7 100644 --- a/TAO/tao/Bounded_Basic_String_Sequence_T.h +++ b/TAO/tao/Bounded_Basic_String_Sequence_T.h @@ -18,6 +18,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { +namespace details +{ + template<typename charT, CORBA::ULong MAX> class bounded_basic_string_sequence { @@ -106,6 +109,8 @@ public: private: implementation_type impl_; }; + +} // namespace details } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Bounded_Sequence_CDR_T.h b/TAO/tao/Bounded_Sequence_CDR_T.h index adfd7e1cea1..70d1480f1ba 100644 --- a/TAO/tao/Bounded_Sequence_CDR_T.h +++ b/TAO/tao/Bounded_Sequence_CDR_T.h @@ -282,8 +282,8 @@ namespace TAO { } template <typename stream, typename charT, CORBA::ULong MAX> - bool demarshal_sequence(stream & strm, TAO::bounded_basic_string_sequence <charT, MAX> & target) { - typedef typename TAO::bounded_basic_string_sequence <charT, MAX> sequence; + bool demarshal_sequence(stream & strm, TAO::details::bounded_basic_string_sequence <charT, MAX> & target) { + typedef typename TAO::details::bounded_basic_string_sequence <charT, MAX> sequence; typedef typename sequence::element_traits::string_var string_var; ::CORBA::ULong new_length = 0; if (!(strm >> new_length)) { @@ -482,7 +482,7 @@ namespace TAO { } template <typename stream, typename charT, CORBA::ULong MAX> - bool marshal_sequence(stream & strm, const TAO::bounded_basic_string_sequence <charT, MAX> & source) { + bool marshal_sequence(stream & strm, const TAO::details::bounded_basic_string_sequence <charT, MAX> & source) { if (0 == &source) ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false); ::CORBA::ULong const length = source.length (); diff --git a/TAO/tao/Bounded_String_Sequence_T.h b/TAO/tao/Bounded_String_Sequence_T.h new file mode 100644 index 00000000000..9f6373343b6 --- /dev/null +++ b/TAO/tao/Bounded_String_Sequence_T.h @@ -0,0 +1,42 @@ +#ifndef guard_bounded_string_sequence_hpp +#define guard_bounded_string_sequence_hpp +/** + * @file + * + * @brief Implement bounded sequences for strings. + * + * $Id$ + * + * @author Carlos O'Ryan + */ + +#include "tao/Bounded_Basic_String_Sequence_T.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +namespace TAO +{ + +template<CORBA::ULong MAX> +class bounded_string_sequence + : public details::bounded_basic_string_sequence<char,MAX> +{ +public: + inline bounded_string_sequence() + : details::bounded_basic_string_sequence<char,MAX>() + {} + inline bounded_string_sequence( + CORBA::ULong length, + char * * data, + CORBA::Boolean release = false) + : details::bounded_basic_string_sequence<char,MAX>( + length, data, release) + {} +}; + + +} // namespace TAO + +TAO_END_VERSIONED_NAMESPACE_DECL + +#endif // guard_bounded_string_sequence_hpp diff --git a/TAO/tao/Bounded_Wstring_Sequence_T.h b/TAO/tao/Bounded_Wstring_Sequence_T.h new file mode 100644 index 00000000000..c0ed84f289e --- /dev/null +++ b/TAO/tao/Bounded_Wstring_Sequence_T.h @@ -0,0 +1,42 @@ +#ifndef guard_bounded_wstring_sequence_hpp +#define guard_bounded_wstring_sequence_hpp +/** + * @file + * + * @brief Implement bounded sequences for wstrings. + * + * $Id$ + * + * @author Carlos O'Ryan + */ + +#include "tao/Bounded_Basic_String_Sequence_T.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +namespace TAO +{ + +template<CORBA::ULong MAX> +class bounded_wstring_sequence + : public details::bounded_basic_string_sequence<CORBA::WChar,MAX> +{ +public: + inline bounded_wstring_sequence() + : details::bounded_basic_string_sequence<CORBA::WChar,MAX>() + {} + inline bounded_wstring_sequence( + CORBA::ULong length, + CORBA::WChar * * data, + CORBA::Boolean release = false) + : details::bounded_basic_string_sequence<CORBA::WChar,MAX>( + length, data, release) + {} +}; + + +} // namespace TAO + +TAO_END_VERSIONED_NAMESPACE_DECL + +#endif // guard_bounded_wstring_sequence_hpp diff --git a/TAO/tao/FlResource/FlResource_Factory.cpp b/TAO/tao/FlResource/FlResource_Factory.cpp index 2071a22c25c..a280383b065 100644 --- a/TAO/tao/FlResource/FlResource_Factory.cpp +++ b/TAO/tao/FlResource/FlResource_Factory.cpp @@ -2,7 +2,7 @@ #include "tao/FlResource/FlResource_Factory.h" #include "tao/debug.h" -#include "ace/FlReactor/FlReactor.h" +#include "ace/FlReactor.h" ACE_RCSID( TAO_FlResource, FlResource_Factory, diff --git a/TAO/tao/FlResource/FlResource_Factory.h b/TAO/tao/FlResource/FlResource_Factory.h index 7d70cf7c5bd..28da6ab9341 100644 --- a/TAO/tao/FlResource/FlResource_Factory.h +++ b/TAO/tao/FlResource/FlResource_Factory.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/FlReactor/FlReactor.h" +#include "ace/FlReactor.h" #include "tao/GUIResource_Factory.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GUIResource_Factory.cpp b/TAO/tao/GUIResource_Factory.cpp index 33695590b87..a94f2e97302 100644 --- a/TAO/tao/GUIResource_Factory.cpp +++ b/TAO/tao/GUIResource_Factory.cpp @@ -8,7 +8,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { GUIResource_Factory::GUIResource_Factory (void) - : dynamically_allocated_reactor_ (false) + : dynamically_allocated_reactor_ (0) { } @@ -41,7 +41,7 @@ namespace TAO reactor = 0; } else - this->dynamically_allocated_reactor_ = true; + this->dynamically_allocated_reactor_ = 1; return reactor; } @@ -51,7 +51,7 @@ namespace TAO { ACE_GUARD ( TAO_SYNCH_MUTEX, ace_mon, this->lock_ ); - if (this->dynamically_allocated_reactor_) + if (this->dynamically_allocated_reactor_ == 1) delete reactor; } } diff --git a/TAO/tao/GUIResource_Factory.h b/TAO/tao/GUIResource_Factory.h index e0f2dab0543..aae6da6ba35 100644 --- a/TAO/tao/GUIResource_Factory.h +++ b/TAO/tao/GUIResource_Factory.h @@ -59,8 +59,7 @@ namespace TAO */ virtual ACE_Reactor *get_reactor (void) ; - /** - * Reclaim the reactor if allocated by this factory. + /** Reclaim the reactor if allocated by this factory. * Please note that this call is NOT synchronized. Left to the * higher level versions to synchronize access. */ @@ -68,8 +67,7 @@ namespace TAO protected: - /** - * Create or return current reactor instance. + /** Create or return current reactor instance. * Please note that this call is NOT synchronized. Left to the * get_reactor to synchronize access. */ @@ -78,9 +76,9 @@ namespace TAO private: /** - * Flag that is set to true if the reactor obtained from the + * Flag that is set to 1 if the reactor obtained from the * get_reactor() method is dynamically allocated. If this flag is - * set to true, then the reclaim_reactor() method with call the delete + * set to 1, then the reclaim_reactor() method with call the delete * operator on the given reactor. This flag is necessary to make * sure that a reactor not allocated by the default resource factory * is not reclaimed by the default resource factory. Such a @@ -88,7 +86,7 @@ namespace TAO * default one overrides the get_reactor() method but does not * override the reclaim_reactor() method. */ - bool dynamically_allocated_reactor_; + int dynamically_allocated_reactor_; /// for internal locking. TAO_SYNCH_MUTEX lock_; diff --git a/TAO/tao/HTTP_Client.cpp b/TAO/tao/HTTP_Client.cpp deleted file mode 100644 index a1091b80858..00000000000 --- a/TAO/tao/HTTP_Client.cpp +++ /dev/null @@ -1,57 +0,0 @@ -// $Id$ - -#include "tao/HTTP_Client.h" -#include "tao/HTTP_Handler.h" -#include "ace/OS_NS_string.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_HTTP_Client::TAO_HTTP_Client (void) -{ -} - -TAO_HTTP_Client::~TAO_HTTP_Client (void) -{ - this->close (); -} - -int -TAO_HTTP_Client::open (const ACE_TCHAR *filename, - const ACE_TCHAR *hostname, - u_short port) -{ - this->filename_ = ACE_OS::strdup (filename); - this->inet_addr_.set (port, hostname); - return 0; -} - -int -TAO_HTTP_Client::read (ACE_Message_Block *mb) -{ - // Create a HTTP_Client Reader - TAO_HTTP_Reader HTTP_reader (mb, this->filename_); - TAO_HTTP_Handler *brp = &HTTP_reader; - - // Connect to the server - if (connector_.connect (brp, this->inet_addr_) == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "TAO_HTTP_Client::read(): Connector error\n"), -1); - } - - return HTTP_reader.byte_count (); - -} - -int -TAO_HTTP_Client::close (void) -{ - if (this->filename_) - { - ACE_OS::free ((void *) this->filename_); - this->filename_ = 0; - } - return 0; -} - -TAO_END_VERSIONED_NAMESPACE_DECL - diff --git a/TAO/tao/HTTP_Client.h b/TAO/tao/HTTP_Client.h deleted file mode 100644 index 75e3b8da646..00000000000 --- a/TAO/tao/HTTP_Client.h +++ /dev/null @@ -1,75 +0,0 @@ - -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file HTTP_Client.h - * - * $Id$ - * - * This is the HTTP_Client class, which is the API for doing file - * uploads/downloads. - * - * @author Stoyan Paunov - */ -//============================================================================= - - -#ifndef TAO_HTTP_CLIENT_H -#define TAO_HTTP_CLIENT_H - -#include "ace/INET_Addr.h" -#include "ace/Svc_Handler.h" -#include "ace/SOCK_Connector.h" -#include "ace/Connector.h" -#include "ace/Message_Block.h" -#include "tao/HTTP_Handler.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -/** - * @class TAO_HTTP_Client - * - * @brief HTTP_Client is intended to provide application API to - * classes that wish to do network i/o at a very - * high level of abstraction. - * - * This class provides the ability to retrieve data from - * the network, of specified length and offset, and potentially - * use any protocol "under the hood" to do so. It currently - * uses HTTP. See HTTP_Handler also. - */ -class TAO_HTTP_Client -{ -public: - TAO_HTTP_Client (void); - ~TAO_HTTP_Client (void); - - /// Initializes the class with the given filename, hostname and port. - /// it should be called with the filename, before any read/write calls - int open (const ACE_TCHAR *filename, - const ACE_TCHAR *hostname = ACE_DEFAULT_SERVER_HOST, - u_short port = 80); - - /// Starts a connection, and reads a file from the server into - /// Message_Block mb - int read (ACE_Message_Block *mb); - - /// Frees memory allocated for filename. - int close (); - -private: - /// Store the internet address of the server - ACE_INET_Addr inet_addr_; - - /// The filename - ACE_TCHAR *filename_; - - /// The connector endpoint to initiate the client connection - ACE_Connector<TAO_HTTP_Handler, ACE_SOCK_CONNECTOR> connector_; - -}; - -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_HTTP_CLIENT_H */ diff --git a/TAO/tao/HTTP_Handler.cpp b/TAO/tao/HTTP_Handler.cpp deleted file mode 100644 index 16e3c2c70c0..00000000000 --- a/TAO/tao/HTTP_Handler.cpp +++ /dev/null @@ -1,197 +0,0 @@ -// $Id$ - -#include "tao/HTTP_Handler.h" -#include "ace/OS_NS_stdio.h" -#include "ace/OS_NS_string.h" -#include "ace/OS_NS_strings.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_HTTP_Handler::TAO_HTTP_Handler (void) -{ -} - -TAO_HTTP_Handler::TAO_HTTP_Handler (ACE_Message_Block * mb, - ACE_TCHAR *filename) : - mb_ (mb), - filename_ (ACE_OS::strdup (filename)), - bytecount_ (0) -{ -} - -TAO_HTTP_Handler::~TAO_HTTP_Handler (void) -{ - if (this->filename_) - { - ACE_OS::free (this->filename_); - filename_ = 0; - } -} - -int -TAO_HTTP_Handler::open (void *) -{ - if (this->send_request () != 0) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "TAO_HTTP_Handler::open():send_request failed\n"), -1); - - if (this->receive_reply () != 0) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "TAO_HTTP_Handler::open():receive_reply failed\n"), -1); - return 0; - -} - -int -TAO_HTTP_Handler::close (u_long) -{ - return 0; -} - -int -TAO_HTTP_Handler::send_request (void) -{ - return -1; -} - -int -TAO_HTTP_Handler::receive_reply (void) -{ - return -1; -} - -size_t -TAO_HTTP_Handler::byte_count (void) const -{ - return bytecount_; -} - -// Reader ************************************************** - -TAO_HTTP_Reader::TAO_HTTP_Reader (ACE_Message_Block * mb, - ACE_TCHAR *filename, - const char *request_prefix, - const char *request_suffix) : - TAO_HTTP_Handler (mb, filename), - request_prefix_ (request_prefix), - request_suffix_ (request_suffix) -{ -} - -int -TAO_HTTP_Reader::send_request (void) -{ - char mesg [MAX_HEADER_SIZE]; - - // Check to see if the request is too big - if (MAX_HEADER_SIZE < (ACE_OS::strlen (request_prefix_) - + ACE_OS::strlen (filename_) - + ACE_OS::strlen (request_suffix_) + 4)) - ACE_ERROR_RETURN((LM_ERROR,"Request too large!"), -1); - - // Create a message to send to the server requesting retrieval of the file - int const len = ACE_OS::sprintf (mesg, "%s %s %s", request_prefix_, filename_, request_suffix_); - - // Send the message to server - if (peer ().send_n (mesg, len) != len) - ACE_ERROR_RETURN((LM_ERROR,"Error sending request\n"), -1); - - return 0; -} - -int -TAO_HTTP_Reader::receive_reply (void) -{ - size_t num_recvd = 0; - char buf [MTU+1]; - char *buf_ptr = 0; - size_t bytes_read = 0; - - // Receive the first MTU bytes and strip the header off. - // Note that we assume that the header will fit into MTU bytes. - if (peer ().recv_n (buf, MTU, 0, &num_recvd) >= 0) - { - //Make sure that response type is 200 OK - if (ACE_OS::strstr (buf,"200 OK") == 0) - ACE_ERROR_RETURN ((LM_ERROR, - "HTTP_Reader::receiveReply(): Response is not 200 OK\n" ), -1); - - // Search for the header termination string "\r\n\r\n", or "\n\n". If - // found, move past it to get to the data portion. - if ((buf_ptr = ACE_OS::strstr (buf,"\r\n\r\n")) != 0) - buf_ptr += 4; - else if ((buf_ptr = ACE_OS::strstr (buf, "\n\n")) != 0) //for compatibility with JAWS - buf_ptr += 2; - else - buf_ptr = buf; - - // Determine number of data bytes read. This is equal to the - // total bytes read minus number of header bytes. - bytes_read = num_recvd - (buf_ptr - buf); - - } - else - { - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "HTTP_Reader::receiveReply():Error while reading header\n"), -1); - } - - // *************************************************************** - // At this point, we have stripped off the header and are ready to - // process data. buf_ptr points to the data - - ACE_Message_Block* temp = 0; - ACE_Message_Block* curr = this->mb_; - - ACE_NEW_RETURN (temp, - ACE_Message_Block (bytes_read), - -1); - curr->cont (temp); - curr = curr->cont (); - - // Copy over all the data bytes into our message buffer. - if (curr->copy (buf_ptr, bytes_read) == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", - "HTTP_Reader::receiveReply():Error copying data into Message_Block\n" ), -1); - } - - // read the rest of the data into a number of ACE_Message_Blocks and - // chain them together in a link list fashion - num_recvd = 0; - - do - { - if (curr->space () == 0) - { - ACE_NEW_RETURN (temp, - ACE_Message_Block (MTU), - -1); - curr->cont (temp); - curr = curr->cont (); - } - - if (peer ().recv_n (curr->wr_ptr (), curr->space (), 0, &num_recvd) >= 0) - { - // Move the write pointer - curr->wr_ptr (num_recvd); - - // Increment bytes_read - bytes_read += num_recvd; - - } - else - { - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "TAO_HTTP_Reader::receive_reply(): Error while reading header\n"), -1); - } - } while (num_recvd != 0); - - // Set the byte count to number of bytes received - this->bytecount_ = bytes_read; - - return 0; -} - -TAO_END_VERSIONED_NAMESPACE_DECL - diff --git a/TAO/tao/HTTP_Handler.h b/TAO/tao/HTTP_Handler.h deleted file mode 100644 index b2b510f9381..00000000000 --- a/TAO/tao/HTTP_Handler.h +++ /dev/null @@ -1,88 +0,0 @@ - -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file HTTP_Handler.h - * - * $Id$ - * - * HTTP_Handler is a base class for HTTP_Reader and - * HTTP_Writer which are created in response to calls to - * read/write, as appropriate - */ -//============================================================================= - - -#ifndef TAO_HTTP_HANDLER_H -#define TAO_HTTP_HANDLER_H - -#include "ace/SOCK_Stream.h" -#include "ace/Svc_Handler.h" -#include "ace/Message_Block.h" -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -/** - * @class TAO_HTTP_Handler - * class to retrieve data via HTTP - */ -class TAO_HTTP_Handler : public ACE_Svc_Handler <ACE_SOCK_STREAM, ACE_NULL_SYNCH> -{ -public: - /// Null constructor, insures that it works properly with Connector - TAO_HTTP_Handler (void); - - /// Always use this constructor to make HTTP_Handlers - TAO_HTTP_Handler (ACE_Message_Block *mb, - ACE_TCHAR *filename); - - /// returns the number of bytes read/written in the last operation. - size_t byte_count (void) const; - - /// Activate this instance of the <HTTP_Handler> - virtual int open (void * = 0); - - /// Close down the Blob - virtual int close (u_long flags = 0); - - ~TAO_HTTP_Handler (void); - -protected: - virtual int send_request (void); - virtual int receive_reply (void); - - ACE_Message_Block *mb_; - ACE_TCHAR *filename_; - size_t bytecount_; - enum - { - /// The handler assumes that the first 2048 bytes of a server response - /// contains the header - MAX_HEADER_SIZE = 2048, - - /// set the MAX_TRANSMISSION_UNIT (MTU) = BUFSIZ as defined by OS - MTU = BUFSIZ - }; -}; - -class TAO_HTTP_Reader : public TAO_HTTP_Handler -{ -public: - TAO_HTTP_Reader (ACE_Message_Block *mb, - ACE_TCHAR *filename, - const char *request_prefix = "GET", - const char *request_suffix = "HTTP/1.0\r\nAccept: HTTP/1.0\r\n\r\n"); - -private: - //NOTE: these functions return -1 on error - int send_request (void); - int receive_reply (void); - const char *request_prefix_; - const char *request_suffix_; -}; - -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_HTTP_HANDLER_H */ diff --git a/TAO/tao/HTTP_Parser.cpp b/TAO/tao/HTTP_Parser.cpp deleted file mode 100644 index 496734e91b0..00000000000 --- a/TAO/tao/HTTP_Parser.cpp +++ /dev/null @@ -1,150 +0,0 @@ -// $Id$ - -#include "tao/HTTP_Parser.h" -#include "tao/HTTP_Client.h" -#include "tao/ORB.h" -#include "tao/Environment.h" -#include "tao/Object.h" - -#include "ace/Read_Buffer.h" -#include "ace/Malloc_Base.h" -#include "ace/Log_Msg.h" -#include "ace/OS_NS_stdio.h" -#include "ace/OS_NS_string.h" - -ACE_RCSID (tao, - HTTP_Parser, - "$Id$") - -static const char file_prefix[] = "http:"; - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_HTTP_Parser::~TAO_HTTP_Parser (void) -{ -} - - -bool -TAO_HTTP_Parser::match_prefix (const char *ior_string) const -{ - return (ACE_OS::strncmp (ior_string, - ::file_prefix, - sizeof (::file_prefix) - 1) == 0); -} - -CORBA::Object_ptr -TAO_HTTP_Parser::parse_string (const char *ior, - CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - // Skip the prefix, we know it is there because this method in only - // called if <match_prefix> returns 1. - const char *http_url = - ior + sizeof (::file_prefix) + 1; - - ACE_TCHAR *hostname = 0; - ACE_TCHAR *filename = 0; - const ACE_TCHAR *ptr = 0; - u_short port = 80; - - if (http_url[0] == '/') - { - filename = ACE_OS::strdup (http_url); - } - else - { - ptr = ACE_OS::strstr (http_url, ":"); - if (ptr) - port = ACE_OS::atoi (ptr + 1); - else - ptr = ACE_OS::strstr (http_url, "/"); - - if(!ptr) - return 0; - else - { - size_t const host_len = ptr - http_url; - ACE_NEW_RETURN (hostname, char [host_len + 1], 0 ); - ACE_OS::strncpy (hostname, http_url, host_len); - hostname [host_len] = '\0'; - ptr = ACE_OS::strstr (ptr, "/"); - if (ptr) - { - filename = ACE_OS::strdup(ptr); - } - else - return 0; - } - } - - ACE_Message_Block* mb = 0; - ACE_NEW_THROW_EX (mb, - ACE_Message_Block (), - CORBA::INTERNAL ()); - - // Create a client - TAO_HTTP_Client client; - - if (TAO_debug_level > 4) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) HTTP_Parser::parse_string, getting IOR from <%s> <%s> <%d>\n"), - hostname, filename, port)); - } - - // Open the client - if (client.open (filename, - hostname, - port) == -1) - { - client.close (); - return 0; - } - - delete [] hostname; - ACE_OS::free (filename); - - // Read from it - if (client.read (mb) <= 0) - { - client.close (); - return 0; - } - - // We get multiple message blocks back, concatenate them to - // one large string - ACE_CString string; - for (ACE_Message_Block * curr = mb; curr != 0; curr = curr->cont ()) - string += curr->rd_ptr(); - - CORBA::Object_ptr object = CORBA::Object::_nil (); - ACE_TRY - { - object = orb->string_to_object (string.c_str() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_RE_THROW; - } - ACE_ENDTRY; - ACE_CHECK_RETURN (CORBA::Object::_nil ()); - - return object; -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DEFINE (TAO_HTTP_Parser, - ACE_TEXT ("HTTP_Parser"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (TAO_HTTP_Parser), - ACE_Service_Type::DELETE_THIS | - ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_DEFINE (TAO, TAO_HTTP_Parser) - - diff --git a/TAO/tao/HTTP_Parser.h b/TAO/tao/HTTP_Parser.h deleted file mode 100644 index 8396039e864..00000000000 --- a/TAO/tao/HTTP_Parser.h +++ /dev/null @@ -1,62 +0,0 @@ - -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file HTTP_Parser.h - * - * $Id$ - * - * @author Johnny Willemsen <jwillemsen@remedy.nl> - */ -//============================================================================= - - -#ifndef TAO_HTTP_PARSER_H -#define TAO_HTTP_PARSER_H - -#include /**/ "ace/pre.h" -#include "ace/Service_Config.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/IOR_Parser.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -/** - * @class TAO_HTTP_Parser - * - * @brief Implements the <http:> IOR format - * - * This class implements the <http:> IOR format. - * It is dynamically loaded by the ORB and used to get an IOR - * from a http server and then interprete the data as an IOR (that - * can be in any valid format). - */ -class TAO_HTTP_Parser : public TAO_IOR_Parser -{ -public: - - /// The destructor - virtual ~TAO_HTTP_Parser (void); - - // = The IOR_Parser methods, please read the documentation in - // IOR_Parser.h - virtual bool match_prefix (const char *ior_string) const; - virtual CORBA::Object_ptr parse_string (const char *ior, - CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)); -}; - -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_HTTP_Parser) -ACE_FACTORY_DECLARE (TAO, TAO_HTTP_Parser) - -#include /**/ "ace/post.h" -#endif /* TAO_HTTP_PARSER_H */ - diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp index 30758b60b00..f9cc17a103c 100644 --- a/TAO/tao/IIOP_Acceptor.cpp +++ b/TAO/tao/IIOP_Acceptor.cpp @@ -1190,7 +1190,15 @@ TAO_IIOP_Acceptor::parse_options_i (int &argc, ACE_TEXT ("TAO (%P|%t) Zero length IIOP ") ACE_TEXT ("option name.\n")), -1); - if (name == "portspan") + if (name == "priority") + { + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("TAO (%P|%t) Invalid IIOP endpoint format: ") + ACE_TEXT ("endpoint priorities no longer supported. \n"), + value.c_str ()), + -1); + } + else if (name == "portspan") { int range = static_cast <int> (ACE_OS::atoi (value.c_str ())); // @@ What's the lower bound on the range? zero, or one? diff --git a/TAO/tao/Incoming_Message_Stack.h b/TAO/tao/Incoming_Message_Stack.h index 453af96fb24..453af96fb24 100644..100755 --- a/TAO/tao/Incoming_Message_Stack.h +++ b/TAO/tao/Incoming_Message_Stack.h diff --git a/TAO/tao/Incoming_Message_Stack.inl b/TAO/tao/Incoming_Message_Stack.inl index fd13e03a54e..fd13e03a54e 100644..100755 --- a/TAO/tao/Incoming_Message_Stack.inl +++ b/TAO/tao/Incoming_Message_Stack.inl diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am index a543b2f5d6f..93002192097 100644 --- a/TAO/tao/Makefile.am +++ b/TAO/tao/Makefile.am @@ -48,7 +48,49 @@ CLEANFILES += \ AnyTypeCode/GIOPA.cpp AnyTypeCode/GIOPA.h GIOPC.cpp GIOPC.h GIOPC.inl GIOPS.h: GIOP-stamp GIOP-stamp: $(srcdir)/GIOP.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/GIOP.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/GIOP.pidl + @touch $@ + +BUILT_SOURCES += \ + AnyTypeCode/BooleanSeqA.cpp \ + AnyTypeCode/BooleanSeqA.h \ + BooleanSeqC.cpp \ + BooleanSeqC.h \ + BooleanSeqS.h + +CLEANFILES += \ + BooleanSeq-stamp \ + AnyTypeCode/BooleanSeqA.cpp \ + AnyTypeCode/BooleanSeqA.h \ + BooleanSeqC.cpp \ + BooleanSeqC.h \ + BooleanSeqS.h + +AnyTypeCode/BooleanSeqA.cpp AnyTypeCode/BooleanSeqA.h BooleanSeqC.cpp BooleanSeqC.h BooleanSeqS.h: BooleanSeq-stamp + +BooleanSeq-stamp: $(srcdir)/BooleanSeq.pidl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/BooleanSeq.pidl + @touch $@ + +BUILT_SOURCES += \ + AnyTypeCode/CharSeqA.cpp \ + AnyTypeCode/CharSeqA.h \ + CharSeqC.cpp \ + CharSeqC.h \ + CharSeqS.h + +CLEANFILES += \ + CharSeq-stamp \ + AnyTypeCode/CharSeqA.cpp \ + AnyTypeCode/CharSeqA.h \ + CharSeqC.cpp \ + CharSeqC.h \ + CharSeqS.h + +AnyTypeCode/CharSeqA.cpp AnyTypeCode/CharSeqA.h CharSeqC.cpp CharSeqC.h CharSeqS.h: CharSeq-stamp + +CharSeq-stamp: $(srcdir)/CharSeq.pidl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/CharSeq.pidl @touch $@ BUILT_SOURCES += \ @@ -69,7 +111,7 @@ CLEANFILES += \ AnyTypeCode/CONV_FRAMEA.cpp AnyTypeCode/CONV_FRAMEA.h CONV_FRAMEC.cpp CONV_FRAMEC.h CONV_FRAMES.h: CONV_FRAME-stamp CONV_FRAME-stamp: $(srcdir)/CONV_FRAME.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/CONV_FRAME.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/CONV_FRAME.pidl @touch $@ BUILT_SOURCES += \ @@ -90,7 +132,49 @@ CLEANFILES += \ AnyTypeCode/CurrentA.cpp AnyTypeCode/CurrentA.h CurrentC.cpp CurrentC.h CurrentS.h: Current-stamp Current-stamp: $(srcdir)/Current.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/Current.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/Current.pidl + @touch $@ + +BUILT_SOURCES += \ + AnyTypeCode/DoubleSeqA.cpp \ + AnyTypeCode/DoubleSeqA.h \ + DoubleSeqC.cpp \ + DoubleSeqC.h \ + DoubleSeqS.h + +CLEANFILES += \ + DoubleSeq-stamp \ + AnyTypeCode/DoubleSeqA.cpp \ + AnyTypeCode/DoubleSeqA.h \ + DoubleSeqC.cpp \ + DoubleSeqC.h \ + DoubleSeqS.h + +AnyTypeCode/DoubleSeqA.cpp AnyTypeCode/DoubleSeqA.h DoubleSeqC.cpp DoubleSeqC.h DoubleSeqS.h: DoubleSeq-stamp + +DoubleSeq-stamp: $(srcdir)/DoubleSeq.pidl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/DoubleSeq.pidl + @touch $@ + +BUILT_SOURCES += \ + AnyTypeCode/FloatSeqA.cpp \ + AnyTypeCode/FloatSeqA.h \ + FloatSeqC.cpp \ + FloatSeqC.h \ + FloatSeqS.h + +CLEANFILES += \ + FloatSeq-stamp \ + AnyTypeCode/FloatSeqA.cpp \ + AnyTypeCode/FloatSeqA.h \ + FloatSeqC.cpp \ + FloatSeqC.h \ + FloatSeqS.h + +AnyTypeCode/FloatSeqA.cpp AnyTypeCode/FloatSeqA.h FloatSeqC.cpp FloatSeqC.h FloatSeqS.h: FloatSeq-stamp + +FloatSeq-stamp: $(srcdir)/FloatSeq.pidl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/FloatSeq.pidl @touch $@ BUILT_SOURCES += \ @@ -109,7 +193,7 @@ CLEANFILES += \ AnyTypeCode/IIOPA.cpp AnyTypeCode/IIOPA.h IIOPC.cpp IIOPC.h: IIOP-stamp IIOP-stamp: $(srcdir)/IIOP.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/IIOP.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/IIOP.pidl @touch $@ BUILT_SOURCES += \ @@ -130,7 +214,7 @@ CLEANFILES += \ AnyTypeCode/IIOP_EndpointsA.cpp AnyTypeCode/IIOP_EndpointsA.h IIOP_EndpointsC.cpp IIOP_EndpointsC.h IIOP_EndpointsS.h: IIOP_Endpoints-stamp IIOP_Endpoints-stamp: $(srcdir)/IIOP_Endpoints.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/IIOP_Endpoints.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/IIOP_Endpoints.pidl @touch $@ BUILT_SOURCES += \ @@ -151,7 +235,7 @@ CLEANFILES += \ AnyTypeCode/IOPA.cpp AnyTypeCode/IOPA.h IOPC.cpp IOPC.h IOPS.h: IOP-stamp IOP-stamp: $(srcdir)/IOP.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/IOP.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/IOP.pidl @touch $@ BUILT_SOURCES += \ @@ -170,7 +254,70 @@ CLEANFILES += \ AnyTypeCode/IOP_IORA.cpp AnyTypeCode/IOP_IORA.h IOP_IORC.cpp IOP_IORC.h: IOP_IOR-stamp IOP_IOR-stamp: $(srcdir)/IOP_IOR.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/IOP_IOR.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/IOP_IOR.pidl + @touch $@ + +BUILT_SOURCES += \ + AnyTypeCode/LongDoubleSeqA.cpp \ + AnyTypeCode/LongDoubleSeqA.h \ + LongDoubleSeqC.cpp \ + LongDoubleSeqC.h \ + LongDoubleSeqS.h + +CLEANFILES += \ + LongDoubleSeq-stamp \ + AnyTypeCode/LongDoubleSeqA.cpp \ + AnyTypeCode/LongDoubleSeqA.h \ + LongDoubleSeqC.cpp \ + LongDoubleSeqC.h \ + LongDoubleSeqS.h + +AnyTypeCode/LongDoubleSeqA.cpp AnyTypeCode/LongDoubleSeqA.h LongDoubleSeqC.cpp LongDoubleSeqC.h LongDoubleSeqS.h: LongDoubleSeq-stamp + +LongDoubleSeq-stamp: $(srcdir)/LongDoubleSeq.pidl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/LongDoubleSeq.pidl + @touch $@ + +BUILT_SOURCES += \ + AnyTypeCode/LongLongSeqA.cpp \ + AnyTypeCode/LongLongSeqA.h \ + LongLongSeqC.cpp \ + LongLongSeqC.h \ + LongLongSeqS.h + +CLEANFILES += \ + LongLongSeq-stamp \ + AnyTypeCode/LongLongSeqA.cpp \ + AnyTypeCode/LongLongSeqA.h \ + LongLongSeqC.cpp \ + LongLongSeqC.h \ + LongLongSeqS.h + +AnyTypeCode/LongLongSeqA.cpp AnyTypeCode/LongLongSeqA.h LongLongSeqC.cpp LongLongSeqC.h LongLongSeqS.h: LongLongSeq-stamp + +LongLongSeq-stamp: $(srcdir)/LongLongSeq.pidl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/LongLongSeq.pidl + @touch $@ + +BUILT_SOURCES += \ + AnyTypeCode/LongSeqA.cpp \ + AnyTypeCode/LongSeqA.h \ + LongSeqC.cpp \ + LongSeqC.h \ + LongSeqS.h + +CLEANFILES += \ + LongSeq-stamp \ + AnyTypeCode/LongSeqA.cpp \ + AnyTypeCode/LongSeqA.h \ + LongSeqC.cpp \ + LongSeqC.h \ + LongSeqS.h + +AnyTypeCode/LongSeqA.cpp AnyTypeCode/LongSeqA.h LongSeqC.cpp LongSeqC.h LongSeqS.h: LongSeq-stamp + +LongSeq-stamp: $(srcdir)/LongSeq.pidl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/LongSeq.pidl @touch $@ BUILT_SOURCES += \ @@ -189,7 +336,7 @@ CLEANFILES += \ AnyTypeCode/Messaging_PolicyValueA.cpp AnyTypeCode/Messaging_PolicyValueA.h Messaging_PolicyValueC.cpp Messaging_PolicyValueC.h: Messaging_PolicyValue-stamp Messaging_PolicyValue-stamp: $(srcdir)/Messaging_PolicyValue.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/Messaging_PolicyValue.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/Messaging_PolicyValue.pidl @touch $@ BUILT_SOURCES += \ @@ -208,7 +355,7 @@ CLEANFILES += \ AnyTypeCode/Messaging_SyncScopeA.cpp AnyTypeCode/Messaging_SyncScopeA.h Messaging_SyncScopeC.cpp Messaging_SyncScopeC.h: Messaging_SyncScope-stamp Messaging_SyncScope-stamp: $(srcdir)/Messaging_SyncScope.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/Messaging_SyncScope.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/Messaging_SyncScope.pidl @touch $@ BUILT_SOURCES += \ @@ -227,7 +374,7 @@ CLEANFILES += \ AnyTypeCode/ObjectIdListA.cpp AnyTypeCode/ObjectIdListA.h ObjectIdListC.cpp ObjectIdListC.h: ObjectIdList-stamp ObjectIdList-stamp: $(srcdir)/ObjectIdList.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/ObjectIdList.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/ObjectIdList.pidl @touch $@ BUILT_SOURCES += \ @@ -248,7 +395,7 @@ CLEANFILES += \ AnyTypeCode/orb_typesA.cpp AnyTypeCode/orb_typesA.h orb_typesC.cpp orb_typesC.h orb_typesS.h: orb_types-stamp orb_types-stamp: $(srcdir)/orb_types.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/orb_types.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/orb_types.pidl @touch $@ BUILT_SOURCES += \ @@ -269,7 +416,7 @@ CLEANFILES += \ AnyTypeCode/ParameterModeA.cpp AnyTypeCode/ParameterModeA.h ParameterModeC.cpp ParameterModeC.h ParameterModeS.h: ParameterMode-stamp ParameterMode-stamp: $(srcdir)/ParameterMode.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/ParameterMode.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/ParameterMode.pidl @touch $@ BUILT_SOURCES += \ @@ -290,7 +437,7 @@ CLEANFILES += \ AnyTypeCode/Policy_ForwardA.cpp AnyTypeCode/Policy_ForwardA.h Policy_ForwardC.cpp Policy_ForwardC.h Policy_ForwardS.h: Policy_Forward-stamp Policy_Forward-stamp: $(srcdir)/Policy_Forward.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/Policy_Forward.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/Policy_Forward.pidl @touch $@ BUILT_SOURCES += \ @@ -309,7 +456,7 @@ CLEANFILES += \ AnyTypeCode/PI_ForwardA.cpp AnyTypeCode/PI_ForwardA.h PI_ForwardC.cpp PI_ForwardC.h: PI_Forward-stamp PI_Forward-stamp: $(srcdir)/PI_Forward.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/PI_Forward.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/PI_Forward.pidl @touch $@ BUILT_SOURCES += \ @@ -330,7 +477,7 @@ CLEANFILES += \ AnyTypeCode/PortableInterceptorA.cpp AnyTypeCode/PortableInterceptorA.h PortableInterceptorC.cpp PortableInterceptorC.h PortableInterceptorS.h: PortableInterceptor-stamp PortableInterceptor-stamp: $(srcdir)/PortableInterceptor.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/PortableInterceptor.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/PortableInterceptor.pidl @touch $@ BUILT_SOURCES += \ @@ -351,7 +498,49 @@ CLEANFILES += \ AnyTypeCode/ServicesA.cpp AnyTypeCode/ServicesA.h ServicesC.cpp ServicesC.h ServicesS.h: Services-stamp Services-stamp: $(srcdir)/Services.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/Services.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/Services.pidl + @touch $@ + +BUILT_SOURCES += \ + AnyTypeCode/ShortSeqA.cpp \ + AnyTypeCode/ShortSeqA.h \ + ShortSeqC.cpp \ + ShortSeqC.h \ + ShortSeqS.h + +CLEANFILES += \ + ShortSeq-stamp \ + AnyTypeCode/ShortSeqA.cpp \ + AnyTypeCode/ShortSeqA.h \ + ShortSeqC.cpp \ + ShortSeqC.h \ + ShortSeqS.h + +AnyTypeCode/ShortSeqA.cpp AnyTypeCode/ShortSeqA.h ShortSeqC.cpp ShortSeqC.h ShortSeqS.h: ShortSeq-stamp + +ShortSeq-stamp: $(srcdir)/ShortSeq.pidl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/ShortSeq.pidl + @touch $@ + +BUILT_SOURCES += \ + AnyTypeCode/StringSeqA.cpp \ + AnyTypeCode/StringSeqA.h \ + StringSeqC.cpp \ + StringSeqC.h \ + StringSeqS.h + +CLEANFILES += \ + StringSeq-stamp \ + AnyTypeCode/StringSeqA.cpp \ + AnyTypeCode/StringSeqA.h \ + StringSeqC.cpp \ + StringSeqC.h \ + StringSeqS.h + +AnyTypeCode/StringSeqA.cpp AnyTypeCode/StringSeqA.h StringSeqC.cpp StringSeqC.h StringSeqS.h: StringSeq-stamp + +StringSeq-stamp: $(srcdir)/StringSeq.pidl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/StringSeq.pidl @touch $@ BUILT_SOURCES += \ @@ -372,7 +561,7 @@ CLEANFILES += \ AnyTypeCode/TAOA.cpp AnyTypeCode/TAOA.h TAOC.cpp TAOC.h TAOS.h: TAO-stamp TAO-stamp: $(srcdir)/TAO.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/TAO.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/TAO.pidl @touch $@ BUILT_SOURCES += \ @@ -393,217 +582,28 @@ CLEANFILES += \ AnyTypeCode/TimeBaseA.cpp AnyTypeCode/TimeBaseA.h TimeBaseC.cpp TimeBaseC.h TimeBaseS.h: TimeBase-stamp TimeBase-stamp: $(srcdir)/TimeBase.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/TimeBase.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/TimeBase.pidl @touch $@ BUILT_SOURCES += \ - AnyTypeCode/BooleanSeqA.cpp \ - AnyTypeCode/BooleanSeqA.h \ - BooleanSeqC.cpp \ - BooleanSeqC.h \ - BooleanSeqS.h - -CLEANFILES += \ - BooleanSeq-stamp \ - AnyTypeCode/BooleanSeqA.cpp \ - AnyTypeCode/BooleanSeqA.h \ - BooleanSeqC.cpp \ - BooleanSeqC.h \ - BooleanSeqS.h - -AnyTypeCode/BooleanSeqA.cpp AnyTypeCode/BooleanSeqA.h BooleanSeqC.cpp BooleanSeqC.h BooleanSeqS.h: BooleanSeq-stamp - -BooleanSeq-stamp: $(srcdir)/BooleanSeq.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/BooleanSeq.pidl - @touch $@ - -BUILT_SOURCES += \ - AnyTypeCode/CharSeqA.cpp \ - AnyTypeCode/CharSeqA.h \ - CharSeqC.cpp \ - CharSeqC.h \ - CharSeqS.h - -CLEANFILES += \ - CharSeq-stamp \ - AnyTypeCode/CharSeqA.cpp \ - AnyTypeCode/CharSeqA.h \ - CharSeqC.cpp \ - CharSeqC.h \ - CharSeqS.h - -AnyTypeCode/CharSeqA.cpp AnyTypeCode/CharSeqA.h CharSeqC.cpp CharSeqC.h CharSeqS.h: CharSeq-stamp - -CharSeq-stamp: $(srcdir)/CharSeq.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/CharSeq.pidl - @touch $@ - -BUILT_SOURCES += \ - AnyTypeCode/DoubleSeqA.cpp \ - AnyTypeCode/DoubleSeqA.h \ - DoubleSeqC.cpp \ - DoubleSeqC.h \ - DoubleSeqS.h - -CLEANFILES += \ - DoubleSeq-stamp \ - AnyTypeCode/DoubleSeqA.cpp \ - AnyTypeCode/DoubleSeqA.h \ - DoubleSeqC.cpp \ - DoubleSeqC.h \ - DoubleSeqS.h - -AnyTypeCode/DoubleSeqA.cpp AnyTypeCode/DoubleSeqA.h DoubleSeqC.cpp DoubleSeqC.h DoubleSeqS.h: DoubleSeq-stamp - -DoubleSeq-stamp: $(srcdir)/DoubleSeq.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/DoubleSeq.pidl - @touch $@ - -BUILT_SOURCES += \ - AnyTypeCode/FloatSeqA.cpp \ - AnyTypeCode/FloatSeqA.h \ - FloatSeqC.cpp \ - FloatSeqC.h \ - FloatSeqS.h - -CLEANFILES += \ - FloatSeq-stamp \ - AnyTypeCode/FloatSeqA.cpp \ - AnyTypeCode/FloatSeqA.h \ - FloatSeqC.cpp \ - FloatSeqC.h \ - FloatSeqS.h - -AnyTypeCode/FloatSeqA.cpp AnyTypeCode/FloatSeqA.h FloatSeqC.cpp FloatSeqC.h FloatSeqS.h: FloatSeq-stamp - -FloatSeq-stamp: $(srcdir)/FloatSeq.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/FloatSeq.pidl - @touch $@ - -BUILT_SOURCES += \ - AnyTypeCode/LongDoubleSeqA.cpp \ - AnyTypeCode/LongDoubleSeqA.h \ - LongDoubleSeqC.cpp \ - LongDoubleSeqC.h \ - LongDoubleSeqS.h - -CLEANFILES += \ - LongDoubleSeq-stamp \ - AnyTypeCode/LongDoubleSeqA.cpp \ - AnyTypeCode/LongDoubleSeqA.h \ - LongDoubleSeqC.cpp \ - LongDoubleSeqC.h \ - LongDoubleSeqS.h - -AnyTypeCode/LongDoubleSeqA.cpp AnyTypeCode/LongDoubleSeqA.h LongDoubleSeqC.cpp LongDoubleSeqC.h LongDoubleSeqS.h: LongDoubleSeq-stamp - -LongDoubleSeq-stamp: $(srcdir)/LongDoubleSeq.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/LongDoubleSeq.pidl - @touch $@ - -BUILT_SOURCES += \ - AnyTypeCode/LongLongSeqA.cpp \ - AnyTypeCode/LongLongSeqA.h \ - LongLongSeqC.cpp \ - LongLongSeqC.h \ - LongLongSeqS.h - -CLEANFILES += \ - LongLongSeq-stamp \ - AnyTypeCode/LongLongSeqA.cpp \ - AnyTypeCode/LongLongSeqA.h \ - LongLongSeqC.cpp \ - LongLongSeqC.h \ - LongLongSeqS.h - -AnyTypeCode/LongLongSeqA.cpp AnyTypeCode/LongLongSeqA.h LongLongSeqC.cpp LongLongSeqC.h LongLongSeqS.h: LongLongSeq-stamp - -LongLongSeq-stamp: $(srcdir)/LongLongSeq.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/LongLongSeq.pidl - @touch $@ - -BUILT_SOURCES += \ - AnyTypeCode/LongSeqA.cpp \ - AnyTypeCode/LongSeqA.h \ - LongSeqC.cpp \ - LongSeqC.h \ - LongSeqS.h - -CLEANFILES += \ - LongSeq-stamp \ - AnyTypeCode/LongSeqA.cpp \ - AnyTypeCode/LongSeqA.h \ - LongSeqC.cpp \ - LongSeqC.h \ - LongSeqS.h - -AnyTypeCode/LongSeqA.cpp AnyTypeCode/LongSeqA.h LongSeqC.cpp LongSeqC.h LongSeqS.h: LongSeq-stamp - -LongSeq-stamp: $(srcdir)/LongSeq.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/LongSeq.pidl - @touch $@ - -BUILT_SOURCES += \ - AnyTypeCode/OctetSeqA.cpp \ - AnyTypeCode/OctetSeqA.h \ - OctetSeqC.cpp \ - OctetSeqC.h \ - OctetSeqS.h - -CLEANFILES += \ - OctetSeq-stamp \ - AnyTypeCode/OctetSeqA.cpp \ - AnyTypeCode/OctetSeqA.h \ - OctetSeqC.cpp \ - OctetSeqC.h \ - OctetSeqS.h - -AnyTypeCode/OctetSeqA.cpp AnyTypeCode/OctetSeqA.h OctetSeqC.cpp OctetSeqC.h OctetSeqS.h: OctetSeq-stamp - -OctetSeq-stamp: $(srcdir)/OctetSeq.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/OctetSeq.pidl - @touch $@ - -BUILT_SOURCES += \ - AnyTypeCode/ShortSeqA.cpp \ - AnyTypeCode/ShortSeqA.h \ - ShortSeqC.cpp \ - ShortSeqC.h \ - ShortSeqS.h - -CLEANFILES += \ - ShortSeq-stamp \ - AnyTypeCode/ShortSeqA.cpp \ - AnyTypeCode/ShortSeqA.h \ - ShortSeqC.cpp \ - ShortSeqC.h \ - ShortSeqS.h - -AnyTypeCode/ShortSeqA.cpp AnyTypeCode/ShortSeqA.h ShortSeqC.cpp ShortSeqC.h ShortSeqS.h: ShortSeq-stamp - -ShortSeq-stamp: $(srcdir)/ShortSeq.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/ShortSeq.pidl - @touch $@ - -BUILT_SOURCES += \ - AnyTypeCode/StringSeqA.cpp \ - AnyTypeCode/StringSeqA.h \ - StringSeqC.cpp \ - StringSeqC.h \ - StringSeqS.h + AnyTypeCode/ULongLongSeqA.cpp \ + AnyTypeCode/ULongLongSeqA.h \ + ULongLongSeqC.cpp \ + ULongLongSeqC.h \ + ULongLongSeqS.h CLEANFILES += \ - StringSeq-stamp \ - AnyTypeCode/StringSeqA.cpp \ - AnyTypeCode/StringSeqA.h \ - StringSeqC.cpp \ - StringSeqC.h \ - StringSeqS.h + ULongLongSeq-stamp \ + AnyTypeCode/ULongLongSeqA.cpp \ + AnyTypeCode/ULongLongSeqA.h \ + ULongLongSeqC.cpp \ + ULongLongSeqC.h \ + ULongLongSeqS.h -AnyTypeCode/StringSeqA.cpp AnyTypeCode/StringSeqA.h StringSeqC.cpp StringSeqC.h StringSeqS.h: StringSeq-stamp +AnyTypeCode/ULongLongSeqA.cpp AnyTypeCode/ULongLongSeqA.h ULongLongSeqC.cpp ULongLongSeqC.h ULongLongSeqS.h: ULongLongSeq-stamp -StringSeq-stamp: $(srcdir)/StringSeq.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/StringSeq.pidl +ULongLongSeq-stamp: $(srcdir)/ULongLongSeq.pidl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/ULongLongSeq.pidl @touch $@ BUILT_SOURCES += \ @@ -624,28 +624,7 @@ CLEANFILES += \ AnyTypeCode/ULongSeqA.cpp AnyTypeCode/ULongSeqA.h ULongSeqC.cpp ULongSeqC.h ULongSeqS.h: ULongSeq-stamp ULongSeq-stamp: $(srcdir)/ULongSeq.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/ULongSeq.pidl - @touch $@ - -BUILT_SOURCES += \ - AnyTypeCode/UShortSeqA.cpp \ - AnyTypeCode/UShortSeqA.h \ - UShortSeqC.cpp \ - UShortSeqC.h \ - UShortSeqS.h - -CLEANFILES += \ - UShortSeq-stamp \ - AnyTypeCode/UShortSeqA.cpp \ - AnyTypeCode/UShortSeqA.h \ - UShortSeqC.cpp \ - UShortSeqC.h \ - UShortSeqS.h - -AnyTypeCode/UShortSeqA.cpp AnyTypeCode/UShortSeqA.h UShortSeqC.cpp UShortSeqC.h UShortSeqS.h: UShortSeq-stamp - -UShortSeq-stamp: $(srcdir)/UShortSeq.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/UShortSeq.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/ULongSeq.pidl @touch $@ BUILT_SOURCES += \ @@ -666,7 +645,7 @@ CLEANFILES += \ AnyTypeCode/WCharSeqA.cpp AnyTypeCode/WCharSeqA.h WCharSeqC.cpp WCharSeqC.h WCharSeqS.h: WCharSeq-stamp WCharSeq-stamp: $(srcdir)/WCharSeq.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/WCharSeq.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/WCharSeq.pidl @touch $@ BUILT_SOURCES += \ @@ -687,28 +666,7 @@ CLEANFILES += \ AnyTypeCode/WStringSeqA.cpp AnyTypeCode/WStringSeqA.h WStringSeqC.cpp WStringSeqC.h WStringSeqS.h: WStringSeq-stamp WStringSeq-stamp: $(srcdir)/WStringSeq.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/WStringSeq.pidl - @touch $@ - -BUILT_SOURCES += \ - AnyTypeCode/ULongLongSeqA.cpp \ - AnyTypeCode/ULongLongSeqA.h \ - ULongLongSeqC.cpp \ - ULongLongSeqC.h \ - ULongLongSeqS.h - -CLEANFILES += \ - ULongLongSeq-stamp \ - AnyTypeCode/ULongLongSeqA.cpp \ - AnyTypeCode/ULongLongSeqA.h \ - ULongLongSeqC.cpp \ - ULongLongSeqC.h \ - ULongLongSeqS.h - -AnyTypeCode/ULongLongSeqA.cpp AnyTypeCode/ULongLongSeqA.h ULongLongSeqC.cpp ULongLongSeqC.h ULongLongSeqS.h: ULongLongSeq-stamp - -ULongLongSeq-stamp: $(srcdir)/ULongLongSeq.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/ULongLongSeq.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/WStringSeq.pidl @touch $@ lib_LTLIBRARIES += libTAO.la @@ -792,9 +750,6 @@ libTAO_la_SOURCES = \ GIOP_Message_State.cpp \ GIOP_Message_Version.cpp \ GUIResource_Factory.cpp \ - HTTP_Client.cpp \ - HTTP_Handler.cpp \ - HTTP_Parser.cpp \ IFR_Client_Adapter.cpp \ IIOPC.cpp \ IIOP_Acceptor.cpp \ @@ -986,7 +941,6 @@ nobase_include_HEADERS = \ AnyTypeCode/Messaging_PolicyValueA.h \ AnyTypeCode/Messaging_SyncScopeA.h \ AnyTypeCode/ObjectIdListA.h \ - AnyTypeCode/OctetSeqA.h \ AnyTypeCode/PI_ForwardA.h \ AnyTypeCode/ParameterModeA.h \ AnyTypeCode/Policy_ForwardA.h \ @@ -998,7 +952,6 @@ nobase_include_HEADERS = \ AnyTypeCode/TimeBaseA.h \ AnyTypeCode/ULongLongSeqA.h \ AnyTypeCode/ULongSeqA.h \ - AnyTypeCode/UShortSeqA.h \ AnyTypeCode/WCharSeqA.h \ AnyTypeCode/WStringSeqA.h \ AnyTypeCode/orb_typesA.h \ @@ -1039,8 +992,10 @@ nobase_include_HEADERS = \ Bounded_Object_Reference_Sequence_T.h \ Bounded_Reference_Allocation_Traits_T.h \ Bounded_Sequence_CDR_T.h \ + Bounded_String_Sequence_T.h \ Bounded_Value_Allocation_Traits_T.h \ Bounded_Value_Sequence_T.h \ + Bounded_Wstring_Sequence_T.h \ Buffer_Allocator_T.cpp \ Buffer_Allocator_T.h \ Buffering_Constraint_Policy.h \ @@ -1154,9 +1109,6 @@ nobase_include_HEADERS = \ GIOP_Utils.h \ GUIResource_Factory.h \ Generic_Sequence_T.h \ - HTTP_Client.h \ - HTTP_Handler.h \ - HTTP_Parser.h \ IFR_Client_Adapter.h \ IIOP.pidl \ IIOP.pidl \ @@ -1292,7 +1244,6 @@ nobase_include_HEADERS = \ Objref_VarOut_T.cpp \ Objref_VarOut_T.h \ OctetSeq.pidl \ - OctetSeq.pidl \ OctetSeqC.h \ OctetSeqS.h \ On_Demand_Fragmentation_Strategy.h \ @@ -1457,7 +1408,6 @@ nobase_include_HEADERS = \ ULongSeqC.h \ ULongSeqS.h \ UShortSeq.pidl \ - UShortSeq.pidl \ UShortSeqC.h \ UShortSeqS.h \ Unbounded_Array_Allocation_Traits_T.h \ @@ -1467,8 +1417,10 @@ nobase_include_HEADERS = \ Unbounded_Octet_Sequence_T.h \ Unbounded_Reference_Allocation_Traits_T.h \ Unbounded_Sequence_CDR_T.h \ + Unbounded_String_Sequence_T.h \ Unbounded_Value_Allocation_Traits_T.h \ Unbounded_Value_Sequence_T.h \ + Unbounded_Wstring_Sequence_T.h \ UserException.h \ UserException.inl \ Value_Traits_T.h \ @@ -1842,6 +1794,7 @@ nobase_include_HEADERS += \ AnyTypeCode/Objref_TypeCode.inl \ AnyTypeCode/Objref_TypeCode_Static.h \ AnyTypeCode/Objref_TypeCode_Static.inl \ + AnyTypeCode/OctetSeqA.h \ AnyTypeCode/PolicyA.h \ AnyTypeCode/Recursive_Type_TypeCode.cpp \ AnyTypeCode/Recursive_Type_TypeCode.h \ @@ -1888,6 +1841,7 @@ nobase_include_HEADERS += \ AnyTypeCode/TypeCode_Traits.h \ AnyTypeCode/TypeCode_Value_Field.h \ AnyTypeCode/Typecode_typesA.h \ + AnyTypeCode/UShortSeqA.h \ AnyTypeCode/Union_TypeCode.cpp \ AnyTypeCode/Union_TypeCode.h \ AnyTypeCode/Union_TypeCode.inl \ @@ -5360,6 +5314,7 @@ EXTRA_DIST += \ ## Makefile.Strategies.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO BUILT_SOURCES += \ Strategies/uiop_endpointsC.cpp \ @@ -5486,6 +5441,7 @@ nobase_include_HEADERS += \ Strategies/COIOP_Endpoint.h \ Strategies/COIOP_Endpoint.inl \ Strategies/COIOP_Endpoints.pidl \ + Strategies/COIOP_Endpoints.pidl \ Strategies/COIOP_EndpointsC.h \ Strategies/COIOP_EndpointsS.h \ Strategies/COIOP_Factory.h \ @@ -5537,10 +5493,12 @@ nobase_include_HEADERS += \ Strategies/UIOP_Transport.h \ Strategies/advanced_resource.h \ Strategies/sciop_endpoints.pidl \ + Strategies/sciop_endpoints.pidl \ Strategies/sciop_endpointsC.h \ Strategies/sciop_endpointsS.h \ Strategies/strategies_export.h \ Strategies/uiop_endpoints.pidl \ + Strategies/uiop_endpoints.pidl \ Strategies/uiop_endpointsC.h \ Strategies/uiop_endpointsS.h @@ -5553,6 +5511,7 @@ CLEANFILES += \ TAO_Strategies.pc: ${top_builddir}/config.status ${srcdir}/Strategies/TAO_Strategies.pc.in ${top_builddir}/config.status --file $@:${srcdir}/Strategies/TAO_Strategies.pc.in +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS EXTRA_DIST += \ diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index da12853bf47..4b33583f878 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -250,11 +250,11 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid) tm_ (), tss_cleanup_funcs_ (), tss_resources_ (), - has_shutdown_ (true), // Start the ORB in a "shutdown" state. Only - // after CORBA::ORB_init() is called will the - // ORB no longer be shutdown. This does not - // mean that the ORB can be reinitialized. It - // can only be initialized once. + has_shutdown_ (1), // Start the ORB in a "shutdown" state. Only + // after CORBA::ORB_init() is called will the + // ORB no longer be shutdown. This does not + // mean that the ORB can be reinitialized. It + // can only be initialized once. thread_per_connection_use_timeout_ (1), open_lock_ (), endpoint_selector_factory_ (0), @@ -1345,7 +1345,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) // The ORB has been initialized, meaning that the ORB is no longer // in the shutdown state. - this->has_shutdown_ = false; + this->has_shutdown_ = 0; return 0; } @@ -2178,7 +2178,7 @@ TAO_ORB_Core::run (ACE_Time_Value *tv, // We don't need to do this because we use the Reactor // mechanisms to shutdown in a thread-safe way. - while (this->has_shutdown () == false) + while (this->has_shutdown () == 0) { // Every time we perform an interation we have to become the // leader again, because it is possible that a client has @@ -2250,7 +2250,7 @@ TAO_ORB_Core::run (ACE_Time_Value *tv, // Otherwise just continue.. } - if (this->has_shutdown () == true && + if (this->has_shutdown () == 1 && this->server_factory_->activate_server_connections ()) this->tm_.wait (); @@ -2273,7 +2273,7 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion { ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_); - if (this->has_shutdown () == true) + if (this->has_shutdown () != 0) return; // Check if we are on the right state, i.e. do not accept @@ -2285,7 +2285,7 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion // Set the 'has_shutdown' flag, so any further attempt to shutdown // becomes a noop. - this->has_shutdown_ = true; + this->has_shutdown_ = 1; // need to release the mutex, because some of the shutdown // operations invoke application code, that could (and in practice diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index 6c4403358d4..d114ef39412 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -596,7 +596,7 @@ public: ACE_ENV_ARG_DECL); /// Get the shutdown flag value - bool has_shutdown (void) const; + int has_shutdown (void); /// Shutdown the ORB and free resources void destroy (ACE_ENV_SINGLE_ARG_DECL); @@ -1183,7 +1183,7 @@ protected: ACE_TSS_TYPE (TAO_ORB_Core_TSS_Resources) tss_resources_; /// Flag which denotes that the ORB has been shutdown. - bool has_shutdown_; + int has_shutdown_; /// The value of the timeout if the flag above is not zero. //@{ diff --git a/TAO/tao/ORB_Core.inl b/TAO/tao/ORB_Core.inl index 480a0df637c..ca3defce178 100644 --- a/TAO/tao/ORB_Core.inl +++ b/TAO/tao/ORB_Core.inl @@ -346,8 +346,8 @@ TAO_ORB_Core::tss_cleanup_funcs (void) return &(this->tss_cleanup_funcs_); } -ACE_INLINE bool -TAO_ORB_Core::has_shutdown (void) const +ACE_INLINE int +TAO_ORB_Core::has_shutdown (void) { return this->has_shutdown_; } diff --git a/TAO/tao/OctetSeq.pidl b/TAO/tao/OctetSeq.pidl index 30589312738..19ad732f38c 100644 --- a/TAO/tao/OctetSeq.pidl +++ b/TAO/tao/OctetSeq.pidl @@ -17,6 +17,9 @@ * -Wb,anyop_export_macro=TAO_AnyTypeCode_Export * -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h * OctetSeq.pidl + * + * Patches for changes to the generated code are available in the + * `diffs' directory. */ diff --git a/TAO/tao/OctetSeqC.cpp b/TAO/tao/OctetSeqC.cpp new file mode 100644 index 00000000000..93c712762cb --- /dev/null +++ b/TAO/tao/OctetSeqC.cpp @@ -0,0 +1,124 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +// TAO_IDL - Generated from +// be\be_codegen.cpp:288 + + +#include "tao/OctetSeqC.h" +#include "tao/CDR.h" +#include "tao/ORB_Core.h" + +// TAO_IDL - Generated from +// be\be_visitor_arg_traits.cpp:70 + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +// Arg traits specializations. +namespace TAO +{ +} + + +// TAO_IDL - Generated from +// be\be_visitor_sequence/sequence_cs.cpp:65 + +#if !defined (_CORBA_OCTETSEQ_CS_) +#define _CORBA_OCTETSEQ_CS_ + +CORBA::OctetSeq::OctetSeq (void) +{} + +CORBA::OctetSeq::OctetSeq ( + CORBA::ULong max + ) + : TAO::unbounded_value_sequence< + CORBA::Octet + > + (max) +{} + +CORBA::OctetSeq::OctetSeq ( + CORBA::ULong max, + CORBA::ULong length, + CORBA::Octet * buffer, + CORBA::Boolean release + ) + : TAO::unbounded_value_sequence< + CORBA::Octet + > + (max, length, buffer, release) +{} + +CORBA::OctetSeq::OctetSeq ( + const OctetSeq &seq + ) + : TAO::unbounded_value_sequence< + CORBA::Octet + > + (seq) +{} + +CORBA::OctetSeq::~OctetSeq (void) +{} + +void CORBA::OctetSeq::_tao_any_destructor ( + void * _tao_void_pointer + ) +{ + OctetSeq * _tao_tmp_pointer = + static_cast<OctetSeq *> (_tao_void_pointer); + delete _tao_tmp_pointer; +} + +#endif /* end #if !defined */ + +// TAO_IDL - Generated from +// be\be_visitor_sequence/cdr_op_cs.cpp:96 + +#if !defined _TAO_CDR_OP_CORBA_OctetSeq_CPP_ +#define _TAO_CDR_OP_CORBA_OctetSeq_CPP_ + +CORBA::Boolean operator<< ( + TAO_OutputCDR &strm, + const CORBA::OctetSeq &_tao_sequence + ) +{ + return TAO::marshal_sequence(strm, _tao_sequence); +} + +CORBA::Boolean operator>> ( + TAO_InputCDR &strm, + CORBA::OctetSeq &_tao_sequence + ) +{ + return TAO::demarshal_sequence(strm, _tao_sequence); +} + +#endif /* _TAO_CDR_OP_CORBA_OctetSeq_CPP_ */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/OctetSeqC.h b/TAO/tao/OctetSeqC.h new file mode 100644 index 00000000000..ab093f703bd --- /dev/null +++ b/TAO/tao/OctetSeqC.h @@ -0,0 +1,175 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +// TAO_IDL - Generated from +// be\be_codegen.cpp:154 + +#ifndef _TAO_IDL_OCTETSEQC_H_ +#define _TAO_IDL_OCTETSEQC_H_ + +#include /**/ "ace/pre.h" + + +#include "ace/config-all.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include /**/ "tao/TAO_Export.h" +#include "tao/Environment.h" +#include "tao/Sequence_T.h" +#include "tao/Seq_Var_T.h" +#include "tao/Seq_Out_T.h" + +#if defined (TAO_EXPORT_MACRO) +#undef TAO_EXPORT_MACRO +#endif +#define TAO_EXPORT_MACRO TAO_Export + +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4250) +#endif /* _MSC_VER */ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +// TAO_IDL - Generated from +// be\be_visitor_module/module_ch.cpp:49 + +namespace CORBA +{ + + // TAO_IDL - Generated from + // be\be_visitor_sequence/sequence_ch.cpp:101 + +#if !defined (_CORBA_OCTETSEQ_CH_) +#define _CORBA_OCTETSEQ_CH_ + + class OctetSeq; + + typedef + TAO_FixedSeq_Var_T< + OctetSeq + > + OctetSeq_var; + + typedef + TAO_Seq_Out_T< + OctetSeq + > + OctetSeq_out; + + class TAO_Export OctetSeq + : public + TAO::unbounded_value_sequence< + CORBA::Octet + > + { + public: + OctetSeq (void); + OctetSeq (CORBA::ULong max); + OctetSeq ( + CORBA::ULong max, + CORBA::ULong length, + CORBA::Octet* buffer, + CORBA::Boolean release = false + ); + OctetSeq (const OctetSeq &); + ~OctetSeq (void); + + static void _tao_any_destructor (void *); + + typedef OctetSeq_var _var_type; + typedef OctetSeq_out _out_type; + +#if (TAO_NO_COPY_OCTET_SEQUENCES == 1) + OctetSeq ( + CORBA::ULong length, + const ACE_Message_Block* mb + ) + : TAO::unbounded_value_sequence<CORBA::Octet> (length, mb) {} +#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */ + }; + +#endif /* end #if !defined */ + +// TAO_IDL - Generated from +// be\be_visitor_module/module_ch.cpp:78 + +} // module CORBA + +// TAO_IDL - Generated from +// be\be_visitor_traits.cpp:61 + +// Traits specializations. +namespace TAO +{ +} + +// Workaround for a Visual Studio .NET bug where this class is not +// properly imported by an application if typedef'd or subclassed, +// resulting in 'multiply defined' link errors. The export macro +// here forces an explicit import by the application. Please see +// http://support.microsoft.com/default.aspx?scid=kb;en-us;309801 +// The problem stems from use of the type below in PortableServer, +// but we put the instantiation here because the application will +// need to see it in *C.h to avoid the error. +#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT + template class TAO_Export TAO::unbounded_value_sequence<CORBA::OctetSeq>; +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ + + +// TAO_IDL - Generated from +// be\be_visitor_sequence/cdr_op_ch.cpp:71 + +#if !defined _TAO_CDR_OP_CORBA_OctetSeq_H_ +#define _TAO_CDR_OP_CORBA_OctetSeq_H_ + +TAO_Export CORBA::Boolean operator<< ( + TAO_OutputCDR &, + const CORBA::OctetSeq & + ); +TAO_Export CORBA::Boolean operator>> ( + TAO_InputCDR &, + CORBA::OctetSeq & + ); + +#endif /* _TAO_CDR_OP_CORBA_OctetSeq_H_ */ + +// TAO_IDL - Generated from +// be\be_codegen.cpp:1062 + +TAO_END_VERSIONED_NAMESPACE_DECL + +#if defined(_MSC_VER) +#pragma warning(pop) +#endif /* _MSC_VER */ + +#include /**/ "ace/post.h" + +#endif /* ifndef */ diff --git a/TAO/tao/OctetSeqS.h b/TAO/tao/OctetSeqS.h new file mode 100644 index 00000000000..17b1360599e --- /dev/null +++ b/TAO/tao/OctetSeqS.h @@ -0,0 +1,28 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +// Skeleton file generation suppressed with command line option -SS diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp index e51f5208e3d..d0530021af4 100644 --- a/TAO/tao/PolicyC.cpp +++ b/TAO/tao/PolicyC.cpp @@ -39,6 +39,10 @@ #include "tao/AnyTypeCode_Adapter.h" #include "ace/Dynamic_Service.h" +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ + #if !defined (__ACE_INLINE__) #include "tao/PolicyC.inl" #endif /* !defined INLINE */ diff --git a/TAO/tao/PortableServer/Servant_var.cpp b/TAO/tao/PortableServer/Servant_var.cpp index e5fca921aaa..e5fca921aaa 100644..100755 --- a/TAO/tao/PortableServer/Servant_var.cpp +++ b/TAO/tao/PortableServer/Servant_var.cpp diff --git a/TAO/tao/PortableServer/Servant_var.h b/TAO/tao/PortableServer/Servant_var.h index 5004ae93159..5004ae93159 100644..100755 --- a/TAO/tao/PortableServer/Servant_var.h +++ b/TAO/tao/PortableServer/Servant_var.h diff --git a/TAO/tao/PortableServer/Servant_var.inl b/TAO/tao/PortableServer/Servant_var.inl index 66796f4499a..66796f4499a 100644..100755 --- a/TAO/tao/PortableServer/Servant_var.inl +++ b/TAO/tao/PortableServer/Servant_var.inl diff --git a/TAO/tao/QtResource/QtResource_Factory.cpp b/TAO/tao/QtResource/QtResource_Factory.cpp index d8ba19c57d0..e14004464f1 100644 --- a/TAO/tao/QtResource/QtResource_Factory.cpp +++ b/TAO/tao/QtResource/QtResource_Factory.cpp @@ -2,7 +2,7 @@ #include "tao/QtResource/QtResource_Factory.h" #include "tao/debug.h" -#include "ace/QtReactor/QtReactor.h" +#include "ace/QtReactor.h" ACE_RCSID (TAO_QtResource, QtResource_Factory, @@ -25,7 +25,7 @@ namespace TAO { ACE_ERROR ((LM_ERROR, "TAO (%P|%t) - QApplication is undefined.", - " Cannot create ACE_QtReactor \n")); + " Cannot create ACE_XtReactor \n")); return 0; } diff --git a/TAO/tao/QtResource/QtResource_Factory.h b/TAO/tao/QtResource/QtResource_Factory.h index 8c63bc68f18..8af126b607a 100644 --- a/TAO/tao/QtResource/QtResource_Factory.h +++ b/TAO/tao/QtResource/QtResource_Factory.h @@ -21,7 +21,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include <qapplication.h> -#include "ace/QtReactor/QtReactor.h" +#include "ace/QtReactor.h" #include "tao/GUIResource_Factory.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Sequence_T.h b/TAO/tao/Sequence_T.h index f4ee888505b..5105a76b7df 100644 --- a/TAO/tao/Sequence_T.h +++ b/TAO/tao/Sequence_T.h @@ -2,12 +2,14 @@ #include "tao/Unbounded_Octet_Sequence_T.h" #include "tao/Unbounded_Value_Sequence_T.h" -#include "tao/Unbounded_Basic_String_Sequence_T.h" +#include "tao/Unbounded_Wstring_Sequence_T.h" +#include "tao/Unbounded_String_Sequence_T.h" #include "tao/Unbounded_Object_Reference_Sequence_T.h" #include "tao/Unbounded_Array_Sequence_T.h" #include "tao/Unbounded_Sequence_CDR_T.h" #include "tao/Bounded_Value_Sequence_T.h" -#include "tao/Bounded_Basic_String_Sequence_T.h" +#include "tao/Bounded_Wstring_Sequence_T.h" +#include "tao/Bounded_String_Sequence_T.h" #include "tao/Bounded_Object_Reference_Sequence_T.h" #include "tao/Bounded_Array_Sequence_T.h" #include "tao/Bounded_Sequence_CDR_T.h" diff --git a/TAO/tao/Strategies.mpc b/TAO/tao/Strategies.mpc index 0085c0e009e..15a60e3197b 100644 --- a/TAO/tao/Strategies.mpc +++ b/TAO/tao/Strategies.mpc @@ -1,6 +1,7 @@ //$Id$ -project : taolib, core, core_anytypecode, core_strategies, tao_versioning_idl_defaults { +project : taolib, core, core_anytypecode, tao_versioning_idl_defaults { + avoids += ace_for_tao // Requires Unix domain sockets and MEM stuff sharedname = TAO_Strategies dynamicflags = TAO_STRATEGIES_BUILD_DLL @@ -25,6 +26,7 @@ project : taolib, core, core_anytypecode, core_strategies, tao_versioning_idl_de } PIDL_Files { + Strategies } IDL_Files { diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp index df0e1fe9ecb..567542945ca 100644 --- a/TAO/tao/Stub.cpp +++ b/TAO/tao/Stub.cpp @@ -263,7 +263,7 @@ TAO_Stub::get_profile_ior_info (TAO_MProfile &profiles, // Get the number of elements - CORBA::ULong const count = profiles.profile_count (); + CORBA::ULong count = profiles.profile_count (); // Set the number of elements in the sequence of tagged_profile ior_info->profiles.length (count); @@ -413,6 +413,53 @@ TAO_Stub::forward_back_one (void) // routines need only ensure that the data being passed in is not // being modified by any other thread. // +// As an _experiment_ (to estimate the performance cost) remote calls +// are currently deemed "cancel-safe". That means that they can be +// called by threads when they're in asynchronous cancellation mode. +// The only effective way to do this is to disable async cancellation +// for the duration of the call. There are numerous rude interactions +// with code generators for C++ ... cancellation handlers just do +// normal stack unwinding like exceptions, but exceptions are purely +// synchronous and sophisticated code generators rely on that to +// generate better code, which in some cases may be very hard to +// unwind. + +class TAO_Synchronous_Cancellation_Required +// = TITLE +// Stick one of these at the beginning of a block that can't +// support asynchronous cancellation, and which must be +// cancel-safe. +// +// = EXAMPLE +// somefunc() +// { +// TAO_Synchronous_Cancellation_Required NOT_USED; +// ... +// } +{ +public: + // These should probably be in a separate inline file, but they're + // only used within this one file right now, and we always want them + // inlined, so here they sit. + TAO_Synchronous_Cancellation_Required (void) + : old_type_ (0) + { +#if !defined (VXWORKS) + ACE_OS::thr_setcanceltype (THR_CANCEL_DEFERRED, &old_type_); +#endif /* ! VXWORKS */ + } + + ~TAO_Synchronous_Cancellation_Required (void) + { +#if !defined (VXWORKS) + int dont_care; + ACE_OS::thr_setcanceltype(old_type_, &dont_care); +#endif /* ! VXWORKS */ + } +private: + int old_type_; +}; + // **************************************************************** #if (TAO_HAS_CORBA_MESSAGING == 1) @@ -540,20 +587,10 @@ TAO_Stub::get_policy_overrides (const CORBA::PolicyTypeSeq &types ACE_ENV_ARG_DECL) { if (this->policies_ == 0) - { - CORBA::PolicyList *policy_list_ptr = 0; - ACE_NEW_THROW_EX (policy_list_ptr, - CORBA::PolicyList (), - CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); + return 0; - return policy_list_ptr; - } - else - { - return this->policies_->get_policy_overrides (types - ACE_ENV_ARG_PARAMETER); - } + return this->policies_->get_policy_overrides (types + ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ @@ -592,7 +629,7 @@ TAO_Stub::marshal (TAO_OutputCDR &cdr) { const TAO_MProfile& mprofile = this->base_profiles_; - CORBA::ULong const profile_count = mprofile.profile_count (); + CORBA::ULong profile_count = mprofile.profile_count (); if ((cdr << profile_count) == 0) return 0; @@ -621,7 +658,7 @@ TAO_Stub::marshal (TAO_OutputCDR &cdr) ? *(this->forward_profiles_perm_) : this->base_profiles_; - CORBA::ULong const profile_count = mprofile.profile_count (); + CORBA::ULong profile_count = mprofile.profile_count (); if ((cdr << profile_count) == 0) return 0; diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp index 8873a811a89..5c8582c2f82 100644 --- a/TAO/tao/TAO_Internal.cpp +++ b/TAO/tao/TAO_Internal.cpp @@ -10,7 +10,6 @@ #include "tao/CORBANAME_Parser.h" #include "tao/CORBALOC_Parser.h" #include "tao/FILE_Parser.h" -#include "tao/HTTP_Parser.h" #include "tao/DLL_Parser.h" #include "tao/ORB_Core.h" #include "tao/Adapter_Factory.h" @@ -540,7 +539,6 @@ namespace pcfg->process_directive (ace_svc_desc_TAO_CORBALOC_Parser); pcfg->process_directive (ace_svc_desc_TAO_FILE_Parser); pcfg->process_directive (ace_svc_desc_TAO_DLL_Parser); - pcfg->process_directive (ace_svc_desc_TAO_HTTP_Parser); pcfg->process_directive (ace_svc_desc_TAO_Default_Stub_Factory); pcfg->process_directive ( ace_svc_desc_TAO_Default_Endpoint_Selector_Factory); diff --git a/TAO/tao/TkResource/TkResource_Factory.cpp b/TAO/tao/TkResource/TkResource_Factory.cpp index 32ad31eacb2..622a0fb45cf 100644 --- a/TAO/tao/TkResource/TkResource_Factory.cpp +++ b/TAO/tao/TkResource/TkResource_Factory.cpp @@ -2,7 +2,7 @@ #include "tao/TkResource/TkResource_Factory.h" #include "tao/debug.h" -#include "ace/TkReactor/TkReactor.h" +#include "ace/TkReactor.h" ACE_RCSID( TAO_TkResource, TkResource_Factory, diff --git a/TAO/tao/TkResource/TkResource_Factory.h b/TAO/tao/TkResource/TkResource_Factory.h index fd2f5461556..f4aab08db60 100644 --- a/TAO/tao/TkResource/TkResource_Factory.h +++ b/TAO/tao/TkResource/TkResource_Factory.h @@ -13,7 +13,7 @@ #ifndef TAO_TKRESOURCE_FACTORY_H #define TAO_TKRESOURCE_FACTORY_H #include /**/ "ace/pre.h" -#include "ace/TkReactor/TkReactor.h" +#include "ace/TkReactor.h" #include "tao/TkResource/TAO_TkResource_Export.h" #include "tao/GUIResource_Factory.h" diff --git a/TAO/tao/UShortSeq.pidl b/TAO/tao/UShortSeq.pidl index b8fb7df4f34..9a6e6bd9667 100644 --- a/TAO/tao/UShortSeq.pidl +++ b/TAO/tao/UShortSeq.pidl @@ -14,6 +14,9 @@ * -Wb,pre_include="ace/pre.h" * -Wb,post_include="ace/post.h" * UShortSeq.pidl + * + * Patches for changes to the generated code are available in the + * `diffs' directory. */ // ================================================================ diff --git a/TAO/tao/UShortSeqC.cpp b/TAO/tao/UShortSeqC.cpp new file mode 100644 index 00000000000..53db618d251 --- /dev/null +++ b/TAO/tao/UShortSeqC.cpp @@ -0,0 +1,127 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +// TAO_IDL - Generated from +// be\be_codegen.cpp:291 + + +#include "tao/UShortSeqC.h" +#include "tao/CDR.h" + +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ + +// TAO_IDL - Generated from +// be\be_visitor_arg_traits.cpp:70 + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +// Arg traits specializations. +namespace TAO +{ +} + + +// TAO_IDL - Generated from +// be\be_visitor_sequence/sequence_cs.cpp:65 + +#if !defined (_CORBA_USHORTSEQ_CS_) +#define _CORBA_USHORTSEQ_CS_ + +CORBA::UShortSeq::UShortSeq (void) +{} + +CORBA::UShortSeq::UShortSeq ( + CORBA::ULong max + ) + : TAO::unbounded_value_sequence< + CORBA::UShort + > + (max) +{} + +CORBA::UShortSeq::UShortSeq ( + CORBA::ULong max, + CORBA::ULong length, + CORBA::UShort * buffer, + CORBA::Boolean release + ) + : TAO::unbounded_value_sequence< + CORBA::UShort + > + (max, length, buffer, release) +{} + +CORBA::UShortSeq::UShortSeq ( + const UShortSeq &seq + ) + : TAO::unbounded_value_sequence< + CORBA::UShort + > + (seq) +{} + +CORBA::UShortSeq::~UShortSeq (void) +{} + +void CORBA::UShortSeq::_tao_any_destructor ( + void * _tao_void_pointer + ) +{ + UShortSeq * _tao_tmp_pointer = + static_cast<UShortSeq *> (_tao_void_pointer); + delete _tao_tmp_pointer; +} + +#endif /* end #if !defined */ + +// TAO_IDL - Generated from +// be\be_visitor_sequence/cdr_op_cs.cpp:96 + +#if !defined _TAO_CDR_OP_CORBA_UShortSeq_CPP_ +#define _TAO_CDR_OP_CORBA_UShortSeq_CPP_ + +CORBA::Boolean operator<< ( + TAO_OutputCDR &strm, + const CORBA::UShortSeq &_tao_sequence + ) +{ + return TAO::marshal_sequence(strm, _tao_sequence); +} + +CORBA::Boolean operator>> ( + TAO_InputCDR &strm, + CORBA::UShortSeq &_tao_sequence + ) +{ + return TAO::demarshal_sequence(strm, _tao_sequence); +} + +#endif /* _TAO_CDR_OP_CORBA_UShortSeq_CPP_ */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/UShortSeqC.h b/TAO/tao/UShortSeqC.h new file mode 100644 index 00000000000..71584f71a87 --- /dev/null +++ b/TAO/tao/UShortSeqC.h @@ -0,0 +1,177 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +// TAO_IDL - Generated from +// be\be_codegen.cpp:153 + +#ifndef _TAO_IDL_ORIG_USHORTSEQC_H_ +#define _TAO_IDL_ORIG_USHORTSEQC_H_ + +#include /**/ "ace/pre.h" + + +#include "ace/config-all.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include /**/ "tao/TAO_Export.h" +#include "tao/ORB.h" +#include "tao/Environment.h" +#include "tao/Sequence_T.h" +#include "tao/Seq_Var_T.h" +#include "tao/Seq_Out_T.h" + +#if defined (TAO_EXPORT_MACRO) +#undef TAO_EXPORT_MACRO +#endif +#define TAO_EXPORT_MACRO TAO_Export + +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4250) +#endif /* _MSC_VER */ + +#if defined (__BORLANDC__) +#pragma option push -w-rvl -w-rch -w-ccc -w-inl +#endif /* __BORLANDC__ */ + +// TAO_IDL - Generated from +// be\be_visitor_module/module_ch.cpp:48 + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +namespace CORBA +{ + + // TAO_IDL - Generated from + // be\be_visitor_sequence/sequence_ch.cpp:101 + +#if !defined (_CORBA_USHORTSEQ_CH_) +#define _CORBA_USHORTSEQ_CH_ + + class UShortSeq; + + typedef + TAO_FixedSeq_Var_T< + UShortSeq + > + UShortSeq_var; + + typedef + TAO_Seq_Out_T< + UShortSeq + > + UShortSeq_out; + + class TAO_Export UShortSeq + : public + TAO::unbounded_value_sequence< + CORBA::UShort + > + { + public: + UShortSeq (void); + UShortSeq (CORBA::ULong max); + UShortSeq ( + CORBA::ULong max, + CORBA::ULong length, + CORBA::UShort* buffer, + CORBA::Boolean release = false + ); + UShortSeq (const UShortSeq &); + ~UShortSeq (void); + + static void _tao_any_destructor (void *); + + typedef UShortSeq_var _var_type; + typedef UShortSeq_out _out_type; + }; + +#endif /* end #if !defined */ + +// TAO_IDL - Generated from +// be\be_visitor_module/module_ch.cpp:66 + +} // module CORBA + +// TAO_IDL - Generated from +// be\be_visitor_traits.cpp:61 + +// Traits specializations. +namespace TAO +{ +} + +// Workaround for a Visual Studio .NET bug where this class is not +// properly imported by an application if typedef'd or subclassed, +// resulting in 'multiply defined' link errors. The export macro +// here forces an explicit import by the application. Please see +// http://support.microsoft.com/default.aspx?scid=kb;en-us;309801 +// The problem stems from use of the type below in DsLogAdmin, +// but we put the instantiation here because the application will +// need to see it in *C.h to avoid the error. +#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT + template class TAO_Export TAO::unbounded_value_sequence<CORBA::UShortSeq>; +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ + +// TAO_IDL - Generated from +// be\be_visitor_sequence/cdr_op_ch.cpp:71 + +#if !defined _TAO_CDR_OP_CORBA_UShortSeq_H_ +#define _TAO_CDR_OP_CORBA_UShortSeq_H_ + +TAO_Export CORBA::Boolean operator<< ( + TAO_OutputCDR &, + const CORBA::UShortSeq & + ); +TAO_Export CORBA::Boolean operator>> ( + TAO_InputCDR &, + CORBA::UShortSeq & + ); + +#endif /* _TAO_CDR_OP_CORBA_UShortSeq_H_ */ + +// TAO_IDL - Generated from +// be\be_codegen.cpp:955 + +TAO_END_VERSIONED_NAMESPACE_DECL + +#if defined(_MSC_VER) +#pragma warning(pop) +#endif /* _MSC_VER */ + +#if defined (__BORLANDC__) +#pragma option pop +#endif /* __BORLANDC__ */ + +#include /**/ "ace/post.h" + +#endif /* ifndef */ + + diff --git a/TAO/tao/UShortSeqS.h b/TAO/tao/UShortSeqS.h new file mode 100644 index 00000000000..17b1360599e --- /dev/null +++ b/TAO/tao/UShortSeqS.h @@ -0,0 +1,28 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +// Skeleton file generation suppressed with command line option -SS diff --git a/TAO/tao/Unbounded_Basic_String_Sequence_T.h b/TAO/tao/Unbounded_Basic_String_Sequence_T.h index 69ce15dfd58..79aed91cb64 100644 --- a/TAO/tao/Unbounded_Basic_String_Sequence_T.h +++ b/TAO/tao/Unbounded_Basic_String_Sequence_T.h @@ -18,6 +18,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { +namespace details +{ + template<typename charT> class unbounded_basic_string_sequence { @@ -100,6 +103,8 @@ public: private: implementation_type impl_; }; + +} // namespace details } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Unbounded_Sequence_CDR_T.h b/TAO/tao/Unbounded_Sequence_CDR_T.h index a9a22457e65..519a1a1b989 100644 --- a/TAO/tao/Unbounded_Sequence_CDR_T.h +++ b/TAO/tao/Unbounded_Sequence_CDR_T.h @@ -317,8 +317,8 @@ namespace TAO { } template <typename stream, typename charT> - bool demarshal_sequence(stream & strm, TAO::unbounded_basic_string_sequence <charT> & target) { - typedef TAO::unbounded_basic_string_sequence <charT> sequence; + bool demarshal_sequence(stream & strm, TAO::details::unbounded_basic_string_sequence <charT> & target) { + typedef TAO::details::unbounded_basic_string_sequence <charT> sequence; typedef typename sequence::element_traits::string_var string_var; ::CORBA::ULong new_length = 0; if (!(strm >> new_length)) { @@ -533,7 +533,7 @@ namespace TAO { } template <typename stream, typename charT> - bool marshal_sequence(stream & strm, const TAO::unbounded_basic_string_sequence <charT> & source) { + bool marshal_sequence(stream & strm, const TAO::details::unbounded_basic_string_sequence <charT> & source) { if (0 == &source) ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false); ::CORBA::ULong const length = source.length (); diff --git a/TAO/tao/Unbounded_String_Sequence_T.h b/TAO/tao/Unbounded_String_Sequence_T.h new file mode 100644 index 00000000000..9b126308dcd --- /dev/null +++ b/TAO/tao/Unbounded_String_Sequence_T.h @@ -0,0 +1,43 @@ +#ifndef guard_unbounded_string_sequence_hpp +#define guard_unbounded_string_sequence_hpp +/** + * @file + * + * @brief Implement unbounded sequences for strings. + * + * $Id$ + * + * @author Carlos O'Ryan + */ +#include "tao/Unbounded_Basic_String_Sequence_T.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +namespace TAO +{ + +class unbounded_string_sequence + : public details::unbounded_basic_string_sequence<char> +{ +public: + inline unbounded_string_sequence() + : details::unbounded_basic_string_sequence<char>() + {} + inline explicit unbounded_string_sequence(CORBA::ULong maximum) + : details::unbounded_basic_string_sequence<char>(maximum) + {} + inline unbounded_string_sequence( + CORBA::ULong maximum, + CORBA::ULong length, + value_type * data, + CORBA::Boolean release = false) + : details::unbounded_basic_string_sequence<char>( + maximum, length, data, release) + {} +}; + +} // namespace TAO + +TAO_END_VERSIONED_NAMESPACE_DECL + +#endif // guard_unbounded_string_sequence_hpp diff --git a/TAO/tao/Unbounded_Wstring_Sequence_T.h b/TAO/tao/Unbounded_Wstring_Sequence_T.h new file mode 100644 index 00000000000..fe8bd1d14b2 --- /dev/null +++ b/TAO/tao/Unbounded_Wstring_Sequence_T.h @@ -0,0 +1,43 @@ +#ifndef guard_unbounded_wstring_sequence_hpp +#define guard_unbounded_wstring_sequence_hpp +/** + * @file + * + * @brief Implement unbounded sequences for wide strings. + * + * $Id$ + * + * @author Carlos O'Ryan + */ +#include "tao/Unbounded_Basic_String_Sequence_T.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +namespace TAO +{ + +class unbounded_wstring_sequence + : public details::unbounded_basic_string_sequence<CORBA::WChar> +{ +public: + inline unbounded_wstring_sequence() + : details::unbounded_basic_string_sequence<CORBA::WChar>() + {} + inline /* explicit */ unbounded_wstring_sequence(CORBA::ULong maximum) + : details::unbounded_basic_string_sequence<CORBA::WChar>(maximum) + {} + inline unbounded_wstring_sequence( + CORBA::ULong maximum, + CORBA::ULong length, + value_type * data, + CORBA::Boolean release = false) + : details::unbounded_basic_string_sequence<CORBA::WChar>( + maximum, length, data, release) + {} +}; + +} // namespace TAO + +TAO_END_VERSIONED_NAMESPACE_DECL + +#endif // guard_unbounded_wstring_sequence_hpp diff --git a/TAO/tao/Valuetype/ValueBase.h b/TAO/tao/Valuetype/ValueBase.h index 5afc6af0025..50229951b3c 100644 --- a/TAO/tao/Valuetype/ValueBase.h +++ b/TAO/tao/Valuetype/ValueBase.h @@ -191,10 +191,10 @@ namespace CORBA public: // otherwise these cannot be called from a static function - /// During marshal jump to the most derived part + /// during marshal jump to the most derived part virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &) const = 0; - /// Called after obtaining the fresh object from create_for_unmarshal () + /// called after obtaining the fresh object from create_for_unmarshal () virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &) = 0; /// Notify the truncated parent valuetype to skip the rest of the chunks diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h index 40bc92b1281..f4a6272d3c0 100644 --- a/TAO/tao/Version.h +++ b/TAO/tao/Version.h @@ -6,4 +6,4 @@ #define TAO_MAJOR_VERSION 1 #define TAO_MINOR_VERSION 5 #define TAO_BETA_VERSION 4 -#define TAO_VERSION "1.5.4" +#define TAO_VERSION " 1.5.4" diff --git a/TAO/tao/XtResource/XtResource_Factory.cpp b/TAO/tao/XtResource/XtResource_Factory.cpp index 3a3ad30376e..0bd2f417292 100644 --- a/TAO/tao/XtResource/XtResource_Factory.cpp +++ b/TAO/tao/XtResource/XtResource_Factory.cpp @@ -2,7 +2,7 @@ #include "tao/XtResource/XtResource_Factory.h" #include "tao/debug.h" -#include "ace/XtReactor/XtReactor.h" +#include "ace/XtReactor.h" ACE_RCSID( TAO_XtResource, XtResource_Factory, diff --git a/TAO/tao/XtResource/XtResource_Factory.h b/TAO/tao/XtResource/XtResource_Factory.h index 85f184ae631..5099969e25c 100644 --- a/TAO/tao/XtResource/XtResource_Factory.h +++ b/TAO/tao/XtResource/XtResource_Factory.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" #include /**/ <X11/Intrinsic.h> #include "tao/XtResource/TAO_XtResource_Export.h" -#include "ace/XtReactor/XtReactor.h" +#include "ace/XtReactor.h" #include "tao/GUIResource_Factory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index 29082bada75..34418e1b0d5 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -601,7 +601,7 @@ TAO_Default_Resource_Factory::get_parser_names (char **&names, } // OK fallback on the hardcoded ones.... - this->parser_names_count_ = 6; // HOW MANY DO WE HAVE? + this->parser_names_count_ = 5; // HOW MANY DO WE HAVE? ACE_NEW_RETURN (this->parser_names_, char *[this->parser_names_count_], -1); @@ -623,9 +623,6 @@ TAO_Default_Resource_Factory::get_parser_names (char **&names, this->parser_names_[index] = CORBA::string_dup ("MCAST_Parser"); ++index; - this->parser_names_[index] = CORBA::string_dup ("HTTP_Parser"); - ++index; - names = this->parser_names_; number_of_names = index; diff --git a/TAO/tao/diffs/OctetSeq.diff b/TAO/tao/diffs/OctetSeq.diff new file mode 100644 index 00000000000..fb15f742a61 --- /dev/null +++ b/TAO/tao/diffs/OctetSeq.diff @@ -0,0 +1,21 @@ +--- orig/OctetSeqC.h 2005-04-08 10:17:34.108726400 +0200 ++++ OctetSeqC.h 2005-04-08 10:17:41.829828800 +0200 +@@ -141,6 +141,18 @@ + { + } + ++// Workaround for a Visual Studio .NET bug where this class is not ++// properly imported by an application if typedef'd or subclassed, ++// resulting in 'multiply defined' link errors. The export macro ++// here forces an explicit import by the application. Please see ++// http://support.microsoft.com/default.aspx?scid=kb;en-us;309801 ++// The problem stems from use of the type below in PortableServer, ++// but we put the instantiation here because the application will ++// need to see it in *C.h to avoid the error. ++#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT ++ template class TAO_Export TAO::unbounded_value_sequence<CORBA::OctetSeq>; ++#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ ++ + // TAO_IDL - Generated from + // be\be_visitor_sequence/any_op_ch.cpp:52 + diff --git a/TAO/tao/diffs/UShortSeq.diff b/TAO/tao/diffs/UShortSeq.diff new file mode 100644 index 00000000000..1938744506a --- /dev/null +++ b/TAO/tao/diffs/UShortSeq.diff @@ -0,0 +1,21 @@ +--- orig/UShortSeqC.h 2005-04-08 10:17:34.909878400 +0200 ++++ UShortSeqC.h 2005-04-08 10:17:41.759728000 +0200 +@@ -133,6 +133,18 @@ + { + } + ++// Workaround for a Visual Studio .NET bug where this class is not ++// properly imported by an application if typedef'd or subclassed, ++// resulting in 'multiply defined' link errors. The export macro ++// here forces an explicit import by the application. Please see ++// http://support.microsoft.com/default.aspx?scid=kb;en-us;309801 ++// The problem stems from use of the type below in DsLogAdmin, ++// but we put the instantiation here because the application will ++// need to see it in *C.h to avoid the error. ++#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT ++ template class TAO_Export TAO_Unbounded_Sequence<CORBA::UShortSeq>; ++#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ ++ + // TAO_IDL - Generated from + // be\be_visitor_sequence/any_op_ch.cpp:52 + diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc index d6523c3cc66..8caf8dfac31 100644 --- a/TAO/tao/tao.mpc +++ b/TAO/tao/tao.mpc @@ -4,13 +4,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core, tao_vers sharedname = TAO dynamicflags = TAO_BUILD_DLL - idlflags += -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode \ - -Wb,export_macro=TAO_Export \ - -Wb,export_include=tao/TAO_Export.h \ - -Wb,anyop_export_macro=TAO_AnyTypeCode_Export \ - -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h - idlflags -= -Sa -St - Source_Files(TAO_COMPONENTS) { Abstract_Servant_Base.cpp Acceptor_Filter.cpp @@ -85,9 +78,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core, tao_vers GIOP_Message_State.cpp GIOP_Message_Version.cpp GIOPC.cpp - HTTP_Client.cpp - HTTP_Handler.cpp - HTTP_Parser.cpp IFR_Client_Adapter.cpp IIOP_Acceptor.cpp IIOP_Connection_Handler.cpp @@ -278,8 +268,10 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core, tao_vers Bounded_Object_Reference_Sequence_T.h Bounded_Reference_Allocation_Traits_T.h Bounded_Sequence_CDR_T.h + Bounded_String_Sequence_T.h Bounded_Value_Allocation_Traits_T.h Bounded_Value_Sequence_T.h + Bounded_Wstring_Sequence_T.h Buffer_Allocator_T.h Buffering_Constraint_Policy.h Cache_Entries.h @@ -357,9 +349,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core, tao_vers GIOPS.h GIOP_Utils.h GUIResource_Factory.h - HTTP_Client.h - HTTP_Handler.h - HTTP_Parser.h IFR_Client_Adapter.h IIOP_Acceptor.h IIOPC.h @@ -548,8 +537,10 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core, tao_vers Unbounded_Octet_Sequence_T.h Unbounded_Reference_Allocation_Traits_T.h Unbounded_Sequence_CDR_T.h + Unbounded_String_Sequence_T.h Unbounded_Value_Allocation_Traits_T.h Unbounded_Value_Sequence_T.h + Unbounded_Wstring_Sequence_T.h UserException.h UShortSeqC.h UShortSeqS.h @@ -591,17 +582,35 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core, tao_vers } IDL_Files { + idlflags += -Gp -Gd -SS -Sorb -GA -Ge 1 -oA AnyTypeCode \ + -Wb,export_macro=TAO_Export \ + -Wb,export_include=tao/TAO_Export.h \ + -Wb,anyop_export_macro=TAO_AnyTypeCode_Export \ + -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h + idlflags -= -Sa -St GIOP.pidl >> AnyTypeCode/GIOPA.h AnyTypeCode/GIOPA.cpp } IDL_Files { - idlflags += -Sci + idlflags += -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode \ + -Wb,export_macro=TAO_Export \ + -Wb,export_include=tao/TAO_Export.h \ + -Wb,anyop_export_macro=TAO_AnyTypeCode_Export \ + -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h + idlflags -= -Sa -St + BooleanSeq.pidl >> AnyTypeCode/BooleanSeqA.h AnyTypeCode/BooleanSeqA.cpp + CharSeq.pidl >> AnyTypeCode/CharSeqA.h AnyTypeCode/CharSeqA.cpp CONV_FRAME.pidl >> AnyTypeCode/CONV_FRAMEA.h AnyTypeCode/CONV_FRAMEA.cpp Current.pidl >> AnyTypeCode/CurrentA.h AnyTypeCode/CurrentA.cpp + DoubleSeq.pidl >> AnyTypeCode/DoubleSeqA.h AnyTypeCode/DoubleSeqA.cpp + FloatSeq.pidl >> AnyTypeCode/FloatSeqA.h AnyTypeCode/FloatSeqA.cpp IIOP.pidl >> AnyTypeCode/IIOPA.h AnyTypeCode/IIOPA.cpp IIOP_Endpoints.pidl >> AnyTypeCode/IIOP_EndpointsA.h AnyTypeCode/IIOP_EndpointsA.cpp IOP.pidl >> AnyTypeCode/IOPA.h AnyTypeCode/IOPA.cpp IOP_IOR.pidl >> AnyTypeCode/IOP_IORA.h AnyTypeCode/IOP_IORA.cpp + LongDoubleSeq.pidl >> AnyTypeCode/LongDoubleSeqA.h AnyTypeCode/LongDoubleSeqA.cpp + LongLongSeq.pidl >> AnyTypeCode/LongLongSeqA.h AnyTypeCode/LongLongSeqA.cpp + LongSeq.pidl >> AnyTypeCode/LongSeqA.h AnyTypeCode/LongSeqA.cpp Messaging_PolicyValue.pidl >> AnyTypeCode/Messaging_PolicyValueA.h AnyTypeCode/Messaging_PolicyValueA.cpp Messaging_SyncScope.pidl >> AnyTypeCode/Messaging_SyncScopeA.h AnyTypeCode/Messaging_SyncScopeA.cpp ObjectIdList.pidl >> AnyTypeCode/ObjectIdListA.h AnyTypeCode/ObjectIdListA.cpp @@ -611,43 +620,25 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core, tao_vers PI_Forward.pidl >> AnyTypeCode/PI_ForwardA.h AnyTypeCode/PI_ForwardA.cpp PortableInterceptor.pidl >> AnyTypeCode/PortableInterceptorA.h AnyTypeCode/PortableInterceptorA.cpp Services.pidl >> AnyTypeCode/ServicesA.h AnyTypeCode/ServicesA.cpp - TAO.pidl >> AnyTypeCode/TAOA.h AnyTypeCode/TAOA.cpp - TimeBase.pidl >> AnyTypeCode/TimeBaseA.h AnyTypeCode/TimeBaseA.cpp - } - - IDL_Files { - idlflags += -Sci -Gse - BooleanSeq.pidl >> AnyTypeCode/BooleanSeqA.h AnyTypeCode/BooleanSeqA.cpp - CharSeq.pidl >> AnyTypeCode/CharSeqA.h AnyTypeCode/CharSeqA.cpp - DoubleSeq.pidl >> AnyTypeCode/DoubleSeqA.h AnyTypeCode/DoubleSeqA.cpp - FloatSeq.pidl >> AnyTypeCode/FloatSeqA.h AnyTypeCode/FloatSeqA.cpp - LongDoubleSeq.pidl >> AnyTypeCode/LongDoubleSeqA.h AnyTypeCode/LongDoubleSeqA.cpp - LongLongSeq.pidl >> AnyTypeCode/LongLongSeqA.h AnyTypeCode/LongLongSeqA.cpp - LongSeq.pidl >> AnyTypeCode/LongSeqA.h AnyTypeCode/LongSeqA.cpp - OctetSeq.pidl >> AnyTypeCode/OctetSeqA.h AnyTypeCode/OctetSeqA.cpp ShortSeq.pidl >> AnyTypeCode/ShortSeqA.h AnyTypeCode/ShortSeqA.cpp StringSeq.pidl >> AnyTypeCode/StringSeqA.h AnyTypeCode/StringSeqA.cpp + TAO.pidl >> AnyTypeCode/TAOA.h AnyTypeCode/TAOA.cpp + TimeBase.pidl >> AnyTypeCode/TimeBaseA.h AnyTypeCode/TimeBaseA.cpp + ULongLongSeq.pidl >> AnyTypeCode/ULongLongSeqA.h AnyTypeCode/ULongLongSeqA.cpp ULongSeq.pidl >> AnyTypeCode/ULongSeqA.h AnyTypeCode/ULongSeqA.cpp - UShortSeq.pidl >> AnyTypeCode/UShortSeqA.h AnyTypeCode/UShortSeqA.cpp WCharSeq.pidl >> AnyTypeCode/WCharSeqA.h AnyTypeCode/WCharSeqA.cpp WStringSeq.pidl >> AnyTypeCode/WStringSeqA.h AnyTypeCode/WStringSeqA.cpp } - IDL_Files { - idlflags += -Sci - ULongLongSeq.pidl >> AnyTypeCode/ULongLongSeqA.h AnyTypeCode/ULongLongSeqA.cpp - } - // These headers are generated by the above *.pidl files. Header_Files { AnyTypeCode/GIOPA.h - AnyTypeCode/BooleanSeqA.h + AnyTypeCode/BooleanSeqA.h AnyTypeCode/CONV_FRAMEA.h AnyTypeCode/CharSeqA.h AnyTypeCode/CurrentA.h AnyTypeCode/DoubleSeqA.h AnyTypeCode/FloatSeqA.h - AnyTypeCode/LongSeqA.h AnyTypeCode/IIOPA.h AnyTypeCode/IIOP_EndpointsA.h AnyTypeCode/IOPA.h @@ -658,7 +649,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core, tao_vers AnyTypeCode/Messaging_PolicyValueA.h AnyTypeCode/Messaging_SyncScopeA.h AnyTypeCode/ObjectIdListA.h - AnyTypeCode/OctetSeqA.h AnyTypeCode/PI_ForwardA.h AnyTypeCode/ParameterModeA.h AnyTypeCode/Policy_ForwardA.h @@ -670,11 +660,10 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core, tao_vers AnyTypeCode/TimeBaseA.h AnyTypeCode/ULongLongSeqA.h AnyTypeCode/ULongSeqA.h - AnyTypeCode/UShortSeqA.h AnyTypeCode/WCharSeqA.h AnyTypeCode/WStringSeqA.h AnyTypeCode/orb_typesA.h - } + } Pkgconfig_Files { TAO.pc.in diff --git a/TAO/tests/Bug_1812_Regression/Bug_1812_Regession.mpc b/TAO/tests/Bug_1812_Regression/Bug_1812_Regession.mpc index 679a47c31c8..679a47c31c8 100644..100755 --- a/TAO/tests/Bug_1812_Regression/Bug_1812_Regession.mpc +++ b/TAO/tests/Bug_1812_Regression/Bug_1812_Regession.mpc diff --git a/TAO/tests/Bug_1812_Regression/Test.idl b/TAO/tests/Bug_1812_Regression/Test.idl index 176f713989b..176f713989b 100644..100755 --- a/TAO/tests/Bug_1812_Regression/Test.idl +++ b/TAO/tests/Bug_1812_Regression/Test.idl diff --git a/TAO/tests/Bug_1812_Regression/test.cpp b/TAO/tests/Bug_1812_Regression/test.cpp index d3b463ab1f1..d3b463ab1f1 100644..100755 --- a/TAO/tests/Bug_1812_Regression/test.cpp +++ b/TAO/tests/Bug_1812_Regression/test.cpp diff --git a/TAO/tests/Bug_1813_Regression/Bug_1813_Regession.mpc b/TAO/tests/Bug_1813_Regression/Bug_1813_Regession.mpc index 679a47c31c8..679a47c31c8 100644..100755 --- a/TAO/tests/Bug_1813_Regression/Bug_1813_Regession.mpc +++ b/TAO/tests/Bug_1813_Regression/Bug_1813_Regession.mpc diff --git a/TAO/tests/Bug_1813_Regression/Test.idl b/TAO/tests/Bug_1813_Regression/Test.idl index 2b47d41dd97..2b47d41dd97 100644..100755 --- a/TAO/tests/Bug_1813_Regression/Test.idl +++ b/TAO/tests/Bug_1813_Regression/Test.idl diff --git a/TAO/tests/Bug_1813_Regression/test.cpp b/TAO/tests/Bug_1813_Regression/test.cpp index d3b463ab1f1..d3b463ab1f1 100644..100755 --- a/TAO/tests/Bug_1813_Regression/test.cpp +++ b/TAO/tests/Bug_1813_Regression/test.cpp diff --git a/TAO/tests/Bug_2144_Regression/Bug_2144_Regression.mpc b/TAO/tests/Bug_2144_Regression/Bug_2144_Regression.mpc index 3fcbdd9dee2..3fcbdd9dee2 100644..100755 --- a/TAO/tests/Bug_2144_Regression/Bug_2144_Regression.mpc +++ b/TAO/tests/Bug_2144_Regression/Bug_2144_Regression.mpc diff --git a/TAO/tests/Bug_2144_Regression/README b/TAO/tests/Bug_2144_Regression/README index 78e177a24c7..78e177a24c7 100644..100755 --- a/TAO/tests/Bug_2144_Regression/README +++ b/TAO/tests/Bug_2144_Regression/README diff --git a/TAO/tests/Bug_2144_Regression/test.cpp b/TAO/tests/Bug_2144_Regression/test.cpp index c7b795b0d04..c7b795b0d04 100644..100755 --- a/TAO/tests/Bug_2144_Regression/test.cpp +++ b/TAO/tests/Bug_2144_Regression/test.cpp diff --git a/TAO/tests/Bug_2144_Regression/test.idl b/TAO/tests/Bug_2144_Regression/test.idl index 28335e7e932..28335e7e932 100644..100755 --- a/TAO/tests/Bug_2144_Regression/test.idl +++ b/TAO/tests/Bug_2144_Regression/test.idl diff --git a/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc b/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc index ff28e59983f..ff28e59983f 100644..100755 --- a/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc +++ b/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc diff --git a/TAO/tests/Bug_2183_Regression/Hello.cpp b/TAO/tests/Bug_2183_Regression/Hello.cpp index 65df3934e3a..65df3934e3a 100644..100755 --- a/TAO/tests/Bug_2183_Regression/Hello.cpp +++ b/TAO/tests/Bug_2183_Regression/Hello.cpp diff --git a/TAO/tests/Bug_2183_Regression/Hello.h b/TAO/tests/Bug_2183_Regression/Hello.h index 7e1c3042968..7e1c3042968 100644..100755 --- a/TAO/tests/Bug_2183_Regression/Hello.h +++ b/TAO/tests/Bug_2183_Regression/Hello.h diff --git a/TAO/tests/Bug_2183_Regression/README b/TAO/tests/Bug_2183_Regression/README index 4e54c27822b..4e54c27822b 100644..100755 --- a/TAO/tests/Bug_2183_Regression/README +++ b/TAO/tests/Bug_2183_Regression/README diff --git a/TAO/tests/Bug_2183_Regression/Test.idl b/TAO/tests/Bug_2183_Regression/Test.idl index 3c0976e106d..3c0976e106d 100644..100755 --- a/TAO/tests/Bug_2183_Regression/Test.idl +++ b/TAO/tests/Bug_2183_Regression/Test.idl diff --git a/TAO/tests/Bug_2183_Regression/client.cpp b/TAO/tests/Bug_2183_Regression/client.cpp index 913d3153ae9..913d3153ae9 100644..100755 --- a/TAO/tests/Bug_2183_Regression/client.cpp +++ b/TAO/tests/Bug_2183_Regression/client.cpp diff --git a/TAO/tests/Bug_2183_Regression/server.cpp b/TAO/tests/Bug_2183_Regression/server.cpp index 4853611a134..4853611a134 100644..100755 --- a/TAO/tests/Bug_2183_Regression/server.cpp +++ b/TAO/tests/Bug_2183_Regression/server.cpp diff --git a/TAO/tests/Bug_2222_Regression/Bug_2222_Regression.mpc b/TAO/tests/Bug_2222_Regression/Bug_2222_Regression.mpc index cff84ebf492..cff84ebf492 100644..100755 --- a/TAO/tests/Bug_2222_Regression/Bug_2222_Regression.mpc +++ b/TAO/tests/Bug_2222_Regression/Bug_2222_Regression.mpc diff --git a/TAO/tests/Bug_2222_Regression/TestCase.idl b/TAO/tests/Bug_2222_Regression/TestCase.idl index 119634fdc21..119634fdc21 100644..100755 --- a/TAO/tests/Bug_2222_Regression/TestCase.idl +++ b/TAO/tests/Bug_2222_Regression/TestCase.idl diff --git a/TAO/tests/Bug_2222_Regression/TestType.idl b/TAO/tests/Bug_2222_Regression/TestType.idl index 408e5cf6d97..408e5cf6d97 100644..100755 --- a/TAO/tests/Bug_2222_Regression/TestType.idl +++ b/TAO/tests/Bug_2222_Regression/TestType.idl diff --git a/TAO/tests/Bug_2222_Regression/test.cpp b/TAO/tests/Bug_2222_Regression/test.cpp index 8e6a7bec7ff..8e6a7bec7ff 100644..100755 --- a/TAO/tests/Bug_2222_Regression/test.cpp +++ b/TAO/tests/Bug_2222_Regression/test.cpp diff --git a/TAO/tests/Bug_2375_Regression/Bug_2375_Regression.mpc b/TAO/tests/Bug_2375_Regression/Bug_2375_Regression.mpc index d428b0fce50..d428b0fce50 100644..100755 --- a/TAO/tests/Bug_2375_Regression/Bug_2375_Regression.mpc +++ b/TAO/tests/Bug_2375_Regression/Bug_2375_Regression.mpc diff --git a/TAO/tests/Bug_2375_Regression/README b/TAO/tests/Bug_2375_Regression/README index 97b642530a1..97b642530a1 100644..100755 --- a/TAO/tests/Bug_2375_Regression/README +++ b/TAO/tests/Bug_2375_Regression/README diff --git a/TAO/tests/Bug_2375_Regression/test.cpp b/TAO/tests/Bug_2375_Regression/test.cpp index 2a2d57db0e7..2a2d57db0e7 100644..100755 --- a/TAO/tests/Bug_2375_Regression/test.cpp +++ b/TAO/tests/Bug_2375_Regression/test.cpp diff --git a/TAO/tests/Bug_2375_Regression/test.idl b/TAO/tests/Bug_2375_Regression/test.idl index a6ee7413825..a6ee7413825 100644..100755 --- a/TAO/tests/Bug_2375_Regression/test.idl +++ b/TAO/tests/Bug_2375_Regression/test.idl diff --git a/TAO/tests/Bug_2669_Regression/Child.idl b/TAO/tests/Bug_2669_Regression/Child.idl index fd35fee57e6..cc6dac2f24b 100644 --- a/TAO/tests/Bug_2669_Regression/Child.idl +++ b/TAO/tests/Bug_2669_Regression/Child.idl @@ -5,10 +5,10 @@ */ //============================================================================= -#pragma prefix "child.pragma.prefix" - #include "Parent.idl" +#pragma prefix "child.pragma.prefix" + interface ChildInterface : ParentInterface {}; module ChildModule diff --git a/TAO/tests/Bug_2669_Regression/client.cpp b/TAO/tests/Bug_2669_Regression/client.cpp index f840ef82b8b..ec1910c1fc2 100644 --- a/TAO/tests/Bug_2669_Regression/client.cpp +++ b/TAO/tests/Bug_2669_Regression/client.cpp @@ -8,7 +8,6 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" -#include "ace/OS_NS_string.h" #include "ChildS.h" @@ -46,7 +45,7 @@ public: NonRelatedChildHandler (void) {}; ~NonRelatedChildHandler (void) {}; }; - + int main (int argc, char *argv[]) { @@ -81,23 +80,14 @@ main (int argc, char *argv[]) // Create two handlers ChildHandler child_handler; NonRelatedChildHandler non_related_child_handler; - + ChildModule::AMI_ChildInterfaceHandler_var the_child_handler_var = child_handler._this (); - - const char * expectedid = "IDL:child.pragma.prefix/ChildModule/AMI_ChildInterfaceHandler:1.0"; - if (ACE_OS::strcmp (the_child_handler_var->_interface_repository_id (), expectedid) != 0) - { - ACE_ERROR ((LM_ERROR, "Error: REGRESSION - ChildModule::repository id is " - "incorrectly generated, received %s\n", - the_child_handler_var->_interface_repository_id ())); - result = 1; - } - + // This handler has no relationship with the above in IDL. AMI_ChildInterfaceHandler_var the_non_related_child_handler_var = non_related_child_handler._this (); - + // Check that both handler objects narrow successfully to their parent // handler types... ParentModule::AMI_ParentInterfaceHandler_var the_parent_handler_var = @@ -105,17 +95,17 @@ main (int argc, char *argv[]) if (CORBA::is_nil (the_parent_handler_var.in ())) { - ACE_ERROR ((LM_ERROR, "Error: REGRESSION - Cannot narrow ChildModule::ChildInterface " + ACE_DEBUG ((LM_ERROR, "Error: REGRESSION - Cannot narrow ChildModule::ChildInterface " "reply handler to its parent handler type.\n")); result = 1; } - + AMI_ParentInterfaceHandler_var the_non_related_parent_handler_var = AMI_ParentInterfaceHandler::_narrow (the_non_related_child_handler_var.in ()); if (CORBA::is_nil (the_non_related_parent_handler_var.in ())) { - ACE_ERROR ((LM_ERROR, "Error: REGRESSION - Cannot narrow ChildInterface " + ACE_DEBUG ((LM_ERROR, "Error: REGRESSION - Cannot narrow ChildInterface " "reply handler to its parent handler type.\n")); result = 1; } @@ -127,25 +117,25 @@ main (int argc, char *argv[]) if (! CORBA::is_nil (the_parent_handler_var.in ())) { - ACE_ERROR ((LM_ERROR, "Error: REGRESSION - ChildModule::ChildInterface reply handler " + ACE_DEBUG ((LM_ERROR, "Error: REGRESSION - ChildModule::ChildInterface reply handler " "narrows to unrelated type.\n")); result = 1; } - + the_non_related_parent_handler_var = AMI_ParentInterfaceHandler::_narrow (the_child_handler_var.in ()); if (! CORBA::is_nil (the_non_related_parent_handler_var.in ())) { - ACE_ERROR ((LM_ERROR, "Error: REGRESSION - ChildModule::ChildInterface reply handler " + ACE_DEBUG ((LM_ERROR, "Error: REGRESSION - ChildModule::ChildInterface reply handler " "narrows to unrelated type.\n")); result = 1; } poa_var->destroy (1,0); - + orb->destroy (); - + } ACE_CATCHANY { diff --git a/TAO/tests/ICMG_Any_Bug/Hello.cpp b/TAO/tests/ICMG_Any_Bug/Hello.cpp index bfa97ea05a1..bfa97ea05a1 100644..100755 --- a/TAO/tests/ICMG_Any_Bug/Hello.cpp +++ b/TAO/tests/ICMG_Any_Bug/Hello.cpp diff --git a/TAO/tests/ICMG_Any_Bug/Hello.h b/TAO/tests/ICMG_Any_Bug/Hello.h index 429a7e10963..429a7e10963 100644..100755 --- a/TAO/tests/ICMG_Any_Bug/Hello.h +++ b/TAO/tests/ICMG_Any_Bug/Hello.h diff --git a/TAO/tests/ICMG_Any_Bug/HelloWorld.h b/TAO/tests/ICMG_Any_Bug/HelloWorld.h index ad60160af2d..ad60160af2d 100644..100755 --- a/TAO/tests/ICMG_Any_Bug/HelloWorld.h +++ b/TAO/tests/ICMG_Any_Bug/HelloWorld.h diff --git a/TAO/tests/ICMG_Any_Bug/client.cpp b/TAO/tests/ICMG_Any_Bug/client.cpp index 3457c09156a..3457c09156a 100644..100755 --- a/TAO/tests/ICMG_Any_Bug/client.cpp +++ b/TAO/tests/ICMG_Any_Bug/client.cpp diff --git a/TAO/tests/ICMG_Any_Bug/server.cpp b/TAO/tests/ICMG_Any_Bug/server.cpp index e32f495349a..e32f495349a 100644..100755 --- a/TAO/tests/ICMG_Any_Bug/server.cpp +++ b/TAO/tests/ICMG_Any_Bug/server.cpp diff --git a/TAO/tests/IDL_Test/array_only.idl b/TAO/tests/IDL_Test/array_only.idl index bb791128223..bb791128223 100644..100755 --- a/TAO/tests/IDL_Test/array_only.idl +++ b/TAO/tests/IDL_Test/array_only.idl diff --git a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp index fc690fa5cf4..fc690fa5cf4 100644..100755 --- a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp +++ b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp diff --git a/TAO/tests/MProfile_Forwarding/Servant_Locator.h b/TAO/tests/MProfile_Forwarding/Servant_Locator.h index ac226fda180..ac226fda180 100644..100755 --- a/TAO/tests/MProfile_Forwarding/Servant_Locator.h +++ b/TAO/tests/MProfile_Forwarding/Servant_Locator.h diff --git a/TAO/tests/MProfile_Forwarding/server.cpp b/TAO/tests/MProfile_Forwarding/server.cpp index 04c27ae739f..04c27ae739f 100644..100755 --- a/TAO/tests/MProfile_Forwarding/server.cpp +++ b/TAO/tests/MProfile_Forwarding/server.cpp diff --git a/TAO/tests/MProfile_Forwarding/test.idl b/TAO/tests/MProfile_Forwarding/test.idl index 1f1e6389faf..1f1e6389faf 100644..100755 --- a/TAO/tests/MProfile_Forwarding/test.idl +++ b/TAO/tests/MProfile_Forwarding/test.idl diff --git a/TAO/tests/MProfile_Forwarding/test_i.inl b/TAO/tests/MProfile_Forwarding/test_i.inl index b11bb431e1f..b11bb431e1f 100644..100755 --- a/TAO/tests/MProfile_Forwarding/test_i.inl +++ b/TAO/tests/MProfile_Forwarding/test_i.inl diff --git a/TAO/tests/Permanent_Forward/Permanent_Forward.mpc b/TAO/tests/Permanent_Forward/Permanent_Forward.mpc index ab5cf4db05d..ab5cf4db05d 100644..100755 --- a/TAO/tests/Permanent_Forward/Permanent_Forward.mpc +++ b/TAO/tests/Permanent_Forward/Permanent_Forward.mpc diff --git a/TAO/tests/Permanent_Forward/README b/TAO/tests/Permanent_Forward/README index 283aa20a87d..283aa20a87d 100644..100755 --- a/TAO/tests/Permanent_Forward/README +++ b/TAO/tests/Permanent_Forward/README diff --git a/TAO/tests/Permanent_Forward/StubTest.cpp b/TAO/tests/Permanent_Forward/StubTest.cpp index 21fbd5409bd..21fbd5409bd 100644..100755 --- a/TAO/tests/Permanent_Forward/StubTest.cpp +++ b/TAO/tests/Permanent_Forward/StubTest.cpp diff --git a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp index 9341e3addbb..4d98648a2ac 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp @@ -115,22 +115,6 @@ main (int argc, char *argv[]) 1); } - // BUG 2656 testing - _get_policy_overrides() should return an empty - // sequence rather than nill. - CORBA::PolicyTypeSeq types; - CORBA::PolicyList_var policies = server->_get_policy_overrides(types); - - if (policies.ptr () == 0) - { - ACE_ERROR ((LM_ERROR, - "(%P|%t) _get_policy_overrides returned nill pointer\n")); - ACE_TRY_THROW (CORBA::INTERNAL ()); - } - else - { - CORBA::ULong ListSize = policies->length(); - } - server->invoke_me (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/tests/QtTests/client.cpp b/TAO/tests/QtTests/client.cpp index 0139cdf6672..0139cdf6672 100644..100755 --- a/TAO/tests/QtTests/client.cpp +++ b/TAO/tests/QtTests/client.cpp diff --git a/TAO/tests/QtTests/client.h b/TAO/tests/QtTests/client.h index e4b50c40a70..e4b50c40a70 100644..100755 --- a/TAO/tests/QtTests/client.h +++ b/TAO/tests/QtTests/client.h diff --git a/TAO/tests/QtTests/server.cpp b/TAO/tests/QtTests/server.cpp index 68ed428b4b6..68ed428b4b6 100644..100755 --- a/TAO/tests/QtTests/server.cpp +++ b/TAO/tests/QtTests/server.cpp diff --git a/TAO/tests/QtTests/test.idl b/TAO/tests/QtTests/test.idl index 1dc08b44be6..1dc08b44be6 100644..100755 --- a/TAO/tests/QtTests/test.idl +++ b/TAO/tests/QtTests/test.idl diff --git a/TAO/tests/QtTests/test_i.cpp b/TAO/tests/QtTests/test_i.cpp index 0d961989108..0d961989108 100644..100755 --- a/TAO/tests/QtTests/test_i.cpp +++ b/TAO/tests/QtTests/test_i.cpp diff --git a/TAO/tests/QtTests/test_i.h b/TAO/tests/QtTests/test_i.h index ac04d36afc9..ac04d36afc9 100644..100755 --- a/TAO/tests/QtTests/test_i.h +++ b/TAO/tests/QtTests/test_i.h diff --git a/TAO/tests/Sequence_Unit_Tests/Bounded_String.cpp b/TAO/tests/Sequence_Unit_Tests/Bounded_String.cpp index 0b230c0558d..8f0bc9e45ef 100644 --- a/TAO/tests/Sequence_Unit_Tests/Bounded_String.cpp +++ b/TAO/tests/Sequence_Unit_Tests/Bounded_String.cpp @@ -8,11 +8,11 @@ * * @author Carlos O'Ryan */ -#include "tao/Bounded_Basic_String_Sequence_T.h" +#include "tao/Bounded_String_Sequence_T.h" #include "tao/CORBA_String.h" CORBA::ULong const MAXIMUM = 42; -typedef TAO::bounded_basic_string_sequence<char, MAXIMUM> s_sequence; +typedef TAO::bounded_string_sequence<MAXIMUM> s_sequence; int main(int,char*[]) { diff --git a/TAO/tests/Sequence_Unit_Tests/Unbounded_String.cpp b/TAO/tests/Sequence_Unit_Tests/Unbounded_String.cpp index 02cccf4ba2a..246c46f7e85 100644 --- a/TAO/tests/Sequence_Unit_Tests/Unbounded_String.cpp +++ b/TAO/tests/Sequence_Unit_Tests/Unbounded_String.cpp @@ -8,10 +8,10 @@ * * @author Carlos O'Ryan */ -#include "tao/Unbounded_Basic_String_Sequence_T.h" +#include "tao/Unbounded_String_Sequence_T.h" #include "tao/CORBA_String.h" -typedef TAO::unbounded_basic_string_sequence<char> s_sequence; +typedef TAO::unbounded_string_sequence s_sequence; int main(int,char*[]) { |