foo

1 files changed, 24 insertions, 24 deletions

diff --git a/ace/Module.h b/ace/Module.h
index f587ef7744f..d2bd2c608f0 100644
--- a/ace/Module.h
+++ b/ace/Module.h
@@ -49,7 +49,8 @@ public:
     M_DELETE = 3 
     // Indicates that close() deletes the Tasks.  Don't change this
     // value without updating the same enum in class ACE_Stream...
-    // The above flags may be or'ed together.
+    // The <M_DELETE_READER> and <M_DELETE_WRITER> flags may be or'ed
+    // together.
   };
 
   // = Initialization and termination methods.
@@ -63,7 +64,7 @@ public:
 	      ACE_Task<ACE_SYNCH_2> *writer = 0, 
 	      ACE_Task<ACE_SYNCH_2> *reader = 0, 
 	      void *args = 0,
-		  int flags = M_DELETE);
+	      int flags = M_DELETE);
   // Create an initialized module with <module_name> as its identity
   // and <reader> and <writer> as its tasks.
 
@@ -71,20 +72,19 @@ public:
 	    ACE_Task<ACE_SYNCH_2> *writer = 0, 
 	    ACE_Task<ACE_SYNCH_2> *reader = 0, 
 	    void *a = 0,
-		int flags = M_DELETE);
+	    int flags = M_DELETE);
   // Create an initialized module with <module_name> as its identity
-  // and <reader> and <writer> as its tasks.
-  // Previously register reader or writers or closed down and deleted
-  // according to the value of flags_.
-  // Should not be called from within ACE_Task::module_closed()
+  // and <reader> and <writer> as its tasks.  Previously register
+  // reader or writers or closed down and deleted according to the
+  // value of flags_.  Should not be called from within
+  // ACE_Task::module_closed().
 
   int close (int flags = M_DELETE_NONE);
   // Close down the Module and its Tasks.  The flags argument can be
-  // used to override the default behaviour, which depends on
-  // previous <flags> values in calls to c'tor(), open(), reader() and
-  // writer().
-  // A previous value M_DELETE[_XXX] can not be overridden.
-  // Should not be called from within ACE_Task::module_closed()
+  // used to override the default behaviour, which depends on previous
+  // <flags> values in calls to c'tor(), open(), reader() and
+  // writer().  A previous value M_DELETE[_XXX] can not be overridden.
+  // Should not be called from within ACE_Task::module_closed().
   
   // = ACE_Task manipulation routines 
   ACE_Task<ACE_SYNCH_2> *writer (void);
@@ -92,23 +92,23 @@ public:
 
   void writer (ACE_Task<ACE_SYNCH_2> *q, int flags = M_DELETE_WRITER);
   // Set the writer task. <flags> can be used to indicate that the
-  // module should delete the writer during a call to close or
-  // to the destructor. If a previous writer exists, it is closed. 
-  // It may also be deleted, depending on the old flags_ value.
-  // Should not be called from within ACE_Task::module_closed()
+  // module should delete the writer during a call to close or to the
+  // destructor. If a previous writer exists, it is closed.  It may
+  // also be deleted, depending on the old flags_ value.  Should not
+  // be called from within ACE_Task::module_closed().
 
   ACE_Task<ACE_SYNCH_2> *reader (void);
   // Get the reader task.
 
   void reader (ACE_Task<ACE_SYNCH_2> *q, int flags = M_DELETE_READER);
   // Set the reader task. <flags> can be used to indicate that the
-  // module should delete the reader during a call to close or
-  // to the destructor. If a previous reader exists, it is closed. 
-  // It may also be deleted, depending on the old flags_ value.
-  // Should not be called from within ACE_Task::module_closed()
+  // module should delete the reader during a call to close or to the
+  // destructor. If a previous reader exists, it is closed.  It may
+  // also be deleted, depending on the old flags_ value.  Should not
+  // be called from within ACE_Task::module_closed()
 
   ACE_Task<ACE_SYNCH_2> *sibling (ACE_Task<ACE_SYNCH_2> *orig); 
-  // Set and get pointer to sibling ACE_Task in ACE_Module 
+  // Set and get pointer to sibling ACE_Task in ACE_Module.
 
   // = Identify the module 
   const char *name (void) const;
@@ -139,9 +139,9 @@ public:
   // Declare the dynamic allocation hooks.
 
 private:
-  int close_i(int which);
-  // Implements the close operation for either the reader
-  // or the writer task (depending on <which>)
+  int close_i (int which, int flags);
+  // Implements the close operation for either the reader or the
+  // writer task (depending on <which>).
 
   ACE_Task<ACE_SYNCH_2> *q_pair_[2];   
   // Pair of Tasks that form the "read-side" and "write-side" of the