From 640a6fc04f5662fb701300ed372db31e88e477cf Mon Sep 17 00:00:00 2001 From: jriegel Date: Sat, 15 Nov 2014 14:07:02 +0100 Subject: [PATCH] Port to VC12 --- .../src/NETGENPlugin/NETGENPlugin_Hypothesis.cpp | 14 +++++++------- .../NETGENPlugin/NETGENPlugin_Hypothesis_2D.cpp | 2 +- .../NETGENPlugin_SimpleHypothesis_2D.cpp | 6 +++--- .../NETGENPlugin_SimpleHypothesis_3D.cpp | 2 +- .../src/StdMeshers/StdMeshers_Arithmetic1D.cpp | 4 ++-- .../src/StdMeshers/StdMeshers_Deflection1D.cpp | 2 +- .../src/StdMeshers/StdMeshers_LengthFromEdges.cpp | 2 +- .../src/StdMeshers/StdMeshers_LocalLength.cpp | 4 ++-- .../src/StdMeshers/StdMeshers_MaxElementArea.cpp | 2 +- .../src/StdMeshers/StdMeshers_MaxElementVolume.cpp | 2 +- .../src/StdMeshers/StdMeshers_MaxLength.cpp | 6 +++--- .../src/StdMeshers/StdMeshers_NumberOfLayers.cpp | 2 +- .../src/StdMeshers/StdMeshers_NumberOfSegments.cpp | 14 +++++++------- .../StdMeshers_SegmentLengthAroundVertex.cpp | 2 +- .../src/StdMeshers/StdMeshers_StartEndLength.cpp | 4 ++-- src/Mod/Sketcher/App/freegcs/Constraints.cpp | 1 + 16 files changed, 35 insertions(+), 34 deletions(-) diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Hypothesis.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Hypothesis.cpp index f743919a7f..b57ff17ca7 100644 --- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Hypothesis.cpp +++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Hypothesis.cpp @@ -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 diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.cpp index 4b8b4aebba..41b19f8399 100644 --- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.cpp +++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.cpp @@ -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 diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.cpp index b1f359bf02..e45db10825 100644 --- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.cpp +++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.cpp @@ -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 diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.cpp index fd799b9cb0..b8a18854d9 100644 --- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.cpp +++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.cpp @@ -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 diff --git a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Arithmetic1D.cpp b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Arithmetic1D.cpp index 9dd35269e8..fc2d00c502 100644 --- a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Arithmetic1D.cpp +++ b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Arithmetic1D.cpp @@ -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; diff --git a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Deflection1D.cpp b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Deflection1D.cpp index 6854ed4192..5033aa8127 100644 --- a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Deflection1D.cpp +++ b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Deflection1D.cpp @@ -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; diff --git a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_LengthFromEdges.cpp b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_LengthFromEdges.cpp index 2f6e3c7035..5e350d90dc 100644 --- a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_LengthFromEdges.cpp +++ b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_LengthFromEdges.cpp @@ -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 diff --git a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_LocalLength.cpp b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_LocalLength.cpp index 54fc1a59f1..2ca825caf1 100644 --- a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_LocalLength.cpp +++ b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_LocalLength.cpp @@ -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 diff --git a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_MaxElementArea.cpp b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_MaxElementArea.cpp index 6b7403dddc..cc776a47ab 100644 --- a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_MaxElementArea.cpp +++ b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_MaxElementArea.cpp @@ -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 diff --git a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_MaxElementVolume.cpp b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_MaxElementVolume.cpp index 9d6cbb5118..d4369c6912 100644 --- a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_MaxElementVolume.cpp +++ b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_MaxElementVolume.cpp @@ -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 diff --git a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_MaxLength.cpp b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_MaxLength.cpp index 862dd26476..21d1bb012b 100644 --- a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_MaxLength.cpp +++ b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_MaxLength.cpp @@ -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 diff --git a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_NumberOfLayers.cpp b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_NumberOfLayers.cpp index 554650b6cf..187cbae78e 100644 --- a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_NumberOfLayers.cpp +++ b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_NumberOfLayers.cpp @@ -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; diff --git a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_NumberOfSegments.cpp b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_NumberOfSegments.cpp index b9dd3284b7..30af4fbd5b 100644 --- a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_NumberOfSegments.cpp +++ b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_NumberOfSegments.cpp @@ -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 diff --git a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.cpp b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.cpp index cadc330a97..7ccdf95689 100644 --- a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.cpp +++ b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.cpp @@ -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 diff --git a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_StartEndLength.cpp b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_StartEndLength.cpp index f7b0d2570d..01cef56d17 100644 --- a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_StartEndLength.cpp +++ b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_StartEndLength.cpp @@ -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; diff --git a/src/Mod/Sketcher/App/freegcs/Constraints.cpp b/src/Mod/Sketcher/App/freegcs/Constraints.cpp index 97e992ca7c..e8de23beee 100644 --- a/src/Mod/Sketcher/App/freegcs/Constraints.cpp +++ b/src/Mod/Sketcher/App/freegcs/Constraints.cpp @@ -22,6 +22,7 @@ #include #include "Constraints.h" +#include namespace GCS {