diff options
Diffstat (limited to 'TAO/orbsvcs')
112 files changed, 1055 insertions, 527 deletions
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 |