Merge topic 'allow_empty_field_construction'

c2ba8baf Allow vtkm::cont::Field to have a default constructor.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !297
This commit is contained in:
Robert Maynard 2016-01-05 10:39:36 -05:00 committed by Kitware Robot
commit 5500bae951

@ -534,6 +534,20 @@ public:
VTKM_ASSERT_CONT(this->Association == ASSOC_LOGICAL_DIM);
}
VTKM_CONT_EXPORT
Field()
: Name(),
Order(),
Association(),
AssocCellSetName(),
AssocLogicalDim(),
Data(),
Bounds(),
ModifiedFlag(true)
{
//Generate an empty field
}
VTKM_CONT_EXPORT
const std::string &GetName() const
{