X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPlugins%2FParaMEDCorba%2FvtkParaMEDCorbaSource.h;h=c01c63e9b638a759aa76ed9c4f4e8a3c628a1fc8;hb=e2c075bb656e4e5b0d8e6fcb7e06b5c25f903dee;hp=d4646c6b830857b05a366b7ca06ad6f08f205148;hpb=89c33033151baa33eeac8fb09d9c0488acb43c35;p=modules%2Fparavis.git diff --git a/src/Plugins/ParaMEDCorba/vtkParaMEDCorbaSource.h b/src/Plugins/ParaMEDCorba/vtkParaMEDCorbaSource.h index d4646c6b..c01c63e9 100644 --- a/src/Plugins/ParaMEDCorba/vtkParaMEDCorbaSource.h +++ b/src/Plugins/ParaMEDCorba/vtkParaMEDCorbaSource.h @@ -1,4 +1,4 @@ -// Copyright (C) 2010-2012 CEA/DEN, EDF R&D +// Copyright (C) 2010-2013 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -23,7 +23,7 @@ #include "ParaMEDMEM2VTK_defines.hxx" #include "vtkUnstructuredGridAlgorithm.h" -#include +#include class vtkDoubleArray; class vtkUnstructuredGrid; @@ -36,7 +36,7 @@ namespace ParaMEDMEM2VTK class vtkParaMEDCorbaSource : public vtkAlgorithm // { public: - vtkTypeRevisionMacro(vtkParaMEDCorbaSource, vtkAlgorithm); + vtkTypeMacro(vtkParaMEDCorbaSource, vtkAlgorithm) ParaMEDMEM2VTK_EXPORT static vtkParaMEDCorbaSource* New(); virtual void PrintSelf( ostream& os, vtkIndent indent ); const char *GetIORCorba(); @@ -60,15 +60,15 @@ protected: int EndPiece; int BufferingPolicy; vtkUnstructuredGrid *MyDataSet; - vtkstd::vector IOR; + vtksys_stl::vector IOR; ParaMEDMEM2VTK::MEDCouplingMultiFieldsFetcher *mfieldsFetcher; //not clean but to avoid to include CORBA.h in this *.h static void *Orb; //ETX - private: +private: /*void traduceMedMeshToUnstructuredDataset(vtkUnstructuredGrid *ret, int nbOfCells, int nbOfNodes, - int nbOfTypes, const int *types, const int *nbOfEltsPerTypes, const int *nodalConnectivity, - const double *coords, int spaceDim); + int nbOfTypes, const int *types, const int *nbOfEltsPerTypes, const int *nodalConnectivity, + const double *coords, int spaceDim); vtkDoubleArray *buildDataArrayFromMedCoords(const double *coords, int nbOfNodes, int spaceDim); void reorganizeCellConnectivity(int vtkType, int nbOfNodes, const int *medConn, int *vtkConn); int transformMedGeomEltType2VtkType(int typeMed, int *nbOfNodesPerCell);*/