summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2001-07-09 23:48:07 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2001-07-09 23:48:07 +0000
commite03b0a94b5294cf885724752ca51e687a97d36f4 (patch)
treea799df8d35f23591e8d33cb9065873f8a4ff0a9a
parent6c71f00dac224ddcbf900c306f647ba2e0889573 (diff)
downloadATCD-e03b0a94b5294cf885724752ca51e687a97d36f4.tar.gz
ChangeLogTag:Mon Jul 9 16:40:02 2001 Ossama Othman <ossama@uci.edu>
-rw-r--r--ChangeLog16
-rw-r--r--ChangeLogs/ChangeLog-02a16
-rw-r--r--ChangeLogs/ChangeLog-03a16
-rw-r--r--ace/Dirent_Selector.cpp12
-rw-r--r--ace/Dirent_Selector.h12
-rw-r--r--ace/Dirent_Selector.inl12
6 files changed, 68 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index e2f5a861a03..550cb99cd23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Mon Jul 9 16:40:02 2001 Ossama Othman <ossama@uci.edu>
+
+ * ace/Dirent_Selector.cpp (ACE_Dirent_Selector):
+
+ Correct order of initialization of members to match order of
+ declaration. Fixes a warning issued from GCC.
+
+ * ace/Dirent_Selector.inl:
+
+ Added missing RCS ID keyword. Fuzz was whining about the lack
+ of it.
+
+ * ace/Dirent_Selector.h:
+
+ Corrected some Doxygen comments.
+
Mon Jul 09 19:12:42 2001 Steve Huston <shuston@riverace.com>
* ace/ace.icc: Added Log_Msg_UNIX_Syslog and Log_Msg_NT_Event_Log
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index e2f5a861a03..550cb99cd23 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,19 @@
+Mon Jul 9 16:40:02 2001 Ossama Othman <ossama@uci.edu>
+
+ * ace/Dirent_Selector.cpp (ACE_Dirent_Selector):
+
+ Correct order of initialization of members to match order of
+ declaration. Fixes a warning issued from GCC.
+
+ * ace/Dirent_Selector.inl:
+
+ Added missing RCS ID keyword. Fuzz was whining about the lack
+ of it.
+
+ * ace/Dirent_Selector.h:
+
+ Corrected some Doxygen comments.
+
Mon Jul 09 19:12:42 2001 Steve Huston <shuston@riverace.com>
* ace/ace.icc: Added Log_Msg_UNIX_Syslog and Log_Msg_NT_Event_Log
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index e2f5a861a03..550cb99cd23 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,19 @@
+Mon Jul 9 16:40:02 2001 Ossama Othman <ossama@uci.edu>
+
+ * ace/Dirent_Selector.cpp (ACE_Dirent_Selector):
+
+ Correct order of initialization of members to match order of
+ declaration. Fixes a warning issued from GCC.
+
+ * ace/Dirent_Selector.inl:
+
+ Added missing RCS ID keyword. Fuzz was whining about the lack
+ of it.
+
+ * ace/Dirent_Selector.h:
+
+ Corrected some Doxygen comments.
+
Mon Jul 09 19:12:42 2001 Steve Huston <shuston@riverace.com>
* ace/ace.icc: Added Log_Msg_UNIX_Syslog and Log_Msg_NT_Event_Log
diff --git a/ace/Dirent_Selector.cpp b/ace/Dirent_Selector.cpp
index bcab72acd26..bef6c40a8d1 100644
--- a/ace/Dirent_Selector.cpp
+++ b/ace/Dirent_Selector.cpp
@@ -7,13 +7,15 @@
#include "ace/Dirent_Selector.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(ace, Dirent_Selector, "$Id$")
+ACE_RCSID (ace,
+ Dirent_Selector,
+ "$Id$")
// Construction/Destruction
-ACE_Dirent_Selector::ACE_Dirent_Selector (void)
- : n_ (0),
- namelist_ (0)
+ACE_Dirent_Selector::ACE_Dirent_Selector (void)
+ : namelist_ (0),
+ n_ (0)
{
}
@@ -34,7 +36,7 @@ ACE_Dirent_Selector::open (const ACE_TCHAR *dir,
int
ACE_Dirent_Selector::close (void)
{
- for (--n_; n_>=0; --n_)
+ for (--n_; n_>=0; --n_)
ACE_OS::free (this->namelist_[n_]);
ACE_OS::free (this->namelist_);
diff --git a/ace/Dirent_Selector.h b/ace/Dirent_Selector.h
index a3588136043..4dcfd945b5b 100644
--- a/ace/Dirent_Selector.h
+++ b/ace/Dirent_Selector.h
@@ -23,9 +23,10 @@
/**
* @class ACE_Dirent
*
- * @brief Define a portable C++ directory-entry iterator based on the POSIX <scandir> API.
+ * @brief Define a portable C++ directory-entry iterator based on the
+ * POSIX @param scandir API.
*/
-class ACE_Export ACE_Dirent_Selector
+class ACE_Export ACE_Dirent_Selector
{
public:
/// Constructor
@@ -45,16 +46,16 @@ public:
/// Open the director <dir> and populate the <namelist_> array with
/// directory entries that match the <selector> and <comparator>.
- int open (const ACE_TCHAR *dir,
+ int open (const ACE_TCHAR *dir,
int (*selector)(const dirent *d) = 0,
int (*comparator)(const dirent **d1, const dirent **d2) = 0);
protected:
/// Ptr to the namelist array.
- dirent **namelist_;
+ dirent **namelist_;
/// # of entries in the array.
- int n_;
+ int n_;
};
#if defined (__ACE_INLINE__)
@@ -63,4 +64,3 @@ protected:
#include "ace/post.h"
#endif /* ACE_DIRENT_SELECTOR_H */
-
diff --git a/ace/Dirent_Selector.inl b/ace/Dirent_Selector.inl
index 2bd4f42e024..577c4db4584 100644
--- a/ace/Dirent_Selector.inl
+++ b/ace/Dirent_Selector.inl
@@ -1,13 +1,15 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
+// $Id$
-ACE_INLINE int
+ACE_INLINE int
ACE_Dirent_Selector::length (void) const
-{
- return n_;
+{
+ return n_;
}
ACE_INLINE dirent *
ACE_Dirent_Selector::operator[] (const int n) const
{
- return this->namelist_[n];
+ return this->namelist_[n];
}