From e539f6d7479db152429c8fbd17254f947796c23e Mon Sep 17 00:00:00 2001
From: Boris Sedji <sedji.boris@hotmail.com>
Date: Thu, 17 Jun 2010 12:05:57 +0000
Subject: [PATCH]
---
Solver/filters.h | 4 ++--
Solver/groupOfElements.h | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/Solver/filters.h b/Solver/filters.h
index be341656e4..ea322ead15 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 8255fa8418..8af0d6e0e9 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]));
}
--
GitLab