[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/hb-vector.hh |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 5eb7e7f6461bcf5b1e1d8ccb49eb904382762533
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Oct 16 13:32:52 2018 -0700

    Revert "[vector] Simplify Sort" and "More of the same"
    
    This reverts commit de0b9a466490c2c13d6ec6f59d5122b0a87d3180.
    This reverts commit 921f0e6ec722940a1e37660e1291aa69f9f39db8.
    
    Annnnd, revert.  MSVC doesn't like it.

diff --git a/src/hb-vector.hh b/src/hb-vector.hh
index 9c2f7249..766e5fb8 100644
--- a/src/hb-vector.hh
+++ b/src/hb-vector.hh
@@ -179,14 +179,19 @@ struct hb_vector_t
     return nullptr;
   }
 
-  inline void qsort (int (*cmp)(const void*, const void*) = Type::cmp)
+  inline void qsort (int (*cmp)(const void*, const void*))
   {
     ::qsort (arrayZ(), len, sizeof (Type), cmp);
   }
 
-  inline void qsort (unsigned int start, unsigned int end, int (*cmp)(const void*, const void*) = Type::cmp)
+  inline void qsort (void)
   {
-    ::qsort (arrayZ() + start, end - start, sizeof (Type), cmp);
+    ::qsort (arrayZ(), len, sizeof (Type), Type::cmp);
+  }
+
+  inline void qsort (unsigned int start, unsigned int end)
+  {
+    ::qsort (arrayZ() + start, end - start, sizeof (Type), Type::cmp);
   }
 
   template <typename T>