yade-dev team mailing list archive
-
yade-dev team
-
Mailing list archive
-
Message #12498
[Branch ~yade-pkg/yade/git-trunk] Rev 3768: Fix compilation warnings.
------------------------------------------------------------
revno: 3768
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
timestamp: Sat 2016-01-02 23:07:33 +0100
message:
Fix compilation warnings.
modified:
pkg/common/PFacet.cpp
--
lp:yade
https://code.launchpad.net/~yade-pkg/yade/git-trunk
Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription
=== modified file 'pkg/common/PFacet.cpp'
--- pkg/common/PFacet.cpp 2015-12-15 12:57:49 +0000
+++ pkg/common/PFacet.cpp 2016-01-02 22:07:33 +0000
@@ -222,7 +222,7 @@
if(intr && intr->isReal()){
shared_ptr<ScGridCoGeom> intrGeom=YADE_PTR_CAST<ScGridCoGeom>(intr->geom);
- if(!intrGeom->isDuplicate==1){ //skip contact.
+ if(!(intrGeom->isDuplicate==1)){ //skip contact.
if (isNew) {SGr=false;}
else {scm->isDuplicate=1;}/*cout<<"Declare "<<c->id1<<"-"<<c->id2<<" as duplicated."<<endl;*/
}
@@ -263,7 +263,7 @@
const shared_ptr<Interaction> intr = scene->interactions->find(c->id1,GC->pfacetList[j]->getId());
if(intr && intr->isReal()){
shared_ptr<ScGridCoGeom> intrGeom=YADE_PTR_CAST<ScGridCoGeom>(intr->geom);
- if(!intrGeom->isDuplicate==1){
+ if(!(intrGeom->isDuplicate==1)){
if (isNew) SGr=false;
else scm->isDuplicate=1;/*cout<<"Declare "<<c->id1<<"-"<<c->id2<<" as duplicated."<<endl;*/
}
@@ -395,7 +395,7 @@
const shared_ptr<Interaction> intr = scene->interactions->find(c->id1,GridNodeList[i]->pfacetList[j]->getId());
if(intr && intr->isReal()){
shared_ptr<ScGridCoGeom> intrGeom=YADE_PTR_CAST<ScGridCoGeom>(intr->geom);
- if(!intrGeom->isDuplicate==1){ //skip contact.
+ if(!(intrGeom->isDuplicate==1)){ //skip contact.
if (isNew) {
return false;}
else {
@@ -645,4 +645,4 @@
}
}
-YADE_PLUGIN((Bo1_PFacet_Aabb));
\ No newline at end of file
+YADE_PLUGIN((Bo1_PFacet_Aabb));