Changeset 44376 in vbox

Timestamp:

Jan 25, 2013 1:35:31 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

83346

Message:

The changes inside loops where enumeration MediumVariant is converted. For correct work under both systems Windows and Linux because enumeration is defined differently on these systems.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageDisk.cpp (modified) (2 diffs)
• Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVD.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVD.cpp (modified) (1 diff)
• Main/src-server/MediumImpl.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp

@@ -375 +375 @@
         com::SafeArray<MediumVariant_T> l_variants(sizeof(MediumVariant_T)*8);
 
-        for (unsigned int i = 0; i < l_variants.size(); ++i)
-        {
-            MediumVariant_T temp = DiskVariant;
-            l_variants [i] = (temp & (1<<i));
+        for (ulong i = 0; i < l_variants.size(); ++i)
+        {
+            ulong temp = DiskVariant;
+            temp &= 1<<i;
+            l_variants [i] = (MediumVariant_T)temp;
         }
 
@@ -687 +688 @@
         com::SafeArray<MediumVariant_T> l_variants(sizeof(MediumVariant_T)*8);
 
-        for (unsigned int i = 0; i < l_variants.size(); ++i)
-        {
-            MediumVariant_T temp = DiskVariant;
-            l_variants [i] = (temp & (1<<i));
+        for (ulong i = 0; i < l_variants.size(); ++i)
+        {
+            ulong temp = DiskVariant;
+            temp &= 1<<i;
+            l_variants [i] = (MediumVariant_T)temp;
         }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVD.cpp

@@ -76 +76 @@
     {
         qulonglong temp = uVariant;
-        l_variants [i] = (KMediumVariant)(temp & (1<<i));
+        temp &= 1<<i;
+        l_variants [i] = (KMediumVariant)temp;
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVD.cpp

@@ -79 +79 @@
     {
         qulonglong temp = uVariant;
-        l_variants [i] = (KMediumVariant)(temp & (1<<i));
+        temp &= 1<<i;
+        l_variants [i] = (KMediumVariant)temp;
     }
 

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

@@ -1543 +1543 @@
     SafeArray<MediumVariant_T> variants(sizeof(MediumVariant_T)*8);
 
-    for (unsigned int i = 0; i < variants.size(); ++i)
-    {
-        MediumVariant_T temp = m->variant;
-        variants [i] = (temp & (1<<i));
+    for (ulong i = 0; i < variants.size(); ++i)
+    {
+        ulong temp = m->variant;
+        temp &= 1<<i; 
+        variants [i] = (MediumVariant_T)temp;
     }