diff options
author | stanleyk <stanleyk@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-02-05 21:11:03 +0000 |
---|---|---|
committer | stanleyk <stanleyk@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-02-05 21:11:03 +0000 |
commit | 5e030faf84086ab02059fcbcc3faed224bd57b95 (patch) | |
tree | 3a62df45ac6ccf599fb07cf6a03d672456ce2e3d /ACE/ace/Mem_Map.inl | |
parent | 9d296f7fa51116ff7040ecb2ad18612cd94b5fd1 (diff) | |
download | ATCD-5e030faf84086ab02059fcbcc3faed224bd57b95.tar.gz |
Merge in OCI_Reliability_Enhancements branch.
Diffstat (limited to 'ACE/ace/Mem_Map.inl')
-rw-r--r-- | ACE/ace/Mem_Map.inl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ACE/ace/Mem_Map.inl b/ACE/ace/Mem_Map.inl index 78a99646a88..4fd43d4f3de 100644 --- a/ACE/ace/Mem_Map.inl +++ b/ACE/ace/Mem_Map.inl @@ -122,7 +122,7 @@ ACE_Mem_Map::unmap (ssize_t len) if (this->base_addr_ != MAP_FAILED) { int const result = ACE_OS::munmap (this->base_addr_, - len < 0 ? this->length_ : len); + len < 0 ? this->length_ : (size_t)len); this->base_addr_ = MAP_FAILED; return result; } @@ -140,7 +140,7 @@ ACE_Mem_Map::unmap (void *addr, ssize_t len) this->close_filemapping_handle (); return ACE_OS::munmap (addr, - len < 0 ? this->length_ : len); + len < 0 ? this->length_ : (size_t)len); } // Sync <len> bytes of the memory region to the backing store starting |