Changeset 64218 in vbox for trunk/src

Timestamp:

Oct 12, 2016 10:28:37 AM (8 years ago)

Author:

vboxsync

Message:

VBoxNetDhcp: Instead of complaining in the comments that operator[] is
not const, just use find().

File:

• trunk/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp (modified) (3 diffs)

trunk/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp

@@ -118 +118 @@
     static int hostDnsServers(const ComHostPtr& host,
                               const RTNETADDRIPV4& networkid,
-                              /* const */ AddressToOffsetMapping& mapping,
+                              const AddressToOffsetMapping& mapping,
                               AddressList& servers);
     int fetchAndUpdateDnsInfo();
@@ -617 +617 @@
 
 
-/**
- * @note: const dropped here, because of map<K,V>::operator[] which
- * isn't const, map<K,V>::at() has const variant but it's C++11.
- */
 int VBoxNetDhcp::hostDnsServers(const ComHostPtr& host,
                                 const RTNETADDRIPV4& networkid,
-                                /* const */ AddressToOffsetMapping& mapping,
+                                const AddressToOffsetMapping& mapping,
                                 AddressList& servers)
 {
@@ -650 +646 @@
         if (addr.au8[0] == 127)
         {
-            /* XXX: here we want map<K,V>::at(const K& k) const */
-            if (mapping[addr] != 0)
+            AddressToOffsetMapping::const_iterator remap(mapping.find(addr));
+
+            if (remap != mapping.end())
             {
-                addr.u = RT_H2N_U32(RT_N2H_U32(networkid.u)
-                                    + mapping[addr]);
+                int offset = remap->second;
+                addr.u = RT_H2N_U32(RT_N2H_U32(networkid.u) + offset);
             }
             else