Win32 Porting.

Correction of Export/Import defines for Win32 platform.
Removed "using namespace std" from header files.

diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx
index f52504b29b66286357b259e6f20260b2ddee0c12..b9087f3214826417b64d43e3e2e6e3a2a9f602e9 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx
@@ -37,8 +37,6 @@
 //  Parameters for work of NETGEN
 //
 
-using namespace std;
-
 class NETGENPLUGIN_EXPORT NETGENPlugin_Hypothesis: public SMESH_Hypothesis
 {
 public:
@@ -89,10 +87,10 @@ public:
   static bool GetDefaultOptimize();
 
   // Persistence
-  virtual ostream & SaveTo(ostream & save);
-  virtual istream & LoadFrom(istream & load);
-  friend NETGENPLUGIN_EXPORT ostream & operator <<(ostream & save, NETGENPlugin_Hypothesis & hyp);
-  friend NETGENPLUGIN_EXPORT istream & operator >>(istream & load, NETGENPlugin_Hypothesis & hyp);
+  virtual std::ostream & SaveTo(std::ostream & save);
+  virtual std::istream & LoadFrom(std::istream & load);
+  friend NETGENPLUGIN_EXPORT std::ostream & operator <<(std::ostream & save, NETGENPlugin_Hypothesis & hyp);
+  friend NETGENPLUGIN_EXPORT std::istream & operator >>(std::istream & load, NETGENPlugin_Hypothesis & hyp);
 
   /*!
    * \brief Does nothing

diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.hxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.hxx
index 5b6d1ebf6130490ea8b69d0a531b7dba31dffda5..6292061ae5b662db65a7cf07a1708f2c19252ac2 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.hxx
@@ -49,8 +49,8 @@ public:
   static bool GetDefaultQuadAllowed();
 
   // Persistence
-  virtual ostream & SaveTo(ostream & save);
-  virtual istream & LoadFrom(istream & load);
+  virtual std::ostream & SaveTo(std::ostream & save);
+  virtual std::istream & LoadFrom(std::istream & load);
 
 private:
   bool _quadAllowed;

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
index e02b65fe807900ffef67a8e0d1e4a54c19801554..765a56c64bda30f98b81a833f02df0481810c241 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
@@ -62,6 +62,7 @@ namespace nglib {
 #include <nglib.h>
 }
 using namespace nglib;
+using namespace std;
 
 //=============================================================================
 /*!

diff --git a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.hxx b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.hxx
index 5231a9be4686ed8e53357afc9d2c257394b40a40..9463237b55fc77dbdb46839a5cf34b23814df707 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.hxx
@@ -35,8 +35,6 @@
 //  Simplified parameters of NETGEN
 //
 
-using namespace std;
-
 class NETGENPLUGIN_EXPORT NETGENPlugin_SimpleHypothesis_2D: public SMESH_Hypothesis
 {
 public:
@@ -80,8 +78,8 @@ public:
   double GetMaxElementArea() const { return _area; }
 
   // Persistence
-  virtual ostream & SaveTo(ostream & save);
-  virtual istream & LoadFrom(istream & load);
+  virtual std::ostream & SaveTo(std::ostream & save);
+  virtual std::istream & LoadFrom(std::istream & load);
 
   /*!
    * \brief Set parameters by mesh

diff --git a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.hxx b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.hxx
index 2ad8dec2dae34328b794a35c9d01c8956b02e4c7..2d1f49e7e4d46e8cf72570c5028fc2b7512e66e6 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.hxx
@@ -35,8 +35,6 @@
 //  Simplified parameters of NETGEN
 //
 
-using namespace std;
-
 class NETGENPLUGIN_EXPORT NETGENPlugin_SimpleHypothesis_3D: public NETGENPlugin_SimpleHypothesis_2D
 {
 public:
@@ -49,8 +47,8 @@ public:
   double GetMaxElementVolume() const { return _volume; }
 
   // Persistence
-  virtual ostream & SaveTo(ostream & save);
-  virtual istream & LoadFrom(istream & load);
+  virtual std::ostream & SaveTo(std::ostream & save);
+  virtual std::istream & LoadFrom(std::istream & load);
 
   /*!
    * \brief Set parameters by mesh