switch to std::sort until I have time to sort this out.

llvm-svn: 60354

1 files changed, 7 insertions, 3 deletions

diff --git a/llvm/include/llvm/ADT/STLExtras.h b/llvm/include/llvm/ADT/STLExtras.h
index 5685729eb51..7be7699bcc2 100644
--- a/llvm/include/llvm/ADT/STLExtras.h
+++ b/llvm/include/llvm/ADT/STLExtras.h
@@ -246,12 +246,16 @@ static inline int array_pod_sort_comparator(const void *P1, const void *P2) {
 ///
 /// NOTE: If qsort_r were portable, we could allow a custom comparator and
 /// default to std::less.
+#include <algorithm>
+  
 template<class IteratorTy>
 static inline void array_pod_sort(IteratorTy Start, IteratorTy End) {
+  std::sort(Start, End);
+  
   // Don't dereference start iterator of empty sequence.
-  if (Start == End) return;
-  qsort(&*Start, End-Start, sizeof(*Start),
-        array_pod_sort_comparator<sizeof(*Start)>);
+  //if (Start == End) return;
+  //qsort(&*Start, End-Start, sizeof(*Start),
+  //      array_pod_sort_comparator<*Start>);
 }
   
 } // End llvm namespace