Skip to content

Commit eb8966f

Browse files
committed
Revisit previous commit (false was always returned)
1 parent f329939 commit eb8966f

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

src/transform/DivSufSort.cpp

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1602,7 +1602,7 @@ uint64 DivSufSort::trPartition(int isad, int first, int middle, int last, int v)
16021602
return ((uint64(first) << 32) | (uint64(last) & uint64(0xFFFFFFFF)));
16031603
}
16041604

1605-
bool DivSufSort::trIntroSort(int isa, int isad, int first, int last, TRBudget& budget)
1605+
void DivSufSort::trIntroSort(int isa, int isad, int first, int last, TRBudget& budget)
16061606
{
16071607
const int incr = isad - isa;
16081608
int limit = trIlg(last - first);
@@ -1648,7 +1648,7 @@ bool DivSufSort::trIntroSort(int isa, int isad, int first, int last, TRBudget& b
16481648
const StackElement* se = _trStack->pop();
16491649

16501650
if (se == nullptr)
1651-
return false;
1651+
return;
16521652

16531653
isad = se->_a;
16541654
first = se->_b;
@@ -1671,7 +1671,7 @@ bool DivSufSort::trIntroSort(int isa, int isad, int first, int last, TRBudget& b
16711671
const StackElement* se = _trStack->pop();
16721672

16731673
if (se == nullptr)
1674-
return false;
1674+
return;
16751675

16761676
isad = se->_a;
16771677
first = se->_b;
@@ -1686,7 +1686,7 @@ bool DivSufSort::trIntroSort(int isa, int isad, int first, int last, TRBudget& b
16861686
const StackElement* se = _trStack->pop();
16871687

16881688
if (se == nullptr)
1689-
return false;
1689+
return;
16901690

16911691
if (se->_d == 0) {
16921692
trCopy(isa, first, se->_b, se->_c, last, isad - isa);
@@ -1701,7 +1701,7 @@ bool DivSufSort::trIntroSort(int isa, int isad, int first, int last, TRBudget& b
17011701
se = _trStack->pop();
17021702

17031703
if (se == nullptr)
1704-
return false;
1704+
return;
17051705

17061706
isad = se->_a;
17071707
first = se->_b;
@@ -1773,7 +1773,7 @@ bool DivSufSort::trIntroSort(int isa, int isad, int first, int last, TRBudget& b
17731773
const StackElement* se = _trStack->pop();
17741774

17751775
if (se == nullptr)
1776-
return false;
1776+
return;
17771777

17781778
isad = se->_a;
17791779
first = se->_b;
@@ -1787,7 +1787,7 @@ bool DivSufSort::trIntroSort(int isa, int isad, int first, int last, TRBudget& b
17871787
const StackElement* se = _trStack->pop();
17881788

17891789
if (se == nullptr)
1790-
return false;
1790+
return;
17911791

17921792
isad = se->_a;
17931793
first = se->_b;
@@ -1950,7 +1950,7 @@ bool DivSufSort::trIntroSort(int isa, int isad, int first, int last, TRBudget& b
19501950
const StackElement* se = _trStack->pop();
19511951

19521952
if (se == nullptr)
1953-
return false;
1953+
return;
19541954

19551955
isad = se->_a;
19561956
first = se->_b;
@@ -1971,7 +1971,7 @@ bool DivSufSort::trIntroSort(int isa, int isad, int first, int last, TRBudget& b
19711971
const StackElement* se = _trStack->pop();
19721972

19731973
if (se == nullptr)
1974-
return false;
1974+
return;
19751975

19761976
isad = se->_a;
19771977
first = se->_b;
@@ -1994,7 +1994,7 @@ bool DivSufSort::trIntroSort(int isa, int isad, int first, int last, TRBudget& b
19941994
const StackElement* se = _trStack->pop();
19951995

19961996
if (se == nullptr)
1997-
return false;
1997+
return;
19981998

19991999
isad = se->_a;
20002000
first = se->_b;
@@ -2004,8 +2004,6 @@ bool DivSufSort::trIntroSort(int isa, int isad, int first, int last, TRBudget& b
20042004
}
20052005
}
20062006
}
2007-
2008-
return true;
20092007
}
20102008

20112009
int DivSufSort::trPivot(const int arr[], int isad, int first, int last) const

src/transform/DivSufSort.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ namespace kanzi
191191

192192
uint64 trPartition(int isad, int first, int middle, int last, int v);
193193

194-
bool trIntroSort(int isa, int isad, int first, int last, TRBudget& budget);
194+
void trIntroSort(int isa, int isad, int first, int last, TRBudget& budget);
195195

196196
int trPivot(const int arr[], int isad, int first, int last) const;
197197

0 commit comments

Comments
 (0)