diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 1998-05-07 05:12:29 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 1998-05-07 05:12:29 +0000 |
| commit | 0ab60e058fd56ba859faeb74d4718ab703433b54 (patch) | |
| tree | bfb5b615852b33d9ca1bf5dca032a737589a61d8 /ace | |
| parent | 8c977f9fec1b162063cb299b478930d11051f371 (diff) | |
| download | ATCD-0ab60e058fd56ba859faeb74d4718ab703433b54.tar.gz | |
*** empty log message ***
Diffstat (limited to 'ace')
| -rw-r--r-- | ace/LSOCK_Dgram.cpp | 17 | ||||
| -rw-r--r-- | ace/Map_Manager.cpp | 4 |
2 files changed, 13 insertions, 8 deletions
diff --git a/ace/LSOCK_Dgram.cpp b/ace/LSOCK_Dgram.cpp index 2f4b466b4de..065b157c7d8 100644 --- a/ace/LSOCK_Dgram.cpp +++ b/ace/LSOCK_Dgram.cpp @@ -1,4 +1,3 @@ -// LSOCK_Dgram.cpp // $Id$ #define ACE_BUILD_DLL @@ -23,14 +22,14 @@ ACE_LSOCK_Dgram::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } -/* The "do nothing" constructor. */ +// The "do nothing" constructor. ACE_LSOCK_Dgram::ACE_LSOCK_Dgram (void) { ACE_TRACE ("ACE_LSOCK_Dgram::ACE_LSOCK_Dgram"); } -/* Here's the general-purpose open routine. */ +// Here's the general-purpose open routine. int ACE_LSOCK_Dgram::open (const ACE_Addr &local, @@ -38,23 +37,27 @@ ACE_LSOCK_Dgram::open (const ACE_Addr &local, int protocol) { ACE_TRACE ("ACE_LSOCK_Dgram::open"); - if (ACE_SOCK_Dgram::open (local, protocol_family, + if (ACE_SOCK_Dgram::open (local, + protocol_family, protocol) == -1) return -1; ACE_LSOCK::set_handle (this->ACE_SOCK_Dgram::get_handle ()); return 0; } -/* Create a local ACE_SOCK datagram. */ +// Create a local ACE_SOCK datagram. ACE_LSOCK_Dgram::ACE_LSOCK_Dgram (const ACE_Addr &local, int protocol_family, int protocol) { ACE_TRACE ("ACE_LSOCK_Dgram::ACE_LSOCK_Dgram"); - if (this->open (local, protocol_family, + if (this->open (local, + protocol_family, protocol) == -1) - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_LSOCK_Dgram"))); + ACE_ERROR ((LM_ERROR, + ASYS_TEXT ("%p\n"), + ASYS_TEXT ("ACE_LSOCK_Dgram"))); } #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */ diff --git a/ace/Map_Manager.cpp b/ace/Map_Manager.cpp index 1dcc90ef917..c37691ab1a2 100644 --- a/ace/Map_Manager.cpp +++ b/ace/Map_Manager.cpp @@ -125,7 +125,9 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::resize_i (size_t size) for (i = this->cur_size_; i < this->total_size_; i++) { - // Call the constructor for each element in the array. + // Call the constructor for each element in the array. Note + // that this requires a default constructor for <EXT_ID> and + // <INT_ID>. new (&(temp[i])) ACE_Map_Entry<EXT_ID, INT_ID>; temp[i].is_free_ = 1; } |