summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2007-02-23 15:38:14 +0000
committerSteve Huston <shuston@riverace.com>2007-02-23 15:38:14 +0000
commitba6c10b87e494680a064423f88f7ed79ed1aaa61 (patch)
tree5c15f8693112c5c69bfeb5fd7cbd38cf692f1322
parentfac22b62ca44ca7faa75326030c5569982dfebc0 (diff)
downloadATCD-ba6c10b87e494680a064423f88f7ed79ed1aaa61.tar.gz
ChangeLogTag:Fri Feb 23 15:37:03 UTC 2007 Steve Huston <shuston@riverace.com>
-rw-r--r--ACE/ChangeLog4
-rw-r--r--ACE/ace/OS_NS_dirent.inl4
2 files changed, 6 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 231224a48da..1c82bf11f40 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,7 @@
+Fri Feb 23 15:37:03 UTC 2007 Steve Huston <shuston@riverace.com>
+
+ * ace/OS_NS_dirent.inl (alphasort): Use a bigger hammer on the casts.
+
Fri Feb 23 10:50:41 UTC 2007 Olli Savia <ops@iki.fi>
* ace/OS_NS_dirent.inl:
diff --git a/ACE/ace/OS_NS_dirent.inl b/ACE/ace/OS_NS_dirent.inl
index d2f09b0f775..7593899196b 100644
--- a/ACE/ace/OS_NS_dirent.inl
+++ b/ACE/ace/OS_NS_dirent.inl
@@ -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 struct ACE_DIRENT * const *>(a),
- static_cast<const struct ACE_DIRENT * const *>(b));
+ return ::alphasort ((const struct ACE_DIRENT **)a,
+ (const struct ACE_DIRENT **)b);
# endif
#endif
}