From 0111dccbe82185f20e075936f129866f29cfcada Mon Sep 17 00:00:00 2001 From: abd Date: Fri, 3 Oct 2008 11:27:02 +0000 Subject: [PATCH] Win32 Porting. Correction of Export/Import defines for Win32 platform. Removed "using namespace std" from header files. --- src/CONVERTOR/VISU_MedConvertor.cxx | 50 +++++++++---------- src/CONVERTOR/VISU_MergeFilterUtilities.hxx | 1 - src/PIPELINE/VISU_DeformedShapePL.cxx | 2 + src/PIPELINE/VISU_PipeLineUtils.hxx | 18 +++---- src/VISUGUI/VisuGUI_CutLinesDlg.cxx | 10 ++-- src/VISUGUI/VisuGUI_CutPlanesDlg.cxx | 8 +-- src/VISUGUI/VisuGUI_Module.cxx | 1 + src/VISUGUI/VisuGUI_Tools.cxx | 2 + src/VISU_I/VISUConfig.cc | 1 + src/VISU_I/VISU_ColoredPrs3dCache_i.cc | 2 + src/VISU_I/VISU_CutLines_i.cc | 1 + src/VISU_I/VISU_CutPlanes_i.cc | 2 +- .../VISU_DeformedShapeAndScalarMap_i.cc | 2 + src/VISU_I/VISU_DeformedShape_i.cc | 1 + src/VISU_I/VISU_GaussPoints_i.cc | 2 + src/VISU_I/VISU_Gen_i.cc | 2 + src/VISU_I/VISU_IsoSurfaces_i.cc | 2 + src/VISU_I/VISU_Mesh_i.cc | 2 + src/VISU_I/VISU_Plot3D_i.cc | 1 + src/VISU_I/VISU_PointMap3d_i.cc | 2 + src/VISU_I/VISU_ResultUtils.cc | 2 + src/VISU_I/VISU_Result_i.cc | 2 + src/VISU_I/VISU_ScalarMap_i.cc | 2 + src/VISU_I/VISU_StreamLines_i.cc | 1 + src/VISU_I/VISU_Table_i.cc | 2 + src/VISU_I/VISU_TimeAnimation.cxx | 1 + src/VISU_I/VISU_Vectors_i.cc | 2 + 27 files changed, 79 insertions(+), 45 deletions(-) diff --git a/src/CONVERTOR/VISU_MedConvertor.cxx b/src/CONVERTOR/VISU_MedConvertor.cxx index 6a531027..d2d01e47 100644 --- a/src/CONVERTOR/VISU_MedConvertor.cxx +++ b/src/CONVERTOR/VISU_MedConvertor.cxx @@ -24,8 +24,6 @@ // Author : Alexey PETROV // Module : VISU -using namespace std; - #include "VISU_MedConvertor.hxx" #include "VISU_ConvertorUtils.hxx" @@ -52,6 +50,8 @@ using MED::TInt; using MED::TFloat; using MED::EBooleen; +using namespace std; + #ifdef _DEBUG_ static int MYDEBUG = 0; static int MYVALUEDEBUG = 0; @@ -644,7 +644,7 @@ namespace for ( int aDimId = 0; aDimId < aVector.size(); aDimId++ ) aGrilleStructure[aDimId] = aVector[aDimId]; } - + int kMax = aGrilleStructure[2]; int jMax = aGrilleStructure[1]; int iMax = aGrilleStructure[0]; @@ -671,8 +671,8 @@ namespace aObj2StructuredId[iii][0] = i; aObj2StructuredId[iii][1] = j; aObj2StructuredId[iii][2] = k; - iii++; - } + iii++; + } } for(; anEntityIter != theEntityInfo.end(); anEntityIter++){ @@ -1576,7 +1576,7 @@ BuildTimeStampMinMax(MED::SharedPtr theTimeStampValue, "; aNbElem = "< #endif +using namespace std; //------------------------------------------------------------------------ namespace VISU diff --git a/src/VISU_I/VISU_Vectors_i.cc b/src/VISU_I/VISU_Vectors_i.cc index 63936340..f99c0902 100644 --- a/src/VISU_I/VISU_Vectors_i.cc +++ b/src/VISU_I/VISU_Vectors_i.cc @@ -44,6 +44,8 @@ static int MYDEBUG = 0; static int MYDEBUG = 0; #endif +using namespace std; + static int INCMEMORY = 4+12; -- 2.39.2