diff options
| author | Steve Huston <shuston@riverace.com> | 2002-10-05 21:07:06 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2002-10-05 21:07:06 +0000 |
| commit | f6bb32b4646e6e15e09dbb5ffaf6db989f5d9e29 (patch) | |
| tree | 499bc588aac858f6be265b097680b744f224d99c | |
| parent | 24d9e8ad0f0d184634dfe9f573ad84e5f4b4a3c2 (diff) | |
| download | ATCD-f6bb32b4646e6e15e09dbb5ffaf6db989f5d9e29.tar.gz | |
ChangeLogTag:Sat Oct 5 17:04:38 2002 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 5 | ||||
| -rw-r--r-- | ace/Memory_Pool.cpp | 6 |
3 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index c380514fd58..4b89c0809c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Oct 5 17:04:38 2002 Steve Huston <shuston@riverace.com> + + * ace/Memory_Pool.cpp (ACE_Pagefile_Memory_Pool::acquire): Remove + casts on comparisons, allowing size_t values to compare directly. + Sat Oct 5 12:30:49 2002 Steve Huston <shuston@riverace.com> * ace/Service_Manager.cpp (list_services): Remove extra right paren. diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index c380514fd58..4b89c0809c5 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,8 @@ +Sat Oct 5 17:04:38 2002 Steve Huston <shuston@riverace.com> + + * ace/Memory_Pool.cpp (ACE_Pagefile_Memory_Pool::acquire): Remove + casts on comparisons, allowing size_t values to compare directly. + Sat Oct 5 12:30:49 2002 Steve Huston <shuston@riverace.com> * ace/Service_Manager.cpp (list_services): Remove extra right paren. diff --git a/ace/Memory_Pool.cpp b/ace/Memory_Pool.cpp index 865327a5634..89f95d0369b 100644 --- a/ace/Memory_Pool.cpp +++ b/ace/Memory_Pool.cpp @@ -1068,8 +1068,7 @@ ACE_Pagefile_Memory_Pool::acquire (size_t nbytes, // small and/or we didn't map the whole shared memory section if (this->shared_cb_->sh_.mapped_size_ > this->local_cb_.sh_.mapped_size_ - || this->shared_cb_->sh_.free_size_ - < (int) rounded_bytes) + || this->shared_cb_->sh_.free_size_ < rounded_bytes) { size_t append = 0; if (rounded_bytes > this->shared_cb_->sh_.free_size_) @@ -1081,8 +1080,7 @@ ACE_Pagefile_Memory_Pool::acquire (size_t nbytes, // Get the block from extra space and update shared and local // control block - if (this->shared_cb_->sh_.free_size_ - < (int) rounded_bytes) + if (this->shared_cb_->sh_.free_size_ < rounded_bytes) return result; result = (void *)((char *) this->local_cb_.mapped_base_ |