ChangeLogTag: Thu Aug 29 06:03:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl>

8 files changed, 46 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index e253fbd3719..daf36ce1d52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,18 @@
 Thu Aug 29 05:53:12 UTC 2002  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * examples/Reactor/Proactor/post_completions.cpp:
-          Fixed compile error
+          Fixed compile error.
+
+        * ace/OS_Dirent.h:
+        * ace/OS_Errno.cpp:
+        * ace/Time_Value.h:
+        * ace/Time_Value.inl:
+          Made method signature the same in definition and implementation.
+
+        * ace/TkReactor.cpp:
+        * ace/TkReactor.h:
+          Made method argument names the same as in the base so that doxygen
+          can generate the documentation.
 
 Wed Aug 28 23:30:31 2002  Steve Huston  <shuston@riverace.com>
 
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index e253fbd3719..daf36ce1d52 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,7 +1,18 @@
 Thu Aug 29 05:53:12 UTC 2002  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * examples/Reactor/Proactor/post_completions.cpp:
-          Fixed compile error
+          Fixed compile error.
+
+        * ace/OS_Dirent.h:
+        * ace/OS_Errno.cpp:
+        * ace/Time_Value.h:
+        * ace/Time_Value.inl:
+          Made method signature the same in definition and implementation.
+
+        * ace/TkReactor.cpp:
+        * ace/TkReactor.h:
+          Made method argument names the same as in the base so that doxygen
+          can generate the documentation.
 
 Wed Aug 28 23:30:31 2002  Steve Huston  <shuston@riverace.com>
 
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 1ca56df859b..4a62543761a 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug 29 06:04:12 UTC 2002  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Sync_Strategies.h:
+          Fixed doxygen command.
+
 Wed Aug 28 16:50:03 2002  Jeff Parsons <parsons@cs.wustl.edu>
 
         * orbsvcs/orbsvcs/Svc_Utils.dsp:
@@ -10,7 +15,7 @@ Wed Aug 28 16:27:05 2002  Jeff Parsons <parsons@cs.wustl.edu>
         * orbsvcs/orbsvcs/IFRService/Repository_i.cpp:
 
           Changed a check to look for a different error return
-          value, to correspond with recent changes to 
+          value, to correspond with recent changes to
           ACE_Configuration.
 
 Wed Aug 28 14:55:43 2002  Jeff Parsons <parsons@cs.wustl.edu>
@@ -20,7 +25,7 @@ Wed Aug 28 14:55:43 2002  Jeff Parsons <parsons@cs.wustl.edu>
         * TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp:
 
           Took away the checks for 'local' that guarded generation
-          of CDR and Any operators. I thought these had been 
+          of CDR and Any operators. I thought these had been
           removed before, but somehow they crept back in. Thanks
           to Irfan <irfan@oomworks.com> for pointing it out.
 
@@ -32,7 +37,7 @@ Wed Aug 28 14:55:43 2002  Jeff Parsons <parsons@cs.wustl.edu>
         * orbsvcs/IFR_Service/drv_preproc_ifr.cpp:
 
           Fixed a signed/unsigned comparison warning that popped
-          up because of a change in ACE.          
+          up because of a change in ACE.
 
 Wed Aug 28 06:06:12 UTC 2002  Johnny Willemsen  <jwillemsen@remedy.nl>
 
diff --git a/TAO/tao/Sync_Strategies.h b/TAO/tao/Sync_Strategies.h
index dcbc524a5a7..9ff8cb51753 100644
--- a/TAO/tao/Sync_Strategies.h
+++ b/TAO/tao/Sync_Strategies.h
@@ -105,14 +105,15 @@ private:
   /**
    * @param buffering_constraint The constraints defined by the
    *        application
+   * @param current_deadline The current deadline
    * @param set_timer Return 1 if the timer should be set
-   * @param interval Return the timer interval value
+   * @param new_deadline Return the timer interval value
    *
    * @return Returns 1 if the deadline has already expired and
    *         flushing must commence immediately.  If the function
    *         returns 0 then flushing may need to be delayed, use @c
-   *         set_timer and 
-   *         
+   *         set_timer and
+   *
    */
   int timer_check (const TAO::BufferingConstraint &buffering_constraint,
                    const ACE_Time_Value &current_deadline,
diff --git a/ace/OS_Dirent.h b/ace/OS_Dirent.h
index 1546305a329..11c5c716112 100644
--- a/ace/OS_Dirent.h
+++ b/ace/OS_Dirent.h
@@ -98,18 +98,18 @@ public:
   static void closedir (ACE_DIR *);
   static dirent *readdir (ACE_DIR *);
   static int readdir_r (ACE_DIR *dirp,
-                        dirent *entry,
-                        dirent **result);
+                        struct dirent *entry,
+                        struct dirent **result);
   static long telldir (ACE_DIR *);
   static void seekdir (ACE_DIR *,
                        long loc);
   static void rewinddir (ACE_DIR *);
 
   static int scandir (const ACE_TCHAR *dirname,
-                      dirent **namelist[],
-                      int (*selector) (const dirent *filename),
-                      int (*comparator) (const dirent **f1,
-                                         const dirent **f2));
+                      struct dirent **namelist[],
+                      int (*selector) (const struct dirent *filename),
+                      int (*comparator) (const struct dirent **f1,
+                                         const struct dirent **f2));
 private:
   // Win32 emulation functions
   static ACE_DIR *opendir_emulation (const ACE_TCHAR *filename);
diff --git a/ace/Time_Value.inl b/ace/Time_Value.inl
index 829b89d5684..7d4be4aafd8 100644
--- a/ace/Time_Value.inl
+++ b/ace/Time_Value.inl
@@ -72,7 +72,7 @@ ACE_Time_Value::set (const timeval &tv)
 }
 
 ACE_INLINE
-ACE_Time_Value::ACE_Time_Value (const timeval &tv)
+ACE_Time_Value::ACE_Time_Value (const struct timeval &tv)
   // : tv_ ()
 {
   // ACE_OS_TRACE ("ACE_Time_Value::ACE_Time_Value");
diff --git a/ace/TkReactor.cpp b/ace/TkReactor.cpp
index 898d9fdc949..87a496f0f3e 100644
--- a/ace/TkReactor.cpp
+++ b/ace/TkReactor.cpp
@@ -381,7 +381,7 @@ ACE_TkReactor::reset_timer_interval
 }
 
 long
-ACE_TkReactor::schedule_timer (ACE_Event_Handler *handler,
+ACE_TkReactor::schedule_timer (ACE_Event_Handler *event_handler,
 			       const void *arg,
                 const ACE_Time_Value &delay,
 			       const ACE_Time_Value &interval)
@@ -389,7 +389,7 @@ ACE_TkReactor::schedule_timer (ACE_Event_Handler *handler,
   ACE_TRACE ("ACE_TkReactor::schedule_timer");
   ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, ace_mon, this->token_, -1));
 
-  long result = ACE_Select_Reactor::schedule_timer (handler,
+  long result = ACE_Select_Reactor::schedule_timer (event_handler,
                                                     arg,
                                                     delay,
                                                     interval);
diff --git a/ace/TkReactor.h b/ace/TkReactor.h
index 795d3afa896..5993e2354c1 100644
--- a/ace/TkReactor.h
+++ b/ace/TkReactor.h
@@ -67,7 +67,7 @@ public:
   virtual ~ACE_TkReactor (void);
 
   // = Timer operations.
-  virtual long schedule_timer (ACE_Event_Handler *handler,
+  virtual long schedule_timer (ACE_Event_Handler *event_handler,
                                const void *arg,
                                const ACE_Time_Value &delay,
                                const ACE_Time_Value &interval);