Commit dac7ab98 authored by Robert Maynard's avatar Robert Maynard
Browse files

Correct a bad memcpy in ColorTable that gcc 7 found

parent c6726644
......@@ -132,7 +132,7 @@ inline bool rangeAlmostEqual(const vtkm::Range& r)
// needs to be a memcpy to avoid strict aliasing issues, doing a count
// of 2*sizeof(T) to couple both values at the same time
std::memcpy(irange, &r.Min, sizeof(vtkm::Int64));
std::memcpy(irange, &r.Max, sizeof(vtkm::Int64));
std::memcpy(irange + 1, &r.Max, sizeof(vtkm::Int64));
// determine the absolute delta between these two numbers.
const vtkm::Int64 delta = std::abs(irange[1] - irange[0]);
// If the numbers are not nearly equal, we don't touch them. This avoids running into
......
......@@ -70,7 +70,7 @@ private:
"Unexpected scalar field range.");
}
template <typename T, vtkm::Id NumberOfComponents>
template <typename T, vtkm::IdComponent NumberOfComponents>
static void TestVecField()
{
const vtkm::Id nvals = 11;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment