diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-06-09 14:03:06 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-06-09 14:03:06 +0000 |
| commit | 09edada315aac2655e7f036ddf454091d55ca014 (patch) | |
| tree | f7cb90f90cb5e5107d81052eebd24724a70628c7 | |
| parent | 7d24bf993e401f474685856dddb8e0c78a14441c (diff) | |
| download | ATCD-09edada315aac2655e7f036ddf454091d55ca014.tar.gz | |
ChangeLogTag: Fri Jun 9 13:58:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ace/FILE_IO.cpp | 8 | ||||
| -rw-r--r-- | ace/MMAP_Memory_Pool.cpp | 6 |
3 files changed, 12 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index bfca76743bc..55eb01b142d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Jun 9 13:58:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/FILE_IO.cpp: + Added static cast from ACE_LOFF_T to size_t + Fri Jun 9 13:42:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * ace/OS_NS_sys_stat.inl: diff --git a/ace/FILE_IO.cpp b/ace/FILE_IO.cpp index fa22628fa10..689aedbb3bc 100644 --- a/ace/FILE_IO.cpp +++ b/ace/FILE_IO.cpp @@ -103,9 +103,9 @@ ACE_FILE_IO::recv (size_t n, ...) const iovp[i].iov_len = va_arg (argp, int); } - ssize_t result = ACE_OS::readv (this->get_handle (), - iovp, - total_tuples); + ssize_t const result = ACE_OS::readv (this->get_handle (), + iovp, + total_tuples); #if !defined (ACE_HAS_ALLOCA) delete [] iovp; #endif /* !defined (ACE_HAS_ALLOCA) */ @@ -124,7 +124,7 @@ ACE_FILE_IO::recvv (iovec *io_vec) ACE_TRACE ("ACE_FILE_IO::recvv"); io_vec->iov_base = 0; - size_t length = static_cast <size_t> (ACE_OS::filesize (this->get_handle ())); + size_t const length = static_cast <size_t> (ACE_OS::filesize (this->get_handle ())); if (length > 0) { diff --git a/ace/MMAP_Memory_Pool.cpp b/ace/MMAP_Memory_Pool.cpp index fa3bf825e60..8320361fe27 100644 --- a/ace/MMAP_Memory_Pool.cpp +++ b/ace/MMAP_Memory_Pool.cpp @@ -328,8 +328,8 @@ ACE_MMAP_Memory_Pool::init_acquire (size_t nbytes, first_time = 0; - if (nbytes < (size_t) this->minimum_bytes_) - nbytes = this->minimum_bytes_; + if (nbytes < static_cast <size_t> (this->minimum_bytes_)) + nbytes = static_cast <size_t> (this->minimum_bytes_); if (this->mmap_.open (this->backing_store_name_, O_RDWR | O_CREAT | O_TRUNC | O_EXCL, @@ -376,7 +376,7 @@ ACE_MMAP_Memory_Pool::init_acquire (size_t nbytes, int ACE_MMAP_Memory_Pool::seh_selector (void *ep) { - DWORD ecode = ((EXCEPTION_POINTERS *) ep)->ExceptionRecord->ExceptionCode; + DWORD const ecode = ((EXCEPTION_POINTERS *) ep)->ExceptionRecord->ExceptionCode; if (ecode == EXCEPTION_ACCESS_VIOLATION) { |