Changeset 75614 in vbox for trunk/src/VBox/NetworkServices/Dhcpd/Config.cpp

Timestamp:

Nov 20, 2018 11:41:35 AM (6 years ago)

Author:

vboxsync

Message:

Main/DHCPD: bugref:9288 Use new implementation of DHCP server (VCC 10 and GCC 4.4.4 support).

File:

• trunk/src/VBox/NetworkServices/Dhcpd/Config.cpp (modified) (5 diffs)

trunk/src/VBox/NetworkServices/Dhcpd/Config.cpp

@@ -589 +589 @@
     /** @todo r=bird: Visual C++ 2010 does not grok this use of 'auto'. */
     // XXX: debug
-    for (auto it: m_GlobalOptions) {
-        std::shared_ptr<DhcpOption> opt(it.second);
+    for (optmap_t::const_iterator it = m_GlobalOptions.begin(); it != m_GlobalOptions.end(); ++it) {
+        std::shared_ptr<DhcpOption> opt(it->second);
 
         octets_t data;
@@ -596 +596 @@
 
         bool space = false;
-        for (auto c: data) {
+        for (octets_t::const_iterator itData = data.begin(); itData != data.end(); ++itData) {
+            uint8_t c = *itData;
             if (space)
                 std::cout << " ";
@@ -854 +855 @@
     optmap << new OptSubnetMask(m_IPv4Netmask);
 
-    for (auto optreq: reqOpts.value())
-    {
+    const OptParameterRequest::value_t& reqValue = reqOpts.value();
+    for (octets_t::const_iterator itOptReq = reqValue.begin(); itOptReq != reqValue.end(); ++itOptReq)
+    {
+        uint8_t optreq = *itOptReq;
         std::cout << ">>> requested option " << (int)optreq << std::endl;
 
@@ -890 +893 @@
     if (vmopts != NULL)
     {
-        for (auto it: *vmopts) {
-            std::shared_ptr<DhcpOption> opt(it.second);
+        for (optmap_t::const_iterator it = vmopts->begin(); it != vmopts->end(); ++it) {
+            std::shared_ptr<DhcpOption> opt(it->second);
             if (optmap.count(opt->optcode()) == 0 && opt->optcode() > 127)
             {
@@ -900 +903 @@
     }
 
-    for (auto it: m_GlobalOptions) {
-        std::shared_ptr<DhcpOption> opt(it.second);
+    for (optmap_t::const_iterator it = m_GlobalOptions.begin(); it != m_GlobalOptions.end(); ++it) {
+        std::shared_ptr<DhcpOption> opt(it->second);
         if (optmap.count(opt->optcode()) == 0 && opt->optcode() > 127)
         {