Fix compilation errors after merging KERNEL module from V4_1_0_maintainance branch

diff --git a/src/VISUGUI/VisuGUI_ClippingPanel.cxx b/src/VISUGUI/VisuGUI_ClippingPanel.cxx
index 5b76f650460c8073b8681dc4dcc4fb79b8bfc298..676eca682c6bea8a624879520227167135d4f308 100644 (file)
--- 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 d3cdeefeedb09140f60e18b7491bcbaf8bf98c1c..5466db2af5571f55b95d0dbf388918c0e80a8002 100644 (file)
--- 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 52684c1bcdcadf7a06b535c5fc59dd8e7422cd1b..8db0a28c687a87b72abcef62bca50316af35a780 100644 (file)
--- a/src/VISUGUI/VisuGUI_Slider.cxx
+++ b/src/VISUGUI/VisuGUI_Slider.cxx
@@ -71,6 +71,8 @@
 #include <QTimer>
 #include <QAction>
 
+using namespace std;
+
 /*!
   Constructor
 */

diff --git a/src/VISUGUI/VisuGUI_Tools.cxx b/src/VISUGUI/VisuGUI_Tools.cxx
index 44eeeca35d6e07e9ec51bf43274f59abefc2b36f..a3baf5e49c5e49f94bf00b929a4032bdf85da842 100644 (file)
--- a/src/VISUGUI/VisuGUI_Tools.cxx
+++ b/src/VISUGUI/VisuGUI_Tools.cxx
@@ -79,6 +79,7 @@
 #include <QSpinBox>
 #include <QDoubleSpinBox>
 
+using namespace std;
 
 //=============================================================================
 namespace VISU

diff --git a/src/VISU_I/VISUConfig.cc b/src/VISU_I/VISUConfig.cc
index 073d07c895fef1e0f0119587355241f384d2ad0e..c8f788b9f447d4b8de2ffdfd640d56f68ee5b853 100644 (file)
--- 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 a030bdc008f42898adedbf01af253484b0bf810e..a9c4ff62abc172dbf8f687753bc117ae6cc188e1 100644 (file)
--- 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 78d5cf5a45b15ecb5dffd5ec5b1d5203506efe74..e9e6ef93cc72756fd2f211f6678a8b03f7baf8c0 100644 (file)
--- 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 88168a37aee9de7ad2ae137dd674c80634b2843d..547a4f3ab69f0dca3221f8db9fb2f70dc4fcf971 100644 (file)
--- 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 0aee75f247d1f5af53a019b22c26f816a43787bd..69e33eb6d09aa0f8c28246262d01f4cdc0e6054e 100644 (file)
--- 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 98b54763fad7180c55497c37c426d23852674627..8a76cd0672c203008a9316b61b08441fecfcabd5 100644 (file)
--- 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 69c50255d1e2e5d26d6ad8b06b799765ea69dd1c..daa06daae63df8acc38dad7932c342126444dbbb 100644 (file)
--- 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 e329711ccbb78b8f87ea1835db776c6641a9fb0a..af64913306cb7eb5456e264b9facb2629a206729 100644 (file)
--- 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 4592dea6de4bfbb880dee0eb7d22542e1d2297de..dcd1acfc22f58a3dcd09dc3d48a43c227dd5c77b 100644 (file)
--- 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 9667e0c3ac55924d4947555c062b8a77306398d1..6ae368bf629f6079da79eaba157808b9eaa9c527 100644 (file)
--- 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 a481198252600b70fc719c6325e101070786d38d..fd6ee897f20c0d1f8121455d5ec3045a407d5c3d 100644 (file)
--- 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 2204b1637ae06c399b5f04923de891bc3230e032..8039cbc67f46fb5cfc554e332cc7f21693185753 100644 (file)
--- 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 3f73561ad8aab2c2503eb9987c430278e0c54690..9407b8f2051446b5dde31d64924fa0fc4d3d64a3 100644 (file)
--- 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 90e3b18adfd5e156db05c6086fb120acd29d0ddb..6d637875d685f3ae53555f8846620f69211f234e 100644 (file)
--- 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 71c9a0e2924f29223771945f719fff924f895eea..aa4afe71c8f1fcc8b308bf522d65464d81009511 100644 (file)
--- 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 3f8ff6589845a8a36d3e1562007237afa6355833..a5ecb5d87792dc17f9c98ee77b705dbe09780efd 100644 (file)
--- 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 2885a351acd0eb6c9fa670a4d6650fda97018471..372f544777086c06ba2a948b604a5dccdc9d1bdf 100644 (file)
--- 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 2ba4a28629dfea61e44ae738c1fa664ad15f694e..d80281d41e7de82496837d61f9f789a033eb5054 100644 (file)
--- 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 2d8e89da0ec59f3bcd33412a7cc4deecbe84c9be..1ffaa4b20eaedb610e1036cf4b57260cb510379c 100644 (file)
--- 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 4cf4c320818c0ab6c19ed3be55a855685258aecf..ef94d2d2c052e72576f7ff49298caa828e8f2a63 100644 (file)
--- 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 01ebfa16f8afb851b6ac250aa0feabaf1bb5fd40..6b0d58ac11e426b32ee6754722c8280e92a0d187 100644 (file)
--- 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 0910d8dc60be4ede36309c0d81a7ab9145215b54..906c0abbe87677180e002295a6dfab511b39871d 100644 (file)
--- 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 0fc2b12e073d89c1c44307f5ba47b3ac43e263f7..13be9942f8991d35c64b5bd68c62e34d161e3a58 100644 (file)
--- a/src/VISU_I/VISU_TimeAnimation.cxx
+++ b/src/VISU_I/VISU_TimeAnimation.cxx
@@ -81,6 +81,7 @@
 #include <Standard_ErrorHandler.hxx>
 #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 1ef9bab6198f9f80d19e28e2aef2d8fc8eaaad0a..9dab489f9c3e621a925900668212229a63af7e73 100644 (file)
--- 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