From 5b21dab3359e535f5a70e2e44294c13deda97f4a Mon Sep 17 00:00:00 2001 From: abd Date: Fri, 10 Oct 2008 10:21:52 +0000 Subject: [PATCH] Fix compilation errors after merging KERNEL module from V4_1_0_maintainance branch --- src/VISUGUI/VisuGUI_ClippingPanel.cxx | 2 ++ src/VISUGUI/VisuGUI_Module.cxx | 2 ++ src/VISUGUI/VisuGUI_Slider.cxx | 2 ++ src/VISUGUI/VisuGUI_Tools.cxx | 1 + src/VISU_I/VISUConfig.cc | 1 + src/VISU_I/VISU_ClippingPlaneMgr.cxx | 1 + src/VISU_I/VISU_ClippingPlaneMgr.hxx | 6 +++--- src/VISU_I/VISU_ColoredPrs3dCache_i.cc | 2 ++ src/VISU_I/VISU_ColoredPrs3dFactory.cc | 1 + src/VISU_I/VISU_ColoredPrs3dHolder_i.cc | 2 ++ src/VISU_I/VISU_ColoredPrs3d_i.cc | 1 + src/VISU_I/VISU_CutLines_i.cc | 1 + src/VISU_I/VISU_CutPlanes_i.cc | 2 +- src/VISU_I/VISU_DeformedShapeAndScalarMap_i.cc | 1 + 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 | 1 + src/VISU_I/VISU_ScalarMap_i.cc | 1 + 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 | 1 + 28 files changed, 42 insertions(+), 4 deletions(-) diff --git a/src/VISUGUI/VisuGUI_ClippingPanel.cxx b/src/VISUGUI/VisuGUI_ClippingPanel.cxx index 5b76f650..676eca68 100644 --- a/src/VISUGUI/VisuGUI_ClippingPanel.cxx +++ b/src/VISUGUI/VisuGUI_ClippingPanel.cxx @@ -67,6 +67,8 @@ #define PRINT3(MARK, VAL) printf("#### %s x=%f, y=%f, z=%f\n", MARK, VAL[0], VAL[1], VAL[2]); +using namespace std; + void AdjustBounds(const double bounds[6], double newBounds[6], double center[3]) { diff --git a/src/VISUGUI/VisuGUI_Module.cxx b/src/VISUGUI/VisuGUI_Module.cxx index d3cdeefe..5466db2a 100644 --- a/src/VISUGUI/VisuGUI_Module.cxx +++ b/src/VISUGUI/VisuGUI_Module.cxx @@ -146,6 +146,8 @@ static int MYDEBUG = 0; #define GAUSS_RESTORE_CONFIGURATION 5702 #define GAUSS_RENAME_CONFIGURATION 5703 +using namespace std; + void CreateCurves( SalomeApp_Module* theModule, VISU::CutLines_i* thePrs, diff --git a/src/VISUGUI/VisuGUI_Slider.cxx b/src/VISUGUI/VisuGUI_Slider.cxx index 52684c1b..8db0a28c 100644 --- a/src/VISUGUI/VisuGUI_Slider.cxx +++ b/src/VISUGUI/VisuGUI_Slider.cxx @@ -71,6 +71,8 @@ #include #include +using namespace std; + /*! Constructor */ diff --git a/src/VISUGUI/VisuGUI_Tools.cxx b/src/VISUGUI/VisuGUI_Tools.cxx index 44eeeca3..a3baf5e4 100644 --- a/src/VISUGUI/VisuGUI_Tools.cxx +++ b/src/VISUGUI/VisuGUI_Tools.cxx @@ -79,6 +79,7 @@ #include #include +using namespace std; //============================================================================= namespace VISU diff --git a/src/VISU_I/VISUConfig.cc b/src/VISU_I/VISUConfig.cc index 073d07c8..c8f788b9 100644 --- a/src/VISU_I/VISUConfig.cc +++ b/src/VISU_I/VISUConfig.cc @@ -47,6 +47,7 @@ static int MYDEBUG = 0; static int MYDEBUG = 0; #endif +using namespace std; namespace VISU { diff --git a/src/VISU_I/VISU_ClippingPlaneMgr.cxx b/src/VISU_I/VISU_ClippingPlaneMgr.cxx index a030bdc0..a9c4ff62 100644 --- a/src/VISU_I/VISU_ClippingPlaneMgr.cxx +++ b/src/VISU_I/VISU_ClippingPlaneMgr.cxx @@ -35,6 +35,7 @@ #define CLIP_PLANES_FOLDER "Clipping Planes" +using namespace std; //************************************************************* VISU_ClippingPlaneMgr::VISU_ClippingPlaneMgr() diff --git a/src/VISU_I/VISU_ClippingPlaneMgr.hxx b/src/VISU_I/VISU_ClippingPlaneMgr.hxx index 78d5cf5a..e9e6ef93 100644 --- a/src/VISU_I/VISU_ClippingPlaneMgr.hxx +++ b/src/VISU_I/VISU_ClippingPlaneMgr.hxx @@ -56,8 +56,8 @@ public: void setPlaneObject(_PTR(SObject) aSOPlane) { mySObject = aSOPlane; } _PTR(SObject) getPlaneObject() const { return mySObject; } - void setName(string theName) { myName = theName; } - string getName() const { return myName; } + void setName(std::string theName) { myName = theName; } + std::string getName() const { return myName; } void setAuto(bool isAuto) { myIsAuto = isAuto; } bool isAuto() const { return myIsAuto; } @@ -69,7 +69,7 @@ protected: private: bool myIsActive; _PTR(SObject) mySObject; - string myName; + std::string myName; bool myIsAuto; }; diff --git a/src/VISU_I/VISU_ColoredPrs3dCache_i.cc b/src/VISU_I/VISU_ColoredPrs3dCache_i.cc index 88168a37..547a4f3a 100644 --- a/src/VISU_I/VISU_ColoredPrs3dCache_i.cc +++ b/src/VISU_I/VISU_ColoredPrs3dCache_i.cc @@ -55,6 +55,8 @@ static int MYDEBUG = 0; static int MYDEBUG = 0; #endif +using namespace std; + namespace { //---------------------------------------------------------------------------- diff --git a/src/VISU_I/VISU_ColoredPrs3dFactory.cc b/src/VISU_I/VISU_ColoredPrs3dFactory.cc index 0aee75f2..69e33eb6 100644 --- a/src/VISU_I/VISU_ColoredPrs3dFactory.cc +++ b/src/VISU_I/VISU_ColoredPrs3dFactory.cc @@ -44,6 +44,7 @@ //static int MYDEBUG = 0; #endif +using namespace std; namespace VISU { diff --git a/src/VISU_I/VISU_ColoredPrs3dHolder_i.cc b/src/VISU_I/VISU_ColoredPrs3dHolder_i.cc index 98b54763..8a76cd06 100644 --- a/src/VISU_I/VISU_ColoredPrs3dHolder_i.cc +++ b/src/VISU_I/VISU_ColoredPrs3dHolder_i.cc @@ -40,6 +40,8 @@ static int MYDEBUG = 0; static int MYDEBUG = 0; #endif +using namespace std; + //--------------------------------------------------------------- int VISU::ColoredPrs3dHolder_i::myNbHolders = 0; diff --git a/src/VISU_I/VISU_ColoredPrs3d_i.cc b/src/VISU_I/VISU_ColoredPrs3d_i.cc index 69c50255..daa06daa 100644 --- a/src/VISU_I/VISU_ColoredPrs3d_i.cc +++ b/src/VISU_I/VISU_ColoredPrs3d_i.cc @@ -46,6 +46,7 @@ static int MYDEBUG = 0; static int MYDEBUG = 0; #endif +using namespace std; //--------------------------------------------------------------- namespace diff --git a/src/VISU_I/VISU_CutLines_i.cc b/src/VISU_I/VISU_CutLines_i.cc index e329711c..af649133 100644 --- a/src/VISU_I/VISU_CutLines_i.cc +++ b/src/VISU_I/VISU_CutLines_i.cc @@ -46,6 +46,7 @@ static int MYDEBUG = 0; static int MYDEBUG = 0; #endif +using namespace std; //--------------------------------------------------------------- size_t diff --git a/src/VISU_I/VISU_CutPlanes_i.cc b/src/VISU_I/VISU_CutPlanes_i.cc index 4592dea6..dcd1acfc 100644 --- a/src/VISU_I/VISU_CutPlanes_i.cc +++ b/src/VISU_I/VISU_CutPlanes_i.cc @@ -41,7 +41,7 @@ static int MYDEBUG = 0; static int MYDEBUG = 0; #endif - +using namespace std; //---------------------------------------------------------------------------- size_t diff --git a/src/VISU_I/VISU_DeformedShapeAndScalarMap_i.cc b/src/VISU_I/VISU_DeformedShapeAndScalarMap_i.cc index 9667e0c3..6ae368bf 100644 --- a/src/VISU_I/VISU_DeformedShapeAndScalarMap_i.cc +++ b/src/VISU_I/VISU_DeformedShapeAndScalarMap_i.cc @@ -47,6 +47,7 @@ static int MYDEBUG = 0; static int INCMEMORY = 4+12; +using namespace std; //--------------------------------------------------------------- size_t diff --git a/src/VISU_I/VISU_DeformedShape_i.cc b/src/VISU_I/VISU_DeformedShape_i.cc index a4811982..fd6ee897 100644 --- a/src/VISU_I/VISU_DeformedShape_i.cc +++ b/src/VISU_I/VISU_DeformedShape_i.cc @@ -45,6 +45,7 @@ static int MYDEBUG = 0; static int MYDEBUG = 0; #endif +using namespace std; //--------------------------------------------------------------- size_t diff --git a/src/VISU_I/VISU_GaussPoints_i.cc b/src/VISU_I/VISU_GaussPoints_i.cc index 2204b163..8039cbc6 100644 --- a/src/VISU_I/VISU_GaussPoints_i.cc +++ b/src/VISU_I/VISU_GaussPoints_i.cc @@ -56,6 +56,8 @@ static int MYDEBUG = 0; static int INCMEMORY = 10; +using namespace std; + //---------------------------------------------------------------------------- size_t VISU::GaussPoints_i diff --git a/src/VISU_I/VISU_Gen_i.cc b/src/VISU_I/VISU_Gen_i.cc index 3f73561a..9407b8f2 100644 --- a/src/VISU_I/VISU_Gen_i.cc +++ b/src/VISU_I/VISU_Gen_i.cc @@ -94,6 +94,8 @@ static int MYDEBUG = 0; static int MYDEBUG = 0; #endif +using namespace std; + extern "C" VISU_I_EXPORT VISU::VISU_Gen_ptr GetImpl(CORBA::ORB_ptr theORB, diff --git a/src/VISU_I/VISU_IsoSurfaces_i.cc b/src/VISU_I/VISU_IsoSurfaces_i.cc index 90e3b18a..6d637875 100644 --- a/src/VISU_I/VISU_IsoSurfaces_i.cc +++ b/src/VISU_I/VISU_IsoSurfaces_i.cc @@ -43,6 +43,8 @@ static int MYDEBUG = 0; static int MYDEBUG = 0; #endif +using namespace std; + //--------------------------------------------------------------- size_t VISU::IsoSurfaces_i diff --git a/src/VISU_I/VISU_Mesh_i.cc b/src/VISU_I/VISU_Mesh_i.cc index 71c9a0e2..aa4afe71 100644 --- a/src/VISU_I/VISU_Mesh_i.cc +++ b/src/VISU_I/VISU_Mesh_i.cc @@ -46,6 +46,8 @@ static int MYDEBUG = 0; static int INCMEMORY = 4; +using namespace std; + //---------------------------------------------------------------------------- namespace { diff --git a/src/VISU_I/VISU_Plot3D_i.cc b/src/VISU_I/VISU_Plot3D_i.cc index 3f8ff658..a5ecb5d8 100644 --- a/src/VISU_I/VISU_Plot3D_i.cc +++ b/src/VISU_I/VISU_Plot3D_i.cc @@ -34,6 +34,7 @@ static int MYDEBUG = 0; static int MYDEBUG = 0; #endif +using namespace std; //--------------------------------------------------------------- size_t diff --git a/src/VISU_I/VISU_PointMap3d_i.cc b/src/VISU_I/VISU_PointMap3d_i.cc index 2885a351..372f5447 100644 --- a/src/VISU_I/VISU_PointMap3d_i.cc +++ b/src/VISU_I/VISU_PointMap3d_i.cc @@ -55,6 +55,8 @@ static int MYDEBUG = 0; static int MYDEBUG = 0; #endif +using namespace std; + //---------------------------------------------------------------- // PointMap3d Object //---------------------------------------------------------------- diff --git a/src/VISU_I/VISU_ResultUtils.cc b/src/VISU_I/VISU_ResultUtils.cc index 2ba4a286..d80281d4 100644 --- a/src/VISU_I/VISU_ResultUtils.cc +++ b/src/VISU_I/VISU_ResultUtils.cc @@ -48,6 +48,8 @@ static int MYTIMEDEBUG = 0; static int MYTIMEDEBUG = 0; #endif +using namespace std; + namespace VISU { //---------------------------------------------------------------------------- diff --git a/src/VISU_I/VISU_Result_i.cc b/src/VISU_I/VISU_Result_i.cc index 2d8e89da..1ffaa4b2 100644 --- a/src/VISU_I/VISU_Result_i.cc +++ b/src/VISU_I/VISU_Result_i.cc @@ -69,6 +69,7 @@ static int MYDEBUG = 1; static int MYDEBUG = 0; #endif +using namespace std; namespace VISU { diff --git a/src/VISU_I/VISU_ScalarMap_i.cc b/src/VISU_I/VISU_ScalarMap_i.cc index 4cf4c320..ef94d2d2 100644 --- a/src/VISU_I/VISU_ScalarMap_i.cc +++ b/src/VISU_I/VISU_ScalarMap_i.cc @@ -53,6 +53,7 @@ static int MYDEBUG = 0; static int INCMEMORY = 4; +using namespace std; //---------------------------------------------------------------------------- size_t diff --git a/src/VISU_I/VISU_StreamLines_i.cc b/src/VISU_I/VISU_StreamLines_i.cc index 01ebfa16..6b0d58ac 100644 --- a/src/VISU_I/VISU_StreamLines_i.cc +++ b/src/VISU_I/VISU_StreamLines_i.cc @@ -45,6 +45,7 @@ static int MYDEBUG = 0; static int MYDEBUG = 0; #endif +using namespace std; //--------------------------------------------------------------- size_t diff --git a/src/VISU_I/VISU_Table_i.cc b/src/VISU_I/VISU_Table_i.cc index 0910d8dc..906c0abb 100644 --- a/src/VISU_I/VISU_Table_i.cc +++ b/src/VISU_I/VISU_Table_i.cc @@ -38,6 +38,8 @@ #include "utilities.h" +using namespace std; + #ifdef _DEBUG_ static int MYDEBUG = 0; #else diff --git a/src/VISU_I/VISU_TimeAnimation.cxx b/src/VISU_I/VISU_TimeAnimation.cxx index 0fc2b12e..13be9942 100644 --- a/src/VISU_I/VISU_TimeAnimation.cxx +++ b/src/VISU_I/VISU_TimeAnimation.cxx @@ -81,6 +81,7 @@ #include #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 1ef9bab6..9dab489f 100644 --- a/src/VISU_I/VISU_Vectors_i.cc +++ b/src/VISU_I/VISU_Vectors_i.cc @@ -46,6 +46,7 @@ static int MYDEBUG = 0; static int INCMEMORY = 4+12; +using namespace std; //--------------------------------------------------------------- size_t -- 2.39.2