diff options
| author | Erik Sohns <esohns@users.noreply.github.com> | 2023-01-22 17:38:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-22 17:38:34 +0100 |
| commit | 9e18d338ec598e1a8da6d32a0fba5a20c76978f7 (patch) | |
| tree | 045f42001bd4e15cf8285686798fe47acd2f2b60 /ACE/ace/Malloc_T.cpp | |
| parent | 8b6ad82dc91f728cea2c9e86a17e5969a3338fcc (diff) | |
| parent | 8ab31e3e5bb8c09a9c326a54545f4cb475345a78 (diff) | |
| download | ATCD-9e18d338ec598e1a8da6d32a0fba5a20c76978f7.tar.gz | |
Merge branch 'master' into message_queue_ex_get_queue
Diffstat (limited to 'ACE/ace/Malloc_T.cpp')
| -rw-r--r-- | ACE/ace/Malloc_T.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/ACE/ace/Malloc_T.cpp b/ACE/ace/Malloc_T.cpp index c336a0d8fde..23f2558de3a 100644 --- a/ACE/ace/Malloc_T.cpp +++ b/ACE/ace/Malloc_T.cpp @@ -476,17 +476,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::open () 0, this->cb_ptr_); - // Why aC++ in 64-bit mode can't grok this, I have no - // idea... but it ends up with an extra bit set which makes - // size_ really big without this hack. -#if defined (__hpux) && defined (__LP64__) - size_t hpux11_hack = (rounded_bytes - sizeof *this->cb_ptr_) - / sizeof (MALLOC_HEADER); - p->size_ = hpux11_hack; -#else - p->size_ = (rounded_bytes - sizeof *this->cb_ptr_) - / sizeof (MALLOC_HEADER); -#endif /* (__hpux) && defined (__LP64__) */ + p->size_ = (rounded_bytes - sizeof *this->cb_ptr_) / sizeof (MALLOC_HEADER); ACE_MALLOC_STATS (++this->cb_ptr_->malloc_stats_.nchunks_); ACE_MALLOC_STATS (++this->cb_ptr_->malloc_stats_.nblocks_); |