diff --git a/libcxx/include/algorithm b/libcxx/include/algorithm --- a/libcxx/include/algorithm +++ b/libcxx/include/algorithm @@ -4162,7 +4162,7 @@ void sort(_Tp** __first, _Tp** __last) { - _VSTD::sort((size_t*)__first, (size_t*)__last, __less()); + _VSTD::sort((uintptr_t*)__first, (uintptr_t*)__last, __less()); } template diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.sort/sort/sort.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.sort/sort/sort.pass.cpp --- a/libcxx/test/std/algorithms/alg.sorting/alg.sort/sort/sort.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.sort/sort/sort.pass.cpp @@ -132,6 +132,22 @@ test_larger_sorts(N, N); } +void +test_pointer_sort() +{ + int array_size = 10; + int v[array_size]; + int *pv[array_size]; + for (int i = 0; i < array_size; i++) { + v[i] = i; + pv[i] = &v[array_size - 1 - i]; + } + std::sort(pv, pv + array_size); + assert(*pv[0] == v[0]); + assert(*pv[1] == v[1]); + assert(*pv[array_size - 1] == v[array_size - 1]); +} + int main(int, char**) { // test null range @@ -155,5 +171,7 @@ test_larger_sorts(1000); test_larger_sorts(1009); + test_pointer_sort(); + return 0; }