Changeset 52492 in vbox

Timestamp:

Aug 25, 2014 11:40:49 AM (10 years ago)

Author:

vboxsync

Message:

MachineImpl: warnings

File:

• trunk/src/VBox/Main/src-server/MachineImpl.cpp (modified) (6 diffs)

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -1205 +1205 @@
         {
             mNetworkAdapters.resize(newCount);
-            for (ULONG slot = oldCount; slot < mNetworkAdapters.size(); slot++)
+            for (size_t slot = oldCount; slot < mNetworkAdapters.size(); slot++)
             {
                 unconst(mNetworkAdapters[slot]).createObject();
-                mNetworkAdapters[slot]->init(this, slot);
+                mNetworkAdapters[slot]->init(this, (ULONG)slot);
             }
         }
@@ -5168 +5168 @@
                            Bstr(tr("Deleting files")).raw(),
                            true /* fCancellable */,
-                           pTask->llFilesToDelete.size() + pTask->llMediums.size() + 1,   // cOperations
+                           (ULONG)(pTask->llFilesToDelete.size() + pTask->llMediums.size() + 1),   // cOperations
                            BstrFmt(tr("Deleting '%s'"), pTask->llFilesToDelete.front().c_str()).raw());
 
@@ -8711 +8711 @@
 
         // boot order
-        for (size_t i = 0; i < RT_ELEMENTS(mHWData->mBootOrder); ++i)
+        for (unsigned i = 0; i < RT_ELEMENTS(mHWData->mBootOrder); ++i)
         {
             settings::BootOrderMap::const_iterator it = data.mapBootOrder.find(i);
@@ -8775 +8775 @@
 
         // network adapters
-        uint32_t newCount = Global::getMaxNetworkAdapters(mHWData->mChipsetType);
-        uint32_t oldCount = mNetworkAdapters.size();
+        size_t newCount = Global::getMaxNetworkAdapters(mHWData->mChipsetType);
+        size_t oldCount = mNetworkAdapters.size();
         if (newCount > oldCount)
         {
             mNetworkAdapters.resize(newCount);
-            for (ULONG slot = oldCount; slot < mNetworkAdapters.size(); ++slot)
+            for (size_t slot = oldCount; slot < mNetworkAdapters.size(); ++slot)
             {
                 unconst(mNetworkAdapters[slot]).createObject();
-                mNetworkAdapters[slot]->init(this, slot);
+                mNetworkAdapters[slot]->init(this, (ULONG)slot);
             }
         }
@@ -10032 +10032 @@
         // boot order
         data.mapBootOrder.clear();
-        for (size_t i = 0; i < RT_ELEMENTS(mHWData->mBootOrder); ++i)
+        for (unsigned i = 0; i < RT_ELEMENTS(mHWData->mBootOrder); ++i)
             data.mapBootOrder[i] = mHWData->mBootOrder[i];
 
@@ -10081 +10081 @@
 
         /* Network adapters (required) */
-        uint32_t uMaxNICs = RT_MIN(Global::getMaxNetworkAdapters(mHWData->mChipsetType), mNetworkAdapters.size());
+        size_t uMaxNICs = RT_MIN(Global::getMaxNetworkAdapters(mHWData->mChipsetType), mNetworkAdapters.size());
         data.llNetworkAdapters.clear();
         /* Write out only the nominal number of network adapters for this
          * chipset type. Since Machine::commit() hasn't been called there
          * may be extra NIC settings in the vector. */
-        for (ULONG slot = 0; slot < uMaxNICs; ++slot)
+        for (size_t slot = 0; slot < uMaxNICs; ++slot)
         {
             settings::NetworkAdapter nic;
-            nic.ulSlot = slot;
+            nic.ulSlot = (uint32_t)slot;
             /* paranoia check... must not be NULL, but must not crash either. */
             if (mNetworkAdapters[slot])