diff options
| author | olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-02-23 08:58:47 +0000 |
|---|---|---|
| committer | olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-02-23 08:58:47 +0000 |
| commit | fa8a8dc69dddc3e9479d722b69057d1654fb8243 (patch) | |
| tree | aadb14a821ca5e58a2eb3b7de6a1cff887f8645e | |
| parent | 282c358fdfc5c8b09f865724e7b3831cf7494940 (diff) | |
| download | ATCD-fa8a8dc69dddc3e9479d722b69057d1654fb8243.tar.gz | |
ChangeLogTag: Fri Feb 23 08:56:15 UTC 2007 Olli Savia <ops@iki.fi>
| -rw-r--r-- | ACE/ChangeLog | 12 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_dirent.inl | 8 | ||||
| -rw-r--r-- | ACE/ace/config-rtems.h | 1 | ||||
| -rw-r--r-- | ACE/ace/config-vxworks5.x.h | 1 | ||||
| -rw-r--r-- | ACE/ace/config-vxworks6.2.h | 1 | ||||
| -rw-r--r-- | ACE/ace/config-vxworks6.3.h | 1 | ||||
| -rw-r--r-- | ACE/ace/config-vxworks6.4.h | 1 |
7 files changed, 25 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index c19533bb04e..fbd75d2a317 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,15 @@ +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 dc58e6a1586..82ca0a0bb03 100644 --- a/ACE/ace/OS_NS_dirent.inl +++ b/ACE/ace/OS_NS_dirent.inl @@ -153,7 +153,15 @@ alphasort (const void *a, const void *b) return ACE_OS::strcmp ((*(struct dirent **)a)->d_name, (*(struct dirent **)b)->d_name); #else +# if defined (ACE_SCANDIR_CMP_USES_VOIDPTR) + return ::alphasort (const_cast<void *>(a), + const_cast<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)); +# endif #endif } diff --git a/ACE/ace/config-rtems.h b/ACE/ace/config-rtems.h index 3889fde1fa8..2b7a82bdfb5 100644 --- a/ACE/ace/config-rtems.h +++ b/ACE/ace/config-rtems.h @@ -39,6 +39,7 @@ #define ACE_HAS_NONSTATIC_OBJECT_MANAGER +#define ACE_LACKS_ALPHASORT #define ACE_LACKS_REGEX_H #define ACE_LACKS_STROPTS_H #define ACE_LACKS_DLFCN_H diff --git a/ACE/ace/config-vxworks5.x.h b/ACE/ace/config-vxworks5.x.h index 702edc3410a..f34ed402fc3 100644 --- a/ACE/ace/config-vxworks5.x.h +++ b/ACE/ace/config-vxworks5.x.h @@ -123,6 +123,7 @@ #define ACE_HAS_STRDUP_EMULATION #define ACE_HAS_STRERROR #define ACE_HAS_THREADS +#define ACE_LACKS_ALPHASORT #define ACE_LACKS_ACCESS #define ACE_LACKS_EXEC #define ACE_LACKS_FCNTL diff --git a/ACE/ace/config-vxworks6.2.h b/ACE/ace/config-vxworks6.2.h index a15458d3dbd..dacd2e50902 100644 --- a/ACE/ace/config-vxworks6.2.h +++ b/ACE/ace/config-vxworks6.2.h @@ -112,6 +112,7 @@ #define ACE_HAS_STRERROR #define ACE_HAS_THREADS #define ACE_HAS_SYSCTL +#define ACE_LACKS_ALPHASORT #define ACE_LACKS_EXEC #define ACE_LACKS_FILELOCKS #define ACE_LACKS_FORK diff --git a/ACE/ace/config-vxworks6.3.h b/ACE/ace/config-vxworks6.3.h index 5a90cdca278..8b3674ed6c9 100644 --- a/ACE/ace/config-vxworks6.3.h +++ b/ACE/ace/config-vxworks6.3.h @@ -76,6 +76,7 @@ #define ACE_HAS_STRERROR #define ACE_HAS_THREADS #define ACE_HAS_SYSCTL +#define ACE_LACKS_ALPHASORT #define ACE_LACKS_EXEC #define ACE_LACKS_FILELOCKS #define ACE_LACKS_FORK diff --git a/ACE/ace/config-vxworks6.4.h b/ACE/ace/config-vxworks6.4.h index 1579f224f79..165db41f0fe 100644 --- a/ACE/ace/config-vxworks6.4.h +++ b/ACE/ace/config-vxworks6.4.h @@ -102,6 +102,7 @@ #define ACE_HAS_STRERROR #define ACE_HAS_THREADS #define ACE_HAS_SYSCTL +#define ACE_LACKS_ALPHASORT #define ACE_LACKS_EXEC #define ACE_LACKS_RLIMIT #define ACE_LACKS_FILELOCKS |