diff options
| author | Chad Elliott <elliottc@objectcomputing.com> | 2019-06-25 07:33:04 -0500 |
|---|---|---|
| committer | Chad Elliott <elliottc@objectcomputing.com> | 2019-06-25 07:33:04 -0500 |
| commit | 9a0cce755eeabf8bc71b749de9ff53dcc4e0d34a (patch) | |
| tree | ca94e89a53cdea53027da182c5e4e896ae15af84 | |
| parent | ea0205bef9691755788871bffaeae8a4fff49a5d (diff) | |
| download | ATCD-9a0cce755eeabf8bc71b749de9ff53dcc4e0d34a.tar.gz | |
Provide two values in the struct linger initializer even though it absolutely is not required by the standard
| -rw-r--r-- | ACE/ace/SOCK_SEQPACK_Association.cpp | 7 | ||||
| -rw-r--r-- | TAO/tao/IIOP_Connection_Handler.cpp | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/ACE/ace/SOCK_SEQPACK_Association.cpp b/ACE/ace/SOCK_SEQPACK_Association.cpp index def25b74165..e1921645f2a 100644 --- a/ACE/ace/SOCK_SEQPACK_Association.cpp +++ b/ACE/ace/SOCK_SEQPACK_Association.cpp @@ -49,14 +49,9 @@ ACE_SOCK_SEQPACK_Association::abort (void) // setsockopt() SO_LINGER configures socket to reap immediately. // Normal close then aborts the association. // - linger slinger = { 0 }; + linger slinger = { 0, 0 }; slinger.l_onoff = 1; -#if !defined(ACE_HAS_LINGER_MS) - // Redundantly set the l_linger member to appease gcc - slinger.l_linger = 0; -#endif - if (-1 == ACE_OS::setsockopt (this->get_handle (), SOL_SOCKET, SO_LINGER, diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp index 12012fb0afe..552eff0856b 100644 --- a/TAO/tao/IIOP_Connection_Handler.cpp +++ b/TAO/tao/IIOP_Connection_Handler.cpp @@ -666,14 +666,9 @@ TAO_IIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_prio void TAO_IIOP_Connection_Handler::abort (void) { - struct linger lval = { 0 }; + struct linger lval = { 0, 0 }; lval.l_onoff = 1; -#if !defined(ACE_HAS_LINGER_MS) - // Redundantly set the l_linger member to appease gcc - lval.l_linger = 0; -#endif - if (this->peer ().set_option(SOL_SOCKET, SO_LINGER, (void*) &lval, |