diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-09-09 09:35:14 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-09-09 09:35:14 +0000 |
| commit | c3efbc7f642bfc5bbbc5dfa3f936af67bfc470af (patch) | |
| tree | 6d9f4e402723ba3e080b549079a78db541816f81 /ACE/ace/Shared_Memory_Pool.cpp | |
| parent | 6dff767d910eda93c9b1e3f184019f94cb30efd6 (diff) | |
| download | ATCD-c3efbc7f642bfc5bbbc5dfa3f936af67bfc470af.tar.gz | |
Thu Sep 9 09:29:30 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/CDR_Base.h:
* ace/CDR_Base.cpp:
* ace/DEV.h:
* ace/FILE.h:
* ace/Global_Macros.h:
* ace/INET_Addr.inl:
* ace/Malloc_T.h:
* ace/Malloc_T.inl:
* ace/Malloc_T.cpp:
* ace/SOCK_Dgram_Bcast.cpp:
* ace/SSL/SSL_SOCK.h:
* ace/Shared_Memory_Pool.cpp:
* ace/Sock_Connect.cpp:
* ace/config-aix-5.x.h:
* ace/config-doxygen.h:
* ace/config-g++-common.h:
* ace/config-hpux-11.00.h:
* ace/config-icc-common.h:
* ace/config-integritySCA.h:
* ace/config-linux-common.h:
* ace/config-macros.h:
* ace/config-mvs.h:
* ace/config-openvms.h:
* ace/config-suncc-common.h:
* ace/config-sunos5.5.h:
* ace/config-sunos5.6.h:
* ace/config-tandem-nsk-mips-v2.h:
* ace/config-tandem-nsk-mips-v3.h:
* ace/config-win32-borland.h:
* ace/config-win32-dmc.h:
* ace/config-win32-ghs.h:
* ace/config-win32-msvc-10.h:
* ace/config-win32-msvc-7.h:
* ace/config-win32-msvc-8.h:
* ace/config-win32-msvc-9.h:
* examples/IOStream/server/iostream_server.h:
* examples/IPC_SAP/SOCK_SAP/C-inserver.cpp:
* examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp:
* examples/Reactor/Misc/test_event_handler_t.cpp:
* tests/Basic_Types_Test.cpp:
* tests/Conn_Test.cpp:
* tests/Message_Queue_Test.cpp:
* tests/SSL/Thread_Pool_Reactor_SSL_Test.h:
* tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp:
Cleanup, all compilers support templated typedefs
* ace/config-cray.h:
* ace/config-cxx-common.h:
Removed these files, obsolete
Diffstat (limited to 'ACE/ace/Shared_Memory_Pool.cpp')
| -rw-r--r-- | ACE/ace/Shared_Memory_Pool.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/ACE/ace/Shared_Memory_Pool.cpp b/ACE/ace/Shared_Memory_Pool.cpp index 93114cf58f4..01bb2001637 100644 --- a/ACE/ace/Shared_Memory_Pool.cpp +++ b/ACE/ace/Shared_Memory_Pool.cpp @@ -168,7 +168,6 @@ ACE_Shared_Memory_Pool::handle_signal (int , siginfo_t *siginfo, ucontext_t *) ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("in_use"))); -#if !defined(_UNICOS) else if (!(siginfo->si_code == SEGV_MAPERR && siginfo->si_addr < (((char *) this->base_addr_) + offset) && siginfo->si_addr >= ((char *) this->base_addr_))) @@ -176,15 +175,6 @@ ACE_Shared_Memory_Pool::handle_signal (int , siginfo_t *siginfo, ucontext_t *) "(%P|%t) address %u out of range\n", siginfo->si_addr), -1); -#else /* ! _UNICOS */ - else if (!(siginfo->si_code == SEGV_MEMERR - && siginfo->si_addr < (((unsigned long) this->base_addr_) + offset) - && siginfo->si_addr >= ((unsigned long) this->base_addr_))) - ACE_ERROR_RETURN ((LM_ERROR, - "(%P|%t) address %u out of range\n", - siginfo->si_addr), - -1); -#endif /* ! _UNICOS */ } // The above if case will check to see that the address is in the @@ -194,11 +184,7 @@ ACE_Shared_Memory_Pool::handle_signal (int , siginfo_t *siginfo, ucontext_t *) size_t counter; // ret value to get shmid from the st table. -#if !defined(_UNICOS) if (this->find_seg (siginfo->si_addr, offset, counter) == -1) -#else /* ! _UNICOS */ - if (this->find_seg ((const void *)siginfo->si_addr, offset, counter) == -1) -#endif /* ! _UNICOS */ ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("in_use")), |