Commit d1526635 authored by David C. Lonie's avatar David C. Lonie
Browse files

Use vtkDataArrayTemplate as the vtkTypeMacro Superclass in subclasses.

This allows us to use vtkDataArrayTemplate<...>::SafeDownCast
for generic implementations.
parent 426987d9
......@@ -35,13 +35,13 @@
#define vtkDataArray vtkDataArrayTemplate<char>
#endif
class VTKCOMMONCORE_EXPORT vtkCharArray : public vtkDataArray
{
public:
vtkTypeMacro(vtkCharArray, vtkDataArray)
#ifndef __WRAP__
#undef vtkDataArray
#endif
{
public:
static vtkCharArray* New();
vtkTypeMacro(vtkCharArray,vtkDataArray);
void PrintSelf(ostream& os, vtkIndent indent);
// This macro expands to the set of method declarations that
......
......@@ -35,13 +35,13 @@
#define vtkDataArray vtkDataArrayTemplate<double>
#endif
class VTKCOMMONCORE_EXPORT vtkDoubleArray : public vtkDataArray
{
public:
vtkTypeMacro(vtkDoubleArray, vtkDataArray)
#ifndef __WRAP__
#undef vtkDataArray
#endif
{
public:
static vtkDoubleArray* New();
vtkTypeMacro(vtkDoubleArray,vtkDataArray);
void PrintSelf(ostream& os, vtkIndent indent);
// This macro expands to the set of method declarations that
......
......@@ -35,13 +35,14 @@
#define vtkDataArray vtkDataArrayTemplate<float>
#endif
class VTKCOMMONCORE_EXPORT vtkFloatArray : public vtkDataArray
{
public:
vtkTypeMacro(vtkFloatArray, vtkDataArray)
#ifndef __WRAP__
#undef vtkDataArray
#endif
{
public:
static vtkFloatArray* New();
vtkTypeMacro(vtkFloatArray,vtkDataArray);
void PrintSelf(ostream& os, vtkIndent indent);
// This macro expands to the set of method declarations that
......
......@@ -35,13 +35,13 @@
#define vtkDataArray vtkDataArrayTemplate<vtkIdType>
#endif
class VTKCOMMONCORE_EXPORT vtkIdTypeArray : public vtkDataArray
{
public:
vtkTypeMacro(vtkIdTypeArray, vtkDataArray)
#ifndef __WRAP__
#undef vtkDataArray
#endif
{
public:
static vtkIdTypeArray* New();
vtkTypeMacro(vtkIdTypeArray,vtkDataArray);
void PrintSelf(ostream& os, vtkIndent indent);
// This macro expands to the set of method declarations that
......
......@@ -39,13 +39,13 @@
#define vtkDataArray vtkDataArrayTemplate<int>
#endif
class VTKCOMMONCORE_EXPORT vtkIntArray : public vtkDataArray
{
public:
vtkTypeMacro(vtkIntArray, vtkDataArray)
#ifndef __WRAP__
#undef vtkDataArray
#endif
{
public:
static vtkIntArray* New();
vtkTypeMacro(vtkIntArray,vtkDataArray);
void PrintSelf(ostream& os, vtkIndent indent);
// This macro expands to the set of method declarations that
......
......@@ -40,13 +40,13 @@
#define vtkDataArray vtkDataArrayTemplate<long>
#endif
class VTKCOMMONCORE_EXPORT vtkLongArray : public vtkDataArray
{
public:
vtkTypeMacro(vtkLongArray, vtkDataArray)
#ifndef __WRAP__
#undef vtkDataArray
#endif
{
public:
static vtkLongArray* New();
vtkTypeMacro(vtkLongArray,vtkDataArray);
void PrintSelf(ostream& os, vtkIndent indent);
// This macro expands to the set of method declarations that
......
......@@ -39,13 +39,13 @@
#define vtkDataArray vtkDataArrayTemplate<long long>
#endif
class VTKCOMMONCORE_EXPORT vtkLongLongArray : public vtkDataArray
{
public:
vtkTypeMacro(vtkLongLongArray, vtkDataArray)
#ifndef __WRAP__
#undef vtkDataArray
#endif
{
public:
static vtkLongLongArray* New();
vtkTypeMacro(vtkLongLongArray,vtkDataArray);
void PrintSelf(ostream& os, vtkIndent indent);
// This macro expands to the set of method declarations that
......
......@@ -39,13 +39,13 @@
#define vtkDataArray vtkDataArrayTemplate<short>
#endif
class VTKCOMMONCORE_EXPORT vtkShortArray : public vtkDataArray
{
public:
vtkTypeMacro(vtkShortArray, vtkDataArray)
#ifndef __WRAP__
#undef vtkDataArray
#endif
{
public:
static vtkShortArray* New();
vtkTypeMacro(vtkShortArray,vtkDataArray);
void PrintSelf(ostream& os, vtkIndent indent);
// This macro expands to the set of method declarations that
......
......@@ -35,13 +35,13 @@
#define vtkDataArray vtkDataArrayTemplate<signed char>
#endif
class VTKCOMMONCORE_EXPORT vtkSignedCharArray : public vtkDataArray
{
public:
vtkTypeMacro(vtkSignedCharArray, vtkDataArray)
#ifndef __WRAP__
#undef vtkDataArray
#endif
{
public:
static vtkSignedCharArray* New();
vtkTypeMacro(vtkSignedCharArray,vtkDataArray);
void PrintSelf(ostream& os, vtkIndent indent);
// This macro expands to the set of method declarations that
......
......@@ -35,13 +35,13 @@
#define vtkDataArray vtkDataArrayTemplate<unsigned char>
#endif
class VTKCOMMONCORE_EXPORT vtkUnsignedCharArray : public vtkDataArray
{
public:
vtkTypeMacro(vtkUnsignedCharArray, vtkDataArray)
#ifndef __WRAP__
#undef vtkDataArray
#endif
{
public:
static vtkUnsignedCharArray* New();
vtkTypeMacro(vtkUnsignedCharArray,vtkDataArray);
void PrintSelf(ostream& os, vtkIndent indent);
// This macro expands to the set of method declarations that
......
......@@ -39,13 +39,13 @@
#define vtkDataArray vtkDataArrayTemplate<unsigned int>
#endif
class VTKCOMMONCORE_EXPORT vtkUnsignedIntArray : public vtkDataArray
{
public:
vtkTypeMacro(vtkUnsignedIntArray, vtkDataArray)
#ifndef __WRAP__
#undef vtkDataArray
#endif
{
public:
static vtkUnsignedIntArray* New();
vtkTypeMacro(vtkUnsignedIntArray,vtkDataArray);
void PrintSelf(ostream& os, vtkIndent indent);
// This macro expands to the set of method declarations that
......
......@@ -41,13 +41,13 @@
#define vtkDataArray vtkDataArrayTemplate<unsigned long>
#endif
class VTKCOMMONCORE_EXPORT vtkUnsignedLongArray : public vtkDataArray
{
public:
vtkTypeMacro(vtkUnsignedLongArray, vtkDataArray)
#ifndef __WRAP__
#undef vtkDataArray
#endif
{
public:
static vtkUnsignedLongArray* New();
vtkTypeMacro(vtkUnsignedLongArray,vtkDataArray);
void PrintSelf(ostream& os, vtkIndent indent);
// This macro expands to the set of method declarations that
......
......@@ -39,13 +39,13 @@
#define vtkDataArray vtkDataArrayTemplate<unsigned long long>
#endif
class VTKCOMMONCORE_EXPORT vtkUnsignedLongLongArray : public vtkDataArray
{
public:
vtkTypeMacro(vtkUnsignedLongLongArray, vtkDataArray)
#ifndef __WRAP__
#undef vtkDataArray
#endif
{
public:
static vtkUnsignedLongLongArray* New();
vtkTypeMacro(vtkUnsignedLongLongArray,vtkDataArray);
void PrintSelf(ostream& os, vtkIndent indent);
// This macro expands to the set of method declarations that
......
......@@ -39,13 +39,13 @@
#define vtkDataArray vtkDataArrayTemplate<unsigned short>
#endif
class VTKCOMMONCORE_EXPORT vtkUnsignedShortArray : public vtkDataArray
{
public:
vtkTypeMacro(vtkUnsignedShortArray, vtkDataArray)
#ifndef __WRAP__
#undef vtkDataArray
#endif
{
public:
static vtkUnsignedShortArray* New();
vtkTypeMacro(vtkUnsignedShortArray,vtkDataArray);
void PrintSelf(ostream& os, vtkIndent indent);
// This macro expands to the set of method declarations that
......
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