diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp index d90ca8c4678..1b06a04dca7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp @@ -1,9 +1,7 @@ // $Id$ -extern unsigned long EC_TPC_debug_level; - -#include "EC_TPC_Dispatching.h" -#include "EC_Defaults.h" +#include "orbsvcs/Event/EC_TPC_Dispatching.h" +#include "orbsvcs/Event/EC_Defaults.h" #include <ace/Dynamic_Service.h> @@ -13,6 +11,10 @@ ACE_RCSID(Event, EC_TPC_Dispatching, "$Id$") #define TAO_EC_TPC_DISPATCHING_DEFAULT_MAP_SIZE 32 #endif +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +extern unsigned long EC_TPC_debug_level; + TAO_EC_TPC_Dispatching::TAO_EC_TPC_Dispatching (TAO_EC_Queue_Full_Service_Object* so) : consumer_task_map_(TAO_EC_TPC_DISPATCHING_DEFAULT_MAP_SIZE) , queue_full_service_object_(so) @@ -130,7 +132,7 @@ TAO_EC_TPC_Dispatching::shutdown (void) MAPTYPE::ITERATOR iter = this->consumer_task_map_.begin (); while (! iter.done()) { - MAPTYPE::ENTRY* entry; + MAPTYPE::ENTRY* entry = 0; if (! iter.next(entry)) continue; @@ -145,7 +147,7 @@ TAO_EC_TPC_Dispatching::shutdown (void) iter = this->consumer_task_map_.begin (); while (! iter.done()) { - MAPTYPE::ENTRY* entry; + MAPTYPE::ENTRY* entry = 0; if (! iter.next(entry)) continue; @@ -192,3 +194,5 @@ TAO_EC_TPC_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, ACE_CHECK; } } + +TAO_END_VERSIONED_NAMESPACE_DECL |