diff options
46 files changed, 8000 insertions, 2642 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 4d806a3ba4a..ec51f282a3f 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,114 @@ +Thu Feb 17 14:44:25 2000 Carlos O'Ryan <coryan@uci.edu> + + * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h: + * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i: + * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp: + Add support for the pull model. The architecture is very + simple, the SupplierAdmin keeps two collections, of + ProxyPushConsumer and ProxyPullSupplier objects. + Somehow the Pulling_Strategy obtains events from the + PullSuppliers connected to the EventChannel and pushes them into + the ConsumerAdmin implementation. + The ProxyPushConsumer objects also propagate their events to the + ConsumerAdmin object. + The ConsumerAdmin implementation propagates the events to its + two collections, the ProxyPushSuppliers and the + ProxyPullSuppliers. + The former use the Dispatching strategy to select a thread that + will finally deliver the event to the PushConsumer client + object. + In contrast the ProxyPullSupplier object queues the event until + the application invokes pull() or try_pull. + + * orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h: + * orbsvcs/orbsvcs/CosEvent/CEC_Factory.h: + * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h: + * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i: + * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp: + Add support in the Factory class for the new pull-related + components. + + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.i: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp: + Implement the CosEventChannelAdmin::ProxyPullConsumer + interface. + + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.i: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp: + Implement the CosEventChannelAdmin::ProxyPullSupplier + interface. + + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp: + Removed all the connected/reconnected/disconnected methods, + since they are only relevant for filtering Event Channels. + + * orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h: + * orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.i: + * orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp: + PullSuppliers must be polled to get the events they have (if + any). There are many strategies to do that, for example, + periodically poll all the suppliers, have dedicated threads + blocked on pull(), one of each supplier, and there may be other + variations too. + This class defines the interface for the Pulling strategy. + + * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h: + * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i: + * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp: + A simple implementation of the Pulling strategy. + + * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h: + * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i: + * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp: + Add support for the ProxyPullSupplier objects. + New push() method to propagate an event to all the connected + consumers. + + * orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h: + * orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i: + * orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp: + Add support for the ProxyPullConsumer objects. + + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.i: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp: + Removed all the connected/reconnected/disconnected methods, + since they are only relevant for filtering Event Channels. + Move the TAO_CEC_Push_Event worker into the CEC_ConsumerAdmin + files, because that's where it is used now. + + * orbsvcs/tests/CosEvent/CosEvent.dsw: + * orbsvcs/tests/CosEvent/Basic/Makefile: + * orbsvcs/tests/CosEvent/Basic/Basic.dsw: + * orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp: + * orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.dsp: + * orbsvcs/tests/CosEvent/Basic/run_test.pl: + New test for the pull-push model, currently disabled because the + CORBA::Any class is not thread safe (see [BUGID:430]) + + * orbsvcs/tests/CosEvent/lib/Counting_Consumer.h: + * orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp: + * orbsvcs/tests/CosEvent/lib/Counting_Supplier.h: + * orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp: + Implement new helper classes for testing the Pull model. + + * docs/cec_options.html: + Documented the options of the COS Event Channel Factory. + + * utils/catior/catior.cpp: + Updated to understand the SHMIOP options. + + * orbsvcs/tests/CosEvent/Basic/Push_Event.cpp: + Minor cosmetic fix. + + * orbsvcs/orbsvcs/Makefile: + Updated dependencies with TAO_ORBSVCS="Naming Time Property + Sched Event CosEvent NativeCosEvent Event2 Notify Trader + LifeCycle Log Concurrency" + Thu Feb 17 13:51:03 2000 Carlos O'Ryan <coryan@uci.edu> * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp: diff --git a/TAO/docs/cec_options.html b/TAO/docs/cec_options.html new file mode 100644 index 00000000000..9f0535657cf --- /dev/null +++ b/TAO/docs/cec_options.html @@ -0,0 +1,346 @@ +<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> +<html> + <head> + <title>COS Event Channel Configuration</title> + <!-- $Id$ --> + </head> + + <body> + <CENTER> + <h1>COS Event Channel Configuration</h1> + </CENTER> + + <H3>Run-time Configuration</H3> + + <P>The new implementation of the COS Event Service uses a + factory to build all the objects and strategies it requires. + The factory can be dynamically loaded using ACE Service + Configurator, this is extremely convenient because the factory + can also parse options in the Service Configurator script file. + </P> + + <P>The current implementation provides a default implementation + for this Factory, this document describes the options used by + this default implementation. + Users can define their own implementation, with new ad-hoc + strategies or with pre-selected strategies. + </P> + + <H3>The configuration file</H3> + + <P>The COS channel uses the same service configurator + file that the ORB uses, the default name for this file is + <CODE>svc.conf</CODE>, but the ORB option + <CODE>-ORBSvcConf</CODE> can be used to override this. + The format of the file is described in detail in + the service configurator documentation, but the relevant section + for the event channel looks like this: + </P> + +<PRE> +# Comments go here... +# More comments if you want to... +static CEC_Factory "-CECDispatching reactive ....." +</PRE> + + <P>All the event service factory options start with + <CODE>-CEC</CODE></P> + + + <H3>The options</H3> + + <P><TABLE BORDER="2" CELLSPACING="2" CELLPADDING="0"> + <TR> + <TH>Option</TH> + <TH>Description</TH> + </TR> + <!-- <TR NAME="CECDispatching"> --> + <TR> + <TD><CODE>-CECDispatching</CODE> + <EM>dispatching_strategy</EM> + </TD> + <TD>Select the dispatching strategy used by the COS + event service. A <EM>reactive</EM> strategy will use the + same thread that received the event from the supplier to + push the event to all the consumers, + the <EM>priority</EM> strategy will use a prioritized pool + of threads and will query the scheduling service to select + the thread that will dispatch each event; + the <EM>mt</EM> strategy will also use a pool of threads, + but the thread to dispatch is randomly selected. + </TD> + </TR> + + <!-- <TR NAME="CECDispatchingThreads"> --> + <TR> + <TD><CODE>-CECDispatchingThreads</CODE> + <EM>number_of_threads</EM> + </TD> + <TD>Select the number of threads used bythe <EM>mt</EM> + dispatching strategy. + </TD> + </TR> + + <!-- <TR NAME="CECProxyConsumerLock"> --> + <TR> + <TD><CODE>-CECProxyConsumerLock</CODE> + <EM>lock_type</EM> + </TD> + <TD>Select the lock type (<EM>null</EM>, <EM>thread</EM> or + <EM>recursive</EM>) to synchronize access to the + ProxyPushConsumer state. + </TD> + </TR> + + <!-- <TR NAME="CECProxySupplierLock"> --> + <TR> + <TD><CODE>-CECProxySupplierLock</CODE> + <EM>lock_type</EM> + </TD> + <TD>Select the lock type (<EM>null</EM>, <EM>thread</EM> or + <EM>recursive</EM>) to synchronize access to the + ProxyPushSupplier state. + </TD> + </TR> + + <!-- <TR NAME="CECORBId"> --> + <TR> + <TD><CODE>-CECORBId</CODE> + <EM>orbid</EM> + </TD> + <TD>Set the name of the ORB used by the event service, only + useful in applications that create multiple ORBs and + activate the event service in one of them. + </TD> + </TR> + + <!-- <TR NAME="CECConsumerControl"> --> + <TR> + <TD><CODE>-CECConsumerControl</CODE> + <EM>policy</EM> + </TD> + <TD>Select the consumer control policy (<EM>null</EM> or + <EM>reactive</EM>) to detect and discard broken consumer + proxies. + </TD> + </TR> + + <!-- <TR NAME="CECSupplierControl"> --> + <TR> + <TD><CODE>-CECSupplierControl</CODE> + <EM>policy</EM> + </TD> + <TD>Select the supplier control policy (<EM>null</EM> or + <EM>reactive</EM>) to detect and discard broken supplier + proxies. + </TD> + </TR> + + <!-- <TR NAME="CECConsumerPeriod"> --> + <TR> + <TD><CODE>-CECConsumerPeriod</CODE> + <EM>period</EM> + </TD> + <TD>Set the period (in microseconds) used by the reactive + consumer control policy to poll the state of the + consumer proxies. + </TD> + </TR> + + <!-- <TR NAME="CECSupplierPeriod"> --> + <TR> + <TD><CODE>-CECSupplierPeriod</CODE> + <EM>period</EM> + </TD> + <TD>Set the period (in microseconds) used by the reactive + supplier control policy to poll the state of the + supplier proxies. + </TD> + </TR> + + <!-- <TR NAME="CECReactivePullingPeriod"> --> + <TR> + <TD><CODE>-CECReactivePullingPeriod</CODE> + <EM>period</EM> + </TD> + <TD>Set the period (in microseconds) used by the reactive + pulling strategy to poll all the PullSuppliers for an + event. + </TD> + </TR> + + <!-- <TR NAME="CECProxyConsumerCollection"> --> + <TR> + <TD><CODE>-CECProxyConsumerCollection</CODE> + <EM>flag[:flags]</EM> + </TD> + <TD><P>Configure the data structure and strategies used to + implement collections of + <CODE>ProxyPushConsumers</CODE> and + <CODE>ProxyPullConsumers</CODE>. + The argument is a colon separated list of flags, with + the following semantics: + <TABLE> + <TR><TH>Flag</TH><TH>Description</TH>< + </TR> + <TR> + <TD>MT</TD> + <TD>Use regular mutexes and/or condition + variables for serialization. + </TD> + <TD>ST</TD> + <TD>Use null mutexes and/or condition + variables for serialization. + </TD> + <TD>LIST</TD> + <TD>Implement the collection using an ordered list, + fast for iteration (i.e. during event dispatching), + but slow for insertion and removal (i.e. when + clients connect and disconnect from the EC). + </TD> + <TD>RB_TREE</TD> + <TD>Implement the collection using a Red-Black tree, + slow for iteration (i.e. during event dispatching), + but fast for insertion and removal (i.e. when + clients connect and disconnect from the EC). + </TD> + <TD>IMMEDIATE</TD> + <TD>Threads block until they can execute a change on + the data structure, the system must use other + approaches to guarantee that the iterators are not + invalidated during event dispatching. For example, + use a separate dispatching thread. + </TD> + <TD>COPY_ON_READ</TD> + <TD>Before initiating an iteration to dispatch events + (or similar tasks) a copy of the complete collection + is performed. + This solves most of the synchronization problems, + but introduces a significant source of overhead and + priority inversions on the critical path. + </TD> + <TD>COPY_ON_WRITE <STRONG>UNIMPLEMENTED</STRONG></TD> + <TD>Similar to the previous one, but the copy is only + performed when needed. + </TD> + <TD>DELAYED</TD> + <TD>Threads that need to change the collection can + detect if that change will invalidate iterators used + by other threads. + If so, the thread posts the change on a queue that + is executed once the collection is no longer in + use. + </TD> + </TR> + </TABLE> + </P> + </TD> + </TR> + + <!-- <TR NAME="CECProxySupplierCollection"> --> + <TR> + <TD><CODE>-CECProxySupplierCollection</CODE> + <EM>flag[:flags]</EM> + </TD> + <TD><P>Configure the data structure and strategies used to + implement collections of <CODE>ProxyPushSupplier</CODE> + and <CODE>ProxyPullSupplier</CODE> objects. + Use the same arguments as with the + <CODE>CECProxyConsumerCollection</CODE> option. + </P> + </TD> + </TR> + </TABLE> + </P> + + <H3>The constructor</H3> + + <P>The <CODE>TAO_CEC_EventChannel</CODE> class implements the + <CODE>CosEventChannelAdmin::EventChannel</CODE> interface; + this class takes one mandatory and two optional parameters in + its constructor: + </P> + +<PRE> + TAO_EC_EventChannel (const TAO_CEC_EventChannel_Attributes& attributes, + TAO_CEC_Factory* factory = 0, + int own_factory = 0); +</PRE> + + <P>The <CODE>factory</CODE> is an optional parameter to override + the default strategy factory used by the event channel, + the event channel will destroy the factory if the + <CODE>own_factory</CODE> argument is true. + </P> + + <P>The <CODE>attributes</CODE> parameter can be used to fine tune + some of the algorithms and strategies used by the event channel, + the default values are probably OK for most applications. + Notice that the attributes include the POA used to activate the + ConsumerAdmin, SupplierAdmin, ProxyPushConsumer, + ProxyPushSupplier, ProxyPullConsumer and the ProxyPullSupplier + objects; + this POAs must have the <CODE>IMPLICIT_ACTIVATION</CODE> and the + <CODE>SYSTEM_ID</CODE> policies (as the RootPOA does). + </P> + + <P><TABLE BORDER="2" CELLSPACING="2" CELLPADDING="0"> + <TR><TH>Attribute</TH><TH>Description</TH></TR> + + <TR><TD><CODE>consumer_reconnect</CODE></TD> + <TD>If the attribute is not zero then the same consumer can + call <CODE>connect_push_consumer</CODE> on its + ProxyPushSupplier multiple times to change its + subscriptions; + this is usually more efficient that disconnecting and + connecting again. + </TD> + </TR> + + <TR><TD><CODE>supplier_reconnect</CODE></TD> + <TD>If the attribute is not zero then the same supplier can + call <CODE>connect_push_supplier</CODE> on its + ProxyPushConsumer multiple times to change its + publications; + this is usually more efficient that disconnecting and + connecting again. + </TD> + </TR> + + <TR><TD><CODE>busy_hwm</CODE></TD> + <TD>When using the delayed strategy to update + ProxyPushSupplier sets this flag controls the maximum + number of thread that can simultaneously iterate over the + set before blocking. + It can be used to avoid starvation in delayed updates on + the set. + </TD> + </TR> + + <TR><TD><CODE>max_write_delay</CODE></TD> + <TD>When using the delayed strategy to update + ProxyPushSupplier sets this flag controls the maximum + number of threads that will initiate dispatching + <B>after</B> a change has been posted. + Any thread after that is blocked until the operations are + performed. + It can be used to completely stop starvation of delayed + updates on the set. + </TD> + </TR> + </TABLE> + </P> + + <P><HR><P> + + Back to the TAO <A HREF="index.html">components documentation</A>. + + <!--#include virtual="/~schmidt/cgi-sig.html" --> + + <address><a href="mailto:coryan@cs.wustl.edu">Carlos O'Ryan</a></address> +<!-- Created: Thu Jul 1 21:44:28 CDT 1999 --> +<!-- hhmts start --> +Last modified: Tue Feb 1 13:50:47 PST 2000 +<!-- hhmts end --> + </body> +</html> diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp index 5f2726f4666..21adda3414f 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp @@ -2,6 +2,7 @@ #include "CEC_ConsumerAdmin.h" #include "CEC_ProxyPushSupplier.h" +#include "CEC_ProxyPullSupplier.h" #include "CEC_ProxyPushConsumer.h" #include "CEC_EventChannel.h" @@ -14,8 +15,10 @@ ACE_RCSID(CosEvent, CEC_ConsumerAdmin, "$Id$") TAO_CEC_ConsumerAdmin::TAO_CEC_ConsumerAdmin (TAO_CEC_EventChannel *ec) : event_channel_ (ec) { - this->collection_ = + this->push_collection_ = this->event_channel_->create_proxy_push_supplier_collection (); + this->pull_collection_ = + this->event_channel_->create_proxy_pull_supplier_collection (); // @@ // @@ this->collection_->busy_hwm (this->event_channel_->busy_hwm ()); @@ -28,65 +31,87 @@ TAO_CEC_ConsumerAdmin::TAO_CEC_ConsumerAdmin (TAO_CEC_EventChannel *ec) TAO_CEC_ConsumerAdmin::~TAO_CEC_ConsumerAdmin (void) { - this->event_channel_->destroy_proxy_push_supplier_collection (this->collection_); - this->collection_ = 0; + this->event_channel_->destroy_proxy_push_supplier_collection (this->push_collection_); + this->push_collection_ = 0; + this->event_channel_->destroy_proxy_pull_supplier_collection (this->pull_collection_); + this->pull_collection_ = 0; } void -TAO_CEC_ConsumerAdmin::connected (TAO_CEC_ProxyPushConsumer *consumer, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ConsumerAdmin::push (const CORBA::Any &event, + CORBA::Environment &ACE_TRY_ENV) { - TAO_CEC_Connect_Consumer worker (consumer); + TAO_CEC_Propagate_Event_Push push_worker (event); + + this->push_collection_->for_each (&push_worker, + ACE_TRY_ENV); + ACE_CHECK; - this->collection_->for_each (&worker, ACE_TRY_ENV); + TAO_CEC_Propagate_Event_Pull pull_worker (event); + + this->pull_collection_->for_each (&pull_worker, + ACE_TRY_ENV); + ACE_CHECK; } void -TAO_CEC_ConsumerAdmin::reconnected (TAO_CEC_ProxyPushConsumer *consumer, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ConsumerAdmin::connected (TAO_CEC_ProxyPushSupplier *supplier, + CORBA::Environment &ACE_TRY_ENV) { - TAO_CEC_Reconnect_Consumer worker (consumer); + this->push_collection_->connected (supplier, ACE_TRY_ENV); +} - this->collection_->for_each (&worker, ACE_TRY_ENV); +void +TAO_CEC_ConsumerAdmin::reconnected (TAO_CEC_ProxyPushSupplier *supplier, + CORBA::Environment &ACE_TRY_ENV) +{ + this->push_collection_->reconnected (supplier, ACE_TRY_ENV); } void -TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPushConsumer *consumer, +TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPushSupplier *supplier, CORBA::Environment &ACE_TRY_ENV) { - TAO_CEC_Disconnect_Consumer worker (consumer); - - this->collection_->for_each (&worker, ACE_TRY_ENV); + this->push_collection_->disconnected (supplier, ACE_TRY_ENV); } void -TAO_CEC_ConsumerAdmin::connected (TAO_CEC_ProxyPushSupplier *supplier, +TAO_CEC_ConsumerAdmin::connected (TAO_CEC_ProxyPullSupplier *supplier, CORBA::Environment &ACE_TRY_ENV) { - this->collection_->connected (supplier, ACE_TRY_ENV); + this->pull_collection_->connected (supplier, ACE_TRY_ENV); } void -TAO_CEC_ConsumerAdmin::reconnected (TAO_CEC_ProxyPushSupplier *supplier, +TAO_CEC_ConsumerAdmin::reconnected (TAO_CEC_ProxyPullSupplier *supplier, CORBA::Environment &ACE_TRY_ENV) { - this->collection_->reconnected (supplier, ACE_TRY_ENV); + this->pull_collection_->reconnected (supplier, ACE_TRY_ENV); } void -TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPushSupplier *supplier, +TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPullSupplier *supplier, CORBA::Environment &ACE_TRY_ENV) { - this->collection_->disconnected (supplier, ACE_TRY_ENV); + this->pull_collection_->disconnected (supplier, ACE_TRY_ENV); } void TAO_CEC_ConsumerAdmin::shutdown (CORBA::Environment &ACE_TRY_ENV) { - TAO_CEC_Shutdown_Supplier worker; + TAO_CEC_Shutdown_Push_Supplier push_worker; + + this->push_collection_->for_each (&push_worker, ACE_TRY_ENV); + ACE_CHECK; + this->push_collection_->shutdown (ACE_TRY_ENV); + ACE_CHECK; + + TAO_CEC_Shutdown_Pull_Supplier pull_worker; - this->collection_->for_each (&worker, ACE_TRY_ENV); - this->collection_->shutdown (ACE_TRY_ENV); + this->pull_collection_->for_each (&pull_worker, ACE_TRY_ENV); + ACE_CHECK; + this->pull_collection_->shutdown (ACE_TRY_ENV); + ACE_CHECK; } CosEventChannelAdmin::ProxyPushSupplier_ptr @@ -100,10 +125,13 @@ TAO_CEC_ConsumerAdmin::obtain_push_supplier (CORBA::Environment &ACE_TRY_ENV) } CosEventChannelAdmin::ProxyPullSupplier_ptr -TAO_CEC_ConsumerAdmin::obtain_pull_supplier (CORBA::Environment &) +TAO_CEC_ConsumerAdmin::obtain_pull_supplier (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - return CosEventChannelAdmin::ProxyPullSupplier::_nil (); + TAO_CEC_ProxyPullSupplier* supplier = + this->event_channel_->create_proxy_pull_supplier (); + + return supplier->_this (ACE_TRY_ENV); } PortableServer::POA_ptr @@ -115,64 +143,67 @@ TAO_CEC_ConsumerAdmin::_default_POA (CORBA::Environment&) // **************************************************************** void -TAO_CEC_Connect_Consumer::work (TAO_CEC_ProxyPushSupplier *supplier, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_Shutdown_Push_Supplier::work (TAO_CEC_ProxyPushSupplier *supplier, + CORBA::Environment &ACE_TRY_ENV) { - supplier->connected (this->consumer_, ACE_TRY_ENV); - ACE_CHECK; - this->consumer_->connected (supplier, ACE_TRY_ENV); - ACE_CHECK; + ACE_TRY + { + supplier->shutdown (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + // Ignore exceptions + } + ACE_ENDTRY; } // **************************************************************** void -TAO_CEC_Reconnect_Consumer::work (TAO_CEC_ProxyPushSupplier *supplier, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_Shutdown_Pull_Supplier::work (TAO_CEC_ProxyPullSupplier *supplier, + CORBA::Environment &ACE_TRY_ENV) { - supplier->reconnected (this->consumer_, ACE_TRY_ENV); - ACE_CHECK; - this->consumer_->reconnected (supplier, ACE_TRY_ENV); - ACE_CHECK; + ACE_TRY + { + supplier->shutdown (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + // Ignore exceptions + } + ACE_ENDTRY; } // **************************************************************** void -TAO_CEC_Disconnect_Consumer::work (TAO_CEC_ProxyPushSupplier *supplier, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_Propagate_Event_Push::work (TAO_CEC_ProxyPushSupplier *supplier, + CORBA::Environment &ACE_TRY_ENV) { - supplier->disconnected (this->consumer_, ACE_TRY_ENV); - ACE_CHECK; - this->consumer_->disconnected (supplier, ACE_TRY_ENV); - ACE_CHECK; + supplier->push (this->event_, ACE_TRY_ENV); } // **************************************************************** void -TAO_CEC_Shutdown_Supplier::work (TAO_CEC_ProxyPushSupplier *supplier, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_Propagate_Event_Pull::work (TAO_CEC_ProxyPullSupplier *supplier, + CORBA::Environment &ACE_TRY_ENV) { - ACE_TRY - { - supplier->shutdown (ACE_TRY_ENV); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - // Ignore exceptions - } - ACE_ENDTRY; + supplier->push (this->event_, ACE_TRY_ENV); } +// **************************************************************** #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class TAO_EC_Worker<TAO_CEC_ProxyPushSupplier>; +template class TAO_EC_Worker<TAO_CEC_ProxyPullSupplier>; #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate TAO_EC_Worker<TAO_CEC_ProxyPushSupplier> +#pragma instantiate TAO_EC_Worker<TAO_CEC_ProxyPullSupplier> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h index c634a819196..6885dad99e7 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h @@ -28,6 +28,7 @@ class TAO_CEC_EventChannel; class TAO_CEC_ProxyPushSupplier; +class TAO_CEC_ProxyPullSupplier; class TAO_CEC_ProxyPushConsumer; class TAO_ORBSVCS_Export TAO_CEC_ConsumerAdmin : public POA_CosEventChannelAdmin::ConsumerAdmin @@ -51,7 +52,6 @@ class TAO_ORBSVCS_Export TAO_CEC_ConsumerAdmin : public POA_CosEventChannelAdmin // = TODO // public: - typedef TAO_EC_Proxy_Collection<TAO_CEC_ProxyPushSupplier> Collection; TAO_CEC_ConsumerAdmin (TAO_CEC_EventChannel* event_channel); // constructor. If <supplier_set> is nil then it builds one using // the <event_channel> argument. @@ -62,16 +62,13 @@ public: void for_each (TAO_EC_Worker<TAO_CEC_ProxyPushSupplier> *worker, CORBA::Environment &ACE_TRY_ENV); + void for_each (TAO_EC_Worker<TAO_CEC_ProxyPullSupplier> *worker, + CORBA::Environment &ACE_TRY_ENV); // For each elements call <worker->work()>. - virtual void connected (TAO_CEC_ProxyPushConsumer*, - CORBA::Environment&); - virtual void reconnected (TAO_CEC_ProxyPushConsumer*, - CORBA::Environment&); - virtual void disconnected (TAO_CEC_ProxyPushConsumer*, - CORBA::Environment&); - // Used to inform the EC that a Consumer has connected or - // disconnected from it. + void push (const CORBA::Any &event, + CORBA::Environment &ACE_TRY_ENV); + // Push the event to all the consumers virtual void connected (TAO_CEC_ProxyPushSupplier*, CORBA::Environment&); @@ -79,6 +76,12 @@ public: CORBA::Environment&); virtual void disconnected (TAO_CEC_ProxyPushSupplier*, CORBA::Environment&); + virtual void connected (TAO_CEC_ProxyPullSupplier*, + CORBA::Environment&); + virtual void reconnected (TAO_CEC_ProxyPullSupplier*, + CORBA::Environment&); + virtual void disconnected (TAO_CEC_ProxyPullSupplier*, + CORBA::Environment&); // Used to inform the EC that a Supplier has connected or // disconnected from it. @@ -101,7 +104,12 @@ private: TAO_CEC_EventChannel *event_channel_; // The Event Channel we belong to - Collection *collection_; + typedef TAO_EC_Proxy_Collection<TAO_CEC_ProxyPushSupplier> PushCollection; + PushCollection *push_collection_; + // The supplier container. + + typedef TAO_EC_Proxy_Collection<TAO_CEC_ProxyPullSupplier> PullCollection; + PullCollection *pull_collection_; // The supplier container. PortableServer::POA_var default_POA_; @@ -110,79 +118,54 @@ private: // **************************************************************** -class TAO_CEC_Connect_Consumer : public TAO_EC_Worker<TAO_CEC_ProxyPushSupplier> +class TAO_CEC_Shutdown_Push_Supplier : public TAO_EC_Worker<TAO_CEC_ProxyPushSupplier> { - // = TITLE - // TAO_CEC_Connect_Consumer - // - // = DESCRIPTION - // Worker class to connect the ProxyPushConsumer objects with all - // the ProxyPushSupplier objects in the collection. - // public: - TAO_CEC_Connect_Consumer (TAO_CEC_ProxyPushConsumer *consumer); - // Constructor + TAO_CEC_Shutdown_Push_Supplier (void); void work (TAO_CEC_ProxyPushSupplier *supplier, CORBA::Environment &ACE_TRY_ENV); - -private: - TAO_CEC_ProxyPushConsumer *consumer_; }; // **************************************************************** -class TAO_CEC_Reconnect_Consumer : public TAO_EC_Worker<TAO_CEC_ProxyPushSupplier> +class TAO_CEC_Shutdown_Pull_Supplier : public TAO_EC_Worker<TAO_CEC_ProxyPullSupplier> { - // = TITLE - // TAO_CEC_Reconnect_Consumer - // - // = DESCRIPTION - // Worker class to reconnect the ProxyPushConsumer objects with all - // the ProxyPushSupplier objects in the collection. - // public: - TAO_CEC_Reconnect_Consumer (TAO_CEC_ProxyPushConsumer *consumer); - // Constructor + TAO_CEC_Shutdown_Pull_Supplier (void); - void work (TAO_CEC_ProxyPushSupplier *supplier, + void work (TAO_CEC_ProxyPullSupplier *supplier, CORBA::Environment &ACE_TRY_ENV); - -private: - TAO_CEC_ProxyPushConsumer *consumer_; }; // **************************************************************** -class TAO_CEC_Disconnect_Consumer : public TAO_EC_Worker<TAO_CEC_ProxyPushSupplier> +class TAO_CEC_Propagate_Event_Push : public TAO_EC_Worker<TAO_CEC_ProxyPushSupplier> { - // = TITLE - // TAO_CEC_Disconnect_Consumer - // - // = DESCRIPTION - // Worker class to disconnect the ProxyPushConsumer objects with all - // the ProxyPushSupplier objects in the collection. - // public: - TAO_CEC_Disconnect_Consumer (TAO_CEC_ProxyPushConsumer *consumer); - // Constructor + TAO_CEC_Propagate_Event_Push (const CORBA::Any& event); void work (TAO_CEC_ProxyPushSupplier *supplier, CORBA::Environment &ACE_TRY_ENV); private: - TAO_CEC_ProxyPushConsumer *consumer_; + CORBA::Any event_; + // The event }; // **************************************************************** -class TAO_CEC_Shutdown_Supplier : public TAO_EC_Worker<TAO_CEC_ProxyPushSupplier> +class TAO_CEC_Propagate_Event_Pull : public TAO_EC_Worker<TAO_CEC_ProxyPullSupplier> { public: - TAO_CEC_Shutdown_Supplier (void); + TAO_CEC_Propagate_Event_Pull (const CORBA::Any& event); - void work (TAO_CEC_ProxyPushSupplier *supplier, + void work (TAO_CEC_ProxyPullSupplier *supplier, CORBA::Environment &ACE_TRY_ENV); + +private: + CORBA::Any event_; + // The event }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i index f16a8014dd1..f8a7aca4ba0 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i @@ -5,39 +5,43 @@ TAO_CEC_ConsumerAdmin:: for_each (TAO_EC_Worker<TAO_CEC_ProxyPushSupplier> *worker, CORBA::Environment &ACE_TRY_ENV) { - this->collection_->for_each (worker, ACE_TRY_ENV); + this->push_collection_->for_each (worker, ACE_TRY_ENV); +} + +ACE_INLINE void +TAO_CEC_ConsumerAdmin:: + for_each (TAO_EC_Worker<TAO_CEC_ProxyPullSupplier> *worker, + CORBA::Environment &ACE_TRY_ENV) +{ + this->pull_collection_->for_each (worker, ACE_TRY_ENV); } // **************************************************************** ACE_INLINE -TAO_CEC_Connect_Consumer:: - TAO_CEC_Connect_Consumer (TAO_CEC_ProxyPushConsumer *consumer) - : consumer_ (consumer) +TAO_CEC_Shutdown_Push_Supplier::TAO_CEC_Shutdown_Push_Supplier (void) { } // **************************************************************** ACE_INLINE -TAO_CEC_Reconnect_Consumer:: - TAO_CEC_Reconnect_Consumer (TAO_CEC_ProxyPushConsumer *consumer) - : consumer_ (consumer) +TAO_CEC_Shutdown_Pull_Supplier::TAO_CEC_Shutdown_Pull_Supplier (void) { } // **************************************************************** ACE_INLINE -TAO_CEC_Disconnect_Consumer:: - TAO_CEC_Disconnect_Consumer (TAO_CEC_ProxyPushConsumer *consumer) - : consumer_ (consumer) +TAO_CEC_Propagate_Event_Push::TAO_CEC_Propagate_Event_Push (const CORBA::Any& event) + : event_ (event) { } // **************************************************************** ACE_INLINE -TAO_CEC_Shutdown_Supplier::TAO_CEC_Shutdown_Supplier (void) +TAO_CEC_Propagate_Event_Pull::TAO_CEC_Propagate_Event_Pull (const CORBA::Any& event) + : event_ (event) { } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp index 559ed663c02..a64633a2aef 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp @@ -2,10 +2,13 @@ #include "CEC_Default_Factory.h" #include "CEC_MT_Dispatching.h" +#include "CEC_Reactive_Pulling_Strategy.h" #include "CEC_ConsumerAdmin.h" #include "CEC_SupplierAdmin.h" #include "CEC_ProxyPushConsumer.h" +#include "CEC_ProxyPullConsumer.h" #include "CEC_ProxyPushSupplier.h" +#include "CEC_ProxyPullSupplier.h" #include "CEC_EventChannel.h" #include "CEC_Reactive_ConsumerControl.h" #include "CEC_Reactive_SupplierControl.h" @@ -32,6 +35,43 @@ TAO_CEC_Default_Factory::init_svcs (void) } int +TAO_CEC_Default_Factory::parse_collection_arg (char *opt) +{ + int collection_type = 0; + int synch_type = 0; + int iteration_type = 0; + + char* aux; + for (char* arg = ACE_OS::strtok_r (opt, ":", &aux); + arg != 0; + arg = ACE_OS::strtok_r (0, ":", &aux)) + { + if (ACE_OS::strcasecmp (arg, "mt") == 0) + synch_type = 0; + else if (ACE_OS::strcasecmp (arg, "st") == 0) + synch_type = 1; + else if (ACE_OS::strcasecmp (arg, "list") == 0) + collection_type = 0; + else if (ACE_OS::strcasecmp (arg, "rb_tree") == 0) + collection_type = 1; + else if (ACE_OS::strcasecmp (arg, "immediate") == 0) + iteration_type = 0; + else if (ACE_OS::strcasecmp (arg, "copy_on_read") == 0) + iteration_type = 1; + else if (ACE_OS::strcasecmp (arg, "copy_on_write") == 0) + iteration_type = 2; + else if (ACE_OS::strcasecmp (arg, "delayed") == 0) + iteration_type = 3; + else + ACE_ERROR ((LM_ERROR, + "CEC_Default_Factory - " + "unknown collection modifier <%s>\n", + arg)); + } + return (synch_type << 8) |(collection_type << 4) | iteration_type; +} + +int TAO_CEC_Default_Factory::init (int argc, char* argv[]) { ACE_Arg_Shifter arg_shifter (argc, argv); @@ -45,7 +85,7 @@ TAO_CEC_Default_Factory::init (int argc, char* argv[]) { char *arg = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (arg, "-ECDispatching") == 0) + if (ACE_OS::strcasecmp (arg, "-CECDispatching") == 0) { arg_shifter.consume_arg (); @@ -71,7 +111,7 @@ TAO_CEC_Default_Factory::init (int argc, char* argv[]) } } - else if (ACE_OS::strcasecmp (arg, "-ECDispatchingThreads") == 0) + else if (ACE_OS::strcasecmp (arg, "-CECDispatchingThreads") == 0) { arg_shifter.consume_arg (); @@ -83,95 +123,33 @@ TAO_CEC_Default_Factory::init (int argc, char* argv[]) } } - else if (ACE_OS::strcasecmp (arg, "-ECProxyPushConsumerCollection") == 0) + else if (ACE_OS::strcasecmp (arg, "-CECProxyConsumerCollection") == 0) { arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) { char* opt = arg_shifter.get_current (); - int collection_type = 0; - int synch_type = 0; - int iteration_type = 0; - - char* aux; - for (char* arg = ACE_OS::strtok_r (opt, ":", &aux); - arg != 0; - arg = ACE_OS::strtok_r (0, ":", &aux)) - { - if (ACE_OS::strcasecmp (arg, "mt") == 0) - synch_type = 0; - else if (ACE_OS::strcasecmp (arg, "st") == 0) - synch_type = 1; - else if (ACE_OS::strcasecmp (arg, "list") == 0) - collection_type = 0; - else if (ACE_OS::strcasecmp (arg, "rb_tree") == 0) - collection_type = 1; - else if (ACE_OS::strcasecmp (arg, "immediate") == 0) - iteration_type = 0; - else if (ACE_OS::strcasecmp (arg, "copy_on_read") == 0) - iteration_type = 1; - else if (ACE_OS::strcasecmp (arg, "copy_on_write") == 0) - iteration_type = 2; - else if (ACE_OS::strcasecmp (arg, "delayed") == 0) - iteration_type = 3; - else - ACE_ERROR ((LM_ERROR, - "CEC_Default_Factory - " - "unknown collection modifier <%s>\n", - arg)); - } this->consumer_collection_ = - (synch_type << 8) |(collection_type << 4) | iteration_type; + this->parse_collection_arg (opt); arg_shifter.consume_arg (); } } - else if (ACE_OS::strcasecmp (arg, "-ECProxyPushSupplierCollection") == 0) + else if (ACE_OS::strcasecmp (arg, "-CECProxySupplierCollection") == 0) { arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) { char* opt = arg_shifter.get_current (); - int collection_type = 0; - int synch_type = 0; - int iteration_type = 0; - - char* aux; - for (char* arg = ACE_OS::strtok_r (opt, ":", &aux); - arg != 0; - arg = ACE_OS::strtok_r (0, ":", &aux)) - { - if (ACE_OS::strcasecmp (arg, "mt") == 0) - synch_type = 0; - else if (ACE_OS::strcasecmp (arg, "st") == 0) - synch_type = 1; - else if (ACE_OS::strcasecmp (arg, "list") == 0) - collection_type = 0; - else if (ACE_OS::strcasecmp (arg, "rb_tree") == 0) - collection_type = 1; - else if (ACE_OS::strcasecmp (arg, "immediate") == 0) - iteration_type = 0; - else if (ACE_OS::strcasecmp (arg, "copy_on_read") == 0) - iteration_type = 1; - else if (ACE_OS::strcasecmp (arg, "copy_on_write") == 0) - iteration_type = 2; - else if (ACE_OS::strcasecmp (arg, "delayed") == 0) - iteration_type = 3; - else - ACE_ERROR ((LM_ERROR, - "CEC_Default_Factory - " - "unknown collection modifier <%s>\n", - arg)); - } this->supplier_collection_ = - (synch_type << 8) | (collection_type << 4) | iteration_type; + this->parse_collection_arg (opt); arg_shifter.consume_arg (); } } - else if (ACE_OS::strcasecmp (arg, "-ECProxyConsumerLock") == 0) + else if (ACE_OS::strcasecmp (arg, "-CECProxyConsumerLock") == 0) { arg_shifter.consume_arg (); @@ -201,7 +179,7 @@ TAO_CEC_Default_Factory::init (int argc, char* argv[]) } } - else if (ACE_OS::strcasecmp (arg, "-ECProxySupplierLock") == 0) + else if (ACE_OS::strcasecmp (arg, "-CECProxySupplierLock") == 0) { arg_shifter.consume_arg (); @@ -231,7 +209,19 @@ TAO_CEC_Default_Factory::init (int argc, char* argv[]) } } - else if (ACE_OS::strcasecmp (arg, "-ECUseORBId") == 0) + else if (ACE_OS::strcasecmp (arg, "-CECReactivePullingPeriod") == 0) + { + arg_shifter.consume_arg (); + + if (arg_shifter.is_parameter_next ()) + { + char* opt = arg_shifter.get_current (); + this->reactive_pulling_period_ = ACE_OS::atoi (opt); + arg_shifter.consume_arg (); + } + } + + else if (ACE_OS::strcasecmp (arg, "-CECUseORBId") == 0) { arg_shifter.consume_arg (); @@ -243,7 +233,7 @@ TAO_CEC_Default_Factory::init (int argc, char* argv[]) } } - else if (ACE_OS::strcasecmp (arg, "-ECConsumerControl") == 0) + else if (ACE_OS::strcasecmp (arg, "-CECConsumerControl") == 0) { arg_shifter.consume_arg (); @@ -269,7 +259,7 @@ TAO_CEC_Default_Factory::init (int argc, char* argv[]) } } - else if (ACE_OS::strcasecmp (arg, "-ECSupplierControl") == 0) + else if (ACE_OS::strcasecmp (arg, "-CECSupplierControl") == 0) { arg_shifter.consume_arg (); @@ -295,7 +285,7 @@ TAO_CEC_Default_Factory::init (int argc, char* argv[]) } } - else if (ACE_OS::strcasecmp (arg, "-ECConsumerControlPeriod") == 0) + else if (ACE_OS::strcasecmp (arg, "-CECConsumerControlPeriod") == 0) { arg_shifter.consume_arg (); @@ -307,7 +297,7 @@ TAO_CEC_Default_Factory::init (int argc, char* argv[]) } } - else if (ACE_OS::strcasecmp (arg, "-ECSupplierControlPeriod") == 0) + else if (ACE_OS::strcasecmp (arg, "-CECSupplierControlPeriod") == 0) { arg_shifter.consume_arg (); @@ -319,7 +309,7 @@ TAO_CEC_Default_Factory::init (int argc, char* argv[]) } } - else if (ACE_OS::strncmp (arg, "-EC", 3) == 0) + else if (ACE_OS::strncmp (arg, "-CEC", 3) == 0) { arg_shifter.consume_arg (); ACE_ERROR ((LM_ERROR, @@ -358,6 +348,29 @@ TAO_CEC_Default_Factory::destroy_dispatching (TAO_CEC_Dispatching *x) delete x; } +TAO_CEC_Pulling_Strategy* +TAO_CEC_Default_Factory::create_pulling_strategy (TAO_CEC_EventChannel *ec) +{ + if (this->pulling_strategy_ == 0) + { + int argc = 0; + char **argv = 0; + CORBA::ORB_var orb = + CORBA::ORB_init (argc, argv, this->orbid_); + + ACE_Time_Value rate (0, this->reactive_pulling_period_); + return new TAO_CEC_Reactive_Pulling_Strategy (rate, ec, + orb.in ()); + } + return 0; +} + +void +TAO_CEC_Default_Factory::destroy_pulling_strategy (TAO_CEC_Pulling_Strategy *x) +{ + delete x; +} + TAO_CEC_ConsumerAdmin* TAO_CEC_Default_Factory::create_consumer_admin (TAO_CEC_EventChannel *ec) { @@ -394,6 +407,18 @@ TAO_CEC_Default_Factory::destroy_proxy_push_supplier (TAO_CEC_ProxyPushSupplier delete x; } +TAO_CEC_ProxyPullSupplier* +TAO_CEC_Default_Factory::create_proxy_pull_supplier (TAO_CEC_EventChannel *ec) +{ + return new TAO_CEC_ProxyPullSupplier (ec); +} + +void +TAO_CEC_Default_Factory::destroy_proxy_pull_supplier (TAO_CEC_ProxyPullSupplier *x) +{ + delete x; +} + TAO_CEC_ProxyPushConsumer* TAO_CEC_Default_Factory::create_proxy_push_consumer (TAO_CEC_EventChannel *ec) { @@ -406,20 +431,43 @@ TAO_CEC_Default_Factory::destroy_proxy_push_consumer (TAO_CEC_ProxyPushConsumer delete x; } +TAO_CEC_ProxyPullConsumer* +TAO_CEC_Default_Factory::create_proxy_pull_consumer (TAO_CEC_EventChannel *ec) +{ + return new TAO_CEC_ProxyPullConsumer (ec); +} + +void +TAO_CEC_Default_Factory::destroy_proxy_pull_consumer (TAO_CEC_ProxyPullConsumer *x) +{ + delete x; +} + // These typedefs workaround a SunCC 4.2 bug typedef TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>::Iterator - TAO_CEC_Consumer_List_Iterator; + TAO_CEC_PushConsumer_List_Iterator; typedef TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>::Iterator - TAO_CEC_Consumer_RB_Tree_Iterator; + TAO_CEC_PushConsumer_RB_Tree_Iterator; +typedef + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>::Iterator + TAO_CEC_PullConsumer_List_Iterator; +typedef + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>::Iterator + TAO_CEC_PullConsumer_RB_Tree_Iterator; typedef TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>::Iterator - TAO_CEC_Supplier_List_Iterator; + TAO_CEC_PushSupplier_List_Iterator; typedef TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>::Iterator - TAO_CEC_Supplier_RB_Tree_Iterator; - + TAO_CEC_PushSupplier_RB_Tree_Iterator; +typedef + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>::Iterator + TAO_CEC_PullSupplier_List_Iterator; +typedef + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>::Iterator + TAO_CEC_PullSupplier_RB_Tree_Iterator; TAO_CEC_ProxyPushConsumer_Collection* TAO_CEC_Default_Factory::create_proxy_push_consumer_collection (TAO_CEC_EventChannel *) @@ -427,90 +475,90 @@ TAO_CEC_Default_Factory::create_proxy_push_consumer_collection (TAO_CEC_EventCha if (this->consumer_collection_ == 0x000) return new TAO_EC_Immediate_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_List_Iterator, + TAO_CEC_PushConsumer_List_Iterator, ACE_SYNCH_MUTEX> (); else if (this->consumer_collection_ == 0x001) return new TAO_EC_Copy_On_Read<TAO_CEC_ProxyPushConsumer, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_List_Iterator, + TAO_CEC_PushConsumer_List_Iterator, ACE_SYNCH_MUTEX> (); /* else if (this->consumer_collection_ == 0x002) return new TAO_EC_Copy_On_Write<TAO_CEC_ProxyPushConsumer, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_List_Iterator, + TAO_CEC_PushConsumer_List_Iterator, ACE_SYNCH_MUTEX> (); */ else if (this->consumer_collection_ == 0x003) return new TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_List_Iterator, + TAO_CEC_PushConsumer_List_Iterator, ACE_SYNCH> (); else if (this->consumer_collection_ == 0x010) return new TAO_EC_Immediate_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_RB_Tree_Iterator, + TAO_CEC_PushConsumer_RB_Tree_Iterator, ACE_SYNCH_MUTEX> (); else if (this->consumer_collection_ == 0x011) return new TAO_EC_Copy_On_Read<TAO_CEC_ProxyPushConsumer, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_RB_Tree_Iterator, + TAO_CEC_PushConsumer_RB_Tree_Iterator, ACE_SYNCH_MUTEX> (); /* else if (this->consumer_collection_ == 0x012) return new TAO_EC_Copy_On_Write<TAO_CEC_ProxyPushConsumer, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_RB_Tree_Iterator, + TAO_CEC_PushConsumer_RB_Tree_Iterator, ACE_SYNCH_MUTEX> (); */ else if (this->consumer_collection_ == 0x013) return new TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_RB_Tree_Iterator, + TAO_CEC_PushConsumer_RB_Tree_Iterator, ACE_SYNCH> (); else if (this->consumer_collection_ == 0x100) return new TAO_EC_Immediate_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_List_Iterator, + TAO_CEC_PushConsumer_List_Iterator, ACE_Null_Mutex> (); else if (this->consumer_collection_ == 0x101) return new TAO_EC_Copy_On_Read<TAO_CEC_ProxyPushConsumer, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_List_Iterator, + TAO_CEC_PushConsumer_List_Iterator, ACE_Null_Mutex> (); /* else if (this->consumer_collection_ == 0x102) return new TAO_EC_Copy_On_Write<TAO_CEC_ProxyPushConsumer, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_List_Iterator, + TAO_CEC_PushConsumer_List_Iterator, ACE_Null_Mutex> (); */ else if (this->consumer_collection_ == 0x103) return new TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_List_Iterator, + TAO_CEC_PushConsumer_List_Iterator, ACE_NULL_SYNCH> (); else if (this->consumer_collection_ == 0x110) return new TAO_EC_Immediate_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_RB_Tree_Iterator, + TAO_CEC_PushConsumer_RB_Tree_Iterator, ACE_Null_Mutex> (); else if (this->consumer_collection_ == 0x111) return new TAO_EC_Copy_On_Read<TAO_CEC_ProxyPushConsumer, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_RB_Tree_Iterator, + TAO_CEC_PushConsumer_RB_Tree_Iterator, ACE_Null_Mutex> (); /* else if (this->consumer_collection_ == 0x112) return new TAO_EC_Copy_On_Write<TAO_CEC_ProxyPushConsumer, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_RB_Tree_Iterator, + TAO_CEC_PushConsumer_RB_Tree_Iterator, ACE_Null_Mutex> (); */ else if (this->consumer_collection_ == 0x113) return new TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_RB_Tree_Iterator, + TAO_CEC_PushConsumer_RB_Tree_Iterator, ACE_NULL_SYNCH> (); return 0; @@ -522,96 +570,197 @@ TAO_CEC_Default_Factory::destroy_proxy_push_consumer_collection (TAO_CEC_ProxyPu delete x; } +TAO_CEC_ProxyPullConsumer_Collection* +TAO_CEC_Default_Factory::create_proxy_pull_consumer_collection (TAO_CEC_EventChannel *) +{ + if (this->consumer_collection_ == 0x000) + return new TAO_EC_Immediate_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_List_Iterator, + ACE_SYNCH_MUTEX> (); + else if (this->consumer_collection_ == 0x001) + return new TAO_EC_Copy_On_Read<TAO_CEC_ProxyPullConsumer, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_List_Iterator, + ACE_SYNCH_MUTEX> (); + /* + else if (this->consumer_collection_ == 0x002) + return new TAO_EC_Copy_On_Write<TAO_CEC_ProxyPullConsumer, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_List_Iterator, + ACE_SYNCH_MUTEX> (); + */ + else if (this->consumer_collection_ == 0x003) + return new TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_List_Iterator, + ACE_SYNCH> (); + else if (this->consumer_collection_ == 0x010) + return new TAO_EC_Immediate_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_RB_Tree_Iterator, + ACE_SYNCH_MUTEX> (); + else if (this->consumer_collection_ == 0x011) + return new TAO_EC_Copy_On_Read<TAO_CEC_ProxyPullConsumer, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_RB_Tree_Iterator, + ACE_SYNCH_MUTEX> (); + /* + else if (this->consumer_collection_ == 0x012) + return new TAO_EC_Copy_On_Write<TAO_CEC_ProxyPullConsumer, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_RB_Tree_Iterator, + ACE_SYNCH_MUTEX> (); + */ + else if (this->consumer_collection_ == 0x013) + return new TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_RB_Tree_Iterator, + ACE_SYNCH> (); + else if (this->consumer_collection_ == 0x100) + return new TAO_EC_Immediate_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_List_Iterator, + ACE_Null_Mutex> (); + else if (this->consumer_collection_ == 0x101) + return new TAO_EC_Copy_On_Read<TAO_CEC_ProxyPullConsumer, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_List_Iterator, + ACE_Null_Mutex> (); + /* + else if (this->consumer_collection_ == 0x102) + return new TAO_EC_Copy_On_Write<TAO_CEC_ProxyPullConsumer, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_List_Iterator, + ACE_Null_Mutex> (); + */ + else if (this->consumer_collection_ == 0x103) + return new TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_List_Iterator, + ACE_NULL_SYNCH> (); + else if (this->consumer_collection_ == 0x110) + return new TAO_EC_Immediate_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_RB_Tree_Iterator, + ACE_Null_Mutex> (); + else if (this->consumer_collection_ == 0x111) + return new TAO_EC_Copy_On_Read<TAO_CEC_ProxyPullConsumer, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_RB_Tree_Iterator, + ACE_Null_Mutex> (); + /* + else if (this->consumer_collection_ == 0x112) + return new TAO_EC_Copy_On_Write<TAO_CEC_ProxyPullConsumer, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_RB_Tree_Iterator, + ACE_Null_Mutex> (); + */ + else if (this->consumer_collection_ == 0x113) + return new TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_RB_Tree_Iterator, + ACE_NULL_SYNCH> (); + + return 0; +} + +void +TAO_CEC_Default_Factory::destroy_proxy_pull_consumer_collection (TAO_CEC_ProxyPullConsumer_Collection *x) +{ + delete x; +} + TAO_CEC_ProxyPushSupplier_Collection* TAO_CEC_Default_Factory::create_proxy_push_supplier_collection (TAO_CEC_EventChannel *) { if (this->supplier_collection_ == 0x000) return new TAO_EC_Immediate_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_List_Iterator, + TAO_CEC_PushSupplier_List_Iterator, ACE_SYNCH_MUTEX> (); else if (this->supplier_collection_ == 0x001) return new TAO_EC_Copy_On_Read<TAO_CEC_ProxyPushSupplier, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_List_Iterator, + TAO_CEC_PushSupplier_List_Iterator, ACE_SYNCH_MUTEX> (); /* else if (this->supplier_collection_ == 0x002) return new TAO_EC_Copy_On_Write<TAO_CEC_ProxyPushSupplier, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_List_Iterator, + TAO_CEC_PushSupplier_List_Iterator, ACE_SYNCH_MUTEX> (); */ else if (this->supplier_collection_ == 0x003) return new TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_List_Iterator, + TAO_CEC_PushSupplier_List_Iterator, ACE_SYNCH> (); else if (this->supplier_collection_ == 0x010) return new TAO_EC_Immediate_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_RB_Tree_Iterator, + TAO_CEC_PushSupplier_RB_Tree_Iterator, ACE_SYNCH_MUTEX> (); else if (this->supplier_collection_ == 0x011) return new TAO_EC_Copy_On_Read<TAO_CEC_ProxyPushSupplier, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_RB_Tree_Iterator, + TAO_CEC_PushSupplier_RB_Tree_Iterator, ACE_SYNCH_MUTEX> (); /* else if (this->supplier_collection_ == 0x012) return new TAO_EC_Copy_On_Write<TAO_CEC_ProxyPushSupplier, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_RB_Tree_Iterator, + TAO_CEC_PushSupplier_RB_Tree_Iterator, ACE_SYNCH_MUTEX> (); */ else if (this->supplier_collection_ == 0x013) return new TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_RB_Tree_Iterator, + TAO_CEC_PushSupplier_RB_Tree_Iterator, ACE_SYNCH> (); else if (this->supplier_collection_ == 0x100) return new TAO_EC_Immediate_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_List_Iterator, + TAO_CEC_PushSupplier_List_Iterator, ACE_Null_Mutex> (); else if (this->supplier_collection_ == 0x101) return new TAO_EC_Copy_On_Read<TAO_CEC_ProxyPushSupplier, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_List_Iterator, + TAO_CEC_PushSupplier_List_Iterator, ACE_Null_Mutex> (); /* else if (this->supplier_collection_ == 0x102) return new TAO_EC_Copy_On_Write<TAO_CEC_ProxyPushSupplier, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_List_Iterator, + TAO_CEC_PushSupplier_List_Iterator, ACE_Null_Mutex> (); */ else if (this->supplier_collection_ == 0x103) return new TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_List_Iterator, + TAO_CEC_PushSupplier_List_Iterator, ACE_NULL_SYNCH> (); else if (this->supplier_collection_ == 0x110) return new TAO_EC_Immediate_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_RB_Tree_Iterator, + TAO_CEC_PushSupplier_RB_Tree_Iterator, ACE_Null_Mutex> (); else if (this->supplier_collection_ == 0x111) return new TAO_EC_Copy_On_Read<TAO_CEC_ProxyPushSupplier, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_RB_Tree_Iterator, + TAO_CEC_PushSupplier_RB_Tree_Iterator, ACE_Null_Mutex> (); /* else if (this->supplier_collection_ == 0x112) return new TAO_EC_Copy_On_Write<TAO_CEC_ProxyPushSupplier, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_RB_Tree_Iterator, + TAO_CEC_PushSupplier_RB_Tree_Iterator, ACE_Null_Mutex> (); */ else if (this->supplier_collection_ == 0x113) return new TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_RB_Tree_Iterator, + TAO_CEC_PushSupplier_RB_Tree_Iterator, ACE_NULL_SYNCH> (); return 0; @@ -623,6 +772,107 @@ TAO_CEC_Default_Factory::destroy_proxy_push_supplier_collection (TAO_CEC_ProxyPu delete x; } +TAO_CEC_ProxyPullSupplier_Collection* +TAO_CEC_Default_Factory::create_proxy_pull_supplier_collection (TAO_CEC_EventChannel *) +{ + if (this->supplier_collection_ == 0x000) + return new TAO_EC_Immediate_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_List_Iterator, + ACE_SYNCH_MUTEX> (); + else if (this->supplier_collection_ == 0x001) + return new TAO_EC_Copy_On_Read<TAO_CEC_ProxyPullSupplier, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_List_Iterator, + ACE_SYNCH_MUTEX> (); + /* + else if (this->supplier_collection_ == 0x002) + return new TAO_EC_Copy_On_Write<TAO_CEC_ProxyPullSupplier, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_List_Iterator, + ACE_SYNCH_MUTEX> (); + */ + else if (this->supplier_collection_ == 0x003) + return new TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_List_Iterator, + ACE_SYNCH> (); + else if (this->supplier_collection_ == 0x010) + return new TAO_EC_Immediate_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_RB_Tree_Iterator, + ACE_SYNCH_MUTEX> (); + else if (this->supplier_collection_ == 0x011) + return new TAO_EC_Copy_On_Read<TAO_CEC_ProxyPullSupplier, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_RB_Tree_Iterator, + ACE_SYNCH_MUTEX> (); + /* + else if (this->supplier_collection_ == 0x012) + return new TAO_EC_Copy_On_Write<TAO_CEC_ProxyPullSupplier, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_RB_Tree_Iterator, + ACE_SYNCH_MUTEX> (); + */ + else if (this->supplier_collection_ == 0x013) + return new TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_RB_Tree_Iterator, + ACE_SYNCH> (); + else if (this->supplier_collection_ == 0x100) + return new TAO_EC_Immediate_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_List_Iterator, + ACE_Null_Mutex> (); + else if (this->supplier_collection_ == 0x101) + return new TAO_EC_Copy_On_Read<TAO_CEC_ProxyPullSupplier, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_List_Iterator, + ACE_Null_Mutex> (); + /* + else if (this->supplier_collection_ == 0x102) + return new TAO_EC_Copy_On_Write<TAO_CEC_ProxyPullSupplier, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_List_Iterator, + ACE_Null_Mutex> (); + */ + else if (this->supplier_collection_ == 0x103) + return new TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_List_Iterator, + ACE_NULL_SYNCH> (); + else if (this->supplier_collection_ == 0x110) + return new TAO_EC_Immediate_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_RB_Tree_Iterator, + ACE_Null_Mutex> (); + else if (this->supplier_collection_ == 0x111) + return new TAO_EC_Copy_On_Read<TAO_CEC_ProxyPullSupplier, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_RB_Tree_Iterator, + ACE_Null_Mutex> (); + /* + else if (this->supplier_collection_ == 0x112) + return new TAO_EC_Copy_On_Write<TAO_CEC_ProxyPullSupplier, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_RB_Tree_Iterator, + ACE_Null_Mutex> (); + */ + else if (this->supplier_collection_ == 0x113) + return new TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_RB_Tree_Iterator, + ACE_NULL_SYNCH> (); + + return 0; +} + +void +TAO_CEC_Default_Factory::destroy_proxy_pull_supplier_collection (TAO_CEC_ProxyPullSupplier_Collection *x) +{ + delete x; +} + ACE_Lock* TAO_CEC_Default_Factory::create_consumer_lock (void) { @@ -755,6 +1005,34 @@ template class ACE_RB_Tree_Node<TAO_CEC_ProxyPushSupplier *, int>; template class ACE_Less_Than<TAO_CEC_ProxyPushSupplier *>; template class TAO_EC_RB_Tree_Based_Proxy_Set_Iterator<TAO_CEC_ProxyPushSupplier>; +template class TAO_EC_Proxy_Collection<TAO_CEC_ProxyPullConsumer>; +template class TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>; +template class TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>; +template class ACE_Unbounded_Set<TAO_CEC_ProxyPullConsumer *>; +template class ACE_Node<TAO_CEC_ProxyPullConsumer *>; +template class ACE_Unbounded_Set_Iterator<TAO_CEC_ProxyPullConsumer *>; +template class ACE_RB_Tree<TAO_CEC_ProxyPullConsumer *, int, ACE_Less_Than<TAO_CEC_ProxyPullConsumer *>, ACE_Null_Mutex>; +template class ACE_RB_Tree_Iterator<TAO_CEC_ProxyPullConsumer *, int, ACE_Less_Than<TAO_CEC_ProxyPullConsumer *>, ACE_Null_Mutex>; +template class ACE_RB_Tree_Reverse_Iterator<TAO_CEC_ProxyPullConsumer *, int, ACE_Less_Than<TAO_CEC_ProxyPullConsumer *>, ACE_Null_Mutex>; +template class ACE_RB_Tree_Iterator_Base<TAO_CEC_ProxyPullConsumer *, int, ACE_Less_Than<TAO_CEC_ProxyPullConsumer *>, ACE_Null_Mutex>; +template class ACE_RB_Tree_Node<TAO_CEC_ProxyPullConsumer *, int>; +template class ACE_Less_Than<TAO_CEC_ProxyPullConsumer *>; +template class TAO_EC_RB_Tree_Based_Proxy_Set_Iterator<TAO_CEC_ProxyPullConsumer>; + +template class TAO_EC_Proxy_Collection<TAO_CEC_ProxyPullSupplier>; +template class TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>; +template class TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>; +template class ACE_Unbounded_Set<TAO_CEC_ProxyPullSupplier *>; +template class ACE_Node<TAO_CEC_ProxyPullSupplier *>; +template class ACE_Unbounded_Set_Iterator<TAO_CEC_ProxyPullSupplier *>; +template class ACE_RB_Tree<TAO_CEC_ProxyPullSupplier *, int, ACE_Less_Than<TAO_CEC_ProxyPullSupplier *>, ACE_Null_Mutex>; +template class ACE_RB_Tree_Iterator<TAO_CEC_ProxyPullSupplier *, int, ACE_Less_Than<TAO_CEC_ProxyPullSupplier *>, ACE_Null_Mutex>; +template class ACE_RB_Tree_Iterator_Base<TAO_CEC_ProxyPullSupplier *, int, ACE_Less_Than<TAO_CEC_ProxyPullSupplier *>, ACE_Null_Mutex>; +template class ACE_RB_Tree_Reverse_Iterator<TAO_CEC_ProxyPullSupplier *, int, ACE_Less_Than<TAO_CEC_ProxyPullSupplier *>, ACE_Null_Mutex>; +template class ACE_RB_Tree_Node<TAO_CEC_ProxyPullSupplier *, int>; +template class ACE_Less_Than<TAO_CEC_ProxyPullSupplier *>; +template class TAO_EC_RB_Tree_Based_Proxy_Set_Iterator<TAO_CEC_ProxyPullSupplier>; + #if defined (ACE_HAS_THREADS) // // To avoid duplicate instantiations of templates we must put the MT @@ -765,391 +1043,788 @@ template class TAO_EC_RB_Tree_Based_Proxy_Set_Iterator<TAO_CEC_ProxyPushSupplier // template class TAO_EC_Immediate_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_List_Iterator, + TAO_CEC_PushConsumer_List_Iterator, ACE_SYNCH_MUTEX>; template class TAO_EC_Copy_On_Read<TAO_CEC_ProxyPushConsumer, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_List_Iterator, + TAO_CEC_PushConsumer_List_Iterator, ACE_SYNCH_MUTEX>; /* template class TAO_EC_Copy_On_Write<TAO_CEC_ProxyPushConsumer, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_List_Iterator, + TAO_CEC_PushConsumer_List_Iterator, ACE_SYNCH_MUTEX>; */ template class TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_List_Iterator, + TAO_CEC_PushConsumer_List_Iterator, ACE_SYNCH>; template class TAO_EC_Busy_Lock_Adapter< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_List_Iterator, + TAO_CEC_PushConsumer_List_Iterator, ACE_SYNCH> >; template class ACE_Guard< TAO_EC_Busy_Lock_Adapter< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_List_Iterator, + TAO_CEC_PushConsumer_List_Iterator, ACE_SYNCH> > >; template class TAO_EC_Connected_Command< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_List_Iterator, + TAO_CEC_PushConsumer_List_Iterator, ACE_SYNCH>,TAO_CEC_ProxyPushConsumer >; template class TAO_EC_Reconnected_Command< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_List_Iterator, + TAO_CEC_PushConsumer_List_Iterator, ACE_SYNCH>,TAO_CEC_ProxyPushConsumer >; template class TAO_EC_Disconnected_Command< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_List_Iterator, + TAO_CEC_PushConsumer_List_Iterator, ACE_SYNCH>,TAO_CEC_ProxyPushConsumer >; template class TAO_EC_Shutdown_Command< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_List_Iterator, + TAO_CEC_PushConsumer_List_Iterator, ACE_SYNCH> >; template class TAO_EC_Immediate_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_RB_Tree_Iterator, + TAO_CEC_PushConsumer_RB_Tree_Iterator, ACE_SYNCH_MUTEX>; template class TAO_EC_Copy_On_Read<TAO_CEC_ProxyPushConsumer, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_RB_Tree_Iterator, + TAO_CEC_PushConsumer_RB_Tree_Iterator, ACE_SYNCH_MUTEX>; /* template class TAO_EC_Copy_On_Write<TAO_CEC_ProxyPushConsumer, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_RB_Tree_Iterator, + TAO_CEC_PushConsumer_RB_Tree_Iterator, ACE_SYNCH_MUTEX>; */ template class TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_RB_Tree_Iterator, + TAO_CEC_PushConsumer_RB_Tree_Iterator, ACE_SYNCH>; template class TAO_EC_Busy_Lock_Adapter< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_RB_Tree_Iterator, + TAO_CEC_PushConsumer_RB_Tree_Iterator, ACE_SYNCH> >; template class ACE_Guard< TAO_EC_Busy_Lock_Adapter< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_RB_Tree_Iterator, + TAO_CEC_PushConsumer_RB_Tree_Iterator, ACE_SYNCH> > >; template class TAO_EC_Connected_Command< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_RB_Tree_Iterator, + TAO_CEC_PushConsumer_RB_Tree_Iterator, ACE_SYNCH>,TAO_CEC_ProxyPushConsumer >; template class TAO_EC_Reconnected_Command< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_RB_Tree_Iterator, + TAO_CEC_PushConsumer_RB_Tree_Iterator, ACE_SYNCH>,TAO_CEC_ProxyPushConsumer >; template class TAO_EC_Disconnected_Command< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_RB_Tree_Iterator, + TAO_CEC_PushConsumer_RB_Tree_Iterator, ACE_SYNCH>,TAO_CEC_ProxyPushConsumer >; template class TAO_EC_Shutdown_Command< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_RB_Tree_Iterator, + TAO_CEC_PushConsumer_RB_Tree_Iterator, ACE_SYNCH> >; template class TAO_EC_Immediate_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_List_Iterator, + TAO_CEC_PushSupplier_List_Iterator, ACE_SYNCH_MUTEX>; template class TAO_EC_Copy_On_Read<TAO_CEC_ProxyPushSupplier, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_List_Iterator, + TAO_CEC_PushSupplier_List_Iterator, ACE_SYNCH_MUTEX>; /* template class TAO_EC_Copy_On_Write<TAO_CEC_ProxyPushSupplier, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_List_Iterator, + TAO_CEC_PushSupplier_List_Iterator, ACE_SYNCH_MUTEX>; */ template class TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_List_Iterator, + TAO_CEC_PushSupplier_List_Iterator, ACE_SYNCH>; template class TAO_EC_Busy_Lock_Adapter< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_List_Iterator, + TAO_CEC_PushSupplier_List_Iterator, ACE_SYNCH> >; template class ACE_Guard< TAO_EC_Busy_Lock_Adapter< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_List_Iterator, + TAO_CEC_PushSupplier_List_Iterator, ACE_SYNCH> > >; template class TAO_EC_Connected_Command< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_List_Iterator, + TAO_CEC_PushSupplier_List_Iterator, ACE_SYNCH>,TAO_CEC_ProxyPushSupplier >; template class TAO_EC_Reconnected_Command< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_List_Iterator, + TAO_CEC_PushSupplier_List_Iterator, ACE_SYNCH>,TAO_CEC_ProxyPushSupplier >; template class TAO_EC_Disconnected_Command< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_List_Iterator, + TAO_CEC_PushSupplier_List_Iterator, ACE_SYNCH>,TAO_CEC_ProxyPushSupplier >; template class TAO_EC_Shutdown_Command< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_List_Iterator, + TAO_CEC_PushSupplier_List_Iterator, ACE_SYNCH> >; template class TAO_EC_Immediate_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_RB_Tree_Iterator, + TAO_CEC_PushSupplier_RB_Tree_Iterator, ACE_SYNCH_MUTEX>; template class TAO_EC_Copy_On_Read<TAO_CEC_ProxyPushSupplier, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_RB_Tree_Iterator, + TAO_CEC_PushSupplier_RB_Tree_Iterator, ACE_SYNCH_MUTEX>; /* template class TAO_EC_Copy_On_Write<TAO_CEC_ProxyPushSupplier, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_RB_Tree_Iterator, + TAO_CEC_PushSupplier_RB_Tree_Iterator, ACE_SYNCH_MUTEX>; */ template class TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_RB_Tree_Iterator, + TAO_CEC_PushSupplier_RB_Tree_Iterator, ACE_SYNCH>; template class TAO_EC_Busy_Lock_Adapter< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_RB_Tree_Iterator, + TAO_CEC_PushSupplier_RB_Tree_Iterator, ACE_SYNCH> >; template class ACE_Guard< TAO_EC_Busy_Lock_Adapter< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_RB_Tree_Iterator, + TAO_CEC_PushSupplier_RB_Tree_Iterator, ACE_SYNCH> > >; template class TAO_EC_Connected_Command< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_RB_Tree_Iterator, + TAO_CEC_PushSupplier_RB_Tree_Iterator, ACE_SYNCH>,TAO_CEC_ProxyPushSupplier >; template class TAO_EC_Reconnected_Command< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_RB_Tree_Iterator, + TAO_CEC_PushSupplier_RB_Tree_Iterator, ACE_SYNCH>,TAO_CEC_ProxyPushSupplier >; template class TAO_EC_Disconnected_Command< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_RB_Tree_Iterator, + TAO_CEC_PushSupplier_RB_Tree_Iterator, ACE_SYNCH>,TAO_CEC_ProxyPushSupplier >; template class TAO_EC_Shutdown_Command< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_RB_Tree_Iterator, + TAO_CEC_PushSupplier_RB_Tree_Iterator, ACE_SYNCH> >; #endif /* ACE_HAS_THREADS */ template class TAO_EC_Immediate_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_List_Iterator, + TAO_CEC_PushConsumer_List_Iterator, ACE_Null_Mutex>; template class TAO_EC_Copy_On_Read<TAO_CEC_ProxyPushConsumer, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_List_Iterator, + TAO_CEC_PushConsumer_List_Iterator, ACE_Null_Mutex>; /* template class TAO_EC_Copy_On_Write<TAO_CEC_ProxyPushConsumer, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_List_Iterator, + TAO_CEC_PushConsumer_List_Iterator, ACE_Null_Mutex>; */ template class TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_List_Iterator, + TAO_CEC_PushConsumer_List_Iterator, ACE_NULL_SYNCH>; template class TAO_EC_Busy_Lock_Adapter< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_List_Iterator, + TAO_CEC_PushConsumer_List_Iterator, ACE_NULL_SYNCH> >; template class ACE_Guard< TAO_EC_Busy_Lock_Adapter< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_List_Iterator, + TAO_CEC_PushConsumer_List_Iterator, ACE_NULL_SYNCH> > >; template class TAO_EC_Connected_Command< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_List_Iterator, + TAO_CEC_PushConsumer_List_Iterator, ACE_NULL_SYNCH>,TAO_CEC_ProxyPushConsumer >; template class TAO_EC_Reconnected_Command< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_List_Iterator, + TAO_CEC_PushConsumer_List_Iterator, ACE_NULL_SYNCH>,TAO_CEC_ProxyPushConsumer >; template class TAO_EC_Disconnected_Command< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_List_Iterator, + TAO_CEC_PushConsumer_List_Iterator, ACE_NULL_SYNCH>,TAO_CEC_ProxyPushConsumer >; template class TAO_EC_Shutdown_Command< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_List_Iterator, + TAO_CEC_PushConsumer_List_Iterator, ACE_NULL_SYNCH> >; template class TAO_EC_Immediate_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_RB_Tree_Iterator, + TAO_CEC_PushConsumer_RB_Tree_Iterator, ACE_Null_Mutex>; template class TAO_EC_Copy_On_Read<TAO_CEC_ProxyPushConsumer, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_RB_Tree_Iterator, + TAO_CEC_PushConsumer_RB_Tree_Iterator, ACE_Null_Mutex>; /* template class TAO_EC_Copy_On_Write<TAO_CEC_ProxyPushConsumer, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_RB_Tree_Iterator, + TAO_CEC_PushConsumer_RB_Tree_Iterator, ACE_Null_Mutex>; */ template class TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_RB_Tree_Iterator, + TAO_CEC_PushConsumer_RB_Tree_Iterator, ACE_NULL_SYNCH>; template class TAO_EC_Busy_Lock_Adapter< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_RB_Tree_Iterator, + TAO_CEC_PushConsumer_RB_Tree_Iterator, ACE_NULL_SYNCH> >; template class ACE_Guard< TAO_EC_Busy_Lock_Adapter< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_RB_Tree_Iterator, + TAO_CEC_PushConsumer_RB_Tree_Iterator, ACE_NULL_SYNCH> > >; template class TAO_EC_Connected_Command< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_RB_Tree_Iterator, + TAO_CEC_PushConsumer_RB_Tree_Iterator, ACE_NULL_SYNCH>,TAO_CEC_ProxyPushConsumer >; template class TAO_EC_Reconnected_Command< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_RB_Tree_Iterator, + TAO_CEC_PushConsumer_RB_Tree_Iterator, ACE_NULL_SYNCH>,TAO_CEC_ProxyPushConsumer >; template class TAO_EC_Disconnected_Command< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_RB_Tree_Iterator, + TAO_CEC_PushConsumer_RB_Tree_Iterator, ACE_NULL_SYNCH>,TAO_CEC_ProxyPushConsumer >; template class TAO_EC_Shutdown_Command< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_Consumer_RB_Tree_Iterator, + TAO_CEC_PushConsumer_RB_Tree_Iterator, ACE_NULL_SYNCH> >; template class TAO_EC_Immediate_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_List_Iterator, + TAO_CEC_PushSupplier_List_Iterator, ACE_Null_Mutex>; template class TAO_EC_Copy_On_Read<TAO_CEC_ProxyPushSupplier, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_List_Iterator, + TAO_CEC_PushSupplier_List_Iterator, ACE_Null_Mutex>; /* template class TAO_EC_Copy_On_Write<TAO_CEC_ProxyPushSupplier, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_List_Iterator, + TAO_CEC_PushSupplier_List_Iterator, ACE_Null_Mutex>; */ template class TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_List_Iterator, + TAO_CEC_PushSupplier_List_Iterator, ACE_NULL_SYNCH>; template class TAO_EC_Busy_Lock_Adapter< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_List_Iterator, + TAO_CEC_PushSupplier_List_Iterator, ACE_NULL_SYNCH> >; template class ACE_Guard< TAO_EC_Busy_Lock_Adapter< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_List_Iterator, + TAO_CEC_PushSupplier_List_Iterator, ACE_NULL_SYNCH> > >; template class TAO_EC_Connected_Command< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_List_Iterator, + TAO_CEC_PushSupplier_List_Iterator, ACE_NULL_SYNCH>,TAO_CEC_ProxyPushSupplier >; template class TAO_EC_Reconnected_Command< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_List_Iterator, + TAO_CEC_PushSupplier_List_Iterator, ACE_NULL_SYNCH>,TAO_CEC_ProxyPushSupplier >; template class TAO_EC_Disconnected_Command< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_List_Iterator, + TAO_CEC_PushSupplier_List_Iterator, ACE_NULL_SYNCH>,TAO_CEC_ProxyPushSupplier >; template class TAO_EC_Shutdown_Command< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_List_Iterator, + TAO_CEC_PushSupplier_List_Iterator, ACE_NULL_SYNCH> >; template class TAO_EC_Immediate_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_RB_Tree_Iterator, + TAO_CEC_PushSupplier_RB_Tree_Iterator, ACE_Null_Mutex>; template class TAO_EC_Copy_On_Read<TAO_CEC_ProxyPushSupplier, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_RB_Tree_Iterator, + TAO_CEC_PushSupplier_RB_Tree_Iterator, ACE_Null_Mutex>; /* template class TAO_EC_Copy_On_Write<TAO_CEC_ProxyPushSupplier, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_RB_Tree_Iterator, + TAO_CEC_PushSupplier_RB_Tree_Iterator, ACE_Null_Mutex>; */ template class TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_RB_Tree_Iterator, + TAO_CEC_PushSupplier_RB_Tree_Iterator, ACE_NULL_SYNCH>; template class TAO_EC_Busy_Lock_Adapter< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_RB_Tree_Iterator, + TAO_CEC_PushSupplier_RB_Tree_Iterator, ACE_NULL_SYNCH> >; template class ACE_Guard< TAO_EC_Busy_Lock_Adapter< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_RB_Tree_Iterator, + TAO_CEC_PushSupplier_RB_Tree_Iterator, ACE_NULL_SYNCH> > >; template class TAO_EC_Connected_Command< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_RB_Tree_Iterator, + TAO_CEC_PushSupplier_RB_Tree_Iterator, ACE_NULL_SYNCH>,TAO_CEC_ProxyPushSupplier >; template class TAO_EC_Reconnected_Command< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_RB_Tree_Iterator, + TAO_CEC_PushSupplier_RB_Tree_Iterator, ACE_NULL_SYNCH>,TAO_CEC_ProxyPushSupplier >; template class TAO_EC_Disconnected_Command< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_RB_Tree_Iterator, + TAO_CEC_PushSupplier_RB_Tree_Iterator, ACE_NULL_SYNCH>,TAO_CEC_ProxyPushSupplier >; template class TAO_EC_Shutdown_Command< TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier, TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_Supplier_RB_Tree_Iterator, + TAO_CEC_PushSupplier_RB_Tree_Iterator, + ACE_NULL_SYNCH> >; + +#if defined (ACE_HAS_THREADS) +// +// To avoid duplicate instantiations of templates we must put the MT +// versions on this #ifdef, otherwise the ACE_SYNCH* macros expand to +// the ACE_NULL* versions, duplicating the non-MT versions below. +// We *cannot* use explicit ACE_Synch classes because that will not +// compile in platforms without threads. +// +template class TAO_EC_Immediate_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_List_Iterator, + ACE_SYNCH_MUTEX>; +template class TAO_EC_Copy_On_Read<TAO_CEC_ProxyPullConsumer, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_List_Iterator, + ACE_SYNCH_MUTEX>; + /* +template class TAO_EC_Copy_On_Write<TAO_CEC_ProxyPullConsumer, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_List_Iterator, + ACE_SYNCH_MUTEX>; + */ +template class TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_List_Iterator, + ACE_SYNCH>; +template class TAO_EC_Busy_Lock_Adapter< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_List_Iterator, + ACE_SYNCH> >; +template class ACE_Guard< TAO_EC_Busy_Lock_Adapter< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_List_Iterator, + ACE_SYNCH> > >; +template class TAO_EC_Connected_Command< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_List_Iterator, + ACE_SYNCH>,TAO_CEC_ProxyPullConsumer >; +template class TAO_EC_Reconnected_Command< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_List_Iterator, + ACE_SYNCH>,TAO_CEC_ProxyPullConsumer >; +template class TAO_EC_Disconnected_Command< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_List_Iterator, + ACE_SYNCH>,TAO_CEC_ProxyPullConsumer >; +template class TAO_EC_Shutdown_Command< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_List_Iterator, + ACE_SYNCH> >; +template class TAO_EC_Immediate_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_RB_Tree_Iterator, + ACE_SYNCH_MUTEX>; +template class TAO_EC_Copy_On_Read<TAO_CEC_ProxyPullConsumer, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_RB_Tree_Iterator, + ACE_SYNCH_MUTEX>; + /* +template class TAO_EC_Copy_On_Write<TAO_CEC_ProxyPullConsumer, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_RB_Tree_Iterator, + ACE_SYNCH_MUTEX>; + */ +template class TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_RB_Tree_Iterator, + ACE_SYNCH>; +template class TAO_EC_Busy_Lock_Adapter< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_RB_Tree_Iterator, + ACE_SYNCH> >; +template class ACE_Guard< TAO_EC_Busy_Lock_Adapter< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_RB_Tree_Iterator, + ACE_SYNCH> > >; +template class TAO_EC_Connected_Command< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_RB_Tree_Iterator, + ACE_SYNCH>,TAO_CEC_ProxyPullConsumer >; +template class TAO_EC_Reconnected_Command< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_RB_Tree_Iterator, + ACE_SYNCH>,TAO_CEC_ProxyPullConsumer >; +template class TAO_EC_Disconnected_Command< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_RB_Tree_Iterator, + ACE_SYNCH>,TAO_CEC_ProxyPullConsumer >; +template class TAO_EC_Shutdown_Command< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_RB_Tree_Iterator, + ACE_SYNCH> >; + +template class TAO_EC_Immediate_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_List_Iterator, + ACE_SYNCH_MUTEX>; +template class TAO_EC_Copy_On_Read<TAO_CEC_ProxyPullSupplier, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_List_Iterator, + ACE_SYNCH_MUTEX>; + /* +template class TAO_EC_Copy_On_Write<TAO_CEC_ProxyPullSupplier, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_List_Iterator, + ACE_SYNCH_MUTEX>; + */ +template class TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_List_Iterator, + ACE_SYNCH>; +template class TAO_EC_Busy_Lock_Adapter< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_List_Iterator, + ACE_SYNCH> >; +template class ACE_Guard< TAO_EC_Busy_Lock_Adapter< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_List_Iterator, + ACE_SYNCH> > >; +template class TAO_EC_Connected_Command< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_List_Iterator, + ACE_SYNCH>,TAO_CEC_ProxyPullSupplier >; +template class TAO_EC_Reconnected_Command< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_List_Iterator, + ACE_SYNCH>,TAO_CEC_ProxyPullSupplier >; +template class TAO_EC_Disconnected_Command< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_List_Iterator, + ACE_SYNCH>,TAO_CEC_ProxyPullSupplier >; +template class TAO_EC_Shutdown_Command< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_List_Iterator, + ACE_SYNCH> >; +template class TAO_EC_Immediate_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_RB_Tree_Iterator, + ACE_SYNCH_MUTEX>; +template class TAO_EC_Copy_On_Read<TAO_CEC_ProxyPullSupplier, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_RB_Tree_Iterator, + ACE_SYNCH_MUTEX>; + /* +template class TAO_EC_Copy_On_Write<TAO_CEC_ProxyPullSupplier, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_RB_Tree_Iterator, + ACE_SYNCH_MUTEX>; + */ +template class TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_RB_Tree_Iterator, + ACE_SYNCH>; +template class TAO_EC_Busy_Lock_Adapter< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_RB_Tree_Iterator, + ACE_SYNCH> >; +template class ACE_Guard< TAO_EC_Busy_Lock_Adapter< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_RB_Tree_Iterator, + ACE_SYNCH> > >; +template class TAO_EC_Connected_Command< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_RB_Tree_Iterator, + ACE_SYNCH>,TAO_CEC_ProxyPullSupplier >; +template class TAO_EC_Reconnected_Command< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_RB_Tree_Iterator, + ACE_SYNCH>,TAO_CEC_ProxyPullSupplier >; +template class TAO_EC_Disconnected_Command< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_RB_Tree_Iterator, + ACE_SYNCH>,TAO_CEC_ProxyPullSupplier >; +template class TAO_EC_Shutdown_Command< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_RB_Tree_Iterator, + ACE_SYNCH> >; +#endif /* ACE_HAS_THREADS */ + +template class TAO_EC_Immediate_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_List_Iterator, + ACE_Null_Mutex>; +template class TAO_EC_Copy_On_Read<TAO_CEC_ProxyPullConsumer, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_List_Iterator, + ACE_Null_Mutex>; + /* +template class TAO_EC_Copy_On_Write<TAO_CEC_ProxyPullConsumer, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_List_Iterator, + ACE_Null_Mutex>; + */ +template class TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_List_Iterator, + ACE_NULL_SYNCH>; +template class TAO_EC_Busy_Lock_Adapter< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_List_Iterator, + ACE_NULL_SYNCH> >; +template class ACE_Guard< TAO_EC_Busy_Lock_Adapter< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_List_Iterator, + ACE_NULL_SYNCH> > >; +template class TAO_EC_Connected_Command< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_List_Iterator, + ACE_NULL_SYNCH>,TAO_CEC_ProxyPullConsumer >; +template class TAO_EC_Reconnected_Command< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_List_Iterator, + ACE_NULL_SYNCH>,TAO_CEC_ProxyPullConsumer >; +template class TAO_EC_Disconnected_Command< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_List_Iterator, + ACE_NULL_SYNCH>,TAO_CEC_ProxyPullConsumer >; +template class TAO_EC_Shutdown_Command< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_List_Iterator, + ACE_NULL_SYNCH> >; +template class TAO_EC_Immediate_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_RB_Tree_Iterator, + ACE_Null_Mutex>; +template class TAO_EC_Copy_On_Read<TAO_CEC_ProxyPullConsumer, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_RB_Tree_Iterator, + ACE_Null_Mutex>; + /* +template class TAO_EC_Copy_On_Write<TAO_CEC_ProxyPullConsumer, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_RB_Tree_Iterator, + ACE_Null_Mutex>; + */ +template class TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_RB_Tree_Iterator, + ACE_NULL_SYNCH>; +template class TAO_EC_Busy_Lock_Adapter< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_RB_Tree_Iterator, + ACE_NULL_SYNCH> >; +template class ACE_Guard< TAO_EC_Busy_Lock_Adapter< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_RB_Tree_Iterator, + ACE_NULL_SYNCH> > >; +template class TAO_EC_Connected_Command< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_RB_Tree_Iterator, + ACE_NULL_SYNCH>,TAO_CEC_ProxyPullConsumer >; +template class TAO_EC_Reconnected_Command< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_RB_Tree_Iterator, + ACE_NULL_SYNCH>,TAO_CEC_ProxyPullConsumer >; +template class TAO_EC_Disconnected_Command< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_RB_Tree_Iterator, + ACE_NULL_SYNCH>,TAO_CEC_ProxyPullConsumer >; +template class TAO_EC_Shutdown_Command< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>, + TAO_CEC_PullConsumer_RB_Tree_Iterator, + ACE_NULL_SYNCH> >; + +template class TAO_EC_Immediate_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_List_Iterator, + ACE_Null_Mutex>; +template class TAO_EC_Copy_On_Read<TAO_CEC_ProxyPullSupplier, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_List_Iterator, + ACE_Null_Mutex>; + /* +template class TAO_EC_Copy_On_Write<TAO_CEC_ProxyPullSupplier, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_List_Iterator, + ACE_Null_Mutex>; + */ +template class TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_List_Iterator, + ACE_NULL_SYNCH>; +template class TAO_EC_Busy_Lock_Adapter< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_List_Iterator, + ACE_NULL_SYNCH> >; +template class ACE_Guard< TAO_EC_Busy_Lock_Adapter< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_List_Iterator, + ACE_NULL_SYNCH> > >; +template class TAO_EC_Connected_Command< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_List_Iterator, + ACE_NULL_SYNCH>,TAO_CEC_ProxyPullSupplier >; +template class TAO_EC_Reconnected_Command< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_List_Iterator, + ACE_NULL_SYNCH>,TAO_CEC_ProxyPullSupplier >; +template class TAO_EC_Disconnected_Command< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_List_Iterator, + ACE_NULL_SYNCH>,TAO_CEC_ProxyPullSupplier >; +template class TAO_EC_Shutdown_Command< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_List_Iterator, + ACE_NULL_SYNCH> >; +template class TAO_EC_Immediate_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_RB_Tree_Iterator, + ACE_Null_Mutex>; +template class TAO_EC_Copy_On_Read<TAO_CEC_ProxyPullSupplier, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_RB_Tree_Iterator, + ACE_Null_Mutex>; + /* +template class TAO_EC_Copy_On_Write<TAO_CEC_ProxyPullSupplier, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_RB_Tree_Iterator, + ACE_Null_Mutex>; + */ +template class TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_RB_Tree_Iterator, + ACE_NULL_SYNCH>; +template class TAO_EC_Busy_Lock_Adapter< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_RB_Tree_Iterator, + ACE_NULL_SYNCH> >; +template class ACE_Guard< TAO_EC_Busy_Lock_Adapter< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_RB_Tree_Iterator, + ACE_NULL_SYNCH> > >; +template class TAO_EC_Connected_Command< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_RB_Tree_Iterator, + ACE_NULL_SYNCH>,TAO_CEC_ProxyPullSupplier >; +template class TAO_EC_Reconnected_Command< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_RB_Tree_Iterator, + ACE_NULL_SYNCH>,TAO_CEC_ProxyPullSupplier >; +template class TAO_EC_Disconnected_Command< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_RB_Tree_Iterator, + ACE_NULL_SYNCH>,TAO_CEC_ProxyPullSupplier >; +template class TAO_EC_Shutdown_Command< + TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier, + TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>, + TAO_CEC_PullSupplier_RB_Tree_Iterator, ACE_NULL_SYNCH> >; #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h index 09c320caa20..07443e08a13 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h @@ -59,6 +59,10 @@ public: create_dispatching (TAO_CEC_EventChannel*); virtual void destroy_dispatching (TAO_CEC_Dispatching*); + virtual TAO_CEC_Pulling_Strategy* + create_pulling_strategy (TAO_CEC_EventChannel*); + virtual void + destroy_pulling_strategy (TAO_CEC_Pulling_Strategy*); virtual TAO_CEC_ConsumerAdmin* create_consumer_admin (TAO_CEC_EventChannel*); virtual void @@ -71,18 +75,34 @@ public: create_proxy_push_supplier (TAO_CEC_EventChannel*); virtual void destroy_proxy_push_supplier (TAO_CEC_ProxyPushSupplier*); + virtual TAO_CEC_ProxyPullSupplier* + create_proxy_pull_supplier (TAO_CEC_EventChannel*); + virtual void + destroy_proxy_pull_supplier (TAO_CEC_ProxyPullSupplier*); virtual TAO_CEC_ProxyPushConsumer* create_proxy_push_consumer (TAO_CEC_EventChannel*); virtual void destroy_proxy_push_consumer (TAO_CEC_ProxyPushConsumer*); + virtual TAO_CEC_ProxyPullConsumer* + create_proxy_pull_consumer (TAO_CEC_EventChannel*); + virtual void + destroy_proxy_pull_consumer (TAO_CEC_ProxyPullConsumer*); virtual TAO_CEC_ProxyPushConsumer_Collection* create_proxy_push_consumer_collection (TAO_CEC_EventChannel*); virtual void destroy_proxy_push_consumer_collection (TAO_CEC_ProxyPushConsumer_Collection*); + virtual TAO_CEC_ProxyPullConsumer_Collection* + create_proxy_pull_consumer_collection (TAO_CEC_EventChannel*); + virtual void + destroy_proxy_pull_consumer_collection (TAO_CEC_ProxyPullConsumer_Collection*); virtual TAO_CEC_ProxyPushSupplier_Collection* create_proxy_push_supplier_collection (TAO_CEC_EventChannel*); virtual void destroy_proxy_push_supplier_collection (TAO_CEC_ProxyPushSupplier_Collection*); + virtual TAO_CEC_ProxyPullSupplier_Collection* + create_proxy_pull_supplier_collection (TAO_CEC_EventChannel*); + virtual void + destroy_proxy_pull_supplier_collection (TAO_CEC_ProxyPullSupplier_Collection*); virtual ACE_Lock* create_consumer_lock (void); virtual void destroy_consumer_lock (ACE_Lock*); @@ -99,7 +119,12 @@ public: destroy_supplier_control (TAO_CEC_SupplierControl*); private: + int parse_collection_arg (char *opt); + // Parse an argument to set the type of collections used. + +private: int dispatching_; + int pulling_strategy_; int consumer_collection_; int supplier_collection_; int consumer_lock_; @@ -113,6 +138,10 @@ private: // The MT dispatching priority has several arguments that could be // controlled here... + int reactive_pulling_period_; + // How often (in microseconds) are the pull suppliers polled by the + // reactive pulling strategy. + const char *orbid_; // Use this ORB to locate global resources. diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i index c43876c1ca6..594e597b015 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i @@ -3,6 +3,7 @@ ACE_INLINE TAO_CEC_Default_Factory::TAO_CEC_Default_Factory (void) : dispatching_ (TAO_CEC_DEFAULT_DISPATCHING), + pulling_strategy_ (TAO_CEC_DEFAULT_PULLING_STRATEGY), consumer_collection_ (TAO_CEC_DEFAULT_CONSUMER_COLLECTION), supplier_collection_ (TAO_CEC_DEFAULT_SUPPLIER_COLLECTION), consumer_lock_ (TAO_CEC_DEFAULT_CONSUMER_LOCK), @@ -11,6 +12,7 @@ TAO_CEC_Default_Factory::TAO_CEC_Default_Factory (void) dispatching_threads_flags_ (TAO_CEC_DEFAULT_DISPATCHING_THREADS_FLAGS), dispatching_threads_priority_ (TAO_CEC_DEFAULT_DISPATCHING_THREADS_PRIORITY), dispatching_threads_force_active_ (TAO_CEC_DEFAULT_DISPATCHING_THREADS_FORCE_ACTIVE), + reactive_pulling_period_ (TAO_CEC_DEFAULT_REACTIVE_PULLING_PERIOD), orbid_ (TAO_CEC_DEFAULT_ORB_ID), consumer_control_ (TAO_CEC_DEFAULT_CONSUMER_CONTROL), supplier_control_ (TAO_CEC_DEFAULT_SUPPLIER_CONTROL), diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h index 64b49e7fa90..e0fa940d1e1 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h @@ -63,6 +63,10 @@ # define TAO_CEC_DEFAULT_DISPATCHING 0 /* reactive */ #endif /* TAO_CEC_DEFAULT_DISPATCHING */ +#ifndef TAO_CEC_DEFAULT_PULLING_STRATEGY +# define TAO_CEC_DEFAULT_PULLING_STRATEGY 0 /* reactive */ +#endif /* TAO_CEC_DEFAULT_PULLING_STRATEGY */ + #ifndef TAO_CEC_DEFAULT_CONSUMER_COLLECTION # define TAO_CEC_DEFAULT_CONSUMER_COLLECTION 0x003 /* delayed MT-safe */ #endif /* TAO_CEC_DEFAULT_CONSUMER_COLLECTION */ @@ -95,6 +99,10 @@ # define TAO_CEC_DEFAULT_DISPATCHING_THREADS_FORCE_ACTIVE 1 #endif /* TAO_CEC_DEFAULT_DISPATCHING_THREADS_FORCE_ACTIVE */ +#ifndef TAO_CEC_DEFAULT_REACTIVE_PULLING_PERIOD +# define TAO_CEC_DEFAULT_REACTIVE_PULLING_PERIOD 5000000 /* usecs */ +#endif /* TAO_CEC_DEFAULT_REACTIVE_PULLING_PERIOD */ + #ifndef TAO_CEC_DEFAULT_ORB_ID # define TAO_CEC_DEFAULT_ORB_ID "" /* */ #endif /* TAO_CEC_DEFAULT_ORB_ID */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp index f36a7e755d8..24a746e63d5 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp @@ -1,8 +1,8 @@ // $Id$ #include "CEC_EventChannel.h" -// #include "CEC_Default_Factory.h" #include "CEC_Dispatching.h" +#include "CEC_Pulling_Strategy.h" #include "CEC_ConsumerAdmin.h" #include "CEC_SupplierAdmin.h" #include "CEC_ConsumerControl.h" @@ -29,25 +29,17 @@ TAO_CEC_EventChannel (const TAO_CEC_EventChannel_Attributes& attr, busy_hwm_ (attr.busy_hwm), max_write_delay_ (attr.max_write_delay) { - // @@ Find out a better way to do this! if (this->factory_ == 0) { this->factory_ = ACE_Dynamic_Service<TAO_CEC_Factory>::instance ("CEC_Factory"); this->own_factory_ = 0; - -#if 0 - if (this->factory_ == 0) - { - ACE_NEW (this->factory_, - TAO_CEC_Default_Factory); - this->own_factory_ = 1; - } -#endif /* 0 */ } this->dispatching_ = this->factory_->create_dispatching (this); + this->pulling_strategy_ = + this->factory_->create_pulling_strategy (this); this->consumer_admin_ = this->factory_->create_consumer_admin (this); this->supplier_admin_ = @@ -63,6 +55,9 @@ TAO_CEC_EventChannel::~TAO_CEC_EventChannel (void) this->factory_->destroy_dispatching (this->dispatching_); this->dispatching_ = 0; + this->factory_->destroy_pulling_strategy (this->pulling_strategy_); + this->pulling_strategy_ = 0; + this->factory_->destroy_consumer_admin (this->consumer_admin_); this->consumer_admin_ = 0; this->factory_->destroy_supplier_admin (this->supplier_admin_); @@ -81,6 +76,7 @@ void TAO_CEC_EventChannel::activate (CORBA::Environment&) { this->dispatching_->activate (); + this->pulling_strategy_->activate (); this->consumer_control_->activate (); this->supplier_control_->activate (); } @@ -89,6 +85,7 @@ void TAO_CEC_EventChannel::shutdown (CORBA::Environment& ACE_TRY_ENV) { this->dispatching_->shutdown (); + this->pulling_strategy_->shutdown (); this->supplier_control_->shutdown (); this->consumer_control_->shutdown (); @@ -119,8 +116,6 @@ void TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPushConsumer* consumer, CORBA::Environment &ACE_TRY_ENV) { - this->consumer_admin_->connected (consumer, ACE_TRY_ENV); - ACE_CHECK; this->supplier_admin_->connected (consumer, ACE_TRY_ENV); ACE_CHECK; } @@ -129,8 +124,6 @@ void TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPushConsumer* consumer, CORBA::Environment &ACE_TRY_ENV) { - this->consumer_admin_->reconnected (consumer, ACE_TRY_ENV); - ACE_CHECK; this->supplier_admin_->reconnected (consumer, ACE_TRY_ENV); ACE_CHECK; } @@ -139,8 +132,30 @@ void TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPushConsumer* consumer, CORBA::Environment &ACE_TRY_ENV) { - this->consumer_admin_->disconnected (consumer, ACE_TRY_ENV); + this->supplier_admin_->disconnected (consumer, ACE_TRY_ENV); + ACE_CHECK; +} + +void +TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPullConsumer* consumer, + CORBA::Environment &ACE_TRY_ENV) +{ + this->supplier_admin_->connected (consumer, ACE_TRY_ENV); ACE_CHECK; +} + +void +TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPullConsumer* consumer, + CORBA::Environment &ACE_TRY_ENV) +{ + this->supplier_admin_->reconnected (consumer, ACE_TRY_ENV); + ACE_CHECK; +} + +void +TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPullConsumer* consumer, + CORBA::Environment &ACE_TRY_ENV) +{ this->supplier_admin_->disconnected (consumer, ACE_TRY_ENV); ACE_CHECK; } @@ -149,8 +164,6 @@ void TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPushSupplier* supplier, CORBA::Environment &ACE_TRY_ENV) { - this->supplier_admin_->connected (supplier, ACE_TRY_ENV); - ACE_CHECK; this->consumer_admin_->connected (supplier, ACE_TRY_ENV); ACE_CHECK; } @@ -159,8 +172,6 @@ void TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPushSupplier* supplier, CORBA::Environment &ACE_TRY_ENV) { - this->supplier_admin_->reconnected (supplier, ACE_TRY_ENV); - ACE_CHECK; this->consumer_admin_->reconnected (supplier TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -169,8 +180,30 @@ void TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPushSupplier* supplier TAO_ENV_ARG_DECL) { - this->supplier_admin_->disconnected (supplier, ACE_TRY_ENV); + this->consumer_admin_->disconnected (supplier TAO_ENV_ARG_PARAMETER); ACE_CHECK; +} + +void +TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPullSupplier* supplier + TAO_ENV_ARG_DECL) +{ + this->consumer_admin_->connected (supplier TAO_ENV_ARG_PARAMETER); + ACE_CHECK; +} + +void +TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPullSupplier* supplier + TAO_ENV_ARG_DECL) +{ + this->consumer_admin_->reconnected (supplier TAO_ENV_ARG_PARAMETER); + ACE_CHECK; +} + +void +TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPullSupplier* supplier + TAO_ENV_ARG_DECL) +{ this->consumer_admin_->disconnected (supplier TAO_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h index aeef401dc0d..b3fa05c1d70 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h @@ -120,33 +120,51 @@ public: // Access the dispatching module.... TAO_CEC_ConsumerAdmin* consumer_admin (void) const; - // Access the consumer admin implementation, useful for controlling - // the activation... + // Access the consumer admin implementation. TAO_CEC_SupplierAdmin* supplier_admin (void) const; - // Access the supplier admin implementation, useful for controlling - // the activation... + // Access the supplier admin implementation. + + TAO_CEC_ConsumerControl* consumer_control (void) const; + // Access the consumer control strategy. + + TAO_CEC_SupplierControl* supplier_control (void) const; + // Access the supplier control strategy. // = The factory methods, they delegate on the CEC_Factory. TAO_CEC_ProxyPushSupplier* create_proxy_push_supplier (void); void destroy_proxy_push_supplier (TAO_CEC_ProxyPushSupplier*); // Create and destroy a ProxyPushSupplier + TAO_CEC_ProxyPullSupplier* create_proxy_pull_supplier (void); + void destroy_proxy_pull_supplier (TAO_CEC_ProxyPullSupplier*); + // Create and destroy a ProxyPullSupplier + TAO_CEC_ProxyPushConsumer* create_proxy_push_consumer (void); void destroy_proxy_push_consumer (TAO_CEC_ProxyPushConsumer*); // Create and destroy a ProxyPushConsumer + TAO_CEC_ProxyPullConsumer* create_proxy_pull_consumer (void); + void destroy_proxy_pull_consumer (TAO_CEC_ProxyPullConsumer*); + // Create and destroy a ProxyPushConsumer + TAO_CEC_ProxyPushSupplier_Collection* create_proxy_push_supplier_collection (void); void destroy_proxy_push_supplier_collection (TAO_CEC_ProxyPushSupplier_Collection*); + TAO_CEC_ProxyPullSupplier_Collection* + create_proxy_pull_supplier_collection (void); + void destroy_proxy_pull_supplier_collection (TAO_CEC_ProxyPullSupplier_Collection*); // Create and destroy a the collections used to store - // ProxyPushSuppliers + // Proxy*Suppliers TAO_CEC_ProxyPushConsumer_Collection* create_proxy_push_consumer_collection (void); void destroy_proxy_push_consumer_collection (TAO_CEC_ProxyPushConsumer_Collection*); + TAO_CEC_ProxyPullConsumer_Collection* + create_proxy_pull_consumer_collection (void); + void destroy_proxy_pull_consumer_collection (TAO_CEC_ProxyPullConsumer_Collection*); // Create and destroy a the collections used to store - // ProxyPushConsumers + // Proxy*Consumers PortableServer::POA_ptr supplier_poa (void); PortableServer::POA_ptr consumer_poa (void); @@ -165,6 +183,12 @@ public: CORBA::Environment&); virtual void disconnected (TAO_CEC_ProxyPushConsumer*, CORBA::Environment&); + virtual void connected (TAO_CEC_ProxyPullConsumer*, + CORBA::Environment&); + virtual void reconnected (TAO_CEC_ProxyPullConsumer*, + CORBA::Environment&); + virtual void disconnected (TAO_CEC_ProxyPullConsumer*, + CORBA::Environment&); // Used to inform the EC that a Consumer has connected or // disconnected from it. @@ -174,6 +198,12 @@ public: CORBA::Environment&); virtual void disconnected (TAO_CEC_ProxyPushSupplier*, CORBA::Environment&); + virtual void connected (TAO_CEC_ProxyPullSupplier*, + CORBA::Environment&); + virtual void reconnected (TAO_CEC_ProxyPullSupplier*, + CORBA::Environment&); + virtual void disconnected (TAO_CEC_ProxyPullSupplier*, + CORBA::Environment&); // Used to inform the EC that a Supplier has connected or // disconnected from it. @@ -229,6 +259,9 @@ private: TAO_CEC_Dispatching *dispatching_; // The dispatching "module" + TAO_CEC_Pulling_Strategy *pulling_strategy_; + // The pulling strategy + TAO_CEC_ConsumerAdmin *consumer_admin_; // The ConsumerAdmin implementation diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i index 26947dabe8f..85a6a65e487 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i @@ -32,6 +32,18 @@ TAO_CEC_EventChannel::supplier_admin (void) const return this->supplier_admin_; } +ACE_INLINE TAO_CEC_ConsumerControl* +TAO_CEC_EventChannel::consumer_control (void) const +{ + return this->consumer_control_; +} + +ACE_INLINE TAO_CEC_SupplierControl* +TAO_CEC_EventChannel::supplier_control (void) const +{ + return this->supplier_control_; +} + ACE_INLINE TAO_CEC_ProxyPushSupplier* TAO_CEC_EventChannel::create_proxy_push_supplier (void) { @@ -44,12 +56,42 @@ TAO_CEC_EventChannel::destroy_proxy_push_supplier (TAO_CEC_ProxyPushSupplier* su this->factory_->destroy_proxy_push_supplier (supplier); } +ACE_INLINE TAO_CEC_ProxyPullSupplier* +TAO_CEC_EventChannel::create_proxy_pull_supplier (void) +{ + return this->factory_->create_proxy_pull_supplier (this); +} + +ACE_INLINE void +TAO_CEC_EventChannel::destroy_proxy_pull_supplier (TAO_CEC_ProxyPullSupplier* supplier) +{ + this->factory_->destroy_proxy_pull_supplier (supplier); +} + ACE_INLINE TAO_CEC_ProxyPushConsumer* TAO_CEC_EventChannel::create_proxy_push_consumer (void) { return this->factory_->create_proxy_push_consumer (this); } +ACE_INLINE void +TAO_CEC_EventChannel::destroy_proxy_push_consumer (TAO_CEC_ProxyPushConsumer* consumer) +{ + this->factory_->destroy_proxy_push_consumer (consumer); +} + +ACE_INLINE TAO_CEC_ProxyPullConsumer* +TAO_CEC_EventChannel::create_proxy_pull_consumer (void) +{ + return this->factory_->create_proxy_pull_consumer (this); +} + +ACE_INLINE void +TAO_CEC_EventChannel::destroy_proxy_pull_consumer (TAO_CEC_ProxyPullConsumer* consumer) +{ + this->factory_->destroy_proxy_pull_consumer (consumer); +} + ACE_INLINE TAO_CEC_ProxyPushConsumer_Collection* TAO_CEC_EventChannel::create_proxy_push_consumer_collection (void) { @@ -62,6 +104,18 @@ TAO_CEC_EventChannel::destroy_proxy_push_consumer_collection (TAO_CEC_ProxyPushC this->factory_->destroy_proxy_push_consumer_collection (x); } +ACE_INLINE TAO_CEC_ProxyPullConsumer_Collection* +TAO_CEC_EventChannel::create_proxy_pull_consumer_collection (void) +{ + return this->factory_->create_proxy_pull_consumer_collection (this); +} + +ACE_INLINE void +TAO_CEC_EventChannel::destroy_proxy_pull_consumer_collection (TAO_CEC_ProxyPullConsumer_Collection* x) +{ + this->factory_->destroy_proxy_pull_consumer_collection (x); +} + ACE_INLINE TAO_CEC_ProxyPushSupplier_Collection* TAO_CEC_EventChannel::create_proxy_push_supplier_collection (void) { @@ -74,10 +128,16 @@ TAO_CEC_EventChannel::destroy_proxy_push_supplier_collection (TAO_CEC_ProxyPushS this->factory_->destroy_proxy_push_supplier_collection (x); } +ACE_INLINE TAO_CEC_ProxyPullSupplier_Collection* +TAO_CEC_EventChannel::create_proxy_pull_supplier_collection (void) +{ + return this->factory_->create_proxy_pull_supplier_collection (this); +} + ACE_INLINE void -TAO_CEC_EventChannel::destroy_proxy_push_consumer (TAO_CEC_ProxyPushConsumer* consumer) +TAO_CEC_EventChannel::destroy_proxy_pull_supplier_collection (TAO_CEC_ProxyPullSupplier_Collection* x) { - this->factory_->destroy_proxy_push_consumer (consumer); + this->factory_->destroy_proxy_pull_supplier_collection (x); } ACE_INLINE PortableServer::POA_ptr diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h index e6fc7fcadb0..55741e38f98 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h @@ -31,16 +31,21 @@ class ACE_Lock; class TAO_CEC_EventChannel; class TAO_CEC_Dispatching; +class TAO_CEC_Pulling_Strategy; class TAO_CEC_ConsumerAdmin; class TAO_CEC_SupplierAdmin; class TAO_CEC_ProxyPushConsumer; +class TAO_CEC_ProxyPullConsumer; class TAO_CEC_ProxyPushSupplier; +class TAO_CEC_ProxyPullSupplier; template<class PROXY> class TAO_EC_Proxy_Collection; class TAO_CEC_ConsumerControl; class TAO_CEC_SupplierControl; typedef TAO_EC_Proxy_Collection<TAO_CEC_ProxyPushConsumer> TAO_CEC_ProxyPushConsumer_Collection; +typedef TAO_EC_Proxy_Collection<TAO_CEC_ProxyPullConsumer> TAO_CEC_ProxyPullConsumer_Collection; typedef TAO_EC_Proxy_Collection<TAO_CEC_ProxyPushSupplier> TAO_CEC_ProxyPushSupplier_Collection; +typedef TAO_EC_Proxy_Collection<TAO_CEC_ProxyPullSupplier> TAO_CEC_ProxyPullSupplier_Collection; class TAO_ORBSVCS_Export TAO_CEC_Factory : public ACE_Service_Object { @@ -69,6 +74,12 @@ public: destroy_dispatching (TAO_CEC_Dispatching*) = 0; // Create and destroy the dispatching module. + virtual TAO_CEC_Pulling_Strategy* + create_pulling_strategy (TAO_CEC_EventChannel*) = 0; + virtual void + destroy_pulling_strategy (TAO_CEC_Pulling_Strategy*) = 0; + // Create and destroy the pulling strategy. + virtual TAO_CEC_ConsumerAdmin* create_consumer_admin (TAO_CEC_EventChannel*) = 0; virtual void @@ -87,24 +98,48 @@ public: destroy_proxy_push_supplier (TAO_CEC_ProxyPushSupplier*) = 0; // Create and destroy a ProxyPushSupplier + virtual TAO_CEC_ProxyPullSupplier* + create_proxy_pull_supplier (TAO_CEC_EventChannel*) = 0; + virtual void + destroy_proxy_pull_supplier (TAO_CEC_ProxyPullSupplier*) = 0; + // Create and destroy a ProxyPullSupplier + virtual TAO_CEC_ProxyPushConsumer* create_proxy_push_consumer (TAO_CEC_EventChannel*) = 0; virtual void destroy_proxy_push_consumer (TAO_CEC_ProxyPushConsumer*) = 0; // Create and destroy a ProxyPushConsumer + virtual TAO_CEC_ProxyPullConsumer* + create_proxy_pull_consumer (TAO_CEC_EventChannel*) = 0; + virtual void + destroy_proxy_pull_consumer (TAO_CEC_ProxyPullConsumer*) = 0; + // Create and destroy a ProxyPullConsumer + virtual TAO_CEC_ProxyPushConsumer_Collection* create_proxy_push_consumer_collection (TAO_CEC_EventChannel*) = 0; virtual void destroy_proxy_push_consumer_collection (TAO_CEC_ProxyPushConsumer_Collection*) = 0; // Create and destroy a collection of TAO_CEC_ProxyPushConsumers + virtual TAO_CEC_ProxyPullConsumer_Collection* + create_proxy_pull_consumer_collection (TAO_CEC_EventChannel*) = 0; + virtual void + destroy_proxy_pull_consumer_collection (TAO_CEC_ProxyPullConsumer_Collection*) = 0; + // Create and destroy a collection of TAO_CEC_ProxyPullConsumers + virtual TAO_CEC_ProxyPushSupplier_Collection* create_proxy_push_supplier_collection (TAO_CEC_EventChannel*) = 0; virtual void destroy_proxy_push_supplier_collection (TAO_CEC_ProxyPushSupplier_Collection*) = 0; // Create and destroy a collection of TAO_CEC_ProxyPushSuppliers + virtual TAO_CEC_ProxyPullSupplier_Collection* + create_proxy_pull_supplier_collection (TAO_CEC_EventChannel*) = 0; + virtual void + destroy_proxy_pull_supplier_collection (TAO_CEC_ProxyPullSupplier_Collection*) = 0; + // Create and destroy a collection of TAO_CEC_ProxyPullSuppliers + virtual ACE_Lock* create_consumer_lock (void) = 0; virtual void destroy_consumer_lock (ACE_Lock*) = 0; virtual ACE_Lock* create_supplier_lock (void) = 0; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp new file mode 100644 index 00000000000..f6e521ad6d4 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp @@ -0,0 +1,330 @@ +// $Id$ + +#include "CEC_ProxyPullConsumer.h" +#include "CEC_EventChannel.h" +#include "CEC_ConsumerAdmin.h" +#include "CEC_ProxyPullSupplier.h" + +#if ! defined (__ACE_INLINE__) +#include "CEC_ProxyPullConsumer.i" +#endif /* __ACE_INLINE__ */ + +ACE_RCSID(CosEvent, CEC_ProxyPullConsumer, "$Id$") + +typedef ACE_Reverse_Lock<ACE_Lock> TAO_CEC_Unlock; + +TAO_CEC_ProxyPullConsumer:: + TAO_CEC_ProxyPullConsumer (TAO_CEC_EventChannel* ec) + : event_channel_ (ec), + refcount_ (1) +{ + this->lock_ = + this->event_channel_->create_consumer_lock (); + + this->default_POA_ = + this->event_channel_->consumer_poa (); +} + +TAO_CEC_ProxyPullConsumer::~TAO_CEC_ProxyPullConsumer (void) +{ + this->event_channel_->destroy_consumer_lock (this->lock_); +} + +// NOTE: There is some amount of duplicated code here, but it is +// intentional. Mainly we want to avoid locking overhead when +// possible, thus the code flow is optimized for that case more than +// for small code. + +CORBA::Any* +TAO_CEC_ProxyPullConsumer::try_pull_from_supplier ( + CORBA::Boolean_out has_event, + CORBA::Environment& ACE_TRY_ENV) +{ + has_event = 0; + CosEventComm::PullSupplier_var supplier; + { + ACE_GUARD_THROW_EX ( + ACE_Lock, ace_mon, *this->lock_, + CORBA::INTERNAL ()); + // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); + ACE_CHECK; + + if (this->is_connected_i () == 0) + return 0; // ACE_THROW (CosEventComm::Disconnected ());???? + + supplier = + CosEventComm::PullSupplier::_duplicate (this->supplier_.in ()); + + // The refcount cannot be zero, because we have at least two + // references, + } + + CORBA::Any_var any; + ACE_TRY + { + any = supplier->try_pull (has_event, ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + // @@ This is where the policies for misbehaving suppliers + // should kick in.... for the moment just ignore them. + } + ACE_ENDTRY; + return any._retn (); +} + +CORBA::Any* +TAO_CEC_ProxyPullConsumer::pull_from_supplier ( + CORBA::Environment& ACE_TRY_ENV) +{ + CosEventComm::PullSupplier_var supplier; + { + ACE_GUARD_THROW_EX ( + ACE_Lock, ace_mon, *this->lock_, + CORBA::INTERNAL ()); + // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); + ACE_CHECK_RETURN (0); + + if (this->is_connected_i () == 0) + return 0; // ACE_THROW (CosEventComm::Disconnected ());???? + + supplier = + CosEventComm::PullSupplier::_duplicate (this->supplier_.in ()); + + // The refcount cannot be zero, because we have at least two + // references, + } + + CORBA::Any_var any; + ACE_TRY + { + any = supplier->pull (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + // @@ This is where the policies for misbehaving suppliers + // should kick in.... for the moment just ignore them. + } + ACE_ENDTRY; + return any._retn (); +} + +CORBA::Boolean +TAO_CEC_ProxyPullConsumer::supplier_non_existent ( + CORBA::Boolean_out disconnected, + CORBA::Environment &ACE_TRY_ENV) +{ + ACE_GUARD_THROW_EX ( + ACE_Lock, ace_mon, *this->lock_, + CORBA::INTERNAL ()); + // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); + ACE_CHECK_RETURN (0); + + disconnected = 0; + if (this->is_connected_i () == 0) + { + disconnected = 1; + return 0; + } + +#if !defined(TAO_HAS_MINIMUM_CORBA) + return this->supplier_->_non_existent (ACE_TRY_ENV); +#else + return 0; +#endif /* TAO_HAS_MINIMUM_CORBA */ +} + +void +TAO_CEC_ProxyPullConsumer::shutdown (CORBA::Environment &ACE_TRY_ENV) +{ + CosEventComm::PullSupplier_var supplier; + + { + ACE_GUARD_THROW_EX ( + ACE_Lock, ace_mon, *this->lock_, + CORBA::INTERNAL ()); + // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); + ACE_CHECK; + + if (this->is_connected_i () == 0) + return; + + supplier = this->supplier_._retn (); + + this->cleanup_i (); + } + + this->deactivate (ACE_TRY_ENV); + ACE_CHECK; + + ACE_TRY + { + supplier->disconnect_pull_supplier (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + // Ignore exceptions, we must isolate other clients from + // failures on this one. + } + ACE_ENDTRY; +} + +void +TAO_CEC_ProxyPullConsumer::cleanup_i (void) +{ + this->supplier_ = + CosEventComm::PullSupplier::_nil (); +} + +void +TAO_CEC_ProxyPullConsumer::deactivate (CORBA::Environment &ACE_TRY_ENV) +{ + PortableServer::POA_var poa = + this->_default_POA (ACE_TRY_ENV); + ACE_CHECK; + PortableServer::ObjectId_var id = + poa->servant_to_id (this, ACE_TRY_ENV); + ACE_CHECK; + poa->deactivate_object (id.in (), ACE_TRY_ENV); + ACE_CHECK; +} + +CORBA::ULong +TAO_CEC_ProxyPullConsumer::_incr_refcnt (void) +{ + ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); + return this->refcount_++; +} + +CORBA::ULong +TAO_CEC_ProxyPullConsumer::_decr_refcnt (void) +{ + { + ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); + this->refcount_--; + if (this->refcount_ != 0) + return this->refcount_; + } + + // Notify the event channel + this->event_channel_->destroy_proxy_pull_consumer (this); + return 0; +} + +void +TAO_CEC_ProxyPullConsumer::connect_pull_supplier ( + CosEventComm::PullSupplier_ptr pull_supplier, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + CosEventChannelAdmin::AlreadyConnected)) +{ + { + ACE_GUARD_THROW_EX ( + ACE_Lock, ace_mon, *this->lock_, + CORBA::INTERNAL ()); + // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); + ACE_CHECK; + + if (this->is_connected_i ()) + { + if (this->event_channel_->supplier_reconnect () == 0) + ACE_THROW (CosEventChannelAdmin::AlreadyConnected ()); + + // Re-connections are allowed, go ahead and disconnect the + // consumer... + this->cleanup_i (); + + // @@ Please read the comments in CEC_ProxyPullSupplier about + // possible race conditions in this area... + TAO_CEC_Unlock reverse_lock (*this->lock_); + + { + ACE_GUARD_THROW_EX ( + TAO_CEC_Unlock, ace_mon, reverse_lock, + CORBA::INTERNAL ()); + // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); + ACE_CHECK; + + this->event_channel_->disconnected (this, ACE_TRY_ENV); + ACE_CHECK; + } + + // What if a second thread connected us after this? + if (this->is_connected_i ()) + return; + } + this->supplier_ = + CosEventComm::PullSupplier::_duplicate (pull_supplier); + } + + // Notify the event channel... + this->event_channel_->connected (this, ACE_TRY_ENV); +} + +void +TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer ( + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + CosEventComm::PullSupplier_var supplier; + + { + ACE_GUARD_THROW_EX ( + ACE_Lock, ace_mon, *this->lock_, + CORBA::INTERNAL ()); + // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); + ACE_CHECK; + + if (this->is_connected_i () == 0) + ACE_THROW (CORBA::BAD_INV_ORDER ()); // @@ add user exception? + + supplier = this->supplier_._retn (); + + this->cleanup_i (); + } + + this->deactivate (ACE_TRY_ENV); + ACE_CHECK; + + // Notify the event channel... + this->event_channel_->disconnected (this, ACE_TRY_ENV); + ACE_CHECK; + + if (this->event_channel_->disconnect_callbacks ()) + { + ACE_TRY + { + supplier->disconnect_pull_supplier (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + // Ignore exceptions, we must isolate other clients from + // failures on this one. + } + ACE_ENDTRY; + } + + this->_decr_refcnt (); +} + +PortableServer::POA_ptr +TAO_CEC_ProxyPullConsumer::_default_POA (CORBA::Environment&) +{ + return PortableServer::POA::_duplicate (this->default_POA_.in ()); +} + +void +TAO_CEC_ProxyPullConsumer::_add_ref (CORBA::Environment &) +{ + this->_incr_refcnt (); +} + +void +TAO_CEC_ProxyPullConsumer::_remove_ref (CORBA::Environment &) +{ + this->_decr_refcnt (); +} diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h new file mode 100644 index 00000000000..d6a7d45b8e6 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h @@ -0,0 +1,131 @@ +/* -*- C++ -*- */ +// $Id$ +// +// ============================================================================ +// +// = LIBRARY +// ORBSVCS Cos Event Channel +// +// = FILENAME +// CEC_ProxyPullConsumer +// +// = AUTHOR +// Carlos O'Ryan (coryan@cs.wustl.edu) +// +// ============================================================================ + +#ifndef TAO_CEC_PROXYPULLCONSUMER_H +#define TAO_CEC_PROXYPULLCONSUMER_H + +#include "orbsvcs/CosEventChannelAdminS.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "orbsvcs/Event/EC_Worker.h" + +class TAO_CEC_EventChannel; +class TAO_CEC_Dispatching; +class TAO_CEC_ProxyPullSupplier; + +class TAO_ORBSVCS_Export TAO_CEC_ProxyPullConsumer : public POA_CosEventChannelAdmin::ProxyPullConsumer +{ + // = TITLE + // ProxyPullConsumer + // + // = DESCRIPTION + // Implement the CosEventChannelAdmin::ProxyPullConsumer interface, + // remember that this class is used to communicate with a + // PullSupplier, so, in effect, this is the ambassador for a + // supplier inside the event channel. + // + // = MEMORY MANAGMENT + // The object commits suicide when disconnect_pull_consumer() is + // called. + // +public: + TAO_CEC_ProxyPullConsumer (TAO_CEC_EventChannel* event_channel); + // constructor... + + virtual ~TAO_CEC_ProxyPullConsumer (void); + // destructor... + + CORBA::Boolean is_connected (void) const; + // Return 0 if no supplier is connected... + + CosEventComm::PullSupplier_ptr supplier (void) const; + // Return the consumer object reference. It returns nil() if it has + // not connected yet. + + CORBA::Any* try_pull_from_supplier (CORBA::Boolean_out has_event, + CORBA::Environment &env); + CORBA::Any* pull_from_supplier (CORBA::Environment &env); + // Pulls from the supplier, verifies that it is connected. + + CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected, + CORBA::Environment &ACE_TRY_ENV); + // Invoke the _non_existent() pseudo-operation on the supplier. If + // it is disconnected then it returns true and sets the + // <disconnected> flag. + + virtual void shutdown (CORBA::Environment&); + // The event channel is shutting down + + CORBA::ULong _incr_refcnt (void); + CORBA::ULong _decr_refcnt (void); + // Increment and decrement the reference count. + + // = The CosEventChannelAdmin::ProxyPullConsumer methods... + virtual void connect_pull_supplier ( + CosEventComm::PullSupplier_ptr pull_supplier, + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException, + CosEventChannelAdmin::AlreadyConnected)); + virtual void disconnect_pull_consumer (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)); + + // = The Servant methods + virtual PortableServer::POA_ptr _default_POA (CORBA::Environment& env); + virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV = + TAO_default_environment ()); + virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV = + TAO_default_environment ()); + +protected: + void supplier (CosEventComm::PullSupplier_ptr supplier); + void supplier_i (CosEventComm::PullSupplier_ptr supplier); + // Set the supplier, used by some implementations to change the + // policies used when invoking operations on the supplier. + + CORBA::Boolean is_connected_i (void) const; + // The private version (without locking) of is_connected(). + + void cleanup_i (void); + // Release the supplier + + void deactivate (CORBA::Environment &ACE_TRY_ENV); + // Deactivate from the POA + +private: + TAO_CEC_EventChannel* event_channel_; + // The supplier admin, used for activation and memory managment. + + ACE_Lock* lock_; + // The locking strategy. + + CORBA::ULong refcount_; + // The reference count. + + CosEventComm::PullSupplier_var supplier_; + // The supplier.... + + PortableServer::POA_var default_POA_; + // Store the default POA. +}; + +#if defined (__ACE_INLINE__) +#include "CEC_ProxyPullConsumer.i" +#endif /* __ACE_INLINE__ */ + +#endif /* TAO_CEC_PROXYPULLCONSUMER_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.i new file mode 100644 index 00000000000..86003baa1c4 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.i @@ -0,0 +1,36 @@ +// $Id$ + +ACE_INLINE CORBA::Boolean +TAO_CEC_ProxyPullConsumer::is_connected_i (void) const +{ + return !CORBA::is_nil (this->supplier_.in ()); +} + +ACE_INLINE CORBA::Boolean +TAO_CEC_ProxyPullConsumer::is_connected (void) const +{ + ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); + + return this->is_connected_i (); +} + +ACE_INLINE CosEventComm::PullSupplier_ptr +TAO_CEC_ProxyPullConsumer::supplier (void) const +{ + ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); + return CosEventComm::PullSupplier::_duplicate (this->supplier_.in ()); +} + +ACE_INLINE void +TAO_CEC_ProxyPullConsumer::supplier_i (CosEventComm::PullSupplier_ptr supplier) +{ + this->supplier_ = supplier; +} + +ACE_INLINE void +TAO_CEC_ProxyPullConsumer::supplier (CosEventComm::PullSupplier_ptr supplier) +{ + ACE_GUARD (ACE_Lock, ace_mon, *this->lock_); + + this->supplier_i (supplier); +} diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp new file mode 100644 index 00000000000..a6f031d8ac1 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp @@ -0,0 +1,327 @@ +// $Id$ + +#include "CEC_ProxyPullSupplier.h" +#include "CEC_Dispatching.h" +#include "CEC_EventChannel.h" + +#if ! defined (__ACE_INLINE__) +#include "CEC_ProxyPullSupplier.i" +#endif /* __ACE_INLINE__ */ + +ACE_RCSID(CosEvent, CEC_ProxyPullSupplier, "$Id$") + +typedef ACE_Reverse_Lock<ACE_Lock> TAO_CEC_Unlock; + +TAO_CEC_ProxyPullSupplier::TAO_CEC_ProxyPullSupplier (TAO_CEC_EventChannel* ec) + : event_channel_ (ec), + refcount_ (1), + wait_not_empty_ (queue_lock_) +{ + this->lock_ = + this->event_channel_->create_supplier_lock (); + + this->default_POA_ = + this->event_channel_->supplier_poa (); +} + +TAO_CEC_ProxyPullSupplier::~TAO_CEC_ProxyPullSupplier (void) +{ + this->event_channel_->destroy_supplier_lock (this->lock_); +} + +void +TAO_CEC_ProxyPullSupplier::shutdown (CORBA::Environment &ACE_TRY_ENV) +{ + // Save the consumer we where connected to, we need to send a + // disconnect message to it. + CosEventComm::PullConsumer_var consumer; + + { + ACE_GUARD_THROW_EX ( + ACE_Lock, ace_mon, *this->lock_, + CORBA::INTERNAL ()); + // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); + ACE_CHECK; + + if (this->is_connected_i () == 0) + return; + + consumer = this->consumer_._retn (); + + this->cleanup_i (); + } + + this->deactivate (ACE_TRY_ENV); + ACE_CHECK; + + this->_decr_refcnt (); + + ACE_TRY + { + consumer->disconnect_pull_consumer (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + // Ignore exceptions, we must isolate other clients from + // problems on this one. + } + ACE_ENDTRY; +} + +CORBA::Boolean +TAO_CEC_ProxyPullSupplier::consumer_non_existent ( + CORBA::Boolean_out disconnected, + CORBA::Environment &ACE_TRY_ENV) +{ + ACE_GUARD_THROW_EX ( + ACE_Lock, ace_mon, *this->lock_, + CORBA::INTERNAL ()); + // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); + ACE_CHECK_RETURN (0); + + disconnected = 0; + if (this->is_connected_i () == 0) + { + disconnected = 1; + return 0; + } + +#if !defined(TAO_HAS_MINIMUM_CORBA) + return this->consumer_->_non_existent (ACE_TRY_ENV); +#else + return 0; +#endif /* TAO_HAS_MINIMUM_CORBA */ +} + +void +TAO_CEC_ProxyPullSupplier::push (const CORBA::Any &event, + CORBA::Environment &) +{ + if (this->is_connected () == 0) + return; + + ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->queue_lock_); + + // Ignore errors + (void) this->queue_.enqueue_tail (event); + + this->wait_not_empty_.signal (); +} + +CORBA::Any * +TAO_CEC_ProxyPullSupplier::pull (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + CosEventComm::Disconnected)) +{ + if (this->is_connected () == 0) + ACE_THROW_RETURN (CosEventComm::Disconnected (), 0); + + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, queue_lock_, 0); + while (this->queue_.is_empty ()) + { + this->wait_not_empty_.wait (); + } + CORBA::Any any; + if (this->queue_.dequeue_head (any) != 0) + { + ACE_THROW_RETURN (CORBA::INTERNAL (), 0); + } + return new CORBA::Any (any); +} + +CORBA::Any * +TAO_CEC_ProxyPullSupplier::try_pull (CORBA::Boolean_out has_event, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)) +{ + if (this->is_connected () == 0) + ACE_THROW_RETURN (CosEventComm::Disconnected (), 0); + + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, queue_lock_, 0); + CORBA::Any any; + if (this->queue_.is_empty ()) + { + any <<= CORBA::Long(0); + has_event = 0; + return new CORBA::Any (any); + } + + if (this->queue_.dequeue_head (any) != 0) + { + ACE_THROW_RETURN (CORBA::INTERNAL (), 0); + } + return new CORBA::Any (any); +} + +void +TAO_CEC_ProxyPullSupplier::cleanup_i (void) +{ + this->consumer_ = + CosEventComm::PullConsumer::_nil (); +} + +void +TAO_CEC_ProxyPullSupplier::deactivate (CORBA::Environment &ACE_TRY_ENV) +{ + PortableServer::POA_var poa = + this->_default_POA (ACE_TRY_ENV); + ACE_CHECK; + PortableServer::ObjectId_var id = + poa->servant_to_id (this, ACE_TRY_ENV); + ACE_CHECK; + poa->deactivate_object (id.in (), ACE_TRY_ENV); + ACE_CHECK; +} + +CORBA::ULong +TAO_CEC_ProxyPullSupplier::_incr_refcnt (void) +{ + ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); + return this->refcount_++; +} + +CORBA::ULong +TAO_CEC_ProxyPullSupplier::_decr_refcnt (void) +{ + { + ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); + this->refcount_--; + if (this->refcount_ != 0) + return this->refcount_; + } + + // Notify the event channel + this->event_channel_->destroy_proxy_pull_supplier (this); + return 0; +} + +void +TAO_CEC_ProxyPullSupplier::connect_pull_consumer ( + CosEventComm::PullConsumer_ptr pull_consumer, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + CosEventChannelAdmin::AlreadyConnected, + CosEventChannelAdmin::TypeError)) +{ + { + ACE_GUARD_THROW_EX ( + ACE_Lock, ace_mon, *this->lock_, + CORBA::INTERNAL ()); + // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); + ACE_CHECK; + + if (this->is_connected_i ()) + { + if (this->event_channel_->consumer_reconnect () == 0) + ACE_THROW (CosEventChannelAdmin::AlreadyConnected ()); + + // Re-connections are allowed.... + this->cleanup_i (); + + this->consumer_ = + CosEventComm::PullConsumer::_duplicate (pull_consumer); + + TAO_CEC_Unlock reverse_lock (*this->lock_); + + { + ACE_GUARD_THROW_EX ( + TAO_CEC_Unlock, ace_mon, reverse_lock, + CORBA::INTERNAL ()); + // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); + ACE_CHECK; + + this->event_channel_->reconnected (this, ACE_TRY_ENV); + ACE_CHECK; + } + return; + } + + this->consumer_ = + CosEventComm::PullConsumer::_duplicate (pull_consumer); + } + + // Notify the event channel... + this->event_channel_->connected (this, ACE_TRY_ENV); +} + +void +TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier ( + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + CosEventComm::PullConsumer_var consumer; + + { + ACE_GUARD_THROW_EX ( + ACE_Lock, ace_mon, *this->lock_, + CORBA::INTERNAL ()); + // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); + ACE_CHECK; + + if (this->is_connected_i () == 0) + ACE_THROW (CORBA::BAD_INV_ORDER ()); + + consumer = this->consumer_._retn (); + + this->cleanup_i (); + } + + this->deactivate (ACE_TRY_ENV); + ACE_CHECK; + + // Notify the event channel.... + this->event_channel_->disconnected (this, ACE_TRY_ENV); + ACE_CHECK; + + if (this->event_channel_->disconnect_callbacks ()) + { + ACE_TRY + { + consumer->disconnect_pull_consumer (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + // Ignore exceptions, we must isolate other clients from + // problems on this one. + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "ProxySupplier::disconnect_pull_supplier"); + } + ACE_ENDTRY; + } + + this->_decr_refcnt (); +} + +PortableServer::POA_ptr +TAO_CEC_ProxyPullSupplier::_default_POA (CORBA::Environment&) +{ + return PortableServer::POA::_duplicate (this->default_POA_.in ()); +} + +void +TAO_CEC_ProxyPullSupplier::_add_ref (CORBA::Environment &) +{ + this->_incr_refcnt (); +} + +void +TAO_CEC_ProxyPullSupplier::_remove_ref (CORBA::Environment &) +{ + this->_decr_refcnt (); +} + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +template class ACE_Unbounded_Queue<CORBA_Any>; +template class ACE_Node<CORBA_Any>; +template class ACE_Unbounded_Queue_Iterator<CORBA_Any>; + +#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +#pragma instantiate ACE_Unbounded_Queue<CORBA_Any> +#pragma instantiate ACE_Node<CORBA_Any> +#pragma instantiate ACE_Unbounded_Queue_Iterator<CORBA_Any> + +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h new file mode 100644 index 00000000000..9d177c6f4e1 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h @@ -0,0 +1,145 @@ +/* -*- C++ -*- */ +// $Id$ +// +// ============================================================================ +// +// = LIBRARY +// ORBSVCS Cos Event Channel +// +// = FILENAME +// CEC_ProxyPushSupplier +// +// = AUTHOR +// Carlos O'Ryan (coryan@cs.wustl.edu) +// +// ============================================================================ + +#ifndef TAO_CEC_PROXYPULLSUPPLIER_H +#define TAO_CEC_PROXYPULLSUPPLIER_H + +#include "orbsvcs/CosEventChannelAdminS.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "ace/Message_Queue.h" + +class TAO_CEC_EventChannel; +class TAO_CEC_ProxyPullConsumer; + +class TAO_ORBSVCS_Export TAO_CEC_ProxyPullSupplier : public POA_CosEventChannelAdmin::ProxyPullSupplier +{ + // = TITLE + // ProxyPullSupplier + // + // = DESCRIPTION + // Implement the CosEventChannelAdmin::ProxyPullSupplier interface, + // remember that this class is used to communicate with a + // PullConsumer, so, in effect, this is the ambassador for a + // consumer inside the event channel. + // + // = MEMORY MANAGMENT + // It does not assume ownership of the TAO_CEC_Dispatching object. + // It makes a copy of the ConsumerQOS and the consumer object + // reference. + // + // = LOCKING + // Locking is strategized, the event channel acts as a factory for + // the locking strategies. + // +public: + TAO_CEC_ProxyPullSupplier (TAO_CEC_EventChannel* event_channel); + // constructor... + + virtual ~TAO_CEC_ProxyPullSupplier (void); + // destructor... + + CORBA::Boolean is_connected (void) const; + // Return 0 if no consumer is connected... + + CosEventComm::PullConsumer_ptr consumer (void) const; + // Return the consumer object reference. It returns nil() if it has + // not connected yet. + // NOTE: This method does not return a new reference!!! Doing so + // will increase the locking overhead on the critical path. + + virtual void shutdown (CORBA::Environment &env); + // The event channel is shutting down + + CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected, + CORBA::Environment &ACE_TRY_ENV); + // Invoke the _non_existent() pseudo-operation on the consumer. If + // it is disconnected then it returns true and sets the + // <disconnected> flag. + + void push (const CORBA::Any &event, + CORBA::Environment &ACE_TRY_ENV); + // Push an event into the queue. + + // = The CosEventChannelAdmin::ProxyPullSupplier methods... + virtual void connect_pull_consumer ( + CosEventComm::PullConsumer_ptr pull_consumer, + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException, + CosEventChannelAdmin::AlreadyConnected, + CosEventChannelAdmin::TypeError)); + virtual CORBA::Any * pull (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)); + virtual CORBA::Any * try_pull (CORBA::Boolean_out has_event, + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)); + virtual void disconnect_pull_supplier (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)); + + CORBA::ULong _incr_refcnt (void); + CORBA::ULong _decr_refcnt (void); + // Increment and decrement the reference count. + + // = The Servant methods + virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env); + virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV); + virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV); + +protected: + void consumer (CosEventComm::PullConsumer_ptr consumer); + void consumer_i (CosEventComm::PullConsumer_ptr consumer); + // Set the consumer, used by some implementations to change the + // policies used when invoking operations on the consumer. + + CORBA::Boolean is_connected_i (void) const; + // The private version (without locking) of is_connected(). + + void cleanup_i (void); + // Release the child and the consumer + + void deactivate (CORBA::Environment &ACE_TRY_ENV); + // Deactivate from the POA + +private: + TAO_CEC_EventChannel* event_channel_; + // The Event Channel that owns this object. + + ACE_Lock* lock_; + // The locking strategy. + + CORBA::ULong refcount_; + // The reference count. + + CosEventComm::PullConsumer_var consumer_; + // The consumer.... + + PortableServer::POA_var default_POA_; + // Store the default POA. + + ACE_SYNCH_MUTEX queue_lock_; + ACE_SYNCH_CONDITION wait_not_empty_; + ACE_Unbounded_Queue<CORBA::Any> queue_; + // Use a message queue to pass the +}; + +#if defined (__ACE_INLINE__) +#include "CEC_ProxyPullSupplier.i" +#endif /* __ACE_INLINE__ */ + +#endif /* TAO_CEC_PROXYPULLSUPPLIER_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.i new file mode 100644 index 00000000000..b7e3149b18d --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.i @@ -0,0 +1,37 @@ +// $Id$ + +ACE_INLINE CORBA::Boolean +TAO_CEC_ProxyPullSupplier::is_connected_i (void) const +{ + return !CORBA::is_nil (this->consumer_.in ()); +} + +ACE_INLINE CORBA::Boolean +TAO_CEC_ProxyPullSupplier::is_connected (void) const +{ + ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); + + return this->is_connected_i (); +} + +ACE_INLINE CosEventComm::PullConsumer_ptr +TAO_CEC_ProxyPullSupplier::consumer (void) const +{ + ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); + + return this->consumer_.in (); +} + +ACE_INLINE void +TAO_CEC_ProxyPullSupplier::consumer_i (CosEventComm::PullConsumer_ptr consumer) +{ + this->consumer_ = consumer; +} + +ACE_INLINE void +TAO_CEC_ProxyPullSupplier::consumer (CosEventComm::PullConsumer_ptr consumer) +{ + ACE_GUARD (ACE_Lock, ace_mon, *this->lock_); + + this->consumer_i (consumer); +} diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp index 4c64abd3a13..cb0cc1f2df1 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp @@ -56,42 +56,6 @@ TAO_CEC_ProxyPushConsumer::supplier_non_existent ( } void -TAO_CEC_ProxyPushConsumer::connected (TAO_CEC_ProxyPushSupplier*, - CORBA::Environment &) -{ -} - -void -TAO_CEC_ProxyPushConsumer::reconnected (TAO_CEC_ProxyPushSupplier*, - CORBA::Environment &) -{ -} - -void -TAO_CEC_ProxyPushConsumer::disconnected (TAO_CEC_ProxyPushSupplier*, - CORBA::Environment &) -{ -} - -void -TAO_CEC_ProxyPushConsumer::connected (TAO_CEC_ProxyPushConsumer*, - CORBA::Environment &) -{ -} - -void -TAO_CEC_ProxyPushConsumer::reconnected (TAO_CEC_ProxyPushConsumer*, - CORBA::Environment &) -{ -} - -void -TAO_CEC_ProxyPushConsumer::disconnected (TAO_CEC_ProxyPushConsumer*, - CORBA::Environment &) -{ -} - -void TAO_CEC_ProxyPushConsumer::shutdown (CORBA::Environment &ACE_TRY_ENV) { CosEventComm::PushSupplier_var supplier; @@ -242,15 +206,9 @@ TAO_CEC_ProxyPushConsumer::push (const CORBA::Any& event, this->refcount_++; } - TAO_CEC_Push_Event worker (event); - - this->event_channel_->consumer_admin ()->for_each (&worker, - ACE_TRY_ENV); + this->event_channel_->consumer_admin ()->push (event, + ACE_TRY_ENV); ACE_CHECK; - // @@ Push to the EC that in turn pushes to the ConsumerAdmin and to - // each supplier Proxy. - // filter->push (event, ACE_TRY_ENV); - // ACE_CHECK; { ACE_GUARD_THROW_EX ( @@ -329,12 +287,3 @@ TAO_CEC_ProxyPushConsumer::_remove_ref (CORBA::Environment &) { this->_decr_refcnt (); } - -// **************************************************************** - -void -TAO_CEC_Push_Event::work (TAO_CEC_ProxyPushSupplier *supplier, - CORBA::Environment &ACE_TRY_ENV) -{ - supplier->push (this->event_, ACE_TRY_ENV); -} diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h index d8fa406da41..2a12b5a4110 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h @@ -64,24 +64,6 @@ public: // it is disconnected then it returns true and sets the // <disconnected> flag. - virtual void connected (TAO_CEC_ProxyPushSupplier* supplier, - CORBA::Environment &env); - virtual void reconnected (TAO_CEC_ProxyPushSupplier* supplier, - CORBA::Environment &env); - virtual void disconnected (TAO_CEC_ProxyPushSupplier* supplier, - CORBA::Environment &env); - // Concrete implementations can use this methods to keep track of - // the consumers interested in these events. - - virtual void connected (TAO_CEC_ProxyPushConsumer* consumer, - CORBA::Environment &env); - virtual void reconnected (TAO_CEC_ProxyPushConsumer* consumer, - CORBA::Environment &env); - virtual void disconnected (TAO_CEC_ProxyPushConsumer* consumer, - CORBA::Environment &env); - // Usually implemented as no-ops, but some configurations may - // require these methods. - virtual void shutdown (CORBA::Environment&); // The event channel is shutting down @@ -140,21 +122,6 @@ private: // Store the default POA. }; -// **************************************************************** - -class TAO_CEC_Push_Event : public TAO_EC_Worker<TAO_CEC_ProxyPushSupplier> -{ -public: - TAO_CEC_Push_Event (const CORBA::Any& event); - - void work (TAO_CEC_ProxyPushSupplier *supplier, - CORBA::Environment &ACE_TRY_ENV); - -private: - CORBA::Any event_; - // The event -}; - #if defined (__ACE_INLINE__) #include "CEC_ProxyPushConsumer.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.i index fcabc4e0377..b6b7f318acc 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.i @@ -34,11 +34,3 @@ TAO_CEC_ProxyPushConsumer::supplier (CosEventComm::PushSupplier_ptr supplier) this->supplier_i (supplier); } - -// **************************************************************** - -ACE_INLINE -TAO_CEC_Push_Event::TAO_CEC_Push_Event (const CORBA::Any& event) - : event_ (event) -{ -} diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp index 61f0c25f80e..6b9f603e3f9 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp @@ -29,42 +29,6 @@ TAO_CEC_ProxyPushSupplier::~TAO_CEC_ProxyPushSupplier (void) } void -TAO_CEC_ProxyPushSupplier::connected (TAO_CEC_ProxyPushConsumer*, - CORBA::Environment &) -{ -} - -void -TAO_CEC_ProxyPushSupplier::reconnected (TAO_CEC_ProxyPushConsumer*, - CORBA::Environment &) -{ -} - -void -TAO_CEC_ProxyPushSupplier::disconnected (TAO_CEC_ProxyPushConsumer*, - CORBA::Environment &) -{ -} - -void -TAO_CEC_ProxyPushSupplier::connected (TAO_CEC_ProxyPushSupplier*, - CORBA::Environment &) -{ -} - -void -TAO_CEC_ProxyPushSupplier::reconnected (TAO_CEC_ProxyPushSupplier*, - CORBA::Environment &) -{ -} - -void -TAO_CEC_ProxyPushSupplier::disconnected (TAO_CEC_ProxyPushSupplier*, - CORBA::Environment &) -{ -} - -void TAO_CEC_ProxyPushSupplier::shutdown (CORBA::Environment &ACE_TRY_ENV) { // Save the consumer we where connected to, we need to send a diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h index 81ba16e874e..f3e4e7c51d6 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h @@ -62,24 +62,6 @@ public: // NOTE: This method does not return a new reference!!! Doing so // will increase the locking overhead on the critical path. - virtual void connected (TAO_CEC_ProxyPushConsumer *consumer, - CORBA::Environment &env); - virtual void reconnected (TAO_CEC_ProxyPushConsumer *consumer, - CORBA::Environment &env); - virtual void disconnected (TAO_CEC_ProxyPushConsumer *consumer, - CORBA::Environment &env); - // Concrete implementations can use this methods to keep track of - // the suppliers that publish its events. - - virtual void connected (TAO_CEC_ProxyPushSupplier *supplier, - CORBA::Environment &env); - virtual void reconnected (TAO_CEC_ProxyPushSupplier *supplier, - CORBA::Environment &env); - virtual void disconnected (TAO_CEC_ProxyPushSupplier *supplier, - CORBA::Environment &env); - // Usually implemented as no-ops, but some configurations may - // require this methods. - virtual void shutdown (CORBA::Environment &env); // The event channel is shutting down diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp new file mode 100644 index 00000000000..0a84bf5f77c --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp @@ -0,0 +1,13 @@ +// $Id$ + +#include "CEC_Pulling_Strategy.h" + +#if ! defined (__ACE_INLINE__) +#include "CEC_Pulling_Strategy.i" +#endif /* __ACE_INLINE__ */ + +ACE_RCSID(CosEvent, CEC_Pulling_Strategy, "$Id$") + +TAO_CEC_Pulling_Strategy::~TAO_CEC_Pulling_Strategy (void) +{ +} diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h new file mode 100644 index 00000000000..b00a4cd2cf6 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h @@ -0,0 +1,68 @@ +/* -*- C++ -*- */ +// $Id$ +// +// ============================================================================ +// +// = LIBRARY +// ORBSVCS Cos Event Channel +// +// = FILENAME +// CEC_Pulling_Strategy +// +// = AUTHOR +// Carlos O'Ryan (coryan@cs.wustl.edu) +// +// = CREDITS +// +// ============================================================================ + +#ifndef TAO_CEC_PULLING_STRATEGY_H +#define TAO_CEC_PULLING_STRATEGY_H + +#include "orbsvcs/orbsvcs_export.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +class TAO_ORBSVCS_Export TAO_CEC_Pulling_Strategy +{ + // = TITLE + // Define the interface for the pulling strategies. + // + // = DESCRIPTION + // The EC may be configured with different pulling strategies, + // for instance, it can use a pool of threads to dispatch the + // events, or a set of queues with threads at different priorities + // for each queue or can simply push the event to the consumer in + // FIFO order. + // +public: + virtual ~TAO_CEC_Pulling_Strategy (void); + // destructor... + + virtual void activate (void) = 0; + // Initialize all the data structures, activate any internal threads, + // etc. + + virtual void shutdown (void) = 0; + // Deactivate any internal threads and cleanup internal data + // structures, it should only return once the threads have finished + // their jobs. + +#if 0 + virtual void connected (TAO_CEC_ProxyPullConsumer *, + CORBA::Environment &) = 0; + virtual void reconnected (TAO_CEC_ProxyPullConsumer *, + CORBA::Environment &) = 0; + virtual void diconnected (TAO_CEC_ProxyPullConsumer *, + CORBA::Environment &) = 0; + // Some strategies may want to keep track of connected consumers. +#endif /* 0 */ +}; + +#if defined (__ACE_INLINE__) +#include "CEC_Pulling_Strategy.i" +#endif /* __ACE_INLINE__ */ + +#endif /* TAO_CEC_PULLING_STRATEGY_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.i new file mode 100644 index 00000000000..cfa1da318d3 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.i @@ -0,0 +1 @@ +// $Id$ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp new file mode 100644 index 00000000000..095f1294357 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp @@ -0,0 +1,199 @@ +// $Id$ + +#include "CEC_Reactive_Pulling_Strategy.h" +#include "CEC_ProxyPullConsumer.h" +#include "CEC_EventChannel.h" +#include "CEC_SupplierAdmin.h" +#include "CEC_ConsumerAdmin.h" + +#if ! defined (__ACE_INLINE__) +#include "CEC_Reactive_Pulling_Strategy.i" +#endif /* __ACE_INLINE__ */ + +ACE_RCSID(CosEvent, CEC_Reactive_Pulling_Strategy, "$Id$") + +TAO_CEC_Reactive_Pulling_Strategy:: + TAO_CEC_Reactive_Pulling_Strategy (const ACE_Time_Value &rate, + TAO_CEC_EventChannel *event_channel, + CORBA::ORB_ptr orb) + : adapter_ (this), + rate_ (rate), + event_channel_ (event_channel), + orb_ (CORBA::ORB::_duplicate (orb)) +{ + this->reactor_ = + this->orb_->orb_core ()->reactor (); +} + +void +TAO_CEC_Reactive_Pulling_Strategy::handle_timeout ( + const ACE_Time_Value &, + const void *) +{ + ACE_TRY_NEW_ENV + { + // Query the state of the Current object *before* we initiate + // the iteration... + CORBA::PolicyTypeSeq types; + CORBA::PolicyList_var policies = + this->policy_current_->get_policy_overrides (types, + ACE_TRY_ENV); + ACE_TRY_CHECK; + + // Change the timeout + this->policy_current_->set_policy_overrides (this->policy_list_, + CORBA::ADD_OVERRIDE, + ACE_TRY_ENV); + ACE_TRY_CHECK; + + ACE_DEBUG ((LM_DEBUG, + "CEC - start iteration in pulling strategy\n")); + TAO_CEC_Pull_Event worker (this->event_channel_->consumer_admin (), + this->event_channel_->supplier_control ()); + + this->event_channel_->supplier_admin ()->for_each (&worker, + ACE_TRY_ENV); + ACE_TRY_CHECK; + + this->policy_current_->set_policy_overrides (policies.in (), + CORBA::SET_OVERRIDE, + ACE_TRY_ENV); + ACE_TRY_CHECK; + for (CORBA::ULong i = 0; i != policies->length (); ++i) + { + policies[i]->destroy (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + } + ACE_CATCHANY + { + // Ignore all exceptions + } + ACE_ENDTRY; +} + +void +TAO_CEC_Reactive_Pulling_Strategy::activate (void) +{ +#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 + long id = this->reactor_->schedule_timer (&this->adapter_, + 0, + this->rate_, + this->rate_); + if (id == -1) + return; + + ACE_TRY_NEW_ENV + { + // Get the PolicyCurrent object + CORBA::Object_var tmp = + this->orb_->resolve_initial_references ("PolicyCurrent", + ACE_TRY_ENV); + ACE_TRY_CHECK; + + this->policy_current_ = + CORBA::PolicyCurrent::_narrow (tmp.in (), + ACE_TRY_ENV); + ACE_TRY_CHECK; + + // Pre-compute the policy list to the set the right timeout + // value... + // @@ TODO It is currently hard-coded to 10 milliseconds + TimeBase::TimeT timeout = 10 * 10000; + CORBA::Any any; + any <<= timeout; + + this->policy_list_.length (1); + this->policy_list_[0] = + this->orb_->create_policy ( + Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, + any, + ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + } + ACE_ENDTRY; +#endif /* TAO_HAS_CORBA_MESSAGING */ +} + +void +TAO_CEC_Reactive_Pulling_Strategy::shutdown (void) +{ + this->reactor_->remove_handler (&this->adapter_, + ACE_Event_Handler::DONT_CALL); +} + +// **************************************************************** + +TAO_CEC_Pulling_Strategy_Adapter::TAO_CEC_Pulling_Strategy_Adapter ( + TAO_CEC_Reactive_Pulling_Strategy *adaptee) + : adaptee_ (adaptee) +{ +} + +int +TAO_CEC_Pulling_Strategy_Adapter::handle_timeout ( + const ACE_Time_Value &tv, + const void *arg) +{ + ACE_DEBUG ((LM_DEBUG, + "CEC - handle_timeout in Adapter\n")); + this->adaptee_->handle_timeout (tv, arg); + return 0; +} + +// **************************************************************** + +void +TAO_CEC_Pull_Event::work (TAO_CEC_ProxyPullConsumer *consumer, + CORBA::Environment &ACE_TRY_ENV) +{ + CORBA::Boolean has_event = 0; + CORBA::Any_var any; + + ACE_TRY + { + ACE_DEBUG ((LM_DEBUG, + "CEC - Pulling event from %x\n", + long(consumer))); + any = consumer->try_pull_from_supplier (has_event, + ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) + { + // @@ this->supplier_control_->supplier_not_exist (consumer, ACE_TRY_ENV); + // @@ ACE_TRY_CHECK; + } + ACE_CATCH (CORBA::TRANSIENT, transient) + { + // This is TAO's minor code for a failed connection, we may + // want to be more lenient in the future.. + // if (transient.minor () == 0x54410085) + // @@ this->control_->supplier_not_exist (consumer, ACE_TRY_ENV); + // @@ ACE_TRY_CHECK; + } + ACE_CATCHANY + { + // Ignore all exceptions + return; + } + ACE_ENDTRY; + + if (has_event) + { + ACE_DEBUG ((LM_DEBUG, + " CEC - pushing the event from %x\n", + long(consumer))); + this->consumer_admin_->push (any.in (), ACE_TRY_ENV); + ACE_CHECK; + } +} + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h new file mode 100644 index 00000000000..0be120a82fb --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h @@ -0,0 +1,132 @@ +/* -*- C++ -*- */ +// $Id$ +// +// ============================================================================ +// +// = LIBRARY +// ORBSVCS Cos Event Channel +// +// = FILENAME +// CEC_Reactive_Pulling_Strategy +// +// = AUTHOR +// Carlos O'Ryan (coryan@cs.wustl.edu) +// +// = CREDITS +// +// ============================================================================ + +#ifndef TAO_CEC_REACTIVE_PULLING_STRATEGY_H +#define TAO_CEC_REACTIVE_PULLING_STRATEGY_H + +#include "CEC_Pulling_Strategy.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "orbsvcs/Event/EC_Worker.h" +#include "tao/corba.h" + +class TAO_CEC_ProxyPullConsumer; +class TAO_CEC_EventChannel; +class TAO_CEC_ConsumerAdmin; +class TAO_CEC_SupplierControl; +class TAO_CEC_Reactive_Pulling_Strategy; + +class TAO_ORBSVCS_Export TAO_CEC_Pulling_Strategy_Adapter : public ACE_Event_Handler +{ + // = TITLE + // Forwards timeout events to the Reactive Pulling Strategy + // + // = DESCRIPTION + // The Reactive Pulling Strategy strategy uses the reactor to + // periodically wakeup and try top pull events from each + // PullSupplier connected to the EventChannel. + // +public: + TAO_CEC_Pulling_Strategy_Adapter (TAO_CEC_Reactive_Pulling_Strategy *adaptee); + // Constructor + + // = Documented in ACE_Event_Handler. + virtual int handle_timeout (const ACE_Time_Value &tv, + const void *arg = 0); + +private: + TAO_CEC_Reactive_Pulling_Strategy *adaptee_; + // The adapted object +}; + +// **************************************************************** + +class TAO_ORBSVCS_Export TAO_CEC_Reactive_Pulling_Strategy : public TAO_CEC_Pulling_Strategy +{ + // = TITLE + // Dispatch using the caller thread. + // + // = DESCRIPTION + // The events are dispatched in FIFO ordering, using the invoking + // thread to push the event to the consumer. + // +public: + TAO_CEC_Reactive_Pulling_Strategy (const ACE_Time_Value &rate, + TAO_CEC_EventChannel *event_channel, + CORBA::ORB_ptr orb); + // The scheduler is used to find the range of priorities and similar + // info. + + void handle_timeout (const ACE_Time_Value &tv, + const void* arg); + // Receive the timeout from the adapter + + // = The CEC_Pulling_Strategy methods. + virtual void activate (void); + virtual void shutdown (void); + +private: + TAO_CEC_Pulling_Strategy_Adapter adapter_; + // The Adapter for the reactor events + + ACE_Time_Value rate_; + // The polling rate + + TAO_CEC_EventChannel *event_channel_; + // The event channel + + CORBA::ORB_var orb_; + // The ORB + + CORBA::PolicyCurrent_var policy_current_; + // To control the timeout policy in the thread + + CORBA::PolicyList policy_list_; + // Precomputed policy list to the set timeout. + + ACE_Reactor *reactor_; + // The ORB reactor +}; + +// **************************************************************** + +class TAO_CEC_Pull_Event : public TAO_EC_Worker<TAO_CEC_ProxyPullConsumer> +{ +public: + TAO_CEC_Pull_Event (TAO_CEC_ConsumerAdmin *consumer_admin, + TAO_CEC_SupplierControl *control); + + virtual void work (TAO_CEC_ProxyPullConsumer *consumer, + CORBA::Environment &ACE_TRY_ENV); + +private: + TAO_CEC_ConsumerAdmin *consumer_admin_; + // Used to propagate the events. + + TAO_CEC_SupplierControl *supplier_control_; + // To report failed or dead suppliers +}; + +#if defined (__ACE_INLINE__) +#include "CEC_Reactive_Pulling_Strategy.i" +#endif /* __ACE_INLINE__ */ + +#endif /* TAO_CEC_REACTIVE_PULLING_STRATEGY_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i new file mode 100644 index 00000000000..729db4ab9f8 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i @@ -0,0 +1,9 @@ +// $Id$ + +ACE_INLINE +TAO_CEC_Pull_Event::TAO_CEC_Pull_Event (TAO_CEC_ConsumerAdmin *consumer_admin, + TAO_CEC_SupplierControl *control) + : consumer_admin_ (consumer_admin), + supplier_control_ (control) +{ +} diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp index 3fe30fde810..e66f58ab334 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp @@ -2,7 +2,7 @@ #include "CEC_SupplierAdmin.h" #include "CEC_ProxyPushConsumer.h" -#include "CEC_ProxyPushSupplier.h" +#include "CEC_ProxyPullConsumer.h" #include "CEC_EventChannel.h" #if ! defined (__ACE_INLINE__) @@ -14,9 +14,12 @@ ACE_RCSID(CosEvent, CEC_SupplierAdmin, "$Id$") TAO_CEC_SupplierAdmin::TAO_CEC_SupplierAdmin (TAO_CEC_EventChannel *ec) : event_channel_ (ec) { - this->collection_ = + this->push_collection_ = this->event_channel_->create_proxy_push_consumer_collection (); + this->pull_collection_ = + this->event_channel_->create_proxy_pull_consumer_collection (); + // @@ // @@ this->collection_->busy_hwm (this->event_channel_->busy_hwm ()); // @@ this->collection_->max_write_delay ( @@ -29,8 +32,11 @@ TAO_CEC_SupplierAdmin::TAO_CEC_SupplierAdmin (TAO_CEC_EventChannel *ec) TAO_CEC_SupplierAdmin::~TAO_CEC_SupplierAdmin (void) { - this->event_channel_->destroy_proxy_push_consumer_collection (this->collection_); - this->collection_ = 0; + this->event_channel_->destroy_proxy_push_consumer_collection (this->push_collection_); + this->push_collection_ = 0; + + this->event_channel_->destroy_proxy_pull_consumer_collection (this->pull_collection_); + this->pull_collection_ = 0; } PortableServer::POA_ptr @@ -40,57 +46,63 @@ TAO_CEC_SupplierAdmin::_default_POA (CORBA::Environment&) } void -TAO_CEC_SupplierAdmin::connected (TAO_CEC_ProxyPushSupplier *supplier, +TAO_CEC_SupplierAdmin::connected (TAO_CEC_ProxyPushConsumer *consumer, CORBA::Environment &ACE_TRY_ENV) { - TAO_CEC_Connect_Supplier worker (supplier); - this->collection_->for_each (&worker, ACE_TRY_ENV); + this->push_collection_->connected (consumer, ACE_TRY_ENV); } void -TAO_CEC_SupplierAdmin::reconnected (TAO_CEC_ProxyPushSupplier *supplier, +TAO_CEC_SupplierAdmin::reconnected (TAO_CEC_ProxyPushConsumer *consumer, CORBA::Environment &ACE_TRY_ENV) { - TAO_CEC_Reconnect_Supplier worker (supplier); - this->collection_->for_each (&worker, ACE_TRY_ENV); + this->push_collection_->reconnected (consumer, ACE_TRY_ENV); } void -TAO_CEC_SupplierAdmin::disconnected (TAO_CEC_ProxyPushSupplier *supplier, +TAO_CEC_SupplierAdmin::disconnected (TAO_CEC_ProxyPushConsumer *consumer, CORBA::Environment &ACE_TRY_ENV) { - TAO_CEC_Disconnect_Supplier worker (supplier); - this->collection_->for_each (&worker, ACE_TRY_ENV); + this->push_collection_->disconnected (consumer, ACE_TRY_ENV); } void -TAO_CEC_SupplierAdmin::connected (TAO_CEC_ProxyPushConsumer *consumer, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_SupplierAdmin::connected (TAO_CEC_ProxyPullConsumer *consumer, + CORBA::Environment &ACE_TRY_ENV) { - this->collection_->connected (consumer, ACE_TRY_ENV); + this->pull_collection_->connected (consumer, ACE_TRY_ENV); } void -TAO_CEC_SupplierAdmin::reconnected (TAO_CEC_ProxyPushConsumer *consumer, +TAO_CEC_SupplierAdmin::reconnected (TAO_CEC_ProxyPullConsumer *consumer, CORBA::Environment &ACE_TRY_ENV) { - this->collection_->reconnected (consumer, ACE_TRY_ENV); + this->pull_collection_->reconnected (consumer, ACE_TRY_ENV); } void -TAO_CEC_SupplierAdmin::disconnected (TAO_CEC_ProxyPushConsumer *consumer, +TAO_CEC_SupplierAdmin::disconnected (TAO_CEC_ProxyPullConsumer *consumer, CORBA::Environment &ACE_TRY_ENV) { - this->collection_->disconnected (consumer, ACE_TRY_ENV); + this->pull_collection_->disconnected (consumer, ACE_TRY_ENV); } void TAO_CEC_SupplierAdmin::shutdown (CORBA::Environment &ACE_TRY_ENV) { - TAO_CEC_Shutdown_Consumer worker; + TAO_CEC_Shutdown_Push_Consumer push_worker; + + this->push_collection_->for_each (&push_worker, ACE_TRY_ENV); + ACE_CHECK; + this->push_collection_->shutdown (ACE_TRY_ENV); + ACE_CHECK; - this->collection_->for_each (&worker, ACE_TRY_ENV); - this->collection_->shutdown (ACE_TRY_ENV); + TAO_CEC_Shutdown_Pull_Consumer pull_worker; + + this->pull_collection_->for_each (&pull_worker, ACE_TRY_ENV); + ACE_CHECK; + this->pull_collection_->shutdown (ACE_TRY_ENV); + ACE_CHECK; } CosEventChannelAdmin::ProxyPushConsumer_ptr @@ -104,54 +116,38 @@ TAO_CEC_SupplierAdmin::obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV) } CosEventChannelAdmin::ProxyPullConsumer_ptr -TAO_CEC_SupplierAdmin::obtain_pull_consumer (CORBA::Environment &) +TAO_CEC_SupplierAdmin::obtain_pull_consumer (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - // @@ - return CosEventChannelAdmin::ProxyPullConsumer::_nil (); -} - -// **************************************************************** + TAO_CEC_ProxyPullConsumer *consumer = + this->event_channel_->create_proxy_pull_consumer (); -void -TAO_CEC_Connect_Supplier::work (TAO_CEC_ProxyPushConsumer *consumer, - CORBA::Environment &ACE_TRY_ENV) -{ - consumer->connected (this->supplier_, ACE_TRY_ENV); - ACE_CHECK; - this->supplier_->connected (consumer, ACE_TRY_ENV); - ACE_CHECK; -} - -// **************************************************************** - -void -TAO_CEC_Reconnect_Supplier::work (TAO_CEC_ProxyPushConsumer *consumer, - CORBA::Environment &ACE_TRY_ENV) -{ - consumer->reconnected (this->supplier_, ACE_TRY_ENV); - ACE_CHECK; - this->supplier_->reconnected (consumer, ACE_TRY_ENV); - ACE_CHECK; + return consumer->_this (ACE_TRY_ENV); } // **************************************************************** void -TAO_CEC_Disconnect_Supplier::work (TAO_CEC_ProxyPushConsumer *consumer, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_Shutdown_Push_Consumer::work (TAO_CEC_ProxyPushConsumer *consumer, + CORBA::Environment &ACE_TRY_ENV) { - consumer->disconnected (this->supplier_, ACE_TRY_ENV); - ACE_CHECK; - this->supplier_->disconnected (consumer, ACE_TRY_ENV); - ACE_CHECK; + ACE_TRY + { + consumer->shutdown (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + // Ignore exceptions + } + ACE_ENDTRY; } // **************************************************************** void -TAO_CEC_Shutdown_Consumer::work (TAO_CEC_ProxyPushConsumer *consumer, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_Shutdown_Pull_Consumer::work (TAO_CEC_ProxyPullConsumer *consumer, + CORBA::Environment &ACE_TRY_ENV) { ACE_TRY { @@ -165,12 +161,16 @@ TAO_CEC_Shutdown_Consumer::work (TAO_CEC_ProxyPushConsumer *consumer, ACE_ENDTRY; } +// **************************************************************** + #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class TAO_EC_Worker<TAO_CEC_ProxyPushConsumer>; +template class TAO_EC_Worker<TAO_CEC_ProxyPullConsumer>; #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate TAO_EC_Worker<TAO_CEC_ProxyPushConsumer> +#pragma instantiate TAO_EC_Worker<TAO_CEC_ProxyPullConsumer> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h index b69d3cd92f7..b9469c63e14 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h @@ -35,8 +35,8 @@ #include "orbsvcs/Event/EC_Worker.h" class TAO_CEC_EventChannel; -class TAO_CEC_ProxyPushSupplier; class TAO_CEC_ProxyPushConsumer; +class TAO_CEC_ProxyPullConsumer; class TAO_ORBSVCS_Export TAO_CEC_SupplierAdmin : public POA_CosEventChannelAdmin::SupplierAdmin { @@ -69,23 +69,23 @@ public: CORBA::Environment &ACE_TRY_ENV); // For each elements call <worker->work()>. + void for_each (TAO_EC_Worker<TAO_CEC_ProxyPullConsumer> *worker, + CORBA::Environment &ACE_TRY_ENV); + // For each elements call <worker->work()>. + virtual void connected (TAO_CEC_ProxyPushConsumer*, CORBA::Environment&); virtual void reconnected (TAO_CEC_ProxyPushConsumer*, CORBA::Environment&); virtual void disconnected (TAO_CEC_ProxyPushConsumer*, CORBA::Environment&); - // Used to inform the EC that a Consumer has connected or - // disconnected from it. - - virtual void connected (TAO_CEC_ProxyPushSupplier*, + virtual void connected (TAO_CEC_ProxyPullConsumer*, CORBA::Environment&); - virtual void reconnected (TAO_CEC_ProxyPushSupplier*, + virtual void reconnected (TAO_CEC_ProxyPullConsumer*, CORBA::Environment&); - virtual void disconnected (TAO_CEC_ProxyPushSupplier*, + virtual void disconnected (TAO_CEC_ProxyPullConsumer*, CORBA::Environment&); - // Used to inform the EC that a Supplier has connected or - // disconnected from it. + // Keep track of connected consumers. virtual void shutdown (CORBA::Environment&); // The event channel is shutting down, inform all the consumers of @@ -106,89 +106,39 @@ private: TAO_CEC_EventChannel *event_channel_; // The Event Channel we belong to - typedef TAO_EC_Proxy_Collection<TAO_CEC_ProxyPushConsumer> Collection; + typedef TAO_EC_Proxy_Collection<TAO_CEC_ProxyPushConsumer> PushCollection; - Collection *collection_; + PushCollection *push_collection_; // The consumer container - PortableServer::POA_var default_POA_; - // Store the default POA. -}; - -// **************************************************************** - -class TAO_CEC_Connect_Supplier : public TAO_EC_Worker<TAO_CEC_ProxyPushConsumer> -{ - // = TITLE - // TAO_CEC_Connect_Supplier - // - // = DESCRIPTION - // Worker class to connect the ProxyPushConsumer objects with all - // the ProxyPushConsumer objects in the collection. - // -public: - TAO_CEC_Connect_Supplier (TAO_CEC_ProxyPushSupplier *supplier); - // Constructor - - void work (TAO_CEC_ProxyPushConsumer *consumer, - CORBA::Environment &ACE_TRY_ENV); - -private: - TAO_CEC_ProxyPushSupplier *supplier_; -}; - -// **************************************************************** + typedef TAO_EC_Proxy_Collection<TAO_CEC_ProxyPullConsumer> PullCollection; -class TAO_CEC_Reconnect_Supplier : public TAO_EC_Worker<TAO_CEC_ProxyPushConsumer> -{ - // = TITLE - // TAO_CEC_Reconnect_Supplier - // - // = DESCRIPTION - // Worker class to reconnect the ProxyPushConsumer objects with all - // the ProxyPushConsumer objects in the collection. - // -public: - TAO_CEC_Reconnect_Supplier (TAO_CEC_ProxyPushSupplier *supplier); - // Constructor - - void work (TAO_CEC_ProxyPushConsumer *consumer, - CORBA::Environment &ACE_TRY_ENV); + PullCollection *pull_collection_; + // The consumer container -private: - TAO_CEC_ProxyPushSupplier *supplier_; + PortableServer::POA_var default_POA_; + // Store the default POA. }; // **************************************************************** -class TAO_CEC_Disconnect_Supplier : public TAO_EC_Worker<TAO_CEC_ProxyPushConsumer> +class TAO_CEC_Shutdown_Push_Consumer : public TAO_EC_Worker<TAO_CEC_ProxyPushConsumer> { - // = TITLE - // TAO_CEC_Disconnect_Supplier - // - // = DESCRIPTION - // Worker class to disconnect the ProxyPushConsumer objects with all - // the ProxyPushConsumer objects in the collection. - // public: - TAO_CEC_Disconnect_Supplier (TAO_CEC_ProxyPushSupplier *supplier); - // Constructor + TAO_CEC_Shutdown_Push_Consumer (void); void work (TAO_CEC_ProxyPushConsumer *consumer, CORBA::Environment &ACE_TRY_ENV); - -private: - TAO_CEC_ProxyPushSupplier *supplier_; }; // **************************************************************** -class TAO_CEC_Shutdown_Consumer : public TAO_EC_Worker<TAO_CEC_ProxyPushConsumer> +class TAO_CEC_Shutdown_Pull_Consumer : public TAO_EC_Worker<TAO_CEC_ProxyPullConsumer> { public: - TAO_CEC_Shutdown_Consumer (void); + TAO_CEC_Shutdown_Pull_Consumer (void); - void work (TAO_CEC_ProxyPushConsumer *consumer, + void work (TAO_CEC_ProxyPullConsumer *consumer, CORBA::Environment &ACE_TRY_ENV); }; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i index fb12348c64e..44cbf7860a5 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i @@ -5,39 +5,27 @@ TAO_CEC_SupplierAdmin:: for_each (TAO_EC_Worker<TAO_CEC_ProxyPushConsumer> *worker, CORBA::Environment &ACE_TRY_ENV) { - this->collection_->for_each (worker, ACE_TRY_ENV); + this->push_collection_->for_each (worker, ACE_TRY_ENV); } -// **************************************************************** - -ACE_INLINE -TAO_CEC_Connect_Supplier:: - TAO_CEC_Connect_Supplier (TAO_CEC_ProxyPushSupplier *supplier) - : supplier_ (supplier) -{ -} - -// **************************************************************** - -ACE_INLINE -TAO_CEC_Reconnect_Supplier:: - TAO_CEC_Reconnect_Supplier (TAO_CEC_ProxyPushSupplier *supplier) - : supplier_ (supplier) +ACE_INLINE void +TAO_CEC_SupplierAdmin:: + for_each (TAO_EC_Worker<TAO_CEC_ProxyPullConsumer> *worker, + CORBA::Environment &ACE_TRY_ENV) { + this->pull_collection_->for_each (worker, ACE_TRY_ENV); } // **************************************************************** ACE_INLINE -TAO_CEC_Disconnect_Supplier:: - TAO_CEC_Disconnect_Supplier (TAO_CEC_ProxyPushSupplier *supplier) - : supplier_ (supplier) +TAO_CEC_Shutdown_Push_Consumer::TAO_CEC_Shutdown_Push_Consumer (void) { } // **************************************************************** ACE_INLINE -TAO_CEC_Shutdown_Consumer::TAO_CEC_Shutdown_Consumer (void) +TAO_CEC_Shutdown_Pull_Consumer::TAO_CEC_Shutdown_Pull_Consumer (void) { } diff --git a/TAO/orbsvcs/orbsvcs/Makefile b/TAO/orbsvcs/orbsvcs/Makefile index b9e51f3d385..50274267416 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile +++ b/TAO/orbsvcs/orbsvcs/Makefile @@ -154,13 +154,17 @@ ifneq (,$(findstring NativeCosEvent,$(TAO_ORBSVCS))) CosEvent/CEC_EventChannel \ CosEvent/CEC_Factory \ CosEvent/CEC_ProxyPushConsumer \ + CosEvent/CEC_ProxyPullConsumer \ CosEvent/CEC_ProxyPushSupplier \ + CosEvent/CEC_ProxyPullSupplier \ CosEvent/CEC_SupplierAdmin \ CosEvent/CEC_SupplierControl \ CosEvent/CEC_Dispatching_Task \ CosEvent/CEC_MT_Dispatching \ CosEvent/CEC_Reactive_ConsumerControl \ CosEvent/CEC_Reactive_SupplierControl \ + CosEvent/CEC_Pulling_Strategy \ + CosEvent/CEC_Reactive_Pulling_Strategy \ CosEvent/CEC_Default_Factory endif # NativeCosEvent @@ -491,8 +495,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -507,6 +514,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -632,14 +648,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -771,8 +779,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -787,6 +798,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -912,14 +932,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -1049,8 +1061,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -1065,6 +1080,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -1187,14 +1211,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -1324,8 +1340,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -1340,6 +1359,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -1462,14 +1490,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -1602,8 +1622,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -1618,6 +1641,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -1740,14 +1772,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -1880,8 +1904,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -1896,6 +1923,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -2021,14 +2057,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -2166,8 +2194,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -2182,6 +2213,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -2307,14 +2347,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -2457,8 +2489,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -2473,6 +2508,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -2598,14 +2642,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -2744,8 +2780,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -2760,6 +2799,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -2885,14 +2933,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -3024,8 +3064,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -3040,6 +3083,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -3162,14 +3214,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -3301,8 +3345,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -3317,6 +3364,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -3439,14 +3495,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -3579,8 +3627,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -3595,6 +3646,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -3717,14 +3777,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -3854,8 +3906,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -3870,6 +3925,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -3992,14 +4056,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -4131,8 +4187,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -4147,6 +4206,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -4269,14 +4337,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -4408,8 +4468,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -4424,6 +4487,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -4546,14 +4618,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -4684,8 +4748,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -4700,6 +4767,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -4822,14 +4898,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -4959,8 +5027,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -4975,6 +5046,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -5097,14 +5177,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -5236,8 +5308,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -5252,6 +5327,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -5377,14 +5461,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -5515,8 +5591,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -5531,6 +5610,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -5653,14 +5741,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -5790,8 +5870,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -5806,6 +5889,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -5928,14 +6020,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -6078,8 +6162,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -6094,6 +6181,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -6216,14 +6312,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -6357,8 +6445,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -6373,6 +6464,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -6495,14 +6595,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -6637,8 +6729,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -6653,6 +6748,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -6775,14 +6879,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -6910,8 +7006,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -6926,6 +7025,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -7048,14 +7156,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -7183,8 +7283,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -7199,6 +7302,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -7321,14 +7433,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -7457,8 +7561,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -7473,6 +7580,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -7595,14 +7711,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -7732,8 +7840,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -7748,6 +7859,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -7870,14 +7990,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -8005,8 +8117,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -8021,6 +8136,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -8143,14 +8267,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -8280,8 +8396,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -8296,6 +8415,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -8418,14 +8546,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -8555,8 +8675,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -8571,6 +8694,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -8693,14 +8825,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -8830,8 +8954,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -8846,6 +8973,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -8968,14 +9104,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -9103,8 +9231,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -9119,6 +9250,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -9241,14 +9381,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -9376,8 +9508,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -9392,6 +9527,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -9514,14 +9658,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -9650,8 +9786,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -9666,6 +9805,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -9788,14 +9936,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -9923,8 +10063,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -9939,6 +10082,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -10061,14 +10213,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -10196,8 +10340,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -10212,6 +10359,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -10334,14 +10490,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -10469,8 +10617,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -10485,6 +10636,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -10607,14 +10767,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -10743,8 +10895,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -10759,6 +10914,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -10881,14 +11045,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -11016,8 +11172,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -11032,6 +11191,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -11154,14 +11322,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -11289,8 +11449,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -11305,6 +11468,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -11427,14 +11599,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -11562,8 +11726,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -11578,6 +11745,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -11700,14 +11876,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -11836,8 +12004,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -11852,6 +12023,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -11974,14 +12154,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -12112,8 +12284,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -12128,6 +12303,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -12250,14 +12434,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -12386,8 +12562,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -12402,6 +12581,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -12524,14 +12712,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -12663,8 +12843,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -12679,6 +12862,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -12801,14 +12993,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -13001,8 +13185,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -13017,6 +13204,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -13142,14 +13338,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -13326,8 +13514,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -13342,6 +13533,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -13467,14 +13667,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -13651,8 +13843,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -13667,6 +13862,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -13792,14 +13996,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -13972,8 +14168,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -13988,6 +14187,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -14113,14 +14321,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -14289,8 +14489,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -14305,6 +14508,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -14427,14 +14639,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -14608,8 +14812,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -14624,6 +14831,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -14746,14 +14962,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -14893,8 +15101,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -14909,6 +15120,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -15031,14 +15251,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -15220,8 +15432,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -15236,6 +15451,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -15358,14 +15582,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -15501,8 +15717,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -15517,6 +15736,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -15639,14 +15867,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -15785,8 +16005,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -15801,6 +16024,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -15923,14 +16155,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -16102,8 +16326,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -16118,6 +16345,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -16240,14 +16476,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -16376,8 +16604,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -16392,6 +16623,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -16514,14 +16754,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -16655,8 +16887,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -16671,6 +16906,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -16793,14 +17037,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -16999,8 +17235,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -17015,6 +17254,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -17137,14 +17385,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -17280,8 +17520,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -17296,6 +17539,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -17418,14 +17670,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -17561,8 +17805,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -17577,6 +17824,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -17699,14 +17955,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -17842,8 +18090,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -17858,6 +18109,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -17980,14 +18240,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -18119,8 +18371,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -18135,6 +18390,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -18262,14 +18526,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -18419,8 +18675,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -18435,6 +18694,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -18557,14 +18825,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -18767,8 +19027,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -18783,6 +19046,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -18905,14 +19177,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -19136,8 +19400,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -19152,6 +19419,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -19274,14 +19550,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -19473,8 +19741,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -19489,6 +19760,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -19611,14 +19891,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -19805,8 +20077,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -19821,6 +20096,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -19943,14 +20227,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -20134,8 +20410,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -20148,6 +20427,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -20270,14 +20558,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -20424,8 +20704,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -20438,6 +20721,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -20560,14 +20852,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -20706,8 +20990,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -20722,6 +21009,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -20844,14 +21140,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -21042,8 +21330,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -21058,6 +21349,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -21180,14 +21480,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -21355,6 +21647,18 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -21368,14 +21672,6 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -21663,8 +21959,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -21679,6 +21978,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -21801,14 +22109,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -21948,8 +22248,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -21964,6 +22267,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -22086,14 +22398,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -22276,8 +22580,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -22292,6 +22599,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -22414,14 +22730,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -22560,8 +22868,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -22576,6 +22887,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -22698,14 +23018,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -22844,8 +23156,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -22860,6 +23175,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -22982,14 +23306,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -23164,8 +23480,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -23180,6 +23499,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -23302,14 +23630,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -23439,8 +23759,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -23455,6 +23778,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -23577,14 +23909,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -23714,8 +24038,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -23730,6 +24057,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -23852,14 +24188,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -24041,8 +24369,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -24057,6 +24388,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -24179,14 +24519,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -24368,8 +24700,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -24384,6 +24719,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -24506,14 +24850,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -24649,8 +24985,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -24665,6 +25004,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -24787,14 +25135,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -24926,8 +25266,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -24942,6 +25285,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -25069,14 +25421,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -25227,8 +25571,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -25243,6 +25590,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -25365,14 +25721,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -25508,8 +25856,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -25524,6 +25875,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -25646,14 +26006,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -25810,8 +26162,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -25826,6 +26181,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -25948,14 +26312,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -26142,8 +26498,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -26158,6 +26517,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -26280,14 +26648,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -26477,8 +26837,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -26493,6 +26856,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -26615,14 +26987,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -26812,8 +27176,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -26828,6 +27195,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -26950,14 +27326,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -27133,8 +27501,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -27149,6 +27520,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -27271,14 +27651,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -27481,8 +27853,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -27497,6 +27872,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -27619,14 +28003,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -27767,7 +28143,8 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ CosEvent/CEC_ConsumerAdmin.i CosEvent/CEC_ProxyPushSupplier.h \ - CosEvent/CEC_ProxyPushSupplier.i CosEvent/CEC_ProxyPushConsumer.h \ + CosEvent/CEC_ProxyPushSupplier.i CosEvent/CEC_ProxyPullSupplier.h \ + CosEvent/CEC_ProxyPullSupplier.i CosEvent/CEC_ProxyPushConsumer.h \ CosEvent/CEC_ProxyPushConsumer.i CosEvent/CEC_EventChannel.h \ CosEvent/CEC_Factory.h CosEvent/CEC_Factory.i CosEvent/CEC_Defaults.h \ CosEvent/CEC_EventChannel.i @@ -27795,8 +28172,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -27811,6 +28191,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -27933,14 +28322,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -28070,8 +28451,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -28086,6 +28470,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -28208,14 +28601,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -28360,8 +28745,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -28376,6 +28764,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -28498,14 +28895,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -28627,6 +29016,7 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ CosEvent/CEC_Defaults.h CosEvent/CEC_EventChannel.i \ CosEvent/CEC_Dispatching.h CosEvent/CEC_Dispatching.i \ + CosEvent/CEC_Pulling_Strategy.h CosEvent/CEC_Pulling_Strategy.i \ CosEvent/CEC_ConsumerAdmin.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Proxy_Collection.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h \ @@ -28678,8 +29068,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -28694,6 +29087,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -28816,14 +29218,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -28955,8 +29349,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -28971,6 +29368,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -29093,14 +29499,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -29246,8 +29644,8 @@ ETCL_y: ETCL/ETCL.yy CosEvent/CEC_ConsumerAdmin.i CosEvent/CEC_ProxyPushSupplier.h \ CosEvent/CEC_ProxyPushSupplier.i -.obj/CEC_ProxyPushSupplier.o .obj/CEC_ProxyPushSupplier.so .shobj/CEC_ProxyPushSupplier.o .shobj/CEC_ProxyPushSupplier.so: CosEvent/CEC_ProxyPushSupplier.cpp \ - CosEvent/CEC_ProxyPushSupplier.h \ +.obj/CEC_ProxyPullConsumer.o .obj/CEC_ProxyPullConsumer.so .shobj/CEC_ProxyPullConsumer.o .shobj/CEC_ProxyPullConsumer.so: CosEvent/CEC_ProxyPullConsumer.cpp \ + CosEvent/CEC_ProxyPullConsumer.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ @@ -29271,8 +29669,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -29287,6 +29688,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -29409,7 +29819,195 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ + $(TAO_ROOT)/tao/POA.h \ + $(TAO_ROOT)/tao/Object_Adapter.h \ + $(TAO_ROOT)/tao/Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ + $(ACE_ROOT)/ace/Map.i \ + $(ACE_ROOT)/ace/Map_T.h \ + $(ACE_ROOT)/ace/Pair.h \ + $(ACE_ROOT)/ace/Pair.i \ + $(ACE_ROOT)/ace/Pair_T.h \ + $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Pair_T.cpp \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Active_Map_Manager.h \ + $(ACE_ROOT)/ace/Active_Map_Manager.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Map_T.i \ + $(ACE_ROOT)/ace/Map_T.cpp \ + $(TAO_ROOT)/tao/Key_Adapters.i \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/POAS.h \ + $(TAO_ROOT)/tao/POA_CORBA.h \ + $(TAO_ROOT)/tao/DynAnyC.h \ + $(TAO_ROOT)/tao/DynAnyC.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/POAS.i \ + $(TAO_ROOT)/tao/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Active_Object_Map.i \ + $(TAO_ROOT)/tao/Object_Adapter.i \ + $(TAO_ROOT)/tao/POAManager.h \ + $(TAO_ROOT)/tao/POAManager.i \ + $(TAO_ROOT)/tao/ImplRepoC.h \ + $(TAO_ROOT)/tao/Operation_Table.h \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ImplRepoC.i \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ + $(TAO_ROOT)/tao/DynAny_i.h \ + $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/InterfaceC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Worker.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Worker.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Worker.cpp \ + CosEvent/CEC_ProxyPullConsumer.i CosEvent/CEC_EventChannel.h \ + CosEvent/CEC_Factory.h CosEvent/CEC_Factory.i CosEvent/CEC_Defaults.h \ + CosEvent/CEC_EventChannel.i CosEvent/CEC_ConsumerAdmin.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Proxy_Collection.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Busy_Lock.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Proxy_Collection.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Proxy_Collection.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Command.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Command.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Command.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Defaults.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ + CosEvent/CEC_ConsumerAdmin.i CosEvent/CEC_ProxyPullSupplier.h \ + CosEvent/CEC_ProxyPullSupplier.i + +.obj/CEC_ProxyPushSupplier.o .obj/CEC_ProxyPushSupplier.so .shobj/CEC_ProxyPushSupplier.o .shobj/CEC_ProxyPushSupplier.so: CosEvent/CEC_ProxyPushSupplier.cpp \ + CosEvent/CEC_ProxyPushSupplier.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Object_Manager.h \ @@ -29417,6 +30015,130 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/IOR_LookupTable.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/IORManipulation.h \ + $(TAO_ROOT)/tao/IORS.h \ + $(TAO_ROOT)/tao/IORC.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/IORC.i \ + $(TAO_ROOT)/tao/Servant_Base.h \ + $(TAO_ROOT)/tao/POAC.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/POAC.i \ + $(TAO_ROOT)/tao/Servant_Base.i \ + $(TAO_ROOT)/tao/IORS.i \ + $(TAO_ROOT)/tao/Interceptor.h \ + $(TAO_ROOT)/tao/InterceptorS.h \ + $(TAO_ROOT)/tao/InterceptorC.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/InterceptorC.i \ + $(TAO_ROOT)/tao/Interceptor.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/Request.i \ + $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOP.h \ + $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Server_Request.i \ + $(TAO_ROOT)/tao/Marshal.h \ + $(TAO_ROOT)/tao/Marshal.i \ + $(TAO_ROOT)/tao/singletons.h \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -29538,8 +30260,8 @@ ETCL_y: ETCL/ETCL.yy CosEvent/CEC_Factory.h CosEvent/CEC_Factory.i CosEvent/CEC_Defaults.h \ CosEvent/CEC_EventChannel.i -.obj/CEC_SupplierAdmin.o .obj/CEC_SupplierAdmin.so .shobj/CEC_SupplierAdmin.o .shobj/CEC_SupplierAdmin.so: CosEvent/CEC_SupplierAdmin.cpp \ - CosEvent/CEC_SupplierAdmin.h \ +.obj/CEC_ProxyPullSupplier.o .obj/CEC_ProxyPullSupplier.so .shobj/CEC_ProxyPullSupplier.o .shobj/CEC_ProxyPullSupplier.so: CosEvent/CEC_ProxyPullSupplier.cpp \ + CosEvent/CEC_ProxyPullSupplier.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ @@ -29563,8 +30285,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -29579,6 +30304,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -29701,7 +30435,171 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ + $(TAO_ROOT)/tao/POA.h \ + $(TAO_ROOT)/tao/Object_Adapter.h \ + $(TAO_ROOT)/tao/Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ + $(ACE_ROOT)/ace/Map.i \ + $(ACE_ROOT)/ace/Map_T.h \ + $(ACE_ROOT)/ace/Pair.h \ + $(ACE_ROOT)/ace/Pair.i \ + $(ACE_ROOT)/ace/Pair_T.h \ + $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Pair_T.cpp \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Active_Map_Manager.h \ + $(ACE_ROOT)/ace/Active_Map_Manager.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Map_T.i \ + $(ACE_ROOT)/ace/Map_T.cpp \ + $(TAO_ROOT)/tao/Key_Adapters.i \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/POAS.h \ + $(TAO_ROOT)/tao/POA_CORBA.h \ + $(TAO_ROOT)/tao/DynAnyC.h \ + $(TAO_ROOT)/tao/DynAnyC.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/POAS.i \ + $(TAO_ROOT)/tao/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Active_Object_Map.i \ + $(TAO_ROOT)/tao/Object_Adapter.i \ + $(TAO_ROOT)/tao/POAManager.h \ + $(TAO_ROOT)/tao/POAManager.i \ + $(TAO_ROOT)/tao/ImplRepoC.h \ + $(TAO_ROOT)/tao/Operation_Table.h \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ImplRepoC.i \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ + $(TAO_ROOT)/tao/DynAny_i.h \ + $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/InterfaceC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ + CosEvent/CEC_ProxyPullSupplier.i CosEvent/CEC_Dispatching.h \ + CosEvent/CEC_Dispatching.i CosEvent/CEC_EventChannel.h \ + CosEvent/CEC_Factory.h CosEvent/CEC_Factory.i CosEvent/CEC_Defaults.h \ + CosEvent/CEC_EventChannel.i + +.obj/CEC_SupplierAdmin.o .obj/CEC_SupplierAdmin.so .shobj/CEC_SupplierAdmin.o .shobj/CEC_SupplierAdmin.so: CosEvent/CEC_SupplierAdmin.cpp \ + CosEvent/CEC_SupplierAdmin.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Object_Manager.h \ @@ -29709,6 +30607,130 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/IOR_LookupTable.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/IORManipulation.h \ + $(TAO_ROOT)/tao/IORS.h \ + $(TAO_ROOT)/tao/IORC.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/IORC.i \ + $(TAO_ROOT)/tao/Servant_Base.h \ + $(TAO_ROOT)/tao/POAC.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/POAC.i \ + $(TAO_ROOT)/tao/Servant_Base.i \ + $(TAO_ROOT)/tao/IORS.i \ + $(TAO_ROOT)/tao/Interceptor.h \ + $(TAO_ROOT)/tao/InterceptorS.h \ + $(TAO_ROOT)/tao/InterceptorC.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/InterceptorC.i \ + $(TAO_ROOT)/tao/Interceptor.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/Request.i \ + $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOP.h \ + $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Server_Request.i \ + $(TAO_ROOT)/tao/Marshal.h \ + $(TAO_ROOT)/tao/Marshal.i \ + $(TAO_ROOT)/tao/singletons.h \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -29849,8 +30871,8 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ CosEvent/CEC_SupplierAdmin.i CosEvent/CEC_ProxyPushConsumer.h \ - CosEvent/CEC_ProxyPushConsumer.i CosEvent/CEC_ProxyPushSupplier.h \ - CosEvent/CEC_ProxyPushSupplier.i CosEvent/CEC_EventChannel.h \ + CosEvent/CEC_ProxyPushConsumer.i CosEvent/CEC_ProxyPullConsumer.h \ + CosEvent/CEC_ProxyPullConsumer.i CosEvent/CEC_EventChannel.h \ CosEvent/CEC_Factory.h CosEvent/CEC_Factory.i CosEvent/CEC_Defaults.h \ CosEvent/CEC_EventChannel.i @@ -29877,8 +30899,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -29893,6 +30918,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -30015,14 +31049,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -30172,6 +31198,18 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -30185,14 +31223,6 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -30453,8 +31483,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -30469,6 +31502,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -30591,14 +31633,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -30744,8 +31778,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -30760,6 +31797,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -30882,14 +31928,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -31064,8 +32102,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -31080,6 +32121,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -31202,14 +32252,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -31359,8 +32401,8 @@ ETCL_y: ETCL/ETCL.yy CosEvent/CEC_SupplierAdmin.i CosEvent/CEC_ProxyPushConsumer.h \ CosEvent/CEC_ProxyPushConsumer.i -.obj/CEC_Default_Factory.o .obj/CEC_Default_Factory.so .shobj/CEC_Default_Factory.o .shobj/CEC_Default_Factory.so: CosEvent/CEC_Default_Factory.cpp \ - CosEvent/CEC_Default_Factory.h CosEvent/CEC_Factory.h \ +.obj/CEC_Pulling_Strategy.o .obj/CEC_Pulling_Strategy.so .shobj/CEC_Pulling_Strategy.o .shobj/CEC_Pulling_Strategy.so: CosEvent/CEC_Pulling_Strategy.cpp \ + CosEvent/CEC_Pulling_Strategy.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ @@ -31374,6 +32416,27 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ + CosEvent/CEC_Pulling_Strategy.i + +.obj/CEC_Reactive_Pulling_Strategy.o .obj/CEC_Reactive_Pulling_Strategy.so .shobj/CEC_Reactive_Pulling_Strategy.o .shobj/CEC_Reactive_Pulling_Strategy.so: \ + CosEvent/CEC_Reactive_Pulling_Strategy.cpp \ + CosEvent/CEC_Reactive_Pulling_Strategy.h \ + CosEvent/CEC_Pulling_Strategy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + CosEvent/CEC_Pulling_Strategy.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Worker.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -31382,8 +32445,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -31398,6 +32464,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -31520,7 +32595,196 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ + $(TAO_ROOT)/tao/POA.h \ + $(TAO_ROOT)/tao/Object_Adapter.h \ + $(TAO_ROOT)/tao/Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ + $(ACE_ROOT)/ace/Map.i \ + $(ACE_ROOT)/ace/Map_T.h \ + $(ACE_ROOT)/ace/Pair.h \ + $(ACE_ROOT)/ace/Pair.i \ + $(ACE_ROOT)/ace/Pair_T.h \ + $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Pair_T.cpp \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Active_Map_Manager.h \ + $(ACE_ROOT)/ace/Active_Map_Manager.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Map_T.i \ + $(ACE_ROOT)/ace/Map_T.cpp \ + $(TAO_ROOT)/tao/Key_Adapters.i \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/POAS.h \ + $(TAO_ROOT)/tao/POA_CORBA.h \ + $(TAO_ROOT)/tao/DynAnyC.h \ + $(TAO_ROOT)/tao/DynAnyC.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/POAS.i \ + $(TAO_ROOT)/tao/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Active_Object_Map.i \ + $(TAO_ROOT)/tao/Object_Adapter.i \ + $(TAO_ROOT)/tao/POAManager.h \ + $(TAO_ROOT)/tao/POAManager.i \ + $(TAO_ROOT)/tao/ImplRepoC.h \ + $(TAO_ROOT)/tao/Operation_Table.h \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ImplRepoC.i \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ + $(TAO_ROOT)/tao/DynAny_i.h \ + $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/InterfaceC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Worker.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Worker.cpp \ + CosEvent/CEC_Reactive_Pulling_Strategy.i \ + CosEvent/CEC_ProxyPullConsumer.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ + CosEvent/CEC_ProxyPullConsumer.i CosEvent/CEC_EventChannel.h \ + CosEvent/CEC_Factory.h CosEvent/CEC_Factory.i CosEvent/CEC_Defaults.h \ + CosEvent/CEC_EventChannel.i CosEvent/CEC_SupplierAdmin.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Proxy_Collection.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Busy_Lock.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Proxy_Collection.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Proxy_Collection.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Command.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Command.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Command.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Defaults.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ + CosEvent/CEC_SupplierAdmin.i CosEvent/CEC_ConsumerAdmin.h \ + CosEvent/CEC_ConsumerAdmin.i + +.obj/CEC_Default_Factory.o .obj/CEC_Default_Factory.so .shobj/CEC_Default_Factory.o .shobj/CEC_Default_Factory.so: CosEvent/CEC_Default_Factory.cpp \ + CosEvent/CEC_Default_Factory.h CosEvent/CEC_Factory.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Object_Manager.h \ @@ -31528,6 +32792,130 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/IOR_LookupTable.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/IORManipulation.h \ + $(TAO_ROOT)/tao/IORS.h \ + $(TAO_ROOT)/tao/IORC.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/IORC.i \ + $(TAO_ROOT)/tao/Servant_Base.h \ + $(TAO_ROOT)/tao/POAC.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/POAC.i \ + $(TAO_ROOT)/tao/Servant_Base.i \ + $(TAO_ROOT)/tao/IORS.i \ + $(TAO_ROOT)/tao/Interceptor.h \ + $(TAO_ROOT)/tao/InterceptorS.h \ + $(TAO_ROOT)/tao/InterceptorC.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/InterceptorC.i \ + $(TAO_ROOT)/tao/Interceptor.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/Request.i \ + $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOP.h \ + $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Server_Request.i \ + $(TAO_ROOT)/tao/Marshal.h \ + $(TAO_ROOT)/tao/Marshal.i \ + $(TAO_ROOT)/tao/singletons.h \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -31650,7 +33038,12 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Stream_Modules.i \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ CosEvent/CEC_Dispatching_Task.i CosEvent/CEC_MT_Dispatching.i \ - CosEvent/CEC_ConsumerAdmin.h \ + CosEvent/CEC_Reactive_Pulling_Strategy.h \ + CosEvent/CEC_Pulling_Strategy.h CosEvent/CEC_Pulling_Strategy.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Worker.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Worker.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Worker.cpp \ + CosEvent/CEC_Reactive_Pulling_Strategy.i CosEvent/CEC_ConsumerAdmin.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ @@ -31672,9 +33065,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Command.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Command.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Command.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Worker.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Defaults.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ @@ -31688,8 +33078,10 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ CosEvent/CEC_ConsumerAdmin.i CosEvent/CEC_SupplierAdmin.h \ CosEvent/CEC_SupplierAdmin.i CosEvent/CEC_ProxyPushConsumer.h \ - CosEvent/CEC_ProxyPushConsumer.i CosEvent/CEC_ProxyPushSupplier.h \ - CosEvent/CEC_ProxyPushSupplier.i CosEvent/CEC_EventChannel.h \ + CosEvent/CEC_ProxyPushConsumer.i CosEvent/CEC_ProxyPullConsumer.h \ + CosEvent/CEC_ProxyPullConsumer.i CosEvent/CEC_ProxyPushSupplier.h \ + CosEvent/CEC_ProxyPushSupplier.i CosEvent/CEC_ProxyPullSupplier.h \ + CosEvent/CEC_ProxyPullSupplier.i CosEvent/CEC_EventChannel.h \ CosEvent/CEC_EventChannel.i CosEvent/CEC_Reactive_ConsumerControl.h \ CosEvent/CEC_ConsumerControl.h CosEvent/CEC_ConsumerControl.i \ CosEvent/CEC_Reactive_ConsumerControl.i \ @@ -31729,8 +33121,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -31745,6 +33140,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -31867,14 +33271,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -32036,8 +33432,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -32052,6 +33451,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -32174,14 +33582,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -32419,6 +33819,18 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -32541,14 +33953,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -32776,8 +34180,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -32792,6 +34199,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -32914,14 +34330,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -33055,8 +34463,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -33071,6 +34482,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -33193,14 +34613,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -33390,6 +34802,18 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -33520,14 +34944,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -33742,8 +35158,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -33758,6 +35177,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -33880,14 +35308,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -33999,8 +35419,7 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \ - Event/RT_Task.h \ - $(ACE_ROOT)/ace/Task.h \ + Event/RT_Task.h $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Task_T.i \ @@ -34111,8 +35530,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -34127,6 +35549,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -34249,14 +35680,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -34468,8 +35891,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -34484,6 +35910,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -34601,14 +36036,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -34824,8 +36251,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -34840,6 +36270,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -34965,14 +36404,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -35151,8 +36582,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -35167,6 +36601,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -35304,14 +36747,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -35490,8 +36925,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -35506,6 +36944,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -35631,14 +37078,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -35814,6 +37253,18 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -35952,14 +37403,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -36180,6 +37623,10 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -36455,8 +37902,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -36471,6 +37921,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -36593,14 +38052,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -36755,8 +38206,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -36771,6 +38225,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -36893,14 +38356,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -37034,8 +38489,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -37050,6 +38508,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -37172,14 +38639,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -37350,6 +38809,18 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Map_Manager.cpp \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -37480,14 +38951,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -37654,6 +39117,18 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -37766,14 +39241,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -37938,8 +39405,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -37954,6 +39424,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -38076,14 +39555,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -38239,8 +39710,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -38255,6 +39729,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -38377,14 +39860,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -38523,8 +39998,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -38539,6 +40017,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -38661,14 +40148,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -38819,6 +40298,18 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Map_Manager.cpp \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -38948,14 +40439,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -39101,6 +40584,18 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Map_Manager.cpp \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -39231,14 +40726,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -39374,8 +40861,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -39390,6 +40880,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -39512,14 +41011,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -39677,8 +41168,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -39693,6 +41187,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -39815,14 +41318,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -39987,6 +41482,18 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -40094,14 +41601,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -40238,8 +41737,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -40254,6 +41756,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -40376,14 +41887,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -40532,8 +42035,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -40548,6 +42054,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -40670,14 +42185,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -40856,6 +42363,18 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -40963,14 +42482,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -41153,6 +42664,18 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -41260,14 +42783,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -41449,6 +42964,18 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -41556,14 +43083,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -41747,6 +43266,18 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -41854,14 +43385,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -42041,6 +43564,18 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -42148,14 +43683,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -42354,6 +43881,18 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -42461,14 +44000,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -42663,6 +44194,18 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -42770,14 +44313,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -42973,6 +44508,18 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -43080,14 +44627,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -43237,8 +44776,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -43253,6 +44795,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -43375,14 +44926,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -43547,6 +45090,18 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -43654,14 +45209,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -43816,8 +45363,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -43832,6 +45382,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -43954,14 +45513,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -44127,6 +45678,18 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -44234,14 +45797,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -44373,8 +45928,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -44389,6 +45947,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -44511,14 +46078,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -44665,6 +46224,18 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -44789,14 +46360,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -44943,6 +46506,18 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -45067,14 +46642,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -45210,8 +46777,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -45226,6 +46796,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -45348,14 +46927,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -45492,8 +47063,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -45508,6 +47082,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -45630,14 +47213,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -45774,8 +47349,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -45790,6 +47368,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -45912,14 +47499,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -46055,8 +47634,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -46071,6 +47653,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -46196,14 +47787,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -46372,6 +47955,18 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Malloc_T.i \ @@ -46485,14 +48080,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -46669,8 +48256,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -46685,6 +48275,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -46810,14 +48409,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -46958,8 +48549,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -46974,6 +48568,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -47105,14 +48708,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -47255,8 +48850,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -47269,6 +48867,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -47398,14 +49005,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -47568,8 +49167,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -47584,6 +49186,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -47706,14 +49317,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -47864,8 +49467,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -47880,6 +49486,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -48002,14 +49617,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -48148,8 +49755,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -48164,6 +49774,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -48286,14 +49905,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -48433,8 +50044,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -48449,6 +50063,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -48571,14 +50194,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -48724,8 +50339,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -48740,6 +50358,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -48862,14 +50489,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -49037,6 +50656,18 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -49146,14 +50777,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -49314,6 +50937,18 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -49421,14 +51056,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -49591,6 +51218,18 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -49700,14 +51339,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -49848,8 +51479,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -49864,6 +51498,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -49986,14 +51629,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -50132,85 +51767,6 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp -.obj/ETCL_Constraint.o .obj/ETCL_Constraint.so .shobj/ETCL_Constraint.o .shobj/ETCL_Constraint.so: ETCL/ETCL_Constraint.cpp ETCL/ETCL_Constraint.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - ETCL/ETCL_Constraint.i ETCL/ETCL_y.h - -.obj/ETCL_l.o .obj/ETCL_l.so .shobj/ETCL_l.o .shobj/ETCL_l.so: ETCL/ETCL_l.cpp \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - ETCL/ETCL_Constraint.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - ETCL/ETCL_Constraint.i ETCL/ETCL_y.h - -.obj/ETCL_y.o .obj/ETCL_y.so .shobj/ETCL_y.o .shobj/ETCL_y.so: ETCL/ETCL_y.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.i - .obj/LogRecordStore.o .obj/LogRecordStore.so .shobj/LogRecordStore.o .shobj/LogRecordStore.so: Log/LogRecordStore.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ @@ -50234,8 +51790,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -50250,6 +51809,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -50372,14 +51940,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -50541,8 +52101,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -50557,6 +52120,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -50682,14 +52254,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -50840,8 +52404,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -50856,6 +52423,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -50981,14 +52557,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -51142,8 +52710,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -51158,6 +52729,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -51283,14 +52863,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -51439,8 +53011,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -51455,6 +53030,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -51580,14 +53164,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -51740,8 +53316,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -51756,6 +53335,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -51881,14 +53469,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -52064,6 +53644,18 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -52171,14 +53763,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -52316,8 +53900,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -52332,6 +53919,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -52454,14 +54050,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -52631,6 +54219,18 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -52741,14 +54341,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -52959,6 +54551,18 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -53069,14 +54673,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -53258,8 +54854,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -53274,6 +54873,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -53396,14 +55004,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -53540,8 +55140,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -53556,6 +55159,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -53678,14 +55290,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -53835,8 +55439,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -53851,6 +55458,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -53973,14 +55589,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -54158,6 +55766,18 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -54269,14 +55889,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -54438,8 +56050,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -54454,6 +56069,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -54576,14 +56200,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -54768,8 +56384,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -54784,6 +56403,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -54906,14 +56534,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -55093,8 +56713,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -55109,6 +56732,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -55231,14 +56863,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -55421,8 +57045,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -55437,6 +57064,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -55559,14 +57195,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -55748,8 +57376,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -55764,6 +57395,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -55886,14 +57526,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -56076,8 +57708,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -56092,6 +57727,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -56214,14 +57858,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -56401,8 +58037,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -56417,6 +58056,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -56539,14 +58187,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -56710,8 +58350,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -56726,6 +58369,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -56851,14 +58503,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -57024,8 +58668,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -57040,6 +58687,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -57162,14 +58818,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -57333,8 +58981,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -57349,6 +59000,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -57471,14 +59131,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -57671,6 +59323,18 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -57780,14 +59444,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -57925,8 +59581,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -57941,6 +59600,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -58063,14 +59731,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -58253,8 +59913,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -58269,6 +59932,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -58391,14 +60063,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -58582,8 +60246,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -58598,6 +60265,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -58720,14 +60396,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -58899,8 +60567,11 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -58915,6 +60586,15 @@ ETCL_y: ETCL/ETCL.yy $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -59037,14 +60717,6 @@ ETCL_y: ETCL/ETCL.yy $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Basic.dsw b/TAO/orbsvcs/tests/CosEvent/Basic/Basic.dsw index 349f06c0320..7eb2b715948 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Basic.dsw +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Basic.dsw @@ -15,6 +15,18 @@ Package=<4> ###############################################################################
+Project: "Pull_Push_Event"=.\Pull_Push_Event.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
Project: "Disconnect"=.\Disconnect.dsp - Package Owner=<4>
Package=<5>
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile index 4ce8078fac5..655494ff787 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile @@ -16,6 +16,7 @@ BIN2 = \ Disconnect \ MT_Disconnect \ Push_Event \ + Pull_Push_Event \ Shutdown #### If the orbsvcs library wasn't built with all components, don't @@ -85,8 +86,11 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -101,6 +105,15 @@ endif $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -223,14 +236,6 @@ endif $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -414,6 +419,18 @@ endif $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -427,14 +444,6 @@ endif $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -703,8 +712,11 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -719,6 +731,15 @@ endif $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -841,7 +862,186 @@ endif $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ + $(TAO_ROOT)/tao/POA.h \ + $(TAO_ROOT)/tao/Object_Adapter.h \ + $(TAO_ROOT)/tao/Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ + $(ACE_ROOT)/ace/Map.i \ + $(ACE_ROOT)/ace/Map_T.h \ + $(ACE_ROOT)/ace/Pair.h \ + $(ACE_ROOT)/ace/Pair.i \ + $(ACE_ROOT)/ace/Pair_T.h \ + $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Pair_T.cpp \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Active_Map_Manager.h \ + $(ACE_ROOT)/ace/Active_Map_Manager.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Map_T.i \ + $(ACE_ROOT)/ace/Map_T.cpp \ + $(TAO_ROOT)/tao/Key_Adapters.i \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/POAS.h \ + $(TAO_ROOT)/tao/POA_CORBA.h \ + $(TAO_ROOT)/tao/DynAnyC.h \ + $(TAO_ROOT)/tao/DynAnyC.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/POAS.i \ + $(TAO_ROOT)/tao/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Active_Object_Map.i \ + $(TAO_ROOT)/tao/Object_Adapter.i \ + $(TAO_ROOT)/tao/POAManager.h \ + $(TAO_ROOT)/tao/POAManager.i \ + $(TAO_ROOT)/tao/ImplRepoC.h \ + $(TAO_ROOT)/tao/Operation_Table.h \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ImplRepoC.i \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ + $(TAO_ROOT)/tao/DynAny_i.h \ + $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/InterfaceC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.i \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + ../lib/Counting_Supplier.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_Factory.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i + +.obj/Pull_Push_Event.o .obj/Pull_Push_Event.so .shobj/Pull_Push_Event.o .shobj/Pull_Push_Event.so: Pull_Push_Event.cpp ../lib/Counting_Consumer.h \ + ../lib/cectest_export.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Object_Manager.h \ @@ -849,6 +1049,130 @@ endif $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/IOR_LookupTable.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/IORManipulation.h \ + $(TAO_ROOT)/tao/IORS.h \ + $(TAO_ROOT)/tao/IORC.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/IORC.i \ + $(TAO_ROOT)/tao/Servant_Base.h \ + $(TAO_ROOT)/tao/POAC.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/POAC.i \ + $(TAO_ROOT)/tao/Servant_Base.i \ + $(TAO_ROOT)/tao/IORS.i \ + $(TAO_ROOT)/tao/Interceptor.h \ + $(TAO_ROOT)/tao/InterceptorS.h \ + $(TAO_ROOT)/tao/InterceptorC.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/InterceptorC.i \ + $(TAO_ROOT)/tao/Interceptor.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/Request.i \ + $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOP.h \ + $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Server_Request.i \ + $(TAO_ROOT)/tao/Marshal.h \ + $(TAO_ROOT)/tao/Marshal.i \ + $(TAO_ROOT)/tao/singletons.h \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -961,7 +1285,6 @@ endif $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - ../lib/Counting_Supplier.h \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -973,6 +1296,7 @@ endif $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.i \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ + ../lib/Counting_Supplier.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_Factory.i \ @@ -1010,8 +1334,11 @@ endif $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -1026,6 +1353,15 @@ endif $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -1148,14 +1484,6 @@ endif $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -1268,7 +1596,6 @@ endif $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - ../lib/Counting_Supplier.h \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -1280,6 +1607,7 @@ endif $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.i \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ + ../lib/Counting_Supplier.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_Factory.i \ diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp new file mode 100644 index 00000000000..5e37fd8880b --- /dev/null +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp @@ -0,0 +1,220 @@ +// $Id$ + +#include "Counting_Consumer.h" +#include "Counting_Supplier.h" +#include "orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/CosEvent/CEC_Default_Factory.h" + +ACE_RCSID(CEC_Tests_Basic, Pull_Push_Event, "$Id$") + +int +main (int argc, char* argv[]) +{ + TAO_CEC_Default_Factory::init_svcs (); + + ACE_DECLARE_NEW_CORBA_ENV; + ACE_TRY + { + // ORB initialization boiler plate... + CORBA::ORB_var orb = + CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + ACE_TRY_CHECK; + + CORBA::Object_var object = + orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + ACE_TRY_CHECK; + PortableServer::POA_var poa = + PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + PortableServer::POAManager_var poa_manager = + poa->the_POAManager (ACE_TRY_ENV); + ACE_TRY_CHECK; + poa_manager->activate (ACE_TRY_ENV); + ACE_TRY_CHECK; + + // **************************************************************** + + TAO_CEC_EventChannel_Attributes attributes (poa.in (), + poa.in ()); + + TAO_CEC_EventChannel ec_impl (attributes); + ec_impl.activate (ACE_TRY_ENV); + ACE_TRY_CHECK; + + CosEventChannelAdmin::EventChannel_var event_channel = + ec_impl._this (ACE_TRY_ENV); + ACE_TRY_CHECK; + + // **************************************************************** + + // Obtain the consumer admin.. + CosEventChannelAdmin::ConsumerAdmin_var consumer_admin = + event_channel->for_consumers (ACE_TRY_ENV); + ACE_TRY_CHECK; + + // Obtain the supplier admin.. + CosEventChannelAdmin::SupplierAdmin_var supplier_admin = + event_channel->for_suppliers (ACE_TRY_ENV); + ACE_TRY_CHECK; + + // **************************************************************** + + const int milliseconds = 50; + + CEC_Counting_Supplier supplier_00; + + supplier_00.connect (supplier_admin.in (), + ACE_TRY_ENV); + ACE_TRY_CHECK; + + // **************************************************************** + + CEC_Counting_Supplier supplier_01; + + supplier_01.connect (supplier_admin.in (), + ACE_TRY_ENV); + ACE_TRY_CHECK; + + // **************************************************************** + + CEC_Pull_Counting_Supplier supplier_10; + + supplier_10.connect (supplier_admin.in (), + ACE_TRY_ENV); + ACE_TRY_CHECK; + + // **************************************************************** + + CEC_Pull_Counting_Supplier supplier_11; + + supplier_11.connect (supplier_admin.in (), + ACE_TRY_ENV); + ACE_TRY_CHECK; + + // **************************************************************** + + // Create a consumer, intialize its RT_Info structures, and + // connnect to the event channel.... + CEC_Counting_Consumer consumer_00 ("Consumer/00"); + consumer_00.connect (consumer_admin.in (), + ACE_TRY_ENV); + ACE_TRY_CHECK; + + // **************************************************************** + + CEC_Pull_Counting_Consumer consumer_01 ("Consumer/01"); + consumer_01.connect (consumer_admin.in (), + ACE_TRY_ENV); + ACE_TRY_CHECK; + + // **************************************************************** + + CEC_Pull_Counting_Consumer consumer_10 ("Consumer/10"); + consumer_10.connect (consumer_admin.in (), + ACE_TRY_ENV); + ACE_TRY_CHECK; + + // **************************************************************** + + CEC_Counting_Supplier_Task task_00 (&supplier_00, + milliseconds); + CEC_Counting_Supplier_Task task_01 (&supplier_01, + 3 * milliseconds); + + if (task_00.activate (THR_BOUND|THR_NEW_LWP, 1) != 0) + { + ACE_ERROR ((LM_ERROR, "Cannot activate task 00\n")); + } + if (task_01.activate (THR_BOUND|THR_NEW_LWP, 1) != 0) + { + ACE_ERROR ((LM_ERROR, "Cannot activate task 01\n")); + } + + // **************************************************************** + + CEC_Counting_Consumer_Task consumer_task_01 (&consumer_01, + 5 * milliseconds); + if (consumer_task_01.activate (THR_BOUND|THR_NEW_LWP, 1) != 0) + { + ACE_ERROR ((LM_ERROR, "Cannot activate task 01\n")); + } + + // **************************************************************** + + CEC_Counting_Consumer_Task consumer_task_10 (&consumer_10, 0); + if (consumer_task_10.activate (THR_BOUND|THR_NEW_LWP, 1) != 0) + { + ACE_ERROR ((LM_ERROR, "Cannot activate task 01\n")); + } + + // **************************************************************** + + ACE_Time_Value tv (100, 0); + ACE_OS::sleep (tv); + + consumer_task_10.stop (); + consumer_task_01.stop (); + task_00.stop (); + task_01.stop (); + + // Wait for all the threads to complete and the return + ACE_Thread_Manager::instance ()->wait (); + + // **************************************************************** + + consumer_10.disconnect (ACE_TRY_ENV); + ACE_TRY_CHECK; + + consumer_01.disconnect (ACE_TRY_ENV); + ACE_TRY_CHECK; + + consumer_00.disconnect (ACE_TRY_ENV); + ACE_TRY_CHECK; + + supplier_11.disconnect (ACE_TRY_ENV); + ACE_TRY_CHECK; + supplier_10.disconnect (ACE_TRY_ENV); + ACE_TRY_CHECK; + supplier_01.disconnect (ACE_TRY_ENV); + ACE_TRY_CHECK; + supplier_00.disconnect (ACE_TRY_ENV); + ACE_TRY_CHECK; + + // **************************************************************** + + event_channel->destroy (ACE_TRY_ENV); + ACE_TRY_CHECK; + + // **************************************************************** + + poa->destroy (1, 1, ACE_TRY_ENV); + ACE_TRY_CHECK; + + orb->destroy (ACE_TRY_ENV); + ACE_TRY_CHECK; + + // **************************************************************** + + CORBA::ULong expected = + task_00.push_count () + + task_01.push_count () + + supplier_10.event_count + + supplier_11.event_count; + + consumer_00.dump_results (expected, 5); + + expected = + consumer_task_01.pull_count (); + consumer_01.dump_results (expected, 5); + expected = + consumer_task_10.pull_count (); + consumer_10.dump_results (expected, 5); + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service"); + return 1; + } + ACE_ENDTRY; + return 0; +} diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.dsp b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.dsp new file mode 100644 index 00000000000..96ac9c22088 --- /dev/null +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.dsp @@ -0,0 +1,98 @@ +# Microsoft Developer Studio Project File - Name="CEC Pull_Push_Event" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=Pull_Push_Event - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "Pull_Push_Event.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "Pull_Push_Event.mak" CFG="Pull_Push_Event - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "Pull_Push_Event - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Pull_Push_Event - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "Pull_Push_Event - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\lib" /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 CECTest.lib orbsvcs.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"
+
+!ELSEIF "$(CFG)" == "Pull_Push_Event - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\lib" /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 CECTestd.lib orbsvcsd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"
+
+!ENDIF
+
+# Begin Target
+
+# Name "Pull_Push_Event - Win32 Release"
+# Name "Pull_Push_Event - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter ".cpp"
+# Begin Source File
+
+SOURCE=.\Pull_Push_Event.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ".h"
+# End Group
+# End Target
+# End Project
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp index 79bcf6e0b38..7a3841f4f8e 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp @@ -5,7 +5,7 @@ #include "orbsvcs/CosEvent/CEC_EventChannel.h" #include "orbsvcs/CosEvent/CEC_Default_Factory.h" -ACE_RCSID(CEC_Tests_Basic, Complex, "$Id$") +ACE_RCSID(CEC_Tests_Basic, Push_Event, "$Id$") int main (int argc, char* argv[]) diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/run_test.pl b/TAO/orbsvcs/tests/CosEvent/Basic/run_test.pl index bf6653e82bb..557700cd2ef 100755 --- a/TAO/orbsvcs/tests/CosEvent/Basic/run_test.pl +++ b/TAO/orbsvcs/tests/CosEvent/Basic/run_test.pl @@ -47,4 +47,12 @@ if ($T->TimedWait (60) == -1) { $T->Kill (); $T->TimedWait (1); } +#print STDERR "\n\nPull-Push Events\n"; +#$T = Process::Create ($prefix . "Pull_Push_Event".$EXE_EXT); +#if ($T->TimedWait (60) == -1) { +# print STDERR "ERROR: Test timedout\n"; +# $status = 1; +# $T->Kill (); $T->TimedWait (1); +#} + exit $status; diff --git a/TAO/orbsvcs/tests/CosEvent/CosEvent.dsw b/TAO/orbsvcs/tests/CosEvent/CosEvent.dsw index ad60c5875d9..2b6a65ed0cb 100644 --- a/TAO/orbsvcs/tests/CosEvent/CosEvent.dsw +++ b/TAO/orbsvcs/tests/CosEvent/CosEvent.dsw @@ -60,6 +60,21 @@ Package=<4> ###############################################################################
+Project: "Pull_Push_Event"=.\Basic\Pull_Push_Event.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name CECTest
+ End Project Dependency
+}}}
+
+###############################################################################
+
Project: "Shutdown"=.\Basic\Shutdown.dsp - Package Owner=<4>
Package=<5>
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp index e28f2c5cff3..6a3d7fb3dd5 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp +++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp @@ -101,6 +101,194 @@ CEC_Counting_Consumer::disconnect_push_consumer (CORBA::Environment &) CosEventChannelAdmin::ProxyPushSupplier::_nil (); } +// **************************************************************** + +CEC_Pull_Counting_Consumer::CEC_Pull_Counting_Consumer (const char* name) + : event_count (0), + disconnect_count (0), + name_ (name) +{ +} + +void +CEC_Pull_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, + CORBA::Environment &ACE_TRY_ENV) +{ + // The canonical protocol to connect to the EC + + CosEventComm::PullConsumer_var consumer = + this->_this (ACE_TRY_ENV); + ACE_CHECK; + + if (CORBA::is_nil (this->supplier_proxy_.in ())) + { + this->supplier_proxy_ = + consumer_admin->obtain_pull_supplier (ACE_TRY_ENV); + ACE_CHECK; + } + + this->supplier_proxy_->connect_pull_consumer (consumer.in (), + ACE_TRY_ENV); + ACE_CHECK; +} + +void +CEC_Pull_Counting_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV) +{ + if (!CORBA::is_nil (this->supplier_proxy_.in ())) + { + this->supplier_proxy_->disconnect_pull_supplier (ACE_TRY_ENV); + ACE_CHECK; + } + + PortableServer::POA_var consumer_poa = + this->_default_POA (ACE_TRY_ENV); + ACE_CHECK; + PortableServer::ObjectId_var consumer_id = + consumer_poa->servant_to_id (this, ACE_TRY_ENV); + ACE_CHECK; + consumer_poa->deactivate_object (consumer_id.in (), ACE_TRY_ENV); + ACE_CHECK; + + this->supplier_proxy_ = + CosEventChannelAdmin::ProxyPullSupplier::_nil (); +} + +CORBA::Any* +CEC_Pull_Counting_Consumer::pull (CORBA::Environment &ACE_TRY_ENV) +{ + if (CORBA::is_nil (this->supplier_proxy_.in ())) + { + return 0; + } + this->event_count++; + return this->supplier_proxy_->pull (ACE_TRY_ENV); +} + +CORBA::Any* +CEC_Pull_Counting_Consumer::try_pull (CORBA::Boolean_out has_event, + CORBA::Environment &ACE_TRY_ENV) +{ + if (CORBA::is_nil (this->supplier_proxy_.in ())) + { + has_event = 0; + return 0; + } + CORBA::Any_var event = + this->supplier_proxy_->try_pull (has_event, ACE_TRY_ENV); + + if (has_event) + this->event_count++; + + return event._retn (); +} + +void +CEC_Pull_Counting_Consumer::dump_results (int expected_count, int tolerance) +{ + int diff = this->event_count - expected_count; + if (diff > tolerance || diff < -tolerance) + { + ACE_DEBUG ((LM_DEBUG, + "ERROR - %s unexpected number of events <%d>\n", + this->name_, + this->event_count)); + } + else + { + ACE_DEBUG ((LM_DEBUG, + "%s - number of events <%d> within margins\n", + this->name_, + this->event_count)); + } +} + +void +CEC_Pull_Counting_Consumer::disconnect_pull_consumer (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + this->disconnect_count++; + this->supplier_proxy_ = + CosEventChannelAdmin::ProxyPullSupplier::_nil (); +} + +// **************************************************************** + +CEC_Counting_Consumer_Task:: + CEC_Counting_Consumer_Task (CEC_Pull_Counting_Consumer *s, + int milliseconds) + : consumer_ (s), + stop_flag_ (0), + pull_count_ (0), + milliseconds_ (milliseconds) +{ +} + +int +CEC_Counting_Consumer_Task::svc () +{ + ACE_TRY_NEW_ENV + { + this->run (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + return -1; + } + ACE_ENDTRY; + return 0; +} + +void +CEC_Counting_Consumer_Task::stop (void) +{ + ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + this->stop_flag_ = 1; +} + +CORBA::ULong +CEC_Counting_Consumer_Task::pull_count (void) +{ + return this->pull_count_; +} + +void +CEC_Counting_Consumer_Task::run (CORBA::Environment &ACE_TRY_ENV) +{ + CORBA::Any event; + event <<= CORBA::Long(0); + + int stop = 0; + do { + CORBA::Boolean has_event; + CORBA::Any_var event = + this->consumer_->try_pull (has_event, + ACE_TRY_ENV); + ACE_CHECK; + + if (this->milliseconds_ != 0) + { + ACE_Time_Value tv (0, 1000 * this->milliseconds_); + ACE_OS::sleep (tv); + } + else + { + // Sleep for a short time to avoid spinning... kind of klugy + ACE_OS::sleep (0); + } + + if (has_event) + { + ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + this->pull_count_++; + } + + stop = this->stop_flag_; + } while (stop == 0); +} + + #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h index b699df4d7a0..012325965f2 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h +++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h @@ -25,6 +25,7 @@ #include "orbsvcs/CosEventCommS.h" #include "orbsvcs/CosEventChannelAdminC.h" +#include "ace/Task.h" class CEC_Test_Export CEC_Counting_Consumer : public POA_CosEventComm::PushConsumer { @@ -70,4 +71,85 @@ protected: // The name }; +// **************************************************************** + +class CEC_Test_Export CEC_Pull_Counting_Consumer : public POA_CosEventComm::PullConsumer +{ + // = TITLE + // Simple consumer object to implement EC tests. + // + // = DESCRIPTION + // This is a simple consumer that counts the events it receives. + // +public: + CEC_Pull_Counting_Consumer (const char* name); + // Constructor + + void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, + CORBA::Environment &ACE_TRY_ENV); + void disconnect (CORBA::Environment &ACE_TRY_ENV); + // Simple connect/disconnect methods.. + + void dump_results (int expected_count, int tolerance); + // Print out an error message if the event count is too far from the + // expected count. + + CORBA::Any *pull (CORBA::Environment &ACE_TRY_ENV); + CORBA::Any *try_pull (CORBA::Boolean_out has_event, + CORBA::Environment &ACE_TRY_ENV); + + // = The CosEventComm::PullConsumer methods + virtual void disconnect_pull_consumer (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)); + // The skeleton methods. + + CORBA::ULong event_count; + // Keep track of the number of events received. + + CORBA::ULong disconnect_count; + // Keep track of the number of disconnect calls received. + +protected: + CosEventChannelAdmin::ProxyPullSupplier_var supplier_proxy_; + // The proxy + + const char* name_; + // The name +}; + +// **************************************************************** + +class CEC_Test_Export CEC_Counting_Consumer_Task : public ACE_Task_Base +{ +public: + CEC_Counting_Consumer_Task (CEC_Pull_Counting_Consumer *consumer, + int milliseconds = 0); + // Create the task... + + // = Check the ACE_Task_Base documentation. + int svc (void); + + void stop (void); + CORBA::ULong pull_count (void); + + void run (CORBA::Environment &ACE_TRY_ENV); + // Run a single iteration of the test + +private: + CEC_Pull_Counting_Consumer *consumer_; + // The consumer we are turning into an active object + + int stop_flag_; + // Set to 1 when the test must stop + + CORBA::ULong pull_count_; + // Count the number of pull() calls + + int milliseconds_; + // If not zero then pause for <milliseconds> before sending each + // event. + + ACE_SYNCH_MUTEX lock_; +}; + #endif /* ECT_CONSUMER_H */ diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp index 18f36c31e85..f664dbcfaaa 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp +++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp @@ -70,12 +70,6 @@ CEC_Counting_Supplier::push (const CORBA::Any&, } void -CEC_Counting_Supplier::disconnect_push_consumer (CORBA::Environment &) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ -} - -void CEC_Counting_Supplier::disconnect_push_supplier (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -155,6 +149,114 @@ CEC_Counting_Supplier_Task::run (CORBA::Environment &ACE_TRY_ENV) } while (stop == 0); } +// **************************************************************** + +CEC_Pull_Counting_Supplier::CEC_Pull_Counting_Supplier (void) + : event_count (0), + disconnect_count (0) +{ +} + +void +CEC_Pull_Counting_Supplier::connect ( + CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin, + CORBA::Environment &ACE_TRY_ENV) +{ + CosEventComm::PullSupplier_var supplier = + this->_this (ACE_TRY_ENV); + ACE_CHECK; + + if (CORBA::is_nil (this->consumer_proxy_.in ())) + { + this->consumer_proxy_ = + supplier_admin->obtain_pull_consumer (ACE_TRY_ENV); + ACE_CHECK; + } + + this->consumer_proxy_->connect_pull_supplier (supplier.in (), + ACE_TRY_ENV); + ACE_CHECK; +} + +void +CEC_Pull_Counting_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV) +{ + if (!CORBA::is_nil (this->consumer_proxy_.in ())) + { + this->consumer_proxy_->disconnect_pull_consumer (ACE_TRY_ENV); + ACE_CHECK; + } + + PortableServer::POA_var supplier_poa = + this->_default_POA (ACE_TRY_ENV); + ACE_CHECK; + PortableServer::ObjectId_var supplier_id = + supplier_poa->servant_to_id (this, ACE_TRY_ENV); + ACE_CHECK; + supplier_poa->deactivate_object (supplier_id.in (), ACE_TRY_ENV); + ACE_CHECK; + + this->consumer_proxy_ = + CosEventChannelAdmin::ProxyPullConsumer::_nil (); +} + +CORBA::Any* +CEC_Pull_Counting_Supplier::pull (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)) +{ + if (CORBA::is_nil (this->consumer_proxy_.in ())) + ACE_THROW_RETURN (CosEventComm::Disconnected (), 0); + + if (this->event_count % 2) + { + // Sleep for 1 second, to simulate blocking calls. + ACE_OS::sleep (1); + } + + this->event_count++; + CORBA::Any event; + event <<= CORBA::Long(0); + + return new CORBA::Any (event); +} + +CORBA::Any* +CEC_Pull_Counting_Supplier::try_pull (CORBA::Boolean_out has_event, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)) +{ + if (CORBA::is_nil (this->consumer_proxy_.in ())) + ACE_THROW_RETURN (CosEventComm::Disconnected (), 0); + + if (this->event_count % 2) + { + // No event + has_event = 0; + } + else + { + // We have an event + has_event = 1; + this->event_count++; + } + + CORBA::Any event; + event <<= CORBA::Long(0); + + return new CORBA::Any (event); +} + +void +CEC_Pull_Counting_Supplier::disconnect_pull_supplier (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + this->disconnect_count++; + this->consumer_proxy_ = + CosEventChannelAdmin::ProxyPullConsumer::_nil (); +} + + + #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h index 3a65a31fb19..159e77205f8 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h +++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h @@ -49,9 +49,7 @@ public: void push (const CORBA::Any& events, CORBA::Environment &_env) ACE_THROW_SPEC ((CORBA::SystemException)); - void disconnect_push_consumer (CORBA::Environment &) - ACE_THROW_SPEC ((CORBA::SystemException)); - // The Consumer side methods. + // Push an event. virtual void disconnect_push_supplier (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -101,4 +99,45 @@ private: ACE_SYNCH_MUTEX lock_; }; +// **************************************************************** + +class CEC_Test_Export CEC_Pull_Counting_Supplier : public POA_CosEventComm::PullSupplier +{ + // = TITLE + // Simple supplier object + // + // = DESCRIPTION + // This class is a supplier of events. + // +public: + CEC_Pull_Counting_Supplier (void); + // Constructor + + // = The CosEventComm::PullSupplier methods + + void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin, + CORBA::Environment &ACE_TRY_ENV); + void disconnect (CORBA::Environment &ACE_TRY_ENV); + // Simple connect/disconnect methods.. + + // The PullSupplier methods. + CORBA::Any* pull (CORBA::Environment &_env) + ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)); + CORBA::Any* try_pull (CORBA::Boolean_out has_event, + CORBA::Environment &_env) + ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)); + virtual void disconnect_pull_supplier (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)); + + CORBA::ULong event_count; + // Count the number of events sent + + CORBA::ULong disconnect_count; + // Count the number of disconnect_pull_supplier calls + +private: + CosEventChannelAdmin::ProxyPullConsumer_var consumer_proxy_; + // Our proxy +}; + #endif /* ECT_SUPPLIER_H */ diff --git a/TAO/utils/catior/catior.cpp b/TAO/utils/catior/catior.cpp index ac1786d3013..704c1665aa8 100644 --- a/TAO/utils/catior/catior.cpp +++ b/TAO/utils/catior/catior.cpp @@ -120,6 +120,9 @@ static CORBA::Boolean cat_uiop_profile (TAO_InputCDR& cdr); static CORBA::Boolean +cat_shmiop_profile (TAO_InputCDR& cdr); + +static CORBA::Boolean cat_octet_seq (const char *object_name, TAO_InputCDR& stream); @@ -253,6 +256,12 @@ catior (char* str, continue_decoding = cat_uiop_profile (stream); ACE_DEBUG ((LM_DEBUG, "%}")); } + else if (tag == TAO_TAG_SHMEM_PROFILE) + { + ACE_DEBUG ((LM_DEBUG, "%{")); + continue_decoding = cat_shmiop_profile (stream); + ACE_DEBUG ((LM_DEBUG, "%}")); + } else { ACE_DEBUG ((LM_DEBUG, "%{")); @@ -605,7 +614,8 @@ cat_tagged_components (TAO_InputCDR& stream) } static CORBA::Boolean -cat_iiop_profile (TAO_InputCDR& stream) +cat_profile_helper (TAO_InputCDR& stream, + const char *protocol) { // OK, we've got an IIOP profile. It's going to be // encapsulated ProfileData. Create a new decoding stream and @@ -639,16 +649,18 @@ cat_iiop_profile (TAO_InputCDR& stream) && iiop_version_minor <= 1)) { ACE_DEBUG ((LM_DEBUG, - "%I detected new v%d.%d IIOP profile", + "%I detected new v%d.%d %s profile", iiop_version_major, - iiop_version_minor)); + iiop_version_minor, + protocol)); return 1; } ACE_DEBUG ((LM_DEBUG, "IIOP Version:\t%d.%d\n", iiop_version_major, - iiop_version_minor)); + iiop_version_minor, + protocol)); // Get host and port. CORBA::UShort port_number; @@ -680,6 +692,18 @@ cat_iiop_profile (TAO_InputCDR& stream) } static CORBA::Boolean +cat_iiop_profile (TAO_InputCDR& stream) +{ + return cat_profile_helper (stream, "IIOP"); +} + +static CORBA::Boolean +cat_shmiop_profile (TAO_InputCDR& stream) +{ + return cat_profile_helper (stream, "SHMIOP"); +} + +static CORBA::Boolean cat_uiop_profile (TAO_InputCDR& stream) { // OK, we've got an IIOP profile. It's going to be |