diff --git a/Solver/filters.h b/Solver/filters.h index be341656e410cb2893bdb24600b421aacea1ff0c..ea322ead152364db935f7d132bd4c2ef94c0b889 100644 --- a/Solver/filters.h +++ b/Solver/filters.h @@ -41,7 +41,7 @@ class FilterNodeEnriched Dof::getTwoIntsFromType(key.getType(), i1,i2); it2 = _EnrichComp->find(i1); it1 = _TagEnrichedVertex->find(key.getEntity()); - if (it1!=_TagEnrichedVertex->end() & it2 != _EnrichComp->end()) + if ((it1!=_TagEnrichedVertex->end()) && (it2 != _EnrichComp->end())) { return true; } @@ -111,7 +111,7 @@ class FilterElementsCutByLevelSet Dof::getTwoIntsFromType(key.getType(), i1,i2); it2 = _EnrichComp->find(i1); it1 = _TagEnrichedVertex.find(key.getEntity()); - if (it1!=_TagEnrichedVertex.end() & it2 != _EnrichComp->end()) + if ((it1!=_TagEnrichedVertex.end()) && (it2 != _EnrichComp->end())) { return true; } diff --git a/Solver/groupOfElements.h b/Solver/groupOfElements.h index 8255fa8418e458f85180cb3708d4d614284d4517..8af0d6e0e9811e4c8a512bd629ed74c05d47f8eb 100644 --- a/Solver/groupOfElements.h +++ b/Solver/groupOfElements.h @@ -103,7 +103,6 @@ class groupOfLagMultElements : public groupOfElements groupOfElements::elementContainer::iterator itp = pElem.begin(); for (;itp!=pElem.end(); itp++) { - MElement *ep; if ((*itp)->getParent()) { if (sElem.find(*itp)) insert((*itp)) ; // warning : find method used to check if parent is in sElem @@ -123,7 +122,7 @@ class groupOfLagMultElements : public groupOfElements groupOfLagMultElements(int dim, int physical, std::vector < groupOfElements *> sElem) : groupOfElements() { groupOfElements pElem(dim , physical); - for (int i;i < sElem.size() ; i ++) + for (unsigned int i;i < sElem.size() ; i ++) { fillElementContainer(pElem,(*sElem[i])); }