Fixed lint errors:

[oota-llvm.git] / include / llvm / ADT / STLExtras.h

diff --git a/include/llvm/ADT/STLExtras.h b/include/llvm/ADT/STLExtras.h
index 7be7699bcc2b041d6c673b193736746cde6c0742..964e7e07ef7d57a67ef37ef61cb4599c44bc5063 100644 (file)
--- a/include/llvm/ADT/STLExtras.h
+++ b/include/llvm/ADT/STLExtras.h
@@ -10,16 +10,16 @@
 // This file contains some templates that are useful if you are working with the
 // STL at all.
 //
-// No library is required when using these functinons.
+// No library is required when using these functions.
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef LLVM_ADT_STLEXTRAS_H
 #define LLVM_ADT_STLEXTRAS_H
 
+#include <cstddef> // for std::size_t
 #include <functional>
 #include <utility> // for std::pair
-#include <cstring> // for std::size_t
 #include "llvm/ADT/iterator.h"
 
 namespace llvm {
@@ -232,6 +232,15 @@ static inline int array_pod_sort_comparator(const void *P1, const void *P2) {
   return 0;
 }
 
+/// get_array_pad_sort_comparator - This is an internal helper function used to
+/// get type deduction of T right.
+template<typename T>
+static int (*get_array_pad_sort_comparator(const T &X))
+             (const void*, const void*) {
+  return array_pod_sort_comparator<T>;
+}
+
+
 /// array_pod_sort - This sorts an array with the specified start and end
 /// extent.  This is just like std::sort, except that it calls qsort instead of
 /// using an inlined template.  qsort is slightly slower than std::sort, but
@@ -246,18 +255,14 @@ 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<*Start>);
+  if (Start == End) return;
+  qsort(&*Start, End-Start, sizeof(*Start),
+        get_array_pad_sort_comparator(*Start));
 }
-  
+
 } // End llvm namespace
 
 #endif