diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2004-09-16 13:16:43 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2004-09-16 13:16:43 +0000 |
| commit | 02a337f4ab74a7cf97f46002383e7306e2f72551 (patch) | |
| tree | a9cf5549a492f791ad96ab2da599af2fc6f52b2a | |
| parent | f4e4152883fdce14dec03fa82a9a8d9113d9fbf8 (diff) | |
| download | ATCD-02a337f4ab74a7cf97f46002383e7306e2f72551.tar.gz | |
ChangeLogTag: Thu Sep 16 08:14:14 2004 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ace/Memory_Pool.cpp | 11 | ||||
| -rw-r--r-- | ace/config-hpux-11.00.h | 6 |
3 files changed, 9 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog index ad4344a7991..308a9badd4a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Thu Sep 16 08:14:14 2004 Chad Elliott <elliott_c@ociweb.com> + + * ace/Memory_Pool.cpp: + * ace/config-hpux-11.00.h: + + Removed a bug workaround for aCC A.03.04. It is no longer a + problem to specify other mmap base addresses when running + 64-bit HP-UX applications. + Thu Sep 16 07:47:09 2004 Chad Elliott <elliott_c@ociweb.com> * bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm: diff --git a/ace/Memory_Pool.cpp b/ace/Memory_Pool.cpp index 28826577d52..e5de1f19fdf 100644 --- a/ace/Memory_Pool.cpp +++ b/ace/Memory_Pool.cpp @@ -485,12 +485,6 @@ ACE_MMAP_Memory_Pool_Options::ACE_MMAP_Memory_Pool_Options (const void *base_add // for backwards compatability if (base_addr_ == 0 && use_fixed_addr_ == ALWAYS_FIXED) use_fixed_addr_ = FIRSTCALL_FIXED; - - // HP-UX 11, 64-bit bug workaround. -#if defined (__hpux) && defined (__LP64__) - long temp = ACE_DEFAULT_BASE_ADDRL; - base_addr_ = (void *) temp; -#endif /* defined (__hpux) && defined (__LP64__) */ } // Handle SIGSEGV and SIGBUS signals to remap memory properly. When a @@ -634,11 +628,6 @@ ACE_Shared_Memory_Pool_Options::ACE_Shared_Memory_Pool_Options (const char *base segment_size_ (segment_size) { ACE_TRACE ("ACE_Shared_Memory_Pool_Options::ACE_Shared_Memory_Pool_Options"); - // HP-UX 11, 64-bit bug workaround -#if defined (__hpux) && defined (__LP64__) - long temp = ACE_DEFAULT_BASE_ADDRL; - base_addr_ = (char *) temp; -#endif /* defined (__hpux) && defined (__LP64__) */ } void diff --git a/ace/config-hpux-11.00.h b/ace/config-hpux-11.00.h index b35b001f4ee..63a08044532 100644 --- a/ace/config-hpux-11.00.h +++ b/ace/config-hpux-11.00.h @@ -210,12 +210,6 @@ // It can also be set so that the mapped region is shareable with 32-bit // programs. To enable the 32/64 sharing, comment out the first definition // of ACE_DEFAULT_BASE_ADDR and uncomment the two lines after it. -// Note - there's a compiler bug on aC++ A.03.04 in 64-bit mode which prevents -// these from working as-is. So, there's some hackery in Naming_Context.cpp -// and Memory_Pool.cpp which works around it. It requires the -// ACE_DEFAULT_BASE_ADDRL definition below - make sure it has the same -// value as what you use for ACE_DEFAULT_BASE_ADDR. This is allegedly fixed -// in A.03.10 on the June Applications CD. #if defined (__LP64__) # define ACE_DEFAULT_BASE_ADDR ((char *) 0x0000001100000000) //# define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000) |