diff options
| author | Olli Savia <ops@iki.fi> | 2007-02-23 10:51:46 +0000 |
|---|---|---|
| committer | Olli Savia <ops@iki.fi> | 2007-02-23 10:51:46 +0000 |
| commit | f0068042365d4127dc786760ba2d0ad0312aae43 (patch) | |
| tree | a3b35e69a791b34f1345203463068f0d80795b26 | |
| parent | b634bb65e27d334f8251f6f3165912ee19d8b6c0 (diff) | |
| download | ATCD-f0068042365d4127dc786760ba2d0ad0312aae43.tar.gz | |
ChangeLogTag: Fri Feb 23 10:50:41 UTC 2007 Olli Savia <ops@iki.fi>
| -rw-r--r-- | ACE/ChangeLog | 9 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_dirent.inl | 8 |
2 files changed, 11 insertions, 6 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index fbd75d2a317..231224a48da 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,15 +1,20 @@ +Fri Feb 23 10:50:41 UTC 2007 Olli Savia <ops@iki.fi> + + * ace/OS_NS_dirent.inl: + Fixed casts again. Hopefully now I got it right. + Fri Feb 23 08:56:15 UTC 2007 Olli Savia <ops@iki.fi> * ace/OS_NS_dirent.inl: Added casts to fix compile errors. - + * ace/config-rtems.h: * ace/config-vxworks5.x.h: * ace/config-vxworks6.2.h: * ace/config-vxworks6.3.h: * ace/config-vxworks6.4.h: Added ACE_LACKS_ALPHASORT. - + Thu Feb 22 18:37:00 UTC 2007 Iliyan Jeliazkov <iliyan@ociweb.com> * ace/Service_Config.h: diff --git a/ACE/ace/OS_NS_dirent.inl b/ACE/ace/OS_NS_dirent.inl index 82ca0a0bb03..d2f09b0f775 100644 --- a/ACE/ace/OS_NS_dirent.inl +++ b/ACE/ace/OS_NS_dirent.inl @@ -150,8 +150,8 @@ ACE_INLINE int alphasort (const void *a, const void *b) { #if defined (ACE_LACKS_ALPHASORT) - return ACE_OS::strcmp ((*(struct dirent **)a)->d_name, - (*(struct dirent **)b)->d_name); + return ACE_OS::strcmp ((*static_cast<const struct ACE_DIRENT * const *>(a))->d_name, + (*static_cast<const struct ACE_DIRENT * const *>(b))->d_name); #else # if defined (ACE_SCANDIR_CMP_USES_VOIDPTR) return ::alphasort (const_cast<void *>(a), @@ -159,8 +159,8 @@ alphasort (const void *a, const void *b) # elif defined (ACE_SCANDIR_CMP_USES_CONST_VOIDPTR) return ::alphasort (a, b); # else - return ::alphasort (static_cast<const dirent **>(a), - static_cast<const dirent **>(b)); + return ::alphasort (static_cast<const struct ACE_DIRENT * const *>(a), + static_cast<const struct ACE_DIRENT * const *>(b)); # endif #endif } |