diff options
| author | Chad Elliott <elliottc@objectcomputing.com> | 2019-06-24 12:25:36 -0500 |
|---|---|---|
| committer | Chad Elliott <elliottc@objectcomputing.com> | 2019-06-24 12:25:36 -0500 |
| commit | ea0205bef9691755788871bffaeae8a4fff49a5d (patch) | |
| tree | 68e212be1fc97cec19c3041ef0a03da9ba449cec | |
| parent | de6952566c18e2fb7bc049dfac5814f6e53cf72f (diff) | |
| download | ATCD-ea0205bef9691755788871bffaeae8a4fff49a5d.tar.gz | |
Redundantly set the l_linger member to appease gcc
| -rw-r--r-- | ACE/ace/SOCK_SEQPACK_Association.cpp | 5 | ||||
| -rw-r--r-- | TAO/tao/IIOP_Connection_Handler.cpp | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/ACE/ace/SOCK_SEQPACK_Association.cpp b/ACE/ace/SOCK_SEQPACK_Association.cpp index 024de691a2e..def25b74165 100644 --- a/ACE/ace/SOCK_SEQPACK_Association.cpp +++ b/ACE/ace/SOCK_SEQPACK_Association.cpp @@ -52,6 +52,11 @@ ACE_SOCK_SEQPACK_Association::abort (void) linger slinger = { 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 bf4bb930103..12012fb0afe 100644 --- a/TAO/tao/IIOP_Connection_Handler.cpp +++ b/TAO/tao/IIOP_Connection_Handler.cpp @@ -669,6 +669,11 @@ TAO_IIOP_Connection_Handler::abort (void) struct linger lval = { 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, |