*** empty log message ***

3 files changed, 17 insertions, 12 deletions

diff --git a/ChangeLog-97b b/ChangeLog-97b
index 6b91086b54b..c5fc793c843 100644
--- a/ChangeLog-97b
+++ b/ChangeLog-97b
@@ -1,3 +1,8 @@
+Mon Oct 13 13:44:40 1997    <irfan@TWOSTEP>
+
+	* ace/Priority_Reactor: Fixed a gross violation of ACE coding
+	  standard. Changed bucket to bucket_.
+
 Mon Oct 13 12:58:01 1997  David L. Levine  <levine@cs.wustl.edu>
 
 	* ace/OS.i: moved ACE_OS::strcasecmp () definition after
diff --git a/ace/Priority_Reactor.cpp b/ace/Priority_Reactor.cpp
index 281442b4fa8..7747a763abd 100644
--- a/ace/Priority_Reactor.cpp
+++ b/ace/Priority_Reactor.cpp
@@ -32,23 +32,23 @@ void ACE_Priority_Reactor::init_bucket (void)
 	   TUPLE_ALLOCATOR (ACE_Select_Reactor::DEFAULT_SIZE));
 
   // The event handlers are assigned to a new As the Event
-  ACE_NEW (this->bucket, QUEUE*[npriorities]);
+  ACE_NEW (this->bucket_, QUEUE*[npriorities]);
   // This loops "ensures" exception safety.
   int i;
   for (i = 0; i < npriorities; ++i)
     {
-      this->bucket[i] = 0;
+      this->bucket_[i] = 0;
     }
   for (i = 0; i < npriorities; ++i)
     {
-      ACE_NEW (this->bucket[i], QUEUE (this->tuple_allocator_));
+      ACE_NEW (this->bucket_[i], QUEUE (this->tuple_allocator_));
     }
 }
 
 ACE_Priority_Reactor::ACE_Priority_Reactor (ACE_Sig_Handler *sh,
 					    ACE_Timer_Queue *tq)
   : ACE_Select_Reactor(sh, tq),
-    bucket (0),
+    bucket_ (0),
     tuple_allocator_ (0)
 {
   ACE_TRACE ("ACE_Priority_Reactor::ACE_Priority_Reactor");
@@ -60,7 +60,7 @@ ACE_Priority_Reactor::ACE_Priority_Reactor (size_t size,
 					    ACE_Sig_Handler *sh,
 					    ACE_Timer_Queue *tq)
   : ACE_Select_Reactor (size, rs, sh, tq),
-    bucket (0),
+    bucket_ (0),
     tuple_allocator_ (0)
 {
   ACE_TRACE ("ACE_Priority_Reactor::ACE_Priority_Reactor");
@@ -72,9 +72,9 @@ ACE_Priority_Reactor::~ACE_Priority_Reactor (void)
   ACE_TRACE ("ACE_Priority_Reactor::~ACE_Priority_Reactor");
   for (int i = 0; i < npriorities; ++i)
     {
-      delete this->bucket[i];
+      delete this->bucket_[i];
     }
-  delete[] this->bucket;
+  delete[] this->bucket_;
   delete tuple_allocator_;
 }
 
@@ -118,7 +118,7 @@ ACE_Priority_Reactor::dispatch_io_set (int number_of_active_handles,
 	  prio = ACE_Event_Handler::LO_PRIORITY;
 	}
 
-      bucket[prio]->enqueue_tail (et);
+      bucket_[prio]->enqueue_tail (et);
       // Update the priority ranges....
       if (min_priority > prio)
 	{
@@ -135,12 +135,12 @@ ACE_Priority_Reactor::dispatch_io_set (int number_of_active_handles,
   for (int i = max_priority; i >= min_priority; --i)
     {
       // Remove all the entries from the wrappers
-      while (!bucket[i]->is_empty ()
+      while (!bucket_[i]->is_empty ()
 	     && number_dispatched < number_of_active_handles
 	     && this->state_changed_ == 0)
 	{
 	  ACE_Event_Tuple et;
-	  bucket[i]->dequeue_head (et);
+	  bucket_[i]->dequeue_head (et);
           this->notify_handle (et.handle_,
                                mask,
                                ready_mask,
@@ -150,7 +150,7 @@ ACE_Priority_Reactor::dispatch_io_set (int number_of_active_handles,
         }
       // Even if we are aborting the loop due to this->state_changed
       // or another error we still want to cleanup the buckets.
-      bucket[i]->reset ();
+      bucket_[i]->reset ();
     }
 
   if (number_dispatched > 0 && this->state_changed_)
diff --git a/ace/Priority_Reactor.h b/ace/Priority_Reactor.h
index eef9fc9ea20..09c7f71c4f8 100644
--- a/ace/Priority_Reactor.h
+++ b/ace/Priority_Reactor.h
@@ -70,7 +70,7 @@ private:
   // A small helper to initialize the bucket.
 
   typedef ACE_Unbounded_Queue<ACE_Event_Tuple> QUEUE;
-  QUEUE** bucket;
+  QUEUE** bucket_;
   // There is a queue per-priority, which simply holds the
   // Event_Handlers until we knwo who goes first.