diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-04-04 07:01:41 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-04-04 07:01:41 +0000 |
| commit | 0573cd1ffda6df6bf36ece40276134e6e037a5a9 (patch) | |
| tree | f091bc6228132ac5887edcae7c9fbb038d03d7d7 /TAO/orbsvcs | |
| parent | ad83cd285585f72b5c561cffa945fbfd6632bd3f (diff) | |
| download | ATCD-0573cd1ffda6df6bf36ece40276134e6e037a5a9.tar.gz | |
ChangeLogTag: Mon Apr 3 18:32:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/orbsvcs')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp index 5649e048aa0..1b06a04dca7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp @@ -132,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; @@ -147,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; diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp index fbd1138e13c..7dd33e5deb6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp @@ -34,7 +34,7 @@ namespace { { const char * name = attrs->getQName (i); const char * value = attrs->getValue (i); - if (ACE_OS::strcmp (name, + if (ACE_OS::strcmp (name, TAO_VERSIONED_NAMESPACE_NAME::TAO_Notify::TOPOLOGY_ID_NAME) == 0) { id = ACE_OS::atoi (value); @@ -180,7 +180,7 @@ namespace TAO_Notify if (this->live_) { ACE_ASSERT (object_stack_.size () > 0); - Topology_Object* cur; + Topology_Object* cur = 0; if (object_stack_.top (cur) == 0) { ACE_DECLARE_NEW_ENV; |