The use of is_sorted in Benchmarker.h was ambiguous
Benchmarker provides its own implementation of is_sorted since this method was not introduced until C++11 and not all compilers necessarily support it. However, for those that did, the system is_sorted conflicted with the provided is_sorted. To get around the problem, specify the full namespace of the is_sorted being used (which is standard practice in VTK-m anyway).
This commit is contained in:
parent
c5c1dee4fc
commit
c637bf94b1
@ -128,7 +128,8 @@ vtkm::Float64 PercentileValue(const std::vector<vtkm::Float64> &samples, const v
|
|||||||
}
|
}
|
||||||
VTKM_ASSERT_CONT(percent >= 0.0);
|
VTKM_ASSERT_CONT(percent >= 0.0);
|
||||||
VTKM_ASSERT_CONT(percent <= 100.0);
|
VTKM_ASSERT_CONT(percent <= 100.0);
|
||||||
VTKM_ASSERT_CONT(is_sorted(samples.begin(), samples.end()));
|
VTKM_ASSERT_CONT(
|
||||||
|
vtkm::benchmarking::stats::is_sorted(samples.begin(), samples.end()));
|
||||||
if (percent == 100.0){
|
if (percent == 100.0){
|
||||||
return samples.back();
|
return samples.back();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user