Merge branch 'implicit_storage_no_exception_on_release' into 'master'

Make releasing an implicit storage resources a no-op instead of exception.

Corrects Issue #16.

See merge request !62
This commit is contained in:
Robert Maynard 2015-06-29 13:00:52 -04:00
commit 22c9a69685
2 changed files with 3 additions and 8 deletions

@ -99,7 +99,6 @@ public:
VTKM_CONT_EXPORT
void ReleaseResources()
{
throw vtkm::cont::ErrorControlBadValue("Implicit arrays are read-only.");
}
private:

@ -95,13 +95,9 @@ struct TemplatedTests
}
catch(vtkm::cont::ErrorControlBadValue) {}
try
{
arrayStorage.ReleaseResources();
VTKM_TEST_ASSERT(true==false,
"Can't Release an implicit array");
}
catch(vtkm::cont::ErrorControlBadValue) {}
//verify that calling ReleaseResources doesn't throw an exception
arrayStorage.ReleaseResources();
}
void BasicAccess()