Commit f8f28a8b authored by Ken Martin's avatar Ken Martin
Browse files

merge fix for solaris build

parent 70a3674c
......@@ -25,7 +25,7 @@
#include "vtkSMSourceProxy.h"
vtkStandardNewMacro(vtkSMInputArrayDomain);
vtkCxxRevisionMacro(vtkSMInputArrayDomain, "1.6");
vtkCxxRevisionMacro(vtkSMInputArrayDomain, "1.6.2.1");
//---------------------------------------------------------------------------
static const char* const vtkSMInputArrayDomainAttributeTypes[] = {
......@@ -255,7 +255,8 @@ int vtkSMInputArrayDomain::ReadXMLAttributes(
}
else if (strcmp(attribute_type, "point") == 0)
{
this->SetAttributeType(vtkSMInputArrayDomain::POINT);
this->SetAttributeType(
static_cast<unsigned char>(vtkSMInputArrayDomain::POINT));
}
else
{
......
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