Commit 6a545b88 authored by Utkarsh Ayachit's avatar Utkarsh Ayachit
Browse files

COMP: fixed build issues on SUN due to static template functions

parent e38077ee
......@@ -30,7 +30,7 @@
#include "vtkIdTypeArray.h"
#include "vtkObjectFactory.h"
vtkCxxRevisionMacro(vtkDataSetAttributes, "1.5");
vtkCxxRevisionMacro(vtkDataSetAttributes, "1.6");
vtkStandardNewMacro(vtkDataSetAttributes);
//--------------------------------------------------------------------------
......@@ -358,7 +358,7 @@ void vtkDataSetAttributes::PassData(vtkFieldData* fd)
//----------------------------------------------------------------------------
template <class iterT>
static void vtkDataSetAttributesCopyValues(
void vtkDataSetAttributesCopyValues(
iterT* destIter, const int* outExt, int outIncs[3], int rowLength,
iterT* srcIter, const int* vtkNotUsed(inExt), int inIncs[3])
{
......@@ -397,7 +397,7 @@ static void vtkDataSetAttributesCopyValues(
//----------------------------------------------------------------------------
VTK_TEMPLATE_SPECIALIZE
static void vtkDataSetAttributesCopyValues(
void vtkDataSetAttributesCopyValues(
vtkArrayIteratorTemplate<vtkStdString>* destIter, const int* outExt,
int outIncs[3], int rowLength,
vtkArrayIteratorTemplate<vtkStdString>* srcIter,
......
......@@ -22,7 +22,7 @@
#include "vtkXMLDataElement.h"
#include "vtkXMLDataParser.h"
vtkCxxRevisionMacro(vtkXMLStructuredDataReader, "1.21");
vtkCxxRevisionMacro(vtkXMLStructuredDataReader, "1.22");
//----------------------------------------------------------------------------
vtkXMLStructuredDataReader::vtkXMLStructuredDataReader()
......@@ -342,7 +342,7 @@ int vtkXMLStructuredDataReader::ReadArrayForCells(vtkXMLDataElement* da,
//----------------------------------------------------------------------------
template <class iterT>
static void vtkXMLStructuredDataReaderSubExtentCopyValues(
void vtkXMLStructuredDataReaderSubExtentCopyValues(
iterT* destIter, vtkIdType destIndex,
iterT* srcIter, vtkIdType srcIndex,
vtkIdType numValues)
......@@ -354,7 +354,7 @@ static void vtkXMLStructuredDataReaderSubExtentCopyValues(
}
//----------------------------------------------------------------------------
VTK_TEMPLATE_SPECIALIZE
static void vtkXMLStructuredDataReaderSubExtentCopyValues(
void vtkXMLStructuredDataReaderSubExtentCopyValues(
vtkArrayIteratorTemplate<vtkStdString>* destIter, vtkIdType destIndex,
vtkArrayIteratorTemplate<vtkStdString>* srcIter, vtkIdType srcIndex,
vtkIdType numValues)
......
......@@ -71,7 +71,7 @@ public:
//----------------------------------------------------------------------------
template <class iterT>
static int vtkXMLWriterWriteBinaryDataBlocks(vtkXMLWriter* writer,
int vtkXMLWriterWriteBinaryDataBlocks(vtkXMLWriter* writer,
iterT* iter,
int wordType, vtkXMLWriter::OffsetType memWordSize, vtkXMLWriter::OffsetType outWordSize)
{
......@@ -113,7 +113,7 @@ static int vtkXMLWriterWriteBinaryDataBlocks(vtkXMLWriter* writer,
//----------------------------------------------------------------------------
VTK_TEMPLATE_SPECIALIZE
static int vtkXMLWriterWriteBinaryDataBlocks(vtkXMLWriter* writer,
int vtkXMLWriterWriteBinaryDataBlocks(vtkXMLWriter* writer,
vtkArrayIteratorTemplate<vtkStdString>* iter,
int wordType, vtkXMLWriter::OffsetType vtkNotUsed(memWordSize), vtkXMLWriter::OffsetType outWordSize)
{
......@@ -202,7 +202,7 @@ static int vtkXMLWriterWriteBinaryDataBlocks(vtkXMLWriter* writer,
}
//*****************************************************************************
vtkCxxRevisionMacro(vtkXMLWriter, "1.64");
vtkCxxRevisionMacro(vtkXMLWriter, "1.65");
vtkCxxSetObjectMacro(vtkXMLWriter, Compressor, vtkDataCompressor);
//----------------------------------------------------------------------------
vtkXMLWriter::vtkXMLWriter()
......@@ -1286,7 +1286,7 @@ vtkXMLWriter::OffsetType vtkXMLWriter::GetOutputWordTypeSize(int dataType)
//----------------------------------------------------------------------------
template <class T>
static vtkXMLWriter::OffsetType vtkXMLWriterGetWordTypeSize(T*)
vtkXMLWriter::OffsetType vtkXMLWriterGetWordTypeSize(T*)
{
return sizeof(T);
}
......@@ -1375,7 +1375,7 @@ const char* vtkXMLWriter::GetWordTypeName(int dataType)
//----------------------------------------------------------------------------
template <class T>
static int vtkXMLWriterWriteVectorAttribute(ostream& os, const char* name,
int vtkXMLWriterWriteVectorAttribute(ostream& os, const char* name,
int length, T* data)
{
os << " " << name << "=\"";
......@@ -1543,7 +1543,7 @@ int vtkXMLWriter::WriteStringAttribute(const char* name, const char* value)
// This method is provided so that the specialization code for certain types
// can be minimal.
template <class T>
static inline ostream& vtkXMLWriteAsciiValue(ostream& os, const T& value)
inline ostream& vtkXMLWriteAsciiValue(ostream& os, const T& value)
{
os << value;
return os;
......@@ -1551,7 +1551,7 @@ static inline ostream& vtkXMLWriteAsciiValue(ostream& os, const T& value)
//----------------------------------------------------------------------------
VTK_TEMPLATE_SPECIALIZE
static inline ostream& vtkXMLWriteAsciiValue(ostream& os, const char &c)
inline ostream& vtkXMLWriteAsciiValue(ostream& os, const char &c)
{
os << short(c);
return os;
......@@ -1559,7 +1559,7 @@ static inline ostream& vtkXMLWriteAsciiValue(ostream& os, const char &c)
//----------------------------------------------------------------------------
VTK_TEMPLATE_SPECIALIZE
static inline ostream& vtkXMLWriteAsciiValue(ostream& os, const unsigned char &c)
inline ostream& vtkXMLWriteAsciiValue(ostream& os, const unsigned char &c)
{
os << static_cast<unsigned short>(c);
return os;
......@@ -1567,7 +1567,7 @@ static inline ostream& vtkXMLWriteAsciiValue(ostream& os, const unsigned char &c
//----------------------------------------------------------------------------
VTK_TEMPLATE_SPECIALIZE
static inline ostream& vtkXMLWriteAsciiValue(ostream& os, const signed char &c)
inline ostream& vtkXMLWriteAsciiValue(ostream& os, const signed char &c)
{
os << short(c);
return os;
......@@ -1575,7 +1575,7 @@ static inline ostream& vtkXMLWriteAsciiValue(ostream& os, const signed char &c)
//----------------------------------------------------------------------------
VTK_TEMPLATE_SPECIALIZE
static inline ostream& vtkXMLWriteAsciiValue(ostream& os, const vtkStdString& str)
inline ostream& vtkXMLWriteAsciiValue(ostream& os, const vtkStdString& str)
{
vtkStdString::const_iterator iter = str.begin();
vtkXMLWriteAsciiValue(os, *iter);
......
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