diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp index 63445e7af3c..3cd55e69237 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp @@ -6,7 +6,6 @@ #include "Delivery_Request.inl" #endif /* __ACE_INLINE__ */ -#include "Routing_Slip.h" #include "tao/debug.h" //#define DEBUG_LEVEL 9 @@ -14,7 +13,7 @@ # define DEBUG_LEVEL TAO_debug_level #endif //DEBUG_LEVEL -namespace TAO_NOTIFY +namespace TAO_Notify { /////////////////// @@ -46,7 +45,7 @@ Delivery_Request::complete () // DO NOT INLINE THIS. It uses the Routing_Slip_Ptr which cannot be declared at // the time Delivery_Request.inl is compiled. -const TAO_Notify_Event_Copy_var & +const TAO_Notify_Event_var & Delivery_Request::event () const { return this->routing_slip_->event (); @@ -70,20 +69,20 @@ Delivery_Request::marshal (TAO_OutputCDR & cdr) } // namespace #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -//template class ACE_Auto_Basic_Ptr<TAO_NOTIFY::Routing_Slip>; -//template class ACE_Strong_Bound_Ptr<TAO_NOTIFY::Routing_Slip, TAO_SYNCH_MUTEX>; -//template class ACE_Auto_Basic_Ptr<TAO_NOTIFY::Delivery_Request>; -//template class ACE_Strong_Bound_Ptr<TAO_NOTIFY::Delivery_Request,TAO_SYNCH_MUTEX>; +//template class ACE_Auto_Basic_Ptr<TAO_Notify::Routing_Slip>; +//template class ACE_Strong_Bound_Ptr<TAO_Notify::Routing_Slip, TAO_SYNCH_MUTEX>; +//template class ACE_Auto_Basic_Ptr<TAO_Notify::Delivery_Request>; +//template class ACE_Strong_Bound_Ptr<TAO_Notify::Delivery_Request,TAO_SYNCH_MUTEX>; // Duplicated in Routing_Slip.cpp -//template class ACE_Vector <TAO_NOTIFY::Delivery_Request_Ptr>; -//template class ACE_Array_Base<ACE_Strong_Bound_Ptr<TAO_NOTIFY::Delivery_Request,TAO_SYNCH_MUTEX> >; +//template class ACE_Vector <TAO_Notify::Delivery_Request_Ptr>; +//template class ACE_Array_Base<ACE_Strong_Bound_Ptr<TAO_Notify::Delivery_Request,TAO_SYNCH_MUTEX> >; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -//#pragma instantiate ACE_Auto_Basic_Ptr<TAO_NOTIFY::Routing_Slip> -//#pragma instantiate ACE_Strong_Bound_Ptr<TAO_NOTIFY::Routing_Slip,TAO_SYNCH_MUTEX> -//#pragma instantiate ACE_Auto_Basic_Ptr<TAO_NOTIFY::Delivery_Request> -//#pragma instantiate ACE_Strong_Bound_Ptr<TAO_NOTIFY::Delivery_Request,TAO_SYNCH_MUTEX> +//#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Notify::Routing_Slip> +//#pragma instantiate ACE_Strong_Bound_Ptr<TAO_Notify::Routing_Slip,TAO_SYNCH_MUTEX> +//#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Notify::Delivery_Request> +//#pragma instantiate ACE_Strong_Bound_Ptr<TAO_Notify::Delivery_Request,TAO_SYNCH_MUTEX> // Duplicated in Routing_Slip.cpp -//#pragma instantiate ACE_Vector <TAO_NOTIFY::Delivery_Request_Ptr> -//#pragma instantiate ACE_Array_Base<ACE_Strong_Bound_Ptr<TAO_NOTIFY::Delivery_Request,TAO_SYNCH_MUTEX> > +//#pragma instantiate ACE_Vector <TAO_Notify::Delivery_Request_Ptr> +//#pragma instantiate ACE_Array_Base<ACE_Strong_Bound_Ptr<TAO_Notify::Delivery_Request,TAO_SYNCH_MUTEX> > #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |