From 24d3f7412b05d30b6128549ba359aaf52945ced8 Mon Sep 17 00:00:00 2001 From: apo Date: Fri, 29 Dec 2006 13:45:59 +0000 Subject: [PATCH] To compile under GCC 3.4 --- src/CONVERTOR/VISU_Convertor_impl.cxx | 32 +++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/CONVERTOR/VISU_Convertor_impl.cxx b/src/CONVERTOR/VISU_Convertor_impl.cxx index 45e325f3..730d4d63 100644 --- a/src/CONVERTOR/VISU_Convertor_impl.cxx +++ b/src/CONVERTOR/VISU_Convertor_impl.cxx @@ -79,6 +79,18 @@ static int MYDEBUGWITHFILES = 0; namespace VISU { + //--------------------------------------------------------------- + std::string + GenerateFieldName(const PFieldImpl& theField, + const PValForTimeImpl& theValForTime) + { + const VISU::TTime& aTime = theValForTime->myTime; + string aFieldName = theField->myMeshName + ", " + theField->myName + ": " + + VISU_Convertor::GenerateName(aTime); + return aFieldName; + } + + //--------------------------------------------------------------- /*! Computes number of points by the given number of cells * in assumption of regular hexahedral mesh structure @@ -1473,8 +1485,8 @@ namespace VISU SetTuple(vtkIdType theTupleId, TVTKBasicType* thePointer) { - this->WritePointer(myDataArray, theTupleId, thePointer); - this->WritePointer(myDataArray2, theTupleId, thePointer); + this->WritePointer(this->myDataArray, theTupleId, thePointer); + this->WritePointer(this->myDataArray2, theTupleId, thePointer); } }; @@ -1545,7 +1557,7 @@ namespace VISU const VISU::TEntity& theEntity) { vtkIdType aNbTuples = theField->myDataSize / theField->myNbComp; - std::string aFieldName = GenerateFieldName(theField, theValForTime); + std::string aFieldName = VISU::GenerateFieldName(theField, theValForTime); vtkDataSetAttributes* aDataSetAttributes; switch(theEntity){ @@ -1745,7 +1757,7 @@ namespace VISU const PValForTimeImpl& theValForTime) { vtkIdType aNbTuples = theSource->GetNumberOfPoints(); - std::string aFieldName = GenerateFieldName(theField, theValForTime); + std::string aFieldName = VISU::GenerateFieldName(theField, theValForTime); vtkDataSetAttributes* aDataSetAttributes; switch(theField->myEntity){ @@ -2166,18 +2178,6 @@ namespace } - //--------------------------------------------------------------- - std::string - GenerateFieldName(const PFieldImpl& theField, - const PValForTimeImpl& theValForTime) - { - const VISU::TTime& aTime = theValForTime->myTime; - string aFieldName = theField->myMeshName + ", " + theField->myName + ": " + - VISU_Convertor::GenerateName(aTime); - return aFieldName; - } - - //--------------------------------------------------------------- void GetCells(const TVTKSource& theSource, -- 2.39.2