Merging with BR_WPdev_For_5_0

diff --git a/src/SMESH/SMESH_2D_Algo.cxx b/src/SMESH/SMESH_2D_Algo.cxx
index ade8abfb75c971858dbed3a3c8a29fe75e3c6e9c..f2eeaeb142241dc48699c3f6f880b68e72f563d5 100644 (file)
--- a/src/SMESH/SMESH_2D_Algo.cxx
+++ b/src/SMESH/SMESH_2D_Algo.cxx
@@ -26,7 +26,6 @@
 //  Module : SMESH
 //  $Header$
 
-using namespace std;
 #include "SMESH_2D_Algo.hxx"
 #include "SMESH_Gen.hxx"
 
@@ -36,6 +35,8 @@ using namespace std;
 #include <TopExp.hxx>
 #include <TopoDS.hxx>
 
+using namespace std;
+
 //=============================================================================
 /*!
  *  

diff --git a/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.h b/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.h
index 8b5b3a77bcde8701849d085ce5d5daca557410a2..10a58bd2041727c6a6cbdc6c33c367798ba6f273 100644 (file)
--- a/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.h
+++ b/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.h
@@ -27,20 +27,20 @@
 #define LIBSMESH_SWIG_H
 
 #ifdef WNT
-#if defined SMESHSWIG_EXPORTS
-  #define SMESHSWIG_EXPORT __declspec( dllexport )
+#if defined SMESH_SWIG_EXPORTS
+  #define SMESH_SWIG_EXPORT __declspec( dllexport )
  #else
-  #define SMESHSWIG_EXPORT __declspec( dllimport )
+  #define SMESH_SWIG_EXPORT __declspec( dllimport )
  #endif
 #else
- #define SMESHSWIG_EXPORT
+ #define SMESH_SWIG_EXPORT
 #endif
 
 // IDL includes
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOMEDS)
 
-class SMESHSWIG_EXPORT SMESH_Swig
+class SMESH_SWIG_EXPORT SMESH_Swig
 {
 public:
   SMESH_Swig();

diff --git a/src/StdMeshers/StdMeshers_UseExisting_1D2D.hxx b/src/StdMeshers/StdMeshers_UseExisting_1D2D.hxx
index e0eedabdb2d995beb8e45fc4d2f40d5e358219a3..780d97d83d253e98c14ccc4e8fc8049dfae6e967 100644 (file)
--- a/src/StdMeshers/StdMeshers_UseExisting_1D2D.hxx
+++ b/src/StdMeshers/StdMeshers_UseExisting_1D2D.hxx
@@ -49,7 +49,7 @@ public:
   
 };
 
-class StdMeshers_UseExisting_1D: public SMESH_1D_Algo
+class STDMESHERS_EXPORT StdMeshers_UseExisting_1D: public SMESH_1D_Algo
 {
 public:
   StdMeshers_UseExisting_1D(int hypId, int studyId, SMESH_Gen* gen);

diff --git a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx
index a5390229476285e7fdd480b097273ace420c0417..09721ce9744cd3b6940994a29c2e80fb29608a47 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx
@@ -27,7 +27,6 @@
 //  Module : SMESH
 //  $Header$
 
-using namespace std;
 #include "StdMeshers_NumberOfSegments_i.hxx"
 #include "SMESH_Gen_i.hxx"
 #include "SMESH_Gen.hxx"
@@ -38,6 +37,7 @@ using namespace std;
 
 #include <TCollection_AsciiString.hxx>
 
+using namespace std;
 //=============================================================================
 /*!
  *  StdMeshers_NumberOfSegments_i::StdMeshers_NumberOfSegments_i

diff --git a/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx b/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx
index e3d5f4eebfb9ee535036fb62663102b2d1655b7b..a1543f7a53e5db7454d3c205eb47040ab01c4ed9 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx
@@ -26,8 +26,6 @@
 //  Module : SMESH
 //  $Header$
 
-using namespace std;
-
 #include "StdMeshers_ProjectionSource1D_i.hxx"
 
 #include "SMESH_Gen_i.hxx"
@@ -39,6 +37,8 @@ using namespace std;
 
 #include "StdMeshers_ObjRefUlils.hxx"
 
+using namespace std;
+
 //=============================================================================
 /*!
  *  StdMeshers_ProjectionSource1D_i::StdMeshers_ProjectionSource1D_i