Merge topic 'allow_runtime_construction_of_device_adapter_id'

a512cd495 Allow runtime construction of DeviceAdapterId

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1425
This commit is contained in:
Robert Maynard 2018-10-03 18:37:56 +00:00 committed by Kitware Robot
commit 30293208b0

@ -63,6 +63,8 @@ struct DeviceAdapterId
DeviceAdapterNameType GetName() const;
protected:
friend DeviceAdapterId make_DeviceAdapterId(vtkm::Int8 id);
constexpr explicit DeviceAdapterId(vtkm::Int8 id)
: Value(id)
{
@ -72,6 +74,11 @@ private:
vtkm::Int8 Value;
};
DeviceAdapterId make_DeviceAdapterId(vtkm::Int8 id)
{
return DeviceAdapterId(id);
}
template <typename DeviceAdapter>
struct DeviceAdapterTraits;
}