From: abd <abd@opencascade.com>
Date: Fri, 8 Aug 2008 07:45:27 +0000 (+0000)
Subject: Merging with BR_WPdev_For_5_0
X-Git-Tag: V5_1_0a1~33
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=65d1c9839186512bd47c31e8365e269dd7b71d26;p=modules%2Fsmesh.git

Merging with BR_WPdev_For_5_0
---

diff --git a/src/SMESH/SMESH_2D_Algo.cxx b/src/SMESH/SMESH_2D_Algo.cxx
index ade8abfb7..f2eeaeb14 100644
--- 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 8b5b3a77b..10a58bd20 100644
--- 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 e0eedabdb..780d97d83 100644
--- 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 a53902294..09721ce97 100644
--- 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 e3d5f4eeb..a1543f7a5 100644
--- 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