maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Use std::less instead of < in array_pod_sort's default comparator. 

This makes array_pod_sort portably safe to use with pointers.

llvm-svn: 207043
This commit is contained in:
Jordan Rose 2014-04-23 22:44:11 +00:00
parent b4a04da0b9
commit 001080b375
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
llvm/include/llvm/ADT/STLExtras.h
View File

@ -171,13 +171,14 @@ LLVM_CONSTEXPR inline size_t array_lengthof(T (&)[N]) {
return N; return N;
} }
/// array_pod_sort_comparator - This is helper function for array_pod_sort, /// Adapt std::less<T> for array_pod_sort.
/// which just uses operator< on T.
template<typename T> template<typename T>
inline int array_pod_sort_comparator(const void *P1, const void *P2) { inline int array_pod_sort_comparator(const void *P1, const void *P2) {
if (*reinterpret_cast<const T*>(P1) < *reinterpret_cast<const T*>(P2)) if (std::less<T>()(*reinterpret_cast<const T*>(P1),
*reinterpret_cast<const T*>(P2)))
return -1; return -1;
if (*reinterpret_cast<const T*>(P2) < *reinterpret_cast<const T*>(P1)) if (std::less<T>()(*reinterpret_cast<const T*>(P2),
*reinterpret_cast<const T*>(P1)))
return 1; return 1;
return 0; return 0;
} }
@ -200,7 +201,7 @@ inline int (*get_array_pod_sort_comparator(const T &))
/// possible. /// possible.
/// ///
/// This function assumes that you have simple POD-like types that can be /// This function assumes that you have simple POD-like types that can be
/// compared with operator< and can be moved with memcpy. If this isn't true, /// compared with std::less and can be moved with memcpy. If this isn't true,
/// you should use std::sort. /// you should use std::sort.
/// ///
/// NOTE: If qsort_r were portable, we could allow a custom comparator and /// NOTE: If qsort_r were portable, we could allow a custom comparator and