diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2004-02-02 15:58:52 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2004-02-02 15:58:52 +0000 |
| commit | 9ef6b57dca3189d51ff84f0fa011cb3f0b0e13ee (patch) | |
| tree | b1c003989475cf07998fab7e0ce495e8bf5dda8a | |
| parent | 0303dbed3b1558d840c5b52d8e1aeab5ee57a516 (diff) | |
| download | ATCD-9ef6b57dca3189d51ff84f0fa011cb3f0b0e13ee.tar.gz | |
ChangeLogTag:
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | ace/OS_NS_unistd.inl | 10 | ||||
| -rw-r--r-- | ace/config-win32-msvc-6.h | 3 |
3 files changed, 21 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 5495481f39d..b60adc57c1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Mon Feb 02 10:00:29 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * ace/config-win32-msvc-6.h: + + Looks like VC6 has a non-const swab. + + * ace/OS_NS_unistd.inl: + + Fixed the non-const part of the swab () to compile with vc6. + Mon Feb 2 08:18:41 2004 Chad Elliott <elliott_c@ociweb.com> * bin/MakeProjectCreator/modules/CbxProjectCreator.pm: diff --git a/ace/OS_NS_unistd.inl b/ace/OS_NS_unistd.inl index 850202c1a99..ac7add36b37 100644 --- a/ace/OS_NS_unistd.inl +++ b/ace/OS_NS_unistd.inl @@ -1060,7 +1060,7 @@ ACE_OS::swab (const void *src, { #if defined (ACE_LACKS_SWAB) const char *from = ACE_static_cast (const char*, - src); + src); char *to = ACE_static_cast (char *, dest); ssize_t ptr = 0; @@ -1074,7 +1074,13 @@ ACE_OS::swab (const void *src, if (ptr == length) /* I.e., if length is odd, */ to[ptr-1] = 0; /* then pad with a NUL. */ #elif defined (ACE_HAS_NONCONST_SWAB) - ::swab (ACE_const_cast (unsigned char *, src), dest, length); + const char *tmp = ACE_static_cast (const char*, + src); + char *from = ACE_const_cast (char *, + tmp); + char *to = ACE_static_cast (char *, + dest); + ::swab (from, to, length); #else ::swab (src, dest, length); #endif /* ACE_LACKS_SWAB */ diff --git a/ace/config-win32-msvc-6.h b/ace/config-win32-msvc-6.h index 5011ff48411..0de2635a306 100644 --- a/ace/config-win32-msvc-6.h +++ b/ace/config-win32-msvc-6.h @@ -113,6 +113,9 @@ // Template specialization is supported. # define ACE_HAS_TEMPLATE_SPECIALIZATION +// Looks like Win32 has a non-const swab function +#define ACE_HAS_NONCONST_SWAB + // At least for ACE_UNIMPLEMENTED_FUNC in class templates, this is needed to // explicitly instantiate a template that has ACE_UNIMPLEMENTED_FUNC. # define ACE_NEEDS_FUNC_DEFINITIONS |