summaryrefslogtreecommitdiff
path: root/ace/OS_NS_sys_shm.inl
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2006-02-01 08:17:23 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2006-02-01 08:17:23 +0000
commitb2130c8c0e885881718f091f540de76896e31676 (patch)
tree69e0d2183b477bcba1a6018fb7b5521fa0805437 /ace/OS_NS_sys_shm.inl
parent17b1afc63e3627179e09559bd3bdaff23bd1d12d (diff)
downloadATCD-b2130c8c0e885881718f091f540de76896e31676.tar.gz
ChangeLogTag: Wed Feb 1 07:52:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'ace/OS_NS_sys_shm.inl')
-rw-r--r--ace/OS_NS_sys_shm.inl4
1 files changed, 2 insertions, 2 deletions
diff --git a/ace/OS_NS_sys_shm.inl b/ace/OS_NS_sys_shm.inl
index 8e7c011e432..1061765f356 100644
--- a/ace/OS_NS_sys_shm.inl
+++ b/ace/OS_NS_sys_shm.inl
@@ -11,7 +11,7 @@ ACE_OS::shmat (int int_id, void *shmaddr, int shmflg)
{
ACE_OS_TRACE ("ACE_OS::shmat");
#if defined (ACE_HAS_SYSV_IPC)
- ACE_OSCALL_RETURN (::shmat (int_id, shmaddr, shmflg), void *, (void *) -1);
+ ACE_OSCALL_RETURN (::shmat (int_id, static_cast <char *> (shmaddr), shmflg), void *, (void *) -1);
#else
ACE_UNUSED_ARG (int_id);
ACE_UNUSED_ARG (shmaddr);
@@ -41,7 +41,7 @@ ACE_OS::shmdt (void *shmaddr)
{
ACE_OS_TRACE ("ACE_OS::shmdt");
#if defined (ACE_HAS_SYSV_IPC)
- ACE_OSCALL_RETURN (::shmdt (shmaddr), int, -1);
+ ACE_OSCALL_RETURN (::shmdt ((char *) shmaddr), int, -1);
#else
ACE_UNUSED_ARG (shmaddr);