Win32 Porting.

Correction of Export/Import defines for Win32 platform.
Removed "using namespace std" from header files.
This commit is contained in:
abd 2008-10-03 11:42:06 +00:00
parent f01eb4a8f1
commit 0fb29d65e9
5 changed files with 11 additions and 16 deletions

View File

@ -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

View File

@ -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;

View File

@ -62,6 +62,7 @@ namespace nglib {
#include <nglib.h>
}
using namespace nglib;
using namespace std;
//=============================================================================
/*!

View File

@ -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

View File

@ -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