Commit ca737437 authored by Robert Maynard's avatar Robert Maynard Committed by Kitware Robot

Merge topic 'unsigned_to_signed_warning_in_logging'

2e93443b All bit shifting in vtkm::cont::Logging happens in unsigned space
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti's avatarAllison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1510
parents 1ba38c59 2e93443b
......@@ -223,8 +223,8 @@ namespace
/// of the stringified number.
inline VTKM_CONT std::string HumanSize(vtkm::UInt64 bytes, int prec = 2)
{
std::int64_t current = bytes;
std::int64_t previous = bytes;
vtkm::UInt64 current = bytes;
vtkm::UInt64 previous = bytes;
constexpr const char* units[] = { "bytes", "KiB", "MiB", "GiB", "TiB", "PiB" };
......
Markdown is supported
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