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()
this->LastWindow = NULL;
}
void vtkAbstractMapper::PrintSelf(vtkOstream& os, vtkIndent indent)
void vtkAbstractMapper::PrintSelf(ostream& os, vtkIndent indent)
{
this->vtkProcessObject::PrintSelf(os,indent);
......
......@@ -59,7 +59,7 @@ class VTK_EXPORT vtkAbstractMapper : public vtkProcessObject
{
public:
vtkTypeMacro(vtkAbstractMapper,vtkProcessObject);
void PrintSelf(vtkOstream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
// Release any graphics resources that are being consumed by this mapper.
......
......@@ -236,7 +236,7 @@ void vtkActor2D::GetActors2D(vtkPropCollection *ac)
ac->AddItem(this);
}
void vtkActor2D::PrintSelf(vtkOstream& os, vtkIndent indent)
void vtkActor2D::PrintSelf(ostream& os, vtkIndent indent)
{
this->vtkProp::PrintSelf(os,indent);
......
......@@ -61,7 +61,7 @@ class vtkMapper2D;
class VTK_EXPORT vtkActor2D : public vtkProp
{
public:
void PrintSelf(vtkOstream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent);
vtkTypeMacro(vtkActor2D,vtkProp);
// Description:
......
......@@ -209,7 +209,7 @@ unsigned long vtkAttributeData::GetActualMemorySize()
return this->Data->GetActualMemorySize();
}
void vtkAttributeData::PrintSelf(vtkOstream& os, vtkIndent indent)
void vtkAttributeData::PrintSelf(ostream& os, vtkIndent indent)
{
vtkObject::PrintSelf(os,indent);
......
......@@ -59,7 +59,7 @@ class VTK_EXPORT vtkAttributeData : public vtkObject
{
public:
vtkTypeMacro(vtkAttributeData,vtkObject);
void PrintSelf(vtkOstream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
// Allocate initial memory size.
......
......@@ -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);
......
......@@ -56,7 +56,7 @@ class VTK_EXPORT vtkBitArray : public vtkDataArray
public:
static vtkBitArray *New();
vtkTypeMacro(vtkBitArray,vtkDataArray);
void PrintSelf(vtkOstream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
// Allocate memory for this array. Delete old storage only if necessary.
......
......@@ -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.
void vtkByteSwap::SwapWrite4BERange(char *mem_ptr1,int num, vtkOstream *fp)
void vtkByteSwap::SwapWrite4BERange(char *mem_ptr1,int num, ostream *fp)
{
#ifndef VTK_WORDS_BIGENDIAN
char one_byte;
......@@ -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.
void vtkByteSwap::SwapWrite2BERange(char *mem_ptr1,int num, vtkOstream *fp)
void vtkByteSwap::SwapWrite2BERange(char *mem_ptr1,int num, ostream *fp)
{
#ifndef VTK_WORDS_BIGENDIAN
char one_byte;
......
......@@ -114,12 +114,12 @@ public:
static void SwapWrite4BERange(unsigned long *i,int num, FILE *fp)
{ vtkByteSwap::SwapWrite4BERange((char *)i,num,fp);};
static void SwapWrite4BERange(char *c,int num, vtkOstream *fp);
static void SwapWrite4BERange(float *p,int num, vtkOstream *fp)
static void SwapWrite4BERange(char *c,int num, ostream *fp);
static void SwapWrite4BERange(float *p,int num, ostream *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);};
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);};
......@@ -148,8 +148,8 @@ public:
static void SwapWrite2BERange(short *i,int num, FILE *fp)
{vtkByteSwap::SwapWrite2BERange((char *)i,num,fp);};
static void SwapWrite2BERange(char *c,int num, vtkOstream *fp);
static void SwapWrite2BERange(short *i,int num, vtkOstream *fp)
static void SwapWrite2BERange(char *c,int num, ostream *fp);
static void SwapWrite2BERange(short *i,int num, ostream *fp)
{vtkByteSwap::SwapWrite2BERange((char *)i,num,fp);};
// Description:
......
......@@ -257,7 +257,7 @@ int vtkCell::GetParametricCenter(float pcoords[3])
return 0;
}
void vtkCell::PrintSelf(vtkOstream& os, vtkIndent indent)
void vtkCell::PrintSelf(ostream& os, vtkIndent indent)
{
int numIds=this->PointIds->GetNumberOfIds();
......
......@@ -81,7 +81,7 @@ class VTK_EXPORT vtkCell : public vtkObject
{
public:
vtkTypeMacro(vtkCell,vtkObject);
void PrintSelf(vtkOstream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
// Initialize cell from outside with point ids and point
......
......@@ -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);
}
......@@ -58,7 +58,7 @@ public:
static vtkCellData *New();
vtkTypeMacro(vtkCellData,vtkDataSetAttributes);
void PrintSelf(vtkOstream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
// Set cell data to null values
......
......@@ -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);
......
......@@ -56,7 +56,7 @@ public:
static vtkCharArray *New();
vtkTypeMacro(vtkCharArray,vtkDataArray);
void PrintSelf(vtkOstream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
// Allocate memory for this array. Delete old storage only if necessary.
......
......@@ -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);
......
......@@ -71,7 +71,7 @@ class VTK_EXPORT vtkCollection : public vtkObject
{
public:
vtkTypeMacro(vtkCollection,vtkObject);
void PrintSelf(vtkOstream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
// Construct with empty list.
......
......@@ -203,7 +203,7 @@ int vtkContourValues::GetNumberOfContours()
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;
......
......@@ -64,7 +64,7 @@ public:
static vtkContourValues *New();
vtkTypeMacro(vtkContourValues,vtkObject);
void PrintSelf(vtkOstream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
// Set the ith contour value.
......
......@@ -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);
......
......@@ -86,7 +86,7 @@ class VTK_EXPORT vtkCoordinate : public vtkObject
{
public:
vtkTypeMacro(vtkCoordinate,vtkObject);
void PrintSelf(vtkOstream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
// Creates an instance of this class with the following defaults:
......
......@@ -143,7 +143,7 @@ vtkSimpleCriticalSection *vtkSimpleCriticalSection::SafeDownCast(vtkSimpleCritic
return (vtkSimpleCriticalSection *)o;
}
void vtkCriticalSection::PrintSelf(vtkOstream& os, vtkIndent indent)
void vtkCriticalSection::PrintSelf(ostream& os, vtkIndent indent)
{
vtkObject::PrintSelf(os, indent);
}
......
......@@ -124,7 +124,7 @@ public:
static vtkCriticalSection *New();
vtkTypeMacro(vtkCriticalSection,vtkObject);
void PrintSelf(vtkOstream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
// Lock the vtkCriticalSection
......
......@@ -255,7 +255,7 @@ unsigned long vtkDataArray::GetActualMemorySize()
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);
......
......@@ -72,7 +72,7 @@ class VTK_EXPORT vtkDataArray : public vtkObject
{
public:
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 void Initialize() = 0;
......
......@@ -57,7 +57,7 @@ class VTK_EXPORT vtkDataInformation : public vtkObject
public:
static vtkDataInformation *New();
vtkTypeMacro(vtkDataInformation,vtkObject);
void PrintSelf(vtkOstream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
// Makes an empty similar type object.
......@@ -108,8 +108,8 @@ public:
// Description:
// Serialization provided for the multi-process ports.
virtual void ReadSelf(vtkIstream& is);
virtual void WriteSelf(vtkOstream& os);
virtual void ReadSelf(istream& is);
virtual void WriteSelf(ostream& os);
protected:
vtkDataInformation();
......
......@@ -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);
......@@ -656,25 +656,25 @@ void vtkDataObject::PrintSelf(vtkOstream& os, vtkIndent indent)
os << indent << "Global Release Data: "
<< (vtkDataObjectGlobalReleaseDataFlag ? "On\n" : "Off\n");
os << indent << "PipelineMTime: " << this->PipelineMTime << vtkEndl;
os << indent << "UpdateTime: " << this->UpdateTime << vtkEndl;
os << indent << "PipelineMTime: " << this->PipelineMTime << endl;
os << indent << "UpdateTime: " << this->UpdateTime << endl;
os << indent << "Update Number Of Pieces: " << this->UpdateNumberOfPieces << vtkEndl;
os << indent << "Update Piece: " << this->UpdatePiece << vtkEndl;
os << indent << "Maximum Number Of Pieces: " << this->MaximumNumberOfPieces << vtkEndl;
os << indent << "Update Number Of Pieces: " << this->UpdateNumberOfPieces << endl;
os << indent << "Update Piece: " << this->UpdatePiece << endl;
os << indent << "Maximum Number Of Pieces: " << this->MaximumNumberOfPieces << endl;
os << indent << "UpdateExtent: " << this->UpdateExtent[0] << ", "
<< this->UpdateExtent[1] << ", " << this->UpdateExtent[2] << ", "
<< this->UpdateExtent[3] << ", " << this->UpdateExtent[4] << ", "
<< this->UpdateExtent[5] << vtkEndl;
<< this->UpdateExtent[5] << endl;
os << indent << "WholeExtent: " << this->WholeExtent[0] << ", "
<< this->WholeExtent[1] << ", " << this->WholeExtent[2] << ", "
<< this->WholeExtent[3] << ", " << this->WholeExtent[4] << ", "
<< this->WholeExtent[5] << vtkEndl;
<< this->WholeExtent[5] << endl;
os << indent << "Field Data:\n";
this->FieldData->PrintSelf(os,indent.GetNextIndent());
os << indent << "LastUpdateExtentWasOutsideOfTheExtent: " <<
this->LastUpdateExtentWasOutsideOfTheExtent << vtkEndl;
this->LastUpdateExtentWasOutsideOfTheExtent << endl;
}
......@@ -73,7 +73,7 @@ public:
static vtkDataObject *New();
vtkTypeMacro(vtkDataObject,vtkObject);
void PrintSelf(vtkOstream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
// Create concrete instance of this data object.
......
......@@ -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;
......
......@@ -74,7 +74,7 @@ class VTK_EXPORT vtkDataSet : public vtkDataObject
{
public:
vtkTypeMacro(vtkDataSet,vtkDataObject);
void PrintSelf(vtkOstream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
// Copy the geometric and topological structure of an object. Note that
......
......@@ -1494,7 +1494,7 @@ unsigned long vtkDataSetAttributes::GetActualMemorySize()
return size;
}
void vtkDataSetAttributes::PrintSelf(vtkOstream& os, vtkIndent indent)
void vtkDataSetAttributes::PrintSelf(ostream& os, vtkIndent indent)
{
vtkObject::PrintSelf(os,indent);
......
......@@ -67,7 +67,7 @@ public:
static vtkDataSetAttributes *New();
vtkTypeMacro(vtkDataSetAttributes,vtkObject);
void PrintSelf(vtkOstream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
// Initialize all of the object's data to NULL
......
......@@ -19,7 +19,7 @@ vtkDirectory::~vtkDirectory()
void vtkDirectory::PrintSelf(vtkOstream& os, vtkIndent indent)
void vtkDirectory::PrintSelf(ostream& os, vtkIndent indent)
{
vtkObject::PrintSelf(os, indent);
if(!this->Path)
......
......@@ -68,7 +68,7 @@ public:
// Description:
// Print directory to stream.
virtual void PrintSelf(vtkOstream& os, vtkIndent indent);
virtual void PrintSelf(ostream& os, vtkIndent indent);
// Description:
// Open the specified directory and load the names of the files
......
......@@ -175,7 +175,7 @@ void vtkDoubleArray::DeepCopy(vtkDataArray *fa)
}
}
void vtkDoubleArray::PrintSelf(vtkOstream& os, vtkIndent indent)
void vtkDoubleArray::PrintSelf(ostream& os, vtkIndent indent)
{
vtkDataArray::PrintSelf(os,indent);
......
......@@ -56,7 +56,7 @@ public:
static vtkDoubleArray *New();
vtkTypeMacro(vtkDoubleArray,vtkDataArray);
void PrintSelf(vtkOstream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
// Allocate memory for this array. Delete old storage only if necessary.
......
......@@ -459,7 +459,7 @@ int vtkEdgeTable::InsertUniquePoint(int p1, int p2, float x[3], int &ptId)
}
}
void vtkEdgeTable::PrintSelf(vtkOstream& os, vtkIndent indent)
void vtkEdgeTable::PrintSelf(ostream& os, vtkIndent indent)
{
vtkObject::PrintSelf(os,indent);
......
......@@ -62,7 +62,7 @@ public:
static vtkEdgeTable *New();
vtkTypeMacro(vtkEdgeTable,vtkObject);
void PrintSelf(vtkOstream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
// Free memory and return to instantiated state.
......
......@@ -61,7 +61,7 @@ public:
static vtkExtent *New();
vtkTypeMacro(vtkExtent,vtkObject);
void PrintSelf(vtkOstream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
// Copy information from one extent into another.
......@@ -77,8 +77,8 @@ public:
// Description:
// Serialization provided for the multi-process ports.
virtual void ReadSelf(vtkIstream& is);
virtual void WriteSelf(vtkOstream& os);
virtual void ReadSelf(istream& is);
virtual void WriteSelf(ostream& os);
protected:
vtkExtent();
......
......@@ -645,7 +645,7 @@ unsigned long vtkFieldData::GetActualMemorySize()
return size;
}
void vtkFieldData::PrintSelf(vtkOstream& os, vtkIndent indent)
void vtkFieldData::PrintSelf(ostream& os, vtkIndent indent)
{
vtkObject::PrintSelf(os,indent);
......
......@@ -75,7 +75,7 @@ public:
static vtkFieldData *New();
vtkTypeMacro(vtkFieldData,vtkObject);
void PrintSelf(vtkOstream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
// Release all data but do not delete object.
......
......@@ -169,7 +169,7 @@ void vtkFloatArray::DeepCopy(vtkDataArray *fa)
}
}
void vtkFloatArray::PrintSelf(vtkOstream& os, vtkIndent indent)
void vtkFloatArray::PrintSelf(ostream& os, vtkIndent indent)
{
vtkDataArray::PrintSelf(os,indent);
......
......@@ -55,7 +55,7 @@ class VTK_EXPORT vtkFloatArray : public vtkDataArray
public:
static vtkFloatArray *New();
vtkTypeMacro(vtkFloatArray,vtkDataArray);
void PrintSelf(vtkOstream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
// Allocate memory for this array. Delete old storage only if necessary.
......
......@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "vtkMath.h"
//----------------------------------------------------------------------------
void vtkGeneralTransform::PrintSelf(vtkOstream& os, vtkIndent indent)
void vtkGeneralTransform::PrintSelf(ostream& os, vtkIndent indent)
{
vtkObject::PrintSelf(os, indent);
}
......
......@@ -73,7 +73,7 @@ class VTK_EXPORT vtkGeneralTransform : public vtkObject
public:
vtkTypeMacro(vtkGeneralTransform,vtkObject);
void PrintSelf(vtkOstream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
// Apply the transformation to a coordinate. You can use the same
......
......@@ -92,7 +92,7 @@ vtkGeneralTransformConcatenation::~vtkGeneralTransformConcatenation()
}
//----------------------------------------------------------------------------
void vtkGeneralTransformConcatenation::PrintSelf(vtkOstream& os, vtkIndent indent)
void vtkGeneralTransformConcatenation::PrintSelf(ostream& os, vtkIndent indent)
{
vtkGeneralTransform::PrintSelf(os,indent);
......
......@@ -60,7 +60,7 @@ public:
static vtkGeneralTransformConcatenation *New();
vtkTypeMacro(vtkGeneralTransformConcatenation,vtkGeneralTransform);
void PrintSelf(vtkOstream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
// Concatenate the current transform with the specified transform(s),
......
......@@ -79,7 +79,7 @@ vtkGeneralTransformInverse::~vtkGeneralTransformInverse()
}
//----------------------------------------------------------------------------
void vtkGeneralTransformInverse::PrintSelf(vtkOstream& os, vtkIndent indent)
void vtkGeneralTransformInverse::PrintSelf(ostream& os, vtkIndent indent)
{
vtkGeneralTransform::PrintSelf(os,indent);
......
......@@ -59,7 +59,7 @@ public:
static vtkGeneralTransformInverse *New();
vtkTypeMacro(vtkGeneralTransformInverse,vtkGeneralTransform);
void PrintSelf(vtkOstream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
// Set the transform that you want this to be an inverse of.
......
......@@ -268,7 +268,7 @@ void vtkIdList::IntersectWith(vtkIdList& otherIds)
}
#undef VTK_TMP_ARRAY_SIZE
void vtkIdList::PrintSelf(vtkOstream& os, vtkIndent indent)
void vtkIdList::PrintSelf(ostream& os, vtkIndent indent)