Commit c9346ebf authored by Will Schroeder's avatar Will Schroeder

ENH:Support ANSi C++ in a better way

parent b2943322
...@@ -50,7 +50,7 @@ vtkAbstractMapper::vtkAbstractMapper() ...@@ -50,7 +50,7 @@ vtkAbstractMapper::vtkAbstractMapper()
this->LastWindow = NULL; this->LastWindow = NULL;
} }
void vtkAbstractMapper::PrintSelf(vtkOstream& os, vtkIndent indent) void vtkAbstractMapper::PrintSelf(ostream& os, vtkIndent indent)
{ {
this->vtkProcessObject::PrintSelf(os,indent); this->vtkProcessObject::PrintSelf(os,indent);
......
...@@ -59,7 +59,7 @@ class VTK_EXPORT vtkAbstractMapper : public vtkProcessObject ...@@ -59,7 +59,7 @@ class VTK_EXPORT vtkAbstractMapper : public vtkProcessObject
{ {
public: public:
vtkTypeMacro(vtkAbstractMapper,vtkProcessObject); vtkTypeMacro(vtkAbstractMapper,vtkProcessObject);
void PrintSelf(vtkOstream& os, vtkIndent indent); void PrintSelf(ostream& os, vtkIndent indent);
// Description: // Description:
// Release any graphics resources that are being consumed by this mapper. // Release any graphics resources that are being consumed by this mapper.
......
...@@ -236,7 +236,7 @@ void vtkActor2D::GetActors2D(vtkPropCollection *ac) ...@@ -236,7 +236,7 @@ void vtkActor2D::GetActors2D(vtkPropCollection *ac)
ac->AddItem(this); ac->AddItem(this);
} }
void vtkActor2D::PrintSelf(vtkOstream& os, vtkIndent indent) void vtkActor2D::PrintSelf(ostream& os, vtkIndent indent)
{ {
this->vtkProp::PrintSelf(os,indent); this->vtkProp::PrintSelf(os,indent);
......
...@@ -61,7 +61,7 @@ class vtkMapper2D; ...@@ -61,7 +61,7 @@ class vtkMapper2D;
class VTK_EXPORT vtkActor2D : public vtkProp class VTK_EXPORT vtkActor2D : public vtkProp
{ {
public: public:
void PrintSelf(vtkOstream& os, vtkIndent indent); void PrintSelf(ostream& os, vtkIndent indent);
vtkTypeMacro(vtkActor2D,vtkProp); vtkTypeMacro(vtkActor2D,vtkProp);
// Description: // Description:
......
...@@ -209,7 +209,7 @@ unsigned long vtkAttributeData::GetActualMemorySize() ...@@ -209,7 +209,7 @@ unsigned long vtkAttributeData::GetActualMemorySize()
return this->Data->GetActualMemorySize(); return this->Data->GetActualMemorySize();
} }
void vtkAttributeData::PrintSelf(vtkOstream& os, vtkIndent indent) void vtkAttributeData::PrintSelf(ostream& os, vtkIndent indent)
{ {
vtkObject::PrintSelf(os,indent); vtkObject::PrintSelf(os,indent);
......
...@@ -59,7 +59,7 @@ class VTK_EXPORT vtkAttributeData : public vtkObject ...@@ -59,7 +59,7 @@ class VTK_EXPORT vtkAttributeData : public vtkObject
{ {
public: public:
vtkTypeMacro(vtkAttributeData,vtkObject); vtkTypeMacro(vtkAttributeData,vtkObject);
void PrintSelf(vtkOstream& os, vtkIndent indent); void PrintSelf(ostream& os, vtkIndent indent);
// Description: // Description:
// Allocate initial memory size. // Allocate initial memory size.
......
...@@ -184,7 +184,7 @@ void vtkBitArray::DeepCopy(vtkDataArray *ia) ...@@ -184,7 +184,7 @@ void vtkBitArray::DeepCopy(vtkDataArray *ia)
} }
} }
void vtkBitArray::PrintSelf(vtkOstream& os, vtkIndent indent) void vtkBitArray::PrintSelf(ostream& os, vtkIndent indent)
{ {
vtkDataArray::PrintSelf(os,indent); vtkDataArray::PrintSelf(os,indent);
......
...@@ -56,7 +56,7 @@ class VTK_EXPORT vtkBitArray : public vtkDataArray ...@@ -56,7 +56,7 @@ class VTK_EXPORT vtkBitArray : public vtkDataArray
public: public:
static vtkBitArray *New(); static vtkBitArray *New();
vtkTypeMacro(vtkBitArray,vtkDataArray); vtkTypeMacro(vtkBitArray,vtkDataArray);
void PrintSelf(vtkOstream& os, vtkIndent indent); void PrintSelf(ostream& os, vtkIndent indent);
// Description: // Description:
// Allocate memory for this array. Delete old storage only if necessary. // Allocate memory for this array. Delete old storage only if necessary.
......
...@@ -109,7 +109,7 @@ void vtkByteSwap::Swap4BERange(char *mem_ptr1,int num) ...@@ -109,7 +109,7 @@ void vtkByteSwap::Swap4BERange(char *mem_ptr1,int num)
// Swap bunch of bytes. Num is the number of four byte words to swap. // Swap bunch of bytes. Num is the number of four byte words to swap.
void vtkByteSwap::SwapWrite4BERange(char *mem_ptr1,int num, vtkOstream *fp) void vtkByteSwap::SwapWrite4BERange(char *mem_ptr1,int num, ostream *fp)
{ {
#ifndef VTK_WORDS_BIGENDIAN #ifndef VTK_WORDS_BIGENDIAN
char one_byte; char one_byte;
...@@ -298,7 +298,7 @@ void vtkByteSwap::Swap2LERange(char *mem_ptr1,int num){} ...@@ -298,7 +298,7 @@ void vtkByteSwap::Swap2LERange(char *mem_ptr1,int num){}
// Swap bunch of bytes. Num is the number of four byte words to swap. // Swap bunch of bytes. Num is the number of four byte words to swap.
void vtkByteSwap::SwapWrite2BERange(char *mem_ptr1,int num, vtkOstream *fp) void vtkByteSwap::SwapWrite2BERange(char *mem_ptr1,int num, ostream *fp)
{ {
#ifndef VTK_WORDS_BIGENDIAN #ifndef VTK_WORDS_BIGENDIAN
char one_byte; char one_byte;
......
...@@ -114,12 +114,12 @@ public: ...@@ -114,12 +114,12 @@ public:
static void SwapWrite4BERange(unsigned long *i,int num, FILE *fp) static void SwapWrite4BERange(unsigned long *i,int num, FILE *fp)
{ vtkByteSwap::SwapWrite4BERange((char *)i,num,fp);}; { vtkByteSwap::SwapWrite4BERange((char *)i,num,fp);};
static void SwapWrite4BERange(char *c,int num, vtkOstream *fp); static void SwapWrite4BERange(char *c,int num, ostream *fp);
static void SwapWrite4BERange(float *p,int num, vtkOstream *fp) static void SwapWrite4BERange(float *p,int num, ostream *fp)
{ vtkByteSwap::SwapWrite4BERange((char *)p,num,fp);}; { vtkByteSwap::SwapWrite4BERange((char *)p,num,fp);};
static void SwapWrite4BERange(int *i,int num, vtkOstream *fp) static void SwapWrite4BERange(int *i,int num, ostream *fp)
{ vtkByteSwap::SwapWrite4BERange((char *)i,num,fp);}; { vtkByteSwap::SwapWrite4BERange((char *)i,num,fp);};
static void SwapWrite4BERange(unsigned long *i,int num, vtkOstream *fp) static void SwapWrite4BERange(unsigned long *i,int num, ostream *fp)
{ vtkByteSwap::SwapWrite4BERange((char *)i,num,fp);}; { vtkByteSwap::SwapWrite4BERange((char *)i,num,fp);};
...@@ -148,8 +148,8 @@ public: ...@@ -148,8 +148,8 @@ public:
static void SwapWrite2BERange(short *i,int num, FILE *fp) static void SwapWrite2BERange(short *i,int num, FILE *fp)
{vtkByteSwap::SwapWrite2BERange((char *)i,num,fp);}; {vtkByteSwap::SwapWrite2BERange((char *)i,num,fp);};
static void SwapWrite2BERange(char *c,int num, vtkOstream *fp); static void SwapWrite2BERange(char *c,int num, ostream *fp);
static void SwapWrite2BERange(short *i,int num, vtkOstream *fp) static void SwapWrite2BERange(short *i,int num, ostream *fp)
{vtkByteSwap::SwapWrite2BERange((char *)i,num,fp);}; {vtkByteSwap::SwapWrite2BERange((char *)i,num,fp);};
// Description: // Description:
......
...@@ -257,7 +257,7 @@ int vtkCell::GetParametricCenter(float pcoords[3]) ...@@ -257,7 +257,7 @@ int vtkCell::GetParametricCenter(float pcoords[3])
return 0; return 0;
} }
void vtkCell::PrintSelf(vtkOstream& os, vtkIndent indent) void vtkCell::PrintSelf(ostream& os, vtkIndent indent)
{ {
int numIds=this->PointIds->GetNumberOfIds(); int numIds=this->PointIds->GetNumberOfIds();
......
...@@ -81,7 +81,7 @@ class VTK_EXPORT vtkCell : public vtkObject ...@@ -81,7 +81,7 @@ class VTK_EXPORT vtkCell : public vtkObject
{ {
public: public:
vtkTypeMacro(vtkCell,vtkObject); vtkTypeMacro(vtkCell,vtkObject);
void PrintSelf(vtkOstream& os, vtkIndent indent); void PrintSelf(ostream& os, vtkIndent indent);
// Description: // Description:
// Initialize cell from outside with point ids and point // Initialize cell from outside with point ids and point
......
...@@ -94,7 +94,7 @@ void vtkCellData::NullCell (int ptId) ...@@ -94,7 +94,7 @@ void vtkCellData::NullCell (int ptId)
} }
void vtkCellData::PrintSelf(vtkOstream& os, vtkIndent indent) void vtkCellData::PrintSelf(ostream& os, vtkIndent indent)
{ {
vtkDataSetAttributes::PrintSelf(os,indent); vtkDataSetAttributes::PrintSelf(os,indent);
} }
...@@ -58,7 +58,7 @@ public: ...@@ -58,7 +58,7 @@ public:
static vtkCellData *New(); static vtkCellData *New();
vtkTypeMacro(vtkCellData,vtkDataSetAttributes); vtkTypeMacro(vtkCellData,vtkDataSetAttributes);
void PrintSelf(vtkOstream& os, vtkIndent indent); void PrintSelf(ostream& os, vtkIndent indent);
// Description: // Description:
// Set cell data to null values // Set cell data to null values
......
...@@ -167,7 +167,7 @@ void vtkCharArray::DeepCopy(vtkDataArray *ia) ...@@ -167,7 +167,7 @@ void vtkCharArray::DeepCopy(vtkDataArray *ia)
} }
} }
void vtkCharArray::PrintSelf(vtkOstream& os, vtkIndent indent) void vtkCharArray::PrintSelf(ostream& os, vtkIndent indent)
{ {
vtkDataArray::PrintSelf(os,indent); vtkDataArray::PrintSelf(os,indent);
......
...@@ -56,7 +56,7 @@ public: ...@@ -56,7 +56,7 @@ public:
static vtkCharArray *New(); static vtkCharArray *New();
vtkTypeMacro(vtkCharArray,vtkDataArray); vtkTypeMacro(vtkCharArray,vtkDataArray);
void PrintSelf(vtkOstream& os, vtkIndent indent); void PrintSelf(ostream& os, vtkIndent indent);
// Description: // Description:
// Allocate memory for this array. Delete old storage only if necessary. // Allocate memory for this array. Delete old storage only if necessary.
......
...@@ -188,7 +188,7 @@ int vtkCollection::GetNumberOfItems() ...@@ -188,7 +188,7 @@ int vtkCollection::GetNumberOfItems()
} }
void vtkCollection::PrintSelf(vtkOstream& os, vtkIndent indent) void vtkCollection::PrintSelf(ostream& os, vtkIndent indent)
{ {
vtkObject::PrintSelf(os,indent); vtkObject::PrintSelf(os,indent);
......
...@@ -71,7 +71,7 @@ class VTK_EXPORT vtkCollection : public vtkObject ...@@ -71,7 +71,7 @@ class VTK_EXPORT vtkCollection : public vtkObject
{ {
public: public:
vtkTypeMacro(vtkCollection,vtkObject); vtkTypeMacro(vtkCollection,vtkObject);
void PrintSelf(vtkOstream& os, vtkIndent indent); void PrintSelf(ostream& os, vtkIndent indent);
// Description: // Description:
// Construct with empty list. // Construct with empty list.
......
...@@ -203,7 +203,7 @@ int vtkContourValues::GetNumberOfContours() ...@@ -203,7 +203,7 @@ int vtkContourValues::GetNumberOfContours()
return this->Contours->GetMaxId()+1; return this->Contours->GetMaxId()+1;
} }
void vtkContourValues::PrintSelf(vtkOstream& os, vtkIndent indent) void vtkContourValues::PrintSelf(ostream& os, vtkIndent indent)
{ {
int i, numContours=this->Contours->GetMaxId() + 1; int i, numContours=this->Contours->GetMaxId() + 1;
......
...@@ -64,7 +64,7 @@ public: ...@@ -64,7 +64,7 @@ public:
static vtkContourValues *New(); static vtkContourValues *New();
vtkTypeMacro(vtkContourValues,vtkObject); vtkTypeMacro(vtkContourValues,vtkObject);
void PrintSelf(vtkOstream& os, vtkIndent indent); void PrintSelf(ostream& os, vtkIndent indent);
// Description: // Description:
// Set the ith contour value. // Set the ith contour value.
......
...@@ -105,7 +105,7 @@ const char *vtkCoordinate::GetCoordinateSystemAsString() ...@@ -105,7 +105,7 @@ const char *vtkCoordinate::GetCoordinateSystemAsString()
} }
} }
void vtkCoordinate::PrintSelf(vtkOstream& os, vtkIndent indent) void vtkCoordinate::PrintSelf(ostream& os, vtkIndent indent)
{ {
this->vtkObject::PrintSelf(os,indent); this->vtkObject::PrintSelf(os,indent);
......
...@@ -86,7 +86,7 @@ class VTK_EXPORT vtkCoordinate : public vtkObject ...@@ -86,7 +86,7 @@ class VTK_EXPORT vtkCoordinate : public vtkObject
{ {
public: public:
vtkTypeMacro(vtkCoordinate,vtkObject); vtkTypeMacro(vtkCoordinate,vtkObject);
void PrintSelf(vtkOstream& os, vtkIndent indent); void PrintSelf(ostream& os, vtkIndent indent);
// Description: // Description:
// Creates an instance of this class with the following defaults: // Creates an instance of this class with the following defaults:
......
...@@ -143,7 +143,7 @@ vtkSimpleCriticalSection *vtkSimpleCriticalSection::SafeDownCast(vtkSimpleCritic ...@@ -143,7 +143,7 @@ vtkSimpleCriticalSection *vtkSimpleCriticalSection::SafeDownCast(vtkSimpleCritic
return (vtkSimpleCriticalSection *)o; return (vtkSimpleCriticalSection *)o;
} }
void vtkCriticalSection::PrintSelf(vtkOstream& os, vtkIndent indent) void vtkCriticalSection::PrintSelf(ostream& os, vtkIndent indent)
{ {
vtkObject::PrintSelf(os, indent); vtkObject::PrintSelf(os, indent);
} }
......
...@@ -124,7 +124,7 @@ public: ...@@ -124,7 +124,7 @@ public:
static vtkCriticalSection *New(); static vtkCriticalSection *New();
vtkTypeMacro(vtkCriticalSection,vtkObject); vtkTypeMacro(vtkCriticalSection,vtkObject);
void PrintSelf(vtkOstream& os, vtkIndent indent); void PrintSelf(ostream& os, vtkIndent indent);
// Description: // Description:
// Lock the vtkCriticalSection // Lock the vtkCriticalSection
......
...@@ -255,7 +255,7 @@ unsigned long vtkDataArray::GetActualMemorySize() ...@@ -255,7 +255,7 @@ unsigned long vtkDataArray::GetActualMemorySize()
return (unsigned long)ceil((size * numPrims)/1000.0); //kilobytes return (unsigned long)ceil((size * numPrims)/1000.0); //kilobytes
} }
void vtkDataArray::PrintSelf(vtkOstream& os, vtkIndent indent) void vtkDataArray::PrintSelf(ostream& os, vtkIndent indent)
{ {
vtkObject::PrintSelf(os,indent); vtkObject::PrintSelf(os,indent);
......
...@@ -72,7 +72,7 @@ class VTK_EXPORT vtkDataArray : public vtkObject ...@@ -72,7 +72,7 @@ class VTK_EXPORT vtkDataArray : public vtkObject
{ {
public: public:
vtkTypeMacro(vtkDataArray,vtkObject); vtkTypeMacro(vtkDataArray,vtkObject);
void PrintSelf(vtkOstream& os, vtkIndent indent); void PrintSelf(ostream& os, vtkIndent indent);
virtual int Allocate(const int sz, const int ext=1000) = 0; virtual int Allocate(const int sz, const int ext=1000) = 0;
virtual void Initialize() = 0; virtual void Initialize() = 0;
......
...@@ -57,7 +57,7 @@ class VTK_EXPORT vtkDataInformation : public vtkObject ...@@ -57,7 +57,7 @@ class VTK_EXPORT vtkDataInformation : public vtkObject
public: public:
static vtkDataInformation *New(); static vtkDataInformation *New();
vtkTypeMacro(vtkDataInformation,vtkObject); vtkTypeMacro(vtkDataInformation,vtkObject);
void PrintSelf(vtkOstream& os, vtkIndent indent); void PrintSelf(ostream& os, vtkIndent indent);
// Description: // Description:
// Makes an empty similar type object. // Makes an empty similar type object.
...@@ -108,8 +108,8 @@ public: ...@@ -108,8 +108,8 @@ public:
// Description: // Description:
// Serialization provided for the multi-process ports. // Serialization provided for the multi-process ports.
virtual void ReadSelf(vtkIstream& is); virtual void ReadSelf(istream& is);
virtual void WriteSelf(vtkOstream& os); virtual void WriteSelf(ostream& os);
protected: protected:
vtkDataInformation(); vtkDataInformation();
......
...@@ -634,7 +634,7 @@ void vtkDataObject::InternalDataObjectCopy(vtkDataObject *src) ...@@ -634,7 +634,7 @@ void vtkDataObject::InternalDataObjectCopy(vtkDataObject *src)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void vtkDataObject::PrintSelf(vtkOstream& os, vtkIndent indent) void vtkDataObject::PrintSelf(ostream& os, vtkIndent indent)
{ {
vtkObject::PrintSelf(os,indent); vtkObject::PrintSelf(os,indent);
...@@ -656,25 +656,25 @@ void vtkDataObject::PrintSelf(vtkOstream& os, vtkIndent indent) ...@@ -656,25 +656,25 @@ void vtkDataObject::PrintSelf(vtkOstream& os, vtkIndent indent)
os << indent << "Global Release Data: " os << indent << "Global Release Data: "
<< (vtkDataObjectGlobalReleaseDataFlag ? "On\n" : "Off\n"); << (vtkDataObjectGlobalReleaseDataFlag ? "On\n" : "Off\n");
os << indent << "PipelineMTime: " << this->PipelineMTime << vtkEndl; os << indent << "PipelineMTime: " << this->PipelineMTime << endl;
os << indent << "UpdateTime: " << this->UpdateTime << vtkEndl; os << indent << "UpdateTime: " << this->UpdateTime << endl;
os << indent << "Update Number Of Pieces: " << this->UpdateNumberOfPieces << vtkEndl; os << indent << "Update Number Of Pieces: " << this->UpdateNumberOfPieces << endl;
os << indent << "Update Piece: " << this->UpdatePiece << vtkEndl; os << indent << "Update Piece: " << this->UpdatePiece << endl;
os << indent << "Maximum Number Of Pieces: " << this->MaximumNumberOfPieces << vtkEndl; os << indent << "Maximum Number Of Pieces: " << this->MaximumNumberOfPieces << endl;
os << indent << "UpdateExtent: " << this->UpdateExtent[0] << ", " os << indent << "UpdateExtent: " << this->UpdateExtent[0] << ", "
<< this->UpdateExtent[1] << ", " << this->UpdateExtent[2] << ", " << this->UpdateExtent[1] << ", " << this->UpdateExtent[2] << ", "
<< this->UpdateExtent[3] << ", " << this->UpdateExtent[4] << ", " << this->UpdateExtent[3] << ", " << this->UpdateExtent[4] << ", "
<< this->UpdateExtent[5] << vtkEndl; << this->UpdateExtent[5] << endl;
os << indent << "WholeExtent: " << this->WholeExtent[0] << ", " os << indent << "WholeExtent: " << this->WholeExtent[0] << ", "
<< this->WholeExtent[1] << ", " << this->WholeExtent[2] << ", " << this->WholeExtent[1] << ", " << this->WholeExtent[2] << ", "
<< this->WholeExtent[3] << ", " << this->WholeExtent[4] << ", " << this->WholeExtent[3] << ", " << this->WholeExtent[4] << ", "
<< this->WholeExtent[5] << vtkEndl; << this->WholeExtent[5] << endl;
os << indent << "Field Data:\n"; os << indent << "Field Data:\n";
this->FieldData->PrintSelf(os,indent.GetNextIndent()); this->FieldData->PrintSelf(os,indent.GetNextIndent());
os << indent << "LastUpdateExtentWasOutsideOfTheExtent: " << os << indent << "LastUpdateExtentWasOutsideOfTheExtent: " <<
this->LastUpdateExtentWasOutsideOfTheExtent << vtkEndl; this->LastUpdateExtentWasOutsideOfTheExtent << endl;
} }
...@@ -73,7 +73,7 @@ public: ...@@ -73,7 +73,7 @@ public:
static vtkDataObject *New(); static vtkDataObject *New();
vtkTypeMacro(vtkDataObject,vtkObject); vtkTypeMacro(vtkDataObject,vtkObject);
void PrintSelf(vtkOstream& os, vtkIndent indent); void PrintSelf(ostream& os, vtkIndent indent);
// Description: // Description:
// Create concrete instance of this data object. // Create concrete instance of this data object.
......
...@@ -373,7 +373,7 @@ void vtkDataSet::InternalDataSetCopy(vtkDataSet *src) ...@@ -373,7 +373,7 @@ void vtkDataSet::InternalDataSetCopy(vtkDataSet *src)
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void vtkDataSet::PrintSelf(vtkOstream& os, vtkIndent indent) void vtkDataSet::PrintSelf(ostream& os, vtkIndent indent)
{ {
float *bounds; float *bounds;
......
...@@ -74,7 +74,7 @@ class VTK_EXPORT vtkDataSet : public vtkDataObject ...@@ -74,7 +74,7 @@ class VTK_EXPORT vtkDataSet : public vtkDataObject
{ {
public: public:
vtkTypeMacro(vtkDataSet,vtkDataObject); vtkTypeMacro(vtkDataSet,vtkDataObject);
void PrintSelf(vtkOstream& os, vtkIndent indent); void PrintSelf(ostream& os, vtkIndent indent);
// Description: // Description:
// Copy the geometric and topological structure of an object. Note that // Copy the geometric and topological structure of an object. Note that
......
...@@ -1494,7 +1494,7 @@ unsigned long vtkDataSetAttributes::GetActualMemorySize() ...@@ -1494,7 +1494,7 @@ unsigned long vtkDataSetAttributes::GetActualMemorySize()
return size; return size;
} }
void vtkDataSetAttributes::PrintSelf(vtkOstream& os, vtkIndent indent) void vtkDataSetAttributes::PrintSelf(ostream& os, vtkIndent indent)
{ {
vtkObject::PrintSelf(os,indent); vtkObject::PrintSelf(os,indent);
......
...@@ -67,7 +67,7 @@ public: ...@@ -67,7 +67,7 @@ public:
static vtkDataSetAttributes *New(); static vtkDataSetAttributes *New();
vtkTypeMacro(vtkDataSetAttributes,vtkObject); vtkTypeMacro(vtkDataSetAttributes,vtkObject);
void PrintSelf(vtkOstream& os, vtkIndent indent); void PrintSelf(ostream& os, vtkIndent indent);
// Description: // Description:
// Initialize all of the object's data to NULL // Initialize all of the object's data to NULL
......
...@@ -19,7 +19,7 @@ vtkDirectory::~vtkDirectory()