Changeset 40023 in vbox for trunk

Timestamp:

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

Author:

vboxsync

Message:

gcc-4.7 fixes

Location:

trunk

Files:

• include/VBox/com/array.h (modified) (11 diffs)
• src/VBox/Additions/x11/vboxmouse/undefined (modified) (1 diff)
• src/VBox/Additions/x11/vboxvideo/undefined (modified) (1 diff)
• src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp (modified) (5 diffs)
• src/VBox/Frontends/VirtualBox/src/globals/COMDefs.h (modified) (5 diffs)
• src/libs/xpcom18a4/xpcom/ds/nsBaseHashtable.h (modified) (3 diffs)
• src/libs/xpcom18a4/xpcom/ds/nsClassHashtable.h (modified) (2 diffs)
• src/libs/xpcom18a4/xpcom/ds/nsInterfaceHashtable.h (modified) (3 diffs)
• src/libs/xpcom18a4/xpcom/ds/nsRefPtrHashtable.h (modified) (3 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]);

trunk/src/VBox/Additions/x11/vboxmouse/undefined

@@ -8 +8 @@
 VErrorF
 Xalloc
+_ITM_registerTMCloneTable
+_ITM_deregisterTMCloneTable
 _Jv_RegisterClasses
 ___errno

trunk/src/VBox/Additions/x11/vboxvideo/undefined

@@ -19 +19 @@
 XNFstrdup
 Xalloc
+_ITM_registerTMCloneTable
+_ITM_deregisterTMCloneTable
 _Jv_RegisterClasses
 ___errno

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -818 +818 @@
     char *cdromFile = NULL;
     char *fdaFile   = NULL;
-    const char *portVRDP = NULL;
+    const char *pszPortVRDP = NULL;
     bool fDiscardState = false;
 #ifdef VBOX_SECURELABEL
@@ -1163 +1163 @@
         {
             // start with the standard VRDP port
-            portVRDP = "0";
+            pszPortVRDP = "0";
 
             // is there another argument
@@ -1169 +1169 @@
             {
                 curArg++;
-                portVRDP = argv[curArg];
-                LogFlow(("Using non standard VRDP port %s\n", portVRDP));
+                pszPortVRDP = argv[curArg];
+                LogFlow(("Using non standard VRDP port %s\n", pszPortVRDP));
             }
         }
@@ -1912 +1912 @@
     }
 
-    if (portVRDP)
+    if (pszPortVRDP)
     {
         rc = gpMachine->COMGETTER(VRDEServer)(gpVRDEServer.asOutParam());
@@ -1919 +1919 @@
         {
             // has a non standard VRDP port been requested?
-            if (portVRDP > 0)
-            {
-                rc = gpVRDEServer->SetVRDEProperty(Bstr("TCP/Ports").raw(), Bstr(portVRDP).raw());
+            if (strcmp(pszPortVRDP, "0"))
+            {
+                rc = gpVRDEServer->SetVRDEProperty(Bstr("TCP/Ports").raw(), Bstr(pszPortVRDP).raw());
                 if (rc != S_OK)
                 {

trunk/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.h

@@ -642 +642 @@
         clear();
         mIface = that.mIface;
-        addref(ptr());
+        this->addref(ptr());
     }
 
@@ -649 +649 @@
         clear();
         setPtr (aIface);
-        addref (aIface);
+        this->addref (aIface);
     }
 
@@ -702 +702 @@
         /* be aware of self assignment */
         I* amIface = ptr();
-        addref (aIface);
-        release (amIface);
+        this->addref (aIface);
+        this->release (amIface);
         if (aIface)
         {
             amIface = NULL;
             B::mRC = aIface->QueryInterface (COM_IIDOF (I), (void **) &amIface);
-            release (aIface);
+            this->release (aIface);
             setPtr(amIface);
         }
@@ -725 +725 @@
 #endif
         /* be aware of self assignment */
-        addref (aIface);
-        release (ptr());
+        this->addref (aIface);
+        this->release (ptr());
         setPtr(aIface);
         B::mRC = S_OK;
@@ -737 +737 @@
        Assert(!mDead);
 #endif
-       release (ptr());
+       this->release (ptr());
        setPtr(NULL);
     }

trunk/src/libs/xpcom18a4/xpcom/ds/nsBaseHashtable.h

@@ -125 +125 @@
   PRBool Get(KeyType aKey, UserDataType* pData) const
   {
-    EntryType* ent = GetEntry(aKey);
+    EntryType* ent = this->GetEntry(aKey);
 
     if (!ent)
@@ -144 +144 @@
   PRBool Put(KeyType aKey, UserDataType aData)
   {
-    EntryType* ent = PutEntry(aKey);
+    EntryType* ent = this->PutEntry(aKey);
 
     if (!ent)
@@ -158 +158 @@
    * @param aKey the key to remove from the hashtable
    */
-  void Remove(KeyType aKey) { RemoveEntry(aKey); }
+  void Remove(KeyType aKey) { this->RemoveEntry(aKey); }
 
   /**

trunk/src/libs/xpcom18a4/xpcom/ds/nsClassHashtable.h

@@ -99 +99 @@
 {
   typename nsBaseHashtable<KeyClass,nsAutoPtr<T>,T*>::EntryType* ent =
-    GetEntry(aKey);
+    this->GetEntry(aKey);
 
   if (ent)
@@ -127 +127 @@
 
   typename nsBaseHashtableMT<KeyClass,nsAutoPtr<T>,T*>::EntryType* ent =
-    GetEntry(aKey);
+    this->GetEntry(aKey);
 
   if (ent)

trunk/src/libs/xpcom18a4/xpcom/ds/nsInterfaceHashtable.h

@@ -112 +112 @@
 {
   typename nsBaseHashtable<KeyClass, nsCOMPtr<Interface>, Interface*>::EntryType* ent =
-    GetEntry(aKey);
+    this->GetEntry(aKey);
 
   if (ent)
@@ -140 +140 @@
 {
   typename nsBaseHashtable<KeyClass, nsCOMPtr<Interface>, Interface*>::EntryType* ent =
-    GetEntry(aKey);
+    this->GetEntry(aKey);
 
   if (ent)
@@ -168 +168 @@
 
   typename nsBaseHashtableMT<KeyClass, nsCOMPtr<Interface>, Interface*>::EntryType* ent =
-    GetEntry(aKey);
+    this->GetEntry(aKey);
 
   if (ent)

trunk/src/libs/xpcom18a4/xpcom/ds/nsRefPtrHashtable.h

@@ -113 +113 @@
 {
   typename nsBaseHashtable<KeyClass, nsRefPtr<RefPtr>, RefPtr*>::EntryType* ent =
-    GetEntry(aKey);
+    this->GetEntry(aKey);
 
   if (ent)
@@ -141 +141 @@
 {
   typename nsBaseHashtable<KeyClass, nsRefPtr<RefPtr>, RefPtr*>::EntryType* ent =
-    GetEntry(aKey);
+    this->GetEntry(aKey);
 
   if (ent)
@@ -169 +169 @@
 
   typename nsBaseHashtableMT<KeyClass, nsRefPtr<RefPtr>, RefPtr*>::EntryType* ent =
-    GetEntry(aKey);
+    this->GetEntry(aKey);
 
   if (ent)