diff options
Diffstat (limited to 'ace/OS_Dirent.inl')
| -rw-r--r-- | ace/OS_Dirent.inl | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/ace/OS_Dirent.inl b/ace/OS_Dirent.inl index e81a952a951..e39373a2fbc 100644 --- a/ace/OS_Dirent.inl +++ b/ace/OS_Dirent.inl @@ -1,15 +1,10 @@ /* -*- C++ -*- */ // $Id$ -#if defined (ACE_HAS_PACE) -#include "pace/dirent.h" -#endif /* ACE_HAS_PACE */ ACE_INLINE DIR * ACE_OS_Dirent::opendir (const ACE_TCHAR *filename) { -#if defined (ACE_HAS_PACE) - return pace_opendir (filename); -#elif defined (ACE_HAS_DIRENT) +#if defined (ACE_HAS_DIRENT) # if defined (ACE_PSOS) // The pointer to the DIR buffer must be passed to ACE_OS_Dirent::closedir @@ -40,15 +35,13 @@ ACE_OS_Dirent::opendir (const ACE_TCHAR *filename) #else ACE_UNUSED_ARG (filename); ACE_NOTSUP_RETURN (0); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_DIRENT */ } ACE_INLINE void ACE_OS_Dirent::closedir (DIR *d) { -#if defined (ACE_HAS_PACE) - pace_closedir (d); -#elif defined (ACE_HAS_DIRENT) +#if defined (ACE_HAS_DIRENT) # if defined (ACE_PSOS) u_long result; @@ -67,8 +60,6 @@ ACE_OS_Dirent::closedir (DIR *d) # if defined (ACE_WIN32) ACE_OS_Dirent::closedir_emulation (d); - delete d->directory_name_; - delete d; # else /* ACE_WIN32 */ ::closedir (d); # endif /* ACE_WIN32 */ @@ -76,15 +67,13 @@ ACE_OS_Dirent::closedir (DIR *d) # endif /* !ACE_PSOS */ #else /* ACE_HAS_DIRENT */ ACE_UNUSED_ARG (d); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_DIRENT */ } ACE_INLINE struct dirent * ACE_OS_Dirent::readdir (DIR *d) { -#if defined (ACE_HAS_PACE) - return pace_readdir (d); -#elif defined (ACE_HAS_DIRENT) +#if defined (ACE_HAS_DIRENT) # if defined (ACE_PSOS) // The returned pointer to the dirent struct must be deleted by the // caller to avoid a memory leak. @@ -118,7 +107,7 @@ ACE_OS_Dirent::readdir (DIR *d) #else ACE_UNUSED_ARG (d); ACE_NOTSUP_RETURN (0); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_DIRENT */ } ACE_INLINE int @@ -126,9 +115,7 @@ ACE_OS_Dirent::readdir_r (DIR *dirp, struct dirent *entry, struct dirent **result) { -#if defined (ACE_HAS_PACE) - return pace_readdir_r (dirp, entry, result); -# elif !defined (ACE_HAS_REENTRANT_FUNCTIONS) +# if !defined (ACE_HAS_REENTRANT_FUNCTIONS) ACE_UNUSED_ARG (entry); // <result> has better not be 0! *result = ACE_OS_Dirent::readdir (dirp); @@ -160,7 +147,7 @@ ACE_OS_Dirent::readdir_r (DIR *dirp, ACE_UNUSED_ARG (result); ACE_NOTSUP_RETURN (0); -#endif /* ACE_HAS_PACE */ +#endif /* !ACE_HAS_REENTRANT_FUNCTIONS */ } ACE_INLINE long @@ -188,9 +175,7 @@ ACE_OS_Dirent::seekdir (DIR *d, long loc) ACE_INLINE void ACE_OS_Dirent::rewinddir (DIR *d) { -#if defined (ACE_HAS_PACE) - pace_rewinddir (d); -#elif defined (ACE_HAS_DIRENT) +#if defined (ACE_HAS_DIRENT) # if defined (ACE_LACKS_SEEKDIR) # if defined (ACE_LACKS_REWINDDIR) ACE_UNUSED_ARG (d); |