Changeset 1041 for cpp/frams/vm/classes/collectionobj.cpp

Timestamp:

12/01/20 01:11:25 (4 years ago)

Author:

Maciej Komosinski

Message:

Use qsort_r() substitute when not available (Android)

File:

• cpp/frams/vm/classes/collectionobj.cpp (modified) (2 diffs)

cpp/frams/vm/classes/collectionobj.cpp

@@ -272 +272 @@
 #ifdef QSORT_R_USING_QSORT_S
         static int compare(void* _this, const void *a, const void *b);
+        bool operator()(const ExtValue *a, const ExtValue *b) { return compare(this,&a,&b) == ExtValue::ResultLower; }
 #else
         static int compare(const void *a, const void *b, void* _this);
+        bool operator()(const ExtValue *a, const ExtValue *b) { return compare(&a,&b,this) == ExtValue::ResultLower; }
 #endif
 };
@@ -319 +321 @@
                 //However, std::sort() requires "strict weak ordering" and may crash (and indeed crashes, "undefined behavior") when given a non-compliant comparator.
                 //We use qsort() instead because we can't control what kind of user script comparator function will be passed to Vector.sort(), and qsort() seems to behave safely for every function.
+#ifdef __ANDROID__
+                std::sort(first, first + data.size(), cmp); //no qsort_r() or equivalent on Android (yet)
+#else
                 qsort_r(first, data.size(), sizeof(ExtValue*), cmp.compare, &cmp);
+#endif
         }
         else