diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2002-08-31 15:34:48 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2002-08-31 15:34:48 +0000 |
| commit | 275e4c5da486f4cb6c06aff0dc836c2eeca1c880 (patch) | |
| tree | a722f8a663c5773d88a13c23a9576f0514c83807 | |
| parent | a3acaa7d9e9f35636cff64bb34de4a75384f37a1 (diff) | |
| download | ATCD-275e4c5da486f4cb6c06aff0dc836c2eeca1c880.tar.gz | |
ChangeLogTag:Sat Aug 31 10:32:38 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 6 | ||||
| -rw-r--r-- | ace/Future.cpp | 8 | ||||
| -rw-r--r-- | ace/Malloc_T.cpp | 3 | ||||
| -rw-r--r-- | ace/Malloc_T.h | 2 |
5 files changed, 16 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index 87a2258a4a9..b5d3e2cf530 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Aug 31 10:32:38 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * ace/Future.cpp (set): Removed a stray reference to "iterator" + and replaced the for loop with a while loop. Thanks to Craig + Rodrigues for reporting this. + Sat Aug 31 01:20:09 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> Gary Duzan <gduzan@bbn.com> diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 87a2258a4a9..b5d3e2cf530 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,9 @@ +Sat Aug 31 10:32:38 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * ace/Future.cpp (set): Removed a stray reference to "iterator" + and replaced the for loop with a while loop. Thanks to Craig + Rodrigues for reporting this. + Sat Aug 31 01:20:09 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> Gary Duzan <gduzan@bbn.com> diff --git a/ace/Future.cpp b/ace/Future.cpp index 3facf8fbcf1..e50418cc804 100644 --- a/ace/Future.cpp +++ b/ace/Future.cpp @@ -182,9 +182,7 @@ ACE_Future_Rep<T>::set (const T &r, ACE_TYPENAME OBSERVER_COLLECTION::iterator end = this->observer_collection_.end (); - for (; - iterator != end; - iterator) + while (iterator != end) { OBSERVER *observer = *iterator++; observer->update (caller); @@ -236,9 +234,7 @@ ACE_Future_Rep<T>::attach (ACE_Future_Observer<T> *observer, // If the value is already produced, then notify observer if (this->value_ == 0) - { - result = this->observer_collection_.insert (observer); - } + result = this->observer_collection_.insert (observer); else observer->update (caller); diff --git a/ace/Malloc_T.cpp b/ace/Malloc_T.cpp index 703232d0d45..b764624b767 100644 --- a/ace/Malloc_T.cpp +++ b/ace/Malloc_T.cpp @@ -392,11 +392,10 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::shared_malloc (size_t nbytes) { currp = prevp->next_block_; } -#endif +#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ // Search the freelist to locate a block of the appropriate size. - while (1) // *Warning* Do not use "continue" within this while-loop. diff --git a/ace/Malloc_T.h b/ace/Malloc_T.h index ba205751699..4796ed004c0 100644 --- a/ace/Malloc_T.h +++ b/ace/Malloc_T.h @@ -481,7 +481,7 @@ public: /// Deallocate memory pointed to by <ptr>, which must have been /// allocated previously by <this->malloc>. - void free (void *ptr); + void free (void *ptr); /// Returns a reference to the underlying memory pool. MEMORY_POOL &memory_pool (void); |