Skip to content

Commit be0af6b

Browse files
committed
Fix several warnings and for now give up a bit on non copyable comparator
1 parent 9e41144 commit be0af6b

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ before_install:
126126
- git clone https://github.com/google/googletest.git benchmark/googletest
127127

128128
install:
129-
- export CMAKE_FLAGS="-DMINISELECT_TESTING=on";
129+
- export CMAKE_FLAGS="-DMINISELECT_TESTING=on -DCMAKE_BUILD_TYPE=RelWithDebInfo";
130130
- if [[ "${SANITIZE}" == "on" ]]; then
131131
export CMAKE_FLAGS="${CMAKE_FLAGS} -DMINISELECT_SANITIZE=on";
132132
fi

include/miniselect/pdqselect.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,6 @@ template <class Iter, class Compare, bool Branchless>
501501
inline void pdqsort_loop(Iter begin, Iter end, Compare& comp, int bad_allowed,
502502
bool leftmost = true) {
503503
typedef typename std::iterator_traits<Iter>::difference_type diff_t;
504-
using CompType = typename median_common_detail::CompareRefType<Compare>::type;
505504

506505
// Use a while loop for tail recursion elimination.
507506
while (true) {
@@ -606,7 +605,7 @@ template <class Iter, class Compare, bool Branchless>
606605
inline void pdqpartial_sort_loop(Iter begin, Iter mid, Iter end, Compare& comp,
607606
int bad_allowed, bool leftmost = true) {
608607
typedef typename std::iterator_traits<Iter>::difference_type diff_t;
609-
using CompType = typename median_common_detail::CompareRefType<Compare>::type;
608+
610609
// Use a while loop for tail recursion elimination.
611610
while (true) {
612611
diff_t size = end - begin;
@@ -714,7 +713,6 @@ template <class Iter, class Compare, bool Branchless>
714713
inline void pdqselect_loop(Iter begin, Iter mid, Iter end, Compare& comp,
715714
int bad_allowed, bool leftmost = true) {
716715
typedef typename std::iterator_traits<Iter>::difference_type diff_t;
717-
using CompType = typename median_common_detail::CompareRefType<Compare>::type;
718716

719717
// Use a while loop for tail recursion elimination.
720718
while (true) {

0 commit comments

Comments
 (0)