diff options
| author | ocielliottc <elliottc@objectcomputing.com> | 2019-06-26 06:47:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-26 06:47:46 -0500 |
| commit | 2ec946a16b88456961b971c48cf43ff5b6eb3f86 (patch) | |
| tree | ca94e89a53cdea53027da182c5e4e896ae15af84 | |
| parent | de6952566c18e2fb7bc049dfac5814f6e53cf72f (diff) | |
| parent | 9a0cce755eeabf8bc71b749de9ff53dcc4e0d34a (diff) | |
| download | ATCD-2ec946a16b88456961b971c48cf43ff5b6eb3f86.tar.gz | |
Merge pull request #927 from ocielliottc/spurious_gcc_warning
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 | 2 | ||||
| -rw-r--r-- | TAO/tao/IIOP_Connection_Handler.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ACE/ace/SOCK_SEQPACK_Association.cpp b/ACE/ace/SOCK_SEQPACK_Association.cpp index 024de691a2e..e1921645f2a 100644 --- a/ACE/ace/SOCK_SEQPACK_Association.cpp +++ b/ACE/ace/SOCK_SEQPACK_Association.cpp @@ -49,7 +49,7 @@ 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 (-1 == ACE_OS::setsockopt (this->get_handle (), diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp index bf4bb930103..552eff0856b 100644 --- a/TAO/tao/IIOP_Connection_Handler.cpp +++ b/TAO/tao/IIOP_Connection_Handler.cpp @@ -666,7 +666,7 @@ 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 (this->peer ().set_option(SOL_SOCKET, |