Changeset 40023 in vbox for trunk/include

Timestamp:

Feb 7, 2012 9:44:31 PM (13 years ago)

Author:

vboxsync

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

76146

Message:

gcc-4.7 fixes

File:

• trunk/include/VBox/com/array.h (modified) (11 diffs)

trunk/include/VBox/com/array.h

@@ -662 +662 @@
              it != aCntr.end(); ++ it, ++ i)
 #ifdef VBOX_WITH_XPCOM
-            Copy(*it, m.arr[i]);
+            SafeArray::Copy(*it, m.arr[i]);
 #else
             Copy(*it, m.raw[i]);
@@ -768 +768 @@
 
 #ifdef VBOX_WITH_XPCOM
-        Copy(aElement, m.arr[m.size]);
+        SafeArray::Copy(aElement, m.arr[m.size]);
         ++ m.size;
 #else
@@ -803 +803 @@
 
 #ifdef VBOX_WITH_XPCOM
-        Init(m.arr[m.size]);
+        SafeArray::Init(m.arr[m.size]);
         ++ m.size;
         return &m.arr[m.size - 1];
@@ -834 +834 @@
             /* initialize the new elements */
             for (size_t i = m.size; i < aNewSize; ++ i)
-                Init(m.arr[i]);
+                SafeArray::Init(m.arr[i]);
         }
 
@@ -1102 +1102 @@
                      * shrink the size. */
                     for (size_t i = aNewSize; i < m.size; ++ i)
-                        Uninit(m.arr[i]);
+                        this->Uninit(m.arr[i]);
 
                     m.size = aNewSize;
@@ -1121 +1121 @@
                  * shrink the size. */
                 for (size_t i = aNewSize; i < m.size; ++ i)
-                    Uninit(m.arr[i]);
+                    this->Uninit(m.arr[i]);
 
                 m.size = aNewSize;
@@ -1176 +1176 @@
                 {
                     for (size_t i = 0; i < size; ++ i)
-                        Uninit(arr[i]);
+                        SafeArray::Uninit(arr[i]);
 
                     nsMemory::Free((void *)arr);
@@ -1616 +1616 @@
              it != aCntr.end(); ++ it, ++ i)
 #ifdef VBOX_WITH_XPCOM
-            Copy(*it, Base::m.arr[i]);
+            SafeIfaceArray::Copy(*it, Base::m.arr[i]);
 #else
             Copy(*it, Base::m.raw[i]);
@@ -1648 +1648 @@
              it != aMap.end(); ++ it, ++ i)
 #ifdef VBOX_WITH_XPCOM
-            Copy(it->second, Base::m.arr[i]);
+            SafeIfaceArray::Copy(it->second, Base::m.arr[i]);
 #else
             Copy(it->second, Base::m.raw[i]);
@@ -1680 +1680 @@
              it != aMap.end(); ++ it, ++ i)
 #ifdef VBOX_WITH_XPCOM
-            Copy(it->second, Base::m.arr[i]);
+            SafeIfaceArray::Copy(it->second, Base::m.arr[i]);
 #else
             Copy(it->second, Base::m.raw[i]);
@@ -1689 +1689 @@
     {
 #ifdef VBOX_WITH_XPCOM
-        Copy(obj, Base::m.arr[iIdx]);
+        SafeIfaceArray::Copy(obj, Base::m.arr[iIdx]);
 #else
         Copy(obj, Base::m.raw[iIdx]);