diff options
25 files changed, 27 insertions, 100 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 505fdd77562..cdef0ce67d7 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,23 @@ +Wed Jan 5 11:21:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> + + * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.{h,cpp,i}: + * orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.{h,cpp,i}: + * orbsvcs/orbsvcs/CosEvent/CEC_Factory.{h,cpp,i}: + * orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.{h,cpp,i}: + * orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.{h,cpp,i}: + * orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.{h,cpp,i}: + Removed i file and updated h/cpp file. + + * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp: + Removed empty explicit instantiation block + + * orbsvcs/orbsvcs/Makefile.am + Updated for changes above + Wed Jan 5 11:07:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.{h,cpp,i}: diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp index 180466d987e..9994b1bcac3 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp @@ -2,12 +2,8 @@ #include "CEC_ConsumerControl.h" -#if ! defined (__ACE_INdLINE__) -#include "CEC_ConsumerControl.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID (CosEvent, - CEC_ConsumerControl, +ACE_RCSID (CosEvent, + CEC_ConsumerControl, "$Id$") TAO_CEC_ConsumerControl::TAO_CEC_ConsumerControl (void) diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h index f3a405d26c7..5f25b3fffd2 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h @@ -91,9 +91,5 @@ public: virtual void successful_transmission (PortableServer::ServantBase* proxy); }; -#if defined (__ACE_INLINE__) -#include "CEC_ConsumerControl.i" -#endif /* __ACE_INLINE__ */ - #include /**/ "ace/post.h" #endif /* TAO_CEC_CONSUMERCONTROL_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.i deleted file mode 100644 index 74e88caa0c5..00000000000 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.i +++ /dev/null @@ -1,2 +0,0 @@ -// $Id$ - diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp index 858d3a7581d..ef98d25450d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp @@ -3,10 +3,6 @@ #include "CEC_Dispatching.h" #include "CEC_ProxyPushSupplier.h" -#if ! defined (__ACE_INLINE__) -#include "CEC_Dispatching.i" -#endif /* __ACE_INLINE__ */ - ACE_RCSID(CosEvent, CEC_Dispatching, "$Id$") TAO_CEC_Dispatching::~TAO_CEC_Dispatching (void) diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h index a6ba0f8a724..e6aff0650d3 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h @@ -110,10 +110,6 @@ public: #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ }; -#if defined (__ACE_INLINE__) -#include "CEC_Dispatching.i" -#endif /* __ACE_INLINE__ */ - #include /**/ "ace/post.h" #endif /* TAO_CEC_DISPATCHING_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.i deleted file mode 100644 index cfa1da318d3..00000000000 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.i +++ /dev/null @@ -1 +0,0 @@ -// $Id$ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp index 03853ad74fe..9225b7f38aa 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp @@ -3,10 +3,6 @@ #include "CEC_Factory.h" #include "ace/Dynamic_Service.h" -#if ! defined (__ACE_INLINE__) -#include "CEC_Factory.i" -#endif /* __ACE_INLINE__ */ - ACE_RCSID(CosEvent, CEC_Factory, "$Id$") TAO_CEC_Factory::~TAO_CEC_Factory (void) diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h index 7161eb63dfd..d60f0e8811a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h @@ -215,9 +215,5 @@ public: destroy_supplier_control (TAO_CEC_SupplierControl*) = 0; }; -#if defined (__ACE_INLINE__) -#include "CEC_Factory.i" -#endif /* __ACE_INLINE__ */ - #include /**/ "ace/post.h" #endif /* TAO_CEC_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.i deleted file mode 100644 index cfa1da318d3..00000000000 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.i +++ /dev/null @@ -1 +0,0 @@ -// $Id$ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp index 3a29103cb96..ddeddeb2ece 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp @@ -2,10 +2,6 @@ #include "CEC_MT_Dispatching.h" -#if ! defined (__ACE_INLINE__) -#include "CEC_MT_Dispatching.i" -#endif /* __ACE_INLINE__ */ - ACE_RCSID(CosEvent, CEC_MT_Dispatching, "$Id$") TAO_CEC_MT_Dispatching::TAO_CEC_MT_Dispatching (int nthreads, diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h index d3a706ff5b8..c19647c53d1 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h @@ -90,10 +90,6 @@ private: int active_; }; -#if defined (__ACE_INLINE__) -#include "CEC_MT_Dispatching.i" -#endif /* __ACE_INLINE__ */ - #include /**/ "ace/post.h" #endif /* TAO_CEC_MT_DISPATCHING_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.i deleted file mode 100644 index 74e88caa0c5..00000000000 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.i +++ /dev/null @@ -1,2 +0,0 @@ -// $Id$ - diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp index cadc6623315..e6b54a8e24a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp @@ -363,8 +363,3 @@ TAO_CEC_ProxyPushConsumer_Guard:: this->event_channel_->destroy_proxy (this->proxy_); } -#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_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp index 0a84bf5f77c..5367a8c4eda 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp @@ -2,10 +2,6 @@ #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 index b4c0c970545..4b2a60fce8e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h @@ -64,9 +64,5 @@ public: #endif /* 0 */ }; -#if defined (__ACE_INLINE__) -#include "CEC_Pulling_Strategy.i" -#endif /* __ACE_INLINE__ */ - #include /**/ "ace/post.h" #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 deleted file mode 100644 index cfa1da318d3..00000000000 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.i +++ /dev/null @@ -1 +0,0 @@ -// $Id$ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp index 795ba286da9..b9fe7ee6bce 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp @@ -23,8 +23,8 @@ #include "CEC_Reactive_ConsumerControl.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID (CosEvent, - CEC_Reactive_ConsumerControl, +ACE_RCSID (CosEvent, + CEC_Reactive_ConsumerControl, "$Id$") TAO_CEC_Reactive_ConsumerControl:: @@ -415,8 +415,3 @@ TAO_CEC_Ping_Pull_Consumer::work (TAO_CEC_ProxyPullSupplier *supplier ACE_ENDTRY; } -#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.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp index 470f8a98292..4f14b03c058 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp @@ -190,8 +190,3 @@ TAO_CEC_Pull_Event::work (TAO_CEC_ProxyPullConsumer *consumer } } -#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_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp index 351b24a2fdc..8f75b183ce0 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp @@ -24,8 +24,8 @@ #include "CEC_Reactive_SupplierControl.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID (CosEvent, - CEC_Reactive_SupplierControl, +ACE_RCSID (CosEvent, + CEC_Reactive_SupplierControl, "$Id$") TAO_CEC_Reactive_SupplierControl:: @@ -88,7 +88,7 @@ TAO_CEC_Reactive_SupplierControl::query_suppliers ( if (this->typed_event_channel_) { TAO_CEC_Ping_Typed_Push_Supplier push_worker (this); - + this->typed_event_channel_->typed_supplier_admin ()->for_each (&push_worker ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -473,8 +473,3 @@ TAO_CEC_Ping_Pull_Supplier::work (TAO_CEC_ProxyPullConsumer *consumer ACE_ENDTRY; } -#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_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp index 788cc6b7852..f8f3edccd29 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp @@ -2,10 +2,6 @@ #include "CEC_SupplierControl.h" -#if ! defined (__ACE_INdLINE__) -#include "CEC_SupplierControl.i" -#endif /* __ACE_INLINE__ */ - ACE_RCSID(CosEvent, CEC_SupplierControl, "$Id$") TAO_CEC_SupplierControl::TAO_CEC_SupplierControl (void) @@ -66,8 +62,3 @@ TAO_CEC_SupplierControl::successful_transmission (PortableServer::ServantBase*) { } -#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_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h index 7875e543f34..242c3cd2172 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h @@ -106,9 +106,5 @@ public: virtual void successful_transmission (PortableServer::ServantBase* proxy); }; -#if defined (__ACE_INLINE__) -#include "CEC_SupplierControl.i" -#endif /* __ACE_INLINE__ */ - #include /**/ "ace/post.h" #endif /* TAO_CEC_SUPPLIERCONTROL_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.i deleted file mode 100644 index 74e88caa0c5..00000000000 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.i +++ /dev/null @@ -1,2 +0,0 @@ -// $Id$ - diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp index fb4e4778985..e64ee26c6e2 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp @@ -415,8 +415,3 @@ TAO_CEC_TypedProxyPushConsumer_Guard:: this->typed_event_channel_->destroy_proxy (this->proxy_); } -#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/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am index 220736250a7..228b35423f1 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.am +++ b/TAO/orbsvcs/orbsvcs/Makefile.am @@ -821,24 +821,18 @@ nobase_include_HEADERS += \ CosEvent/CEC_TypedProxyPushConsumer.h \ CosEvent/CEC_TypedSupplierAdmin.h \ CosEvent/CEC_ConsumerAdmin.i \ - CosEvent/CEC_ConsumerControl.i \ CosEvent/CEC_Default_Factory.i \ - CosEvent/CEC_Dispatching.i \ CosEvent/CEC_Dispatching_Task.i \ CosEvent/CEC_DynamicImplementation.i \ CosEvent/CEC_EventChannel.i \ - CosEvent/CEC_Factory.i \ - CosEvent/CEC_MT_Dispatching.i \ CosEvent/CEC_ProxyPullConsumer.i \ CosEvent/CEC_ProxyPullSupplier.i \ CosEvent/CEC_ProxyPushConsumer.i \ CosEvent/CEC_ProxyPushSupplier.i \ - CosEvent/CEC_Pulling_Strategy.i \ CosEvent/CEC_Reactive_ConsumerControl.i \ CosEvent/CEC_Reactive_Pulling_Strategy.i \ CosEvent/CEC_Reactive_SupplierControl.i \ CosEvent/CEC_SupplierAdmin.i \ - CosEvent/CEC_SupplierControl.i \ CosEvent/CEC_TypedConsumerAdmin.i \ CosEvent/CEC_TypedEvent.i \ CosEvent/CEC_TypedEventChannel.i \ |