summaryrefslogtreecommitdiff
path: root/ace/Memory_Pool.cpp
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-04-17 22:03:29 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-04-17 22:03:29 +0000
commit55cb2e66c91098a01376dec01b6492683a0e336f (patch)
treefe057c3bbe7e5e5755a2147d1f16c9e8e0341afe /ace/Memory_Pool.cpp
parentf3874978d76d5a5e8cfab559c586061af979f67b (diff)
downloadATCD-55cb2e66c91098a01376dec01b6492683a0e336f.tar.gz
fixed typos
Diffstat (limited to 'ace/Memory_Pool.cpp')
-rw-r--r--ace/Memory_Pool.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/ace/Memory_Pool.cpp b/ace/Memory_Pool.cpp
index 07b7f6f4268..a6d0489e1c6 100644
--- a/ace/Memory_Pool.cpp
+++ b/ace/Memory_Pool.cpp
@@ -301,7 +301,7 @@ ACE_MMAP_Memory_Pool::remap (void *addr)
ACE_MMAP_Memory_Pool_Options::ACE_MMAP_Memory_Pool_Options (void *base_addr,
int use_fixed_addr,
int write_each_page,
- int minimum_bytes,
+ off_t minimum_bytes,
u_int flags,
int guess_on_fault)
: base_addr_ (base_addr),
@@ -429,7 +429,7 @@ ACE_Shared_Memory_Pool_Options::ACE_Shared_Memory_Pool_Options (char *base_addr,
off_t minimum_bytes)
: base_addr_ (base_addr),
max_segments_ (max_segments),
- minimum_bytes_ (minimum_bytes)
+ minimum_bytes_ (minimum_bytes),
file_perms_ (file_perms)
{
ACE_TRACE ("ACE_Shared_Memory_Pool_Options::ACE_Shared_Memory_Pool_Options");
@@ -642,9 +642,9 @@ ACE_Shared_Memory_Pool::init_acquire (size_t nbytes,
size_t counter;
off_t shm_table_offset = ACE::round_to_pagesize (sizeof (SHM_TABLE));
- rounded_bytes = this->round_up (nbytes > this->minimum_bytes_
+ rounded_bytes = this->round_up (nbytes > (size_t) this->minimum_bytes_
? nbytes
- : this->minimum_bytes_);
+ : (size_t) this->minimum_bytes_);
// Acquire the semaphore to serialize initialization and prevent
// race conditions.