diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-05-20 13:47:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 13:47:50 +0200 |
| commit | 0a50ebb1c91efb70a4d7de65eac68aca22f1485a (patch) | |
| tree | 7c63bc3ddf51478c1fc0eebfc3bfa20dd5ddb894 | |
| parent | 71ad93429ff7f99dc50419da5f0cbac9b6af752d (diff) | |
| parent | 4d603bcaa034c0ee27c12eae4b53ac62a3e139ee (diff) | |
| download | ATCD-0a50ebb1c91efb70a4d7de65eac68aca22f1485a.tar.gz | |
Merge pull request #1119 from jwillemsen/jwi-msvcwarnings
Fix some msvc level 4 warnings
| -rw-r--r-- | ACE/ace/Configuration_Import_Export.cpp | 2 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_stropts.cpp | 7 | ||||
| -rw-r--r-- | ACE/ace/QoS/README | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/ACE/ace/Configuration_Import_Export.cpp b/ACE/ace/Configuration_Import_Export.cpp index c9da29bfbfb..3b91d3226ad 100644 --- a/ACE/ace/Configuration_Import_Export.cpp +++ b/ACE/ace/Configuration_Import_Export.cpp @@ -410,7 +410,6 @@ ACE_Registry_ImpExp::export_section (const ACE_Configuration_Section_Key& sectio int index = 0; ACE_TString name; ACE_Configuration_Section_Key sub_key; - ACE_TString sub_section; while (!config_.enumerate_sections (section, index, name)) { ACE_TString sub_section (path); @@ -699,7 +698,6 @@ ACE_Ini_ImpExp::export_section (const ACE_Configuration_Section_Key& section, int index = 0; ACE_TString name; ACE_Configuration_Section_Key sub_key; - ACE_TString sub_section; while (!config_.enumerate_sections (section, index, name)) { ACE_TString sub_section (path); diff --git a/ACE/ace/OS_NS_stropts.cpp b/ACE/ace/OS_NS_stropts.cpp index 64b527fcc64..bdcd3317c7f 100644 --- a/ACE/ace/OS_NS_stropts.cpp +++ b/ACE/ace/OS_NS_stropts.cpp @@ -56,12 +56,11 @@ ACE_OS::ioctl (ACE_HANDLE socket, ACE_OVERLAPPED_COMPLETION_FUNC func) { # if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) - - QOS qos; - unsigned long qos_len = sizeof (QOS); - if (io_control_code == SIO_SET_QOS) { + QOS qos; + unsigned long qos_len = sizeof (QOS); + qos.SendingFlowspec = *(ace_qos.sending_flowspec ()); qos.ReceivingFlowspec = *(ace_qos.receiving_flowspec ()); qos.ProviderSpecific = (WSABUF) ace_qos.provider_specific (); diff --git a/ACE/ace/QoS/README b/ACE/ace/QoS/README index 870812aa0db..ec133bed31b 100644 --- a/ACE/ace/QoS/README +++ b/ACE/ace/QoS/README @@ -1,5 +1,3 @@ - - ACE QoS API (AQoSA) =================== |