diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-01-27 12:35:55 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-01-27 12:35:55 +0000 |
| commit | db843c699c27d98cc07b8b9d3eaa565b469727c2 (patch) | |
| tree | 1d2ab198fd458ec002d566aa4f4c60304e7c09d8 /ace | |
| parent | ee7ca9d2474b0c7e9cbc66d303b386b2b8e39f07 (diff) | |
| download | ATCD-db843c699c27d98cc07b8b9d3eaa565b469727c2.tar.gz | |
ChangeLogTag: Fri Jan 27 11:31:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'ace')
| -rw-r--r-- | ace/OS_NS_sys_shm.h | 4 | ||||
| -rw-r--r-- | ace/OS_NS_sys_shm.inl | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ace/OS_NS_sys_shm.h b/ace/OS_NS_sys_shm.h index d19414b114f..df39efdfd60 100644 --- a/ace/OS_NS_sys_shm.h +++ b/ace/OS_NS_sys_shm.h @@ -41,7 +41,7 @@ namespace ACE_OS //@{ @name A set of wrappers for System V shared memory. ACE_NAMESPACE_INLINE_FUNCTION void *shmat (int int_id, - void *shmaddr, + const void *shmaddr, int shmflg); ACE_NAMESPACE_INLINE_FUNCTION @@ -50,7 +50,7 @@ namespace ACE_OS struct shmid_ds *buf); ACE_NAMESPACE_INLINE_FUNCTION - int shmdt (void *shmaddr); + int shmdt (const void *shmaddr); ACE_NAMESPACE_INLINE_FUNCTION int shmget (key_t key, diff --git a/ace/OS_NS_sys_shm.inl b/ace/OS_NS_sys_shm.inl index 1061765f356..2dd36a5f618 100644 --- a/ace/OS_NS_sys_shm.inl +++ b/ace/OS_NS_sys_shm.inl @@ -7,11 +7,11 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE void * -ACE_OS::shmat (int int_id, void *shmaddr, int shmflg) +ACE_OS::shmat (int int_id, const void *shmaddr, int shmflg) { ACE_OS_TRACE ("ACE_OS::shmat"); #if defined (ACE_HAS_SYSV_IPC) - ACE_OSCALL_RETURN (::shmat (int_id, static_cast <char *> (shmaddr), shmflg), void *, (void *) -1); + ACE_OSCALL_RETURN (::shmat (int_id, shmaddr, shmflg), void *, (void *) -1); #else ACE_UNUSED_ARG (int_id); ACE_UNUSED_ARG (shmaddr); @@ -37,11 +37,11 @@ ACE_OS::shmctl (int int_id, int cmd, struct shmid_ds *buf) } ACE_INLINE int -ACE_OS::shmdt (void *shmaddr) +ACE_OS::shmdt (const void *shmaddr) { ACE_OS_TRACE ("ACE_OS::shmdt"); #if defined (ACE_HAS_SYSV_IPC) - ACE_OSCALL_RETURN (::shmdt ((char *) shmaddr), int, -1); + ACE_OSCALL_RETURN (::shmdt (shmaddr), int, -1); #else ACE_UNUSED_ARG (shmaddr); |