diff --git a/Mesh/yamakawa.cpp b/Mesh/yamakawa.cpp index 7d783e6fb1980be5b2fe6f4b31e077aa28ccce5b..1dc4b3be2dd318157b8a9328819e0cee4f95b099 100644 --- a/Mesh/yamakawa.cpp +++ b/Mesh/yamakawa.cpp @@ -2425,7 +2425,7 @@ void Supplementary::init_markings(GRegion* gr){ for(i=0;i<gr->getNumMeshElements();i++){ element = gr->getMeshElement(i); if(four(element)){ - markings.insert(std::pair<MElement*,bool>(element,0)); + markings.insert(std::pair<MElement*,bool>(element,false)); } } } diff --git a/Numeric/MetricBasis.cpp b/Numeric/MetricBasis.cpp index b739d0221bef93e080fbfff94726f96724e94604..65fdf56c7c708d3428d6b958b67dab28d8a5aac7 100644 --- a/Numeric/MetricBasis.cpp +++ b/Numeric/MetricBasis.cpp @@ -1274,7 +1274,7 @@ void MetricBasis::_maxAstK4(const fullMatrix<double> &coeff, while (itJ != _ineqJ2.end() && itP != _ineqP3.end()) { double num = 0, den = 0; - for (int l = 0; l < itJ->second.size(); ++l) { + for (unsigned int l = 0; l < itJ->second.size(); ++l) { const int i = itJ->second[l].i; const int j = itJ->second[l].j; num += itJ->second[l].val * jac(i) * jac(j); @@ -1414,7 +1414,7 @@ void MetricBasis::_maxKstA3(const fullMatrix<double> &coeff, num -= itJ->second[l].val * jac(i) * jac(j); } num *= beta; - for (int l = 0; l < itP->second.size(); ++l) { + for (unsigned int l = 0; l < itP->second.size(); ++l) { const int i = itP->second[l].i; const int j = itP->second[l].j; const int k = itP->second[l].k; diff --git a/contrib/bamg/bamglib/Mesh2.h b/contrib/bamg/bamglib/Mesh2.h index 3c4afa346d185cb181da6631af1d2ce128310c3d..879843d419d57962fc2c8461f5520cb602af5ecb 100644 --- a/contrib/bamg/bamglib/Mesh2.h +++ b/contrib/bamg/bamglib/Mesh2.h @@ -54,7 +54,7 @@ namespace bamg { const double Pi = 3.14159265358979323846264338328; -const float fPi = 3.14159265358979323846264338328; +const float fPi = (float)3.14159265358979323846264338328; class MeshIstream;