diff options
| author | Huang-Ming Huang <huangming.huang@gmail.com> | 2017-04-04 13:41:39 -0500 |
|---|---|---|
| committer | Huang-Ming Huang <huangming.huang@gmail.com> | 2017-04-04 14:27:16 -0500 |
| commit | ec8faa7b1b57c46718b072e46cb91009b4fae7e3 (patch) | |
| tree | ecaa0841f2aed1171e588f62ed94bf20538ee701 /ACE/ace | |
| parent | d5cfdb41caf7feffc320fd53836905012dce1b55 (diff) | |
| download | ATCD-ec8faa7b1b57c46718b072e46cb91009b4fae7e3.tar.gz | |
Fix compiler issues on macOS with ACE_FACE_SAFETY* defined
Diffstat (limited to 'ACE/ace')
| -rw-r--r-- | ACE/ace/Pipe.cpp | 2 | ||||
| -rw-r--r-- | ACE/ace/Shared_Memory_Pool.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ACE/ace/Pipe.cpp b/ACE/ace/Pipe.cpp index dc513785f30..7384dcc6332 100644 --- a/ACE/ace/Pipe.cpp +++ b/ACE/ace/Pipe.cpp @@ -55,7 +55,7 @@ ACE_Pipe::open (int buffer_size) } sockaddr_un addr = { -#ifdef ACE_VXWORKS +#if defined(ACE_VXWORKS) || defined(__APPLE__) sizeof (sockaddr_un), #endif AF_LOCAL, {}}; diff --git a/ACE/ace/Shared_Memory_Pool.cpp b/ACE/ace/Shared_Memory_Pool.cpp index 677be28e0ab..845f595ad6a 100644 --- a/ACE/ace/Shared_Memory_Pool.cpp +++ b/ACE/ace/Shared_Memory_Pool.cpp @@ -123,7 +123,7 @@ ACE_Shared_Memory_Pool::commit_backing_store_name (size_t rounded_bytes, "exceeded max number of segments = %d, base = %u, offset = %u\n", counter, this->base_addr_, - offset), + static_cast<unsigned int>(offset)), -1); else { |