Remove const from ArrayPortalGroupVec.
Remove the const from the ValueType of the delegate portal in ArrayPortalGroupVec. This was creating a Vec with a const type, which was immutable, which was problematic when trying to create the Vec in the first place.
This commit is contained in:
parent
d47417fd20
commit
1432b160d5
@ -25,6 +25,10 @@
|
|||||||
#include <vtkm/cont/Assert.h>
|
#include <vtkm/cont/Assert.h>
|
||||||
#include <vtkm/cont/ErrorControlBadValue.h>
|
#include <vtkm/cont/ErrorControlBadValue.h>
|
||||||
|
|
||||||
|
VTKM_THIRDPARTY_PRE_INCLUDE
|
||||||
|
#include <boost/type_traits/remove_const.hpp>
|
||||||
|
VTKM_THIRDPARTY_POST_INCLUDE
|
||||||
|
|
||||||
namespace vtkm {
|
namespace vtkm {
|
||||||
namespace cont {
|
namespace cont {
|
||||||
|
|
||||||
@ -37,8 +41,10 @@ public:
|
|||||||
static const vtkm::IdComponent NUM_COMPONENTS = _NUM_COMPONENTS;
|
static const vtkm::IdComponent NUM_COMPONENTS = _NUM_COMPONENTS;
|
||||||
typedef _SourcePortalType SourcePortalType;
|
typedef _SourcePortalType SourcePortalType;
|
||||||
|
|
||||||
typedef vtkm::Vec<typename SourcePortalType::ValueType, NUM_COMPONENTS>
|
typedef typename
|
||||||
ValueType;
|
boost::remove_const<typename SourcePortalType::ValueType>::type
|
||||||
|
ComponentType;
|
||||||
|
typedef vtkm::Vec<ComponentType, NUM_COMPONENTS> ValueType;
|
||||||
|
|
||||||
VTKM_SUPPRESS_EXEC_WARNINGS
|
VTKM_SUPPRESS_EXEC_WARNINGS
|
||||||
VTKM_EXEC_CONT_EXPORT
|
VTKM_EXEC_CONT_EXPORT
|
||||||
|
Loading…
Reference in New Issue
Block a user