Port to VC12
This commit is contained in:
parent
f2d990d9ca
commit
8c1b1aa86b
|
@ -211,13 +211,13 @@ istream & NETGENPlugin_Hypothesis::LoadFrom(istream & load)
|
|||
int is;
|
||||
double val;
|
||||
|
||||
isOK = (load >> val);
|
||||
isOK = !(load >> val).bad();
|
||||
if (isOK)
|
||||
_maxSize = val;
|
||||
else
|
||||
load.clear(ios::badbit | load.rdstate());
|
||||
|
||||
isOK = (load >> is);
|
||||
isOK = !(load >> is).bad();
|
||||
if (isOK)
|
||||
SetFineness((Fineness) is);
|
||||
else
|
||||
|
@ -225,32 +225,32 @@ istream & NETGENPlugin_Hypothesis::LoadFrom(istream & load)
|
|||
|
||||
if (_fineness == UserDefined)
|
||||
{
|
||||
isOK = (load >> val);
|
||||
isOK = !(load >> val).bad();
|
||||
if (isOK)
|
||||
_growthRate = val;
|
||||
else
|
||||
load.clear(ios::badbit | load.rdstate());
|
||||
|
||||
isOK = (load >> val);
|
||||
isOK = !(load >> val).bad();
|
||||
if (isOK)
|
||||
_nbSegPerEdge = val;
|
||||
else
|
||||
load.clear(ios::badbit | load.rdstate());
|
||||
|
||||
isOK = (load >> val);
|
||||
isOK = !(load >> val).bad();
|
||||
if (isOK)
|
||||
_nbSegPerRadius = val;
|
||||
else
|
||||
load.clear(ios::badbit | load.rdstate());
|
||||
}
|
||||
|
||||
isOK = (load >> is);
|
||||
isOK = !(load >> is).bad();
|
||||
if (isOK)
|
||||
_secondOrder = (bool) is;
|
||||
else
|
||||
load.clear(ios::badbit | load.rdstate());
|
||||
|
||||
isOK = (load >> is);
|
||||
isOK = !(load >> is).bad();
|
||||
if (isOK)
|
||||
_optimize = (bool) is;
|
||||
else
|
||||
|
|
|
@ -96,7 +96,7 @@ istream & NETGENPlugin_Hypothesis_2D::LoadFrom(istream & load)
|
|||
bool isOK = true;
|
||||
int is;
|
||||
|
||||
isOK = (load >> is);
|
||||
isOK = !(load >> is).bad();
|
||||
if (isOK)
|
||||
_quadAllowed = (bool) is;
|
||||
else
|
||||
|
|
|
@ -142,19 +142,19 @@ istream & NETGENPlugin_SimpleHypothesis_2D::LoadFrom(istream & load)
|
|||
bool isOK = true;
|
||||
double val;
|
||||
|
||||
isOK = (load >> val);
|
||||
isOK = !(load >> val).bad();
|
||||
if (isOK)
|
||||
_nbSegments = (int) val;
|
||||
else
|
||||
load.clear(ios::badbit | load.rdstate());
|
||||
|
||||
isOK = (load >> val);
|
||||
isOK = !(load >> val).bad();
|
||||
if (isOK)
|
||||
_segmentLength = val;
|
||||
else
|
||||
load.clear(ios::badbit | load.rdstate());
|
||||
|
||||
isOK = (load >> val);
|
||||
isOK = !(load >> val).bad();
|
||||
if (isOK)
|
||||
_area = val;
|
||||
else
|
||||
|
|
|
@ -108,7 +108,7 @@ istream & NETGENPlugin_SimpleHypothesis_3D::LoadFrom(istream & load)
|
|||
bool isOK = true;
|
||||
double val;
|
||||
|
||||
isOK = (load >> val);
|
||||
isOK = !(load >> val).bad();
|
||||
if (isOK)
|
||||
_volume = val;
|
||||
else
|
||||
|
|
|
@ -120,10 +120,10 @@ ostream & StdMeshers_Arithmetic1D::SaveTo(ostream & save)
|
|||
istream & StdMeshers_Arithmetic1D::LoadFrom(istream & load)
|
||||
{
|
||||
bool isOK = true;
|
||||
isOK = (load >> _begLength);
|
||||
isOK = !(load >> _begLength).bad();
|
||||
if (!isOK)
|
||||
load.clear(ios::badbit | load.rdstate());
|
||||
isOK = (load >> _endLength);
|
||||
isOK = !(load >> _endLength).bad();
|
||||
if (!isOK)
|
||||
load.clear(ios::badbit | load.rdstate());
|
||||
return load;
|
||||
|
|
|
@ -119,7 +119,7 @@ ostream & StdMeshers_Deflection1D::SaveTo(ostream & save)
|
|||
|
||||
istream & StdMeshers_Deflection1D::LoadFrom(istream & load)
|
||||
{
|
||||
bool isOK = (load >> _value);
|
||||
bool isOK = !(load >> _value).bad();
|
||||
if (!isOK)
|
||||
load.clear(ios::badbit | load.rdstate());
|
||||
return load;
|
||||
|
|
|
@ -106,7 +106,7 @@ istream & StdMeshers_LengthFromEdges::LoadFrom(istream & load)
|
|||
{
|
||||
bool isOK = true;
|
||||
int a;
|
||||
isOK = (load >> a);
|
||||
isOK = !(load >> a).bad();
|
||||
if (isOK)
|
||||
this->_mode = a;
|
||||
else
|
||||
|
|
|
@ -148,13 +148,13 @@ istream & StdMeshers_LocalLength::LoadFrom(istream & load)
|
|||
bool isOK = true;
|
||||
double a;
|
||||
|
||||
isOK = (load >> a);
|
||||
isOK = !(load >> a).bad();
|
||||
if (isOK)
|
||||
this->_length = a;
|
||||
else
|
||||
load.clear(ios::badbit | load.rdstate());
|
||||
|
||||
isOK = (load >> a);
|
||||
isOK = !(load >> a).bad();
|
||||
if (isOK)
|
||||
this->_precision = a;
|
||||
else
|
||||
|
|
|
@ -114,7 +114,7 @@ istream & StdMeshers_MaxElementArea::LoadFrom(istream & load)
|
|||
{
|
||||
bool isOK = true;
|
||||
double a;
|
||||
isOK = (load >> a);
|
||||
isOK = !(load >> a).bad();
|
||||
if (isOK)
|
||||
this->_maxArea = a;
|
||||
else
|
||||
|
|
|
@ -116,7 +116,7 @@ istream & StdMeshers_MaxElementVolume::LoadFrom(istream & load)
|
|||
{
|
||||
bool isOK = true;
|
||||
double a;
|
||||
isOK = (load >> a);
|
||||
isOK = !(load >> a).bad();
|
||||
if (isOK)
|
||||
this->_maxVolume = a;
|
||||
else
|
||||
|
|
|
@ -159,20 +159,20 @@ istream & StdMeshers_MaxLength::LoadFrom(istream & load)
|
|||
bool isOK = true;
|
||||
double a;
|
||||
|
||||
isOK = (load >> a);
|
||||
isOK = !(load >> a).bad();
|
||||
if (isOK)
|
||||
_length = a;
|
||||
else
|
||||
load.clear(ios::badbit | load.rdstate());
|
||||
|
||||
isOK = (load >> a);
|
||||
isOK = !(load >> a).bad();
|
||||
if (isOK)
|
||||
_preestimated = a;
|
||||
else
|
||||
load.clear(ios::badbit | load.rdstate());
|
||||
|
||||
bool pre;
|
||||
isOK = (load >> pre);
|
||||
isOK = !(load >> pre).bad();
|
||||
if ( isOK )
|
||||
_preestimation = pre;
|
||||
else
|
||||
|
|
|
@ -118,7 +118,7 @@ ostream & StdMeshers_NumberOfLayers::SaveTo(ostream & save)
|
|||
istream & StdMeshers_NumberOfLayers::LoadFrom(istream & load)
|
||||
{
|
||||
bool isOK = true;
|
||||
isOK = (load >> _nbLayers);
|
||||
isOK = !(load >> _nbLayers).bad();
|
||||
if (!isOK)
|
||||
load.clear(ios::badbit | load.rdstate());
|
||||
return load;
|
||||
|
|
|
@ -520,7 +520,7 @@ istream & StdMeshers_NumberOfSegments::LoadFrom(istream & load)
|
|||
int a;
|
||||
|
||||
// read number of segments
|
||||
isOK = (load >> a);
|
||||
isOK = !(load >> a).bad();
|
||||
if (isOK)
|
||||
_numberOfSegments = a;
|
||||
else
|
||||
|
@ -533,7 +533,7 @@ istream & StdMeshers_NumberOfSegments::LoadFrom(istream & load)
|
|||
// (nb.segments, distr.type, some other params.),
|
||||
// we wait here the ditribution type, which is integer
|
||||
double scale_factor;
|
||||
isOK = (load >> scale_factor);
|
||||
isOK = !(load >> scale_factor).bad();
|
||||
a = (int)scale_factor;
|
||||
|
||||
// try to interprete ditribution type,
|
||||
|
@ -554,7 +554,7 @@ istream & StdMeshers_NumberOfSegments::LoadFrom(istream & load)
|
|||
{
|
||||
case DT_Scale:
|
||||
{
|
||||
isOK = (load >> b);
|
||||
isOK = !(load >> b).bad();
|
||||
if (isOK)
|
||||
_scaleFactor = b;
|
||||
else
|
||||
|
@ -568,14 +568,14 @@ istream & StdMeshers_NumberOfSegments::LoadFrom(istream & load)
|
|||
break;
|
||||
case DT_TabFunc:
|
||||
{
|
||||
isOK = (load >> a);
|
||||
isOK = !(load >> a).bad();
|
||||
if (isOK)
|
||||
{
|
||||
_table.resize(a, 0.);
|
||||
int i;
|
||||
for (i=0; i < _table.size(); i++)
|
||||
{
|
||||
isOK = (load >> b);
|
||||
isOK = !(load >> b).bad();
|
||||
if (isOK)
|
||||
_table[i] = b;
|
||||
else
|
||||
|
@ -594,7 +594,7 @@ istream & StdMeshers_NumberOfSegments::LoadFrom(istream & load)
|
|||
case DT_ExprFunc:
|
||||
{
|
||||
string str;
|
||||
isOK = (load >> str);
|
||||
isOK = !(load >> str).bad();
|
||||
if (isOK)
|
||||
_func = str;
|
||||
else
|
||||
|
@ -613,7 +613,7 @@ istream & StdMeshers_NumberOfSegments::LoadFrom(istream & load)
|
|||
|
||||
if (_distrType == DT_TabFunc || _distrType == DT_ExprFunc)
|
||||
{
|
||||
isOK = (load >> a);
|
||||
isOK = !(load >> a).bad();
|
||||
if (isOK)
|
||||
_convMode = a;
|
||||
else
|
||||
|
|
|
@ -117,7 +117,7 @@ istream & StdMeshers_SegmentLengthAroundVertex::LoadFrom(istream & load)
|
|||
{
|
||||
bool isOK = true;
|
||||
double a;
|
||||
isOK = (load >> a);
|
||||
isOK = !(load >> a).bad();
|
||||
if (isOK)
|
||||
this->_length = a;
|
||||
else
|
||||
|
|
|
@ -121,10 +121,10 @@ ostream & StdMeshers_StartEndLength::SaveTo(ostream & save)
|
|||
istream & StdMeshers_StartEndLength::LoadFrom(istream & load)
|
||||
{
|
||||
bool isOK = true;
|
||||
isOK = (load >> _begLength);
|
||||
isOK = !(load >> _begLength).bad();
|
||||
if (!isOK)
|
||||
load.clear(ios::badbit | load.rdstate());
|
||||
isOK = (load >> _endLength);
|
||||
isOK = !(load >> _endLength).bad();
|
||||
if (!isOK)
|
||||
load.clear(ios::badbit | load.rdstate());
|
||||
return load;
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
|
||||
#include <cmath>
|
||||
#include "Constraints.h"
|
||||
#include <algorithm>
|
||||
|
||||
namespace GCS
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue
Block a user