From 0fb29d65e9f39e06e1ca8b97724b942a324a2c34 Mon Sep 17 00:00:00 2001 From: abd Date: Fri, 3 Oct 2008 11:42:06 +0000 Subject: [PATCH] Win32 Porting. Correction of Export/Import defines for Win32 platform. Removed "using namespace std" from header files. --- src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx | 10 ++++------ src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.hxx | 4 ++-- src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx | 1 + src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.hxx | 6 ++---- src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.hxx | 6 ++---- 5 files changed, 11 insertions(+), 16 deletions(-) diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx index f52504b..b9087f3 100644 --- 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 5b6d1eb..6292061 100644 --- 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 e02b65f..765a56c 100644 --- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx +++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx @@ -62,6 +62,7 @@ namespace nglib { #include } using namespace nglib; +using namespace std; //============================================================================= /*! diff --git a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.hxx b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.hxx index 5231a9b..9463237 100644 --- 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 2ad8dec..2d1f49e 100644 --- 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 -- 2.39.2