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

Timestamp:

Nov 19, 2018 11:52:10 AM (6 years ago)

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/NetworkServices/Dhcpd/Config.cpp (modified) (7 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::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::iterator c = data.begin(); c != data.end(); ++c) {
             if (space)
                 std::cout << " ";
             else
                 space = true;
-            std::cout << (int)c;
+            std::cout << (int)*c;
         }
         std::cout << std::endl;
@@ -854 +854 @@
     optmap << new OptSubnetMask(m_IPv4Netmask);
 
-    for (auto optreq: reqOpts.value())
-    {
-        std::cout << ">>> requested option " << (int)optreq << std::endl;
-
-        if (optreq == OptSubnetMask::optcode)
+    const OptParameterRequest::value_t& reqValue = reqOpts.value();
+    for (octets_t::const_iterator optreq = reqValue.begin(); optreq != reqValue.end(); ++optreq)
+    {
+        std::cout << ">>> requested option " << (int)*optreq << std::endl;
+
+        if (*optreq == OptSubnetMask::optcode)
         {
             std::cout << "... always supplied" << std::endl;
@@ -866 +867 @@
         if (vmopts != NULL)
         {
-            optmap_t::const_iterator it( vmopts->find(optreq) );
+            optmap_t::const_iterator it( vmopts->find(*optreq) );
             if (it != vmopts->end())
             {
@@ -875 +876 @@
         }
 
-        optmap_t::const_iterator it( m_GlobalOptions.find(optreq) );
+        optmap_t::const_iterator it( m_GlobalOptions.find(*optreq) );
         if (it != m_GlobalOptions.end())
         {
@@ -890 +891 @@
     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 +901 @@
     }
 
-    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)
         {