Changeset 102324 in vbox for trunk/src/libs/xpcom18a4/xpcom/ds

Timestamp:

Nov 27, 2023 3:12:46 PM (15 months ago)

Author:

vboxsync

Message:

libs/xpcom: Replace NS_QuickSort with IPRT RTSortShell and get rid of it, bugref:10545

Location:

trunk/src/libs/xpcom18a4/xpcom/ds

Files:

• nsQuickSort.cpp (deleted)
• nsQuickSort.h (deleted)
• nsVoidArray.cpp (modified) (3 diffs)

trunk/src/libs/xpcom18a4/xpcom/ds/nsVoidArray.cpp

@@ -35 +35 @@
  *
  * ***** END LICENSE BLOCK ***** */
+#include <iprt/cdefs.h>
+#include <iprt/sort.h>
+
 #include "nsVoidArray.h"
-#include "nsQuickSort.h"
 #include "prmem.h"
 #include "nsCRT.h"
@@ -618 +620 @@
 };
 
-PR_STATIC_CALLBACK(int)
-VoidArrayComparator(const void* aElement1, const void* aElement2, void* aData)
+static DECLCALLBACK(int) VoidArrayComparator(const void* aElement1, const void* aElement2, void* aData)
 {
   VoidArrayComparatorContext* ctx = NS_STATIC_CAST(VoidArrayComparatorContext*, aData);
@@ -632 +633 @@
   {
     VoidArrayComparatorContext ctx = {aFunc, aData};
-    NS_QuickSort(mImpl->mArray, mImpl->mCount, sizeof(mImpl->mArray[0]),
-                 VoidArrayComparator, &ctx);
+    RTSortShell(mImpl->mArray, mImpl->mCount, sizeof(mImpl->mArray[0]),
+                VoidArrayComparator, &ctx);
   }
 }