From 7fb93bfa55db8de183af01cec4e715462e5123ad Mon Sep 17 00:00:00 2001
From: Laurent Van Migroet <l.vanmiegroet@ulg.ac.be>
Date: Thu, 13 May 2010 21:00:32 +0000
Subject: [PATCH] waring remove msvc
---
Geo/GModelFactory.cpp | 18 +++++++++---------
Solver/function.cpp | 12 ++++++------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/Geo/GModelFactory.cpp b/Geo/GModelFactory.cpp
index 7d9ac12cf2..e8ef2668f7 100644
--- a/Geo/GModelFactory.cpp
+++ b/Geo/GModelFactory.cpp
@@ -558,9 +558,9 @@ std::vector<GFace *> OCCFactory::addRuledFaces (GModel *gm, std::vector< std::ve
Standard_Boolean anIsRuled = Standard_True;
BRepOffsetAPI_ThruSections aGenerator (anIsSolid,anIsRuled);
- for (int i=0;i<wires.size();i++) {
+ for (unsigned i=0;i<wires.size();i++) {
BRepBuilderAPI_MakeWire wire_maker;
- for (int j=0;j<wires[i].size();j++) {
+ for (unsigned j=0;j<wires[i].size();j++) {
GEdge *ge = wires[i][j];
printf("edge %d\n",ge->tag());
OCCEdge *occe = dynamic_cast<OCCEdge*>(ge);
@@ -590,14 +590,14 @@ GFace * OCCFactory::addFace (GModel *gm, std::vector<GEdge *> edges, std::vector
BRepOffsetAPI_MakeFilling aGenerator;
- for (int i=0;i<edges.size();i++) {
+ for (unsigned i=0;i<edges.size();i++) {
GEdge *ge = edges[i];
OCCEdge *occe = dynamic_cast<OCCEdge*>(ge);
if (occe){
aGenerator.Add(occe->getTopoDS_Edge(),GeomAbs_C0);
}
}
- for (int i=0;i<points.size();i++) {
+ for (unsigned i=0;i<points.size();i++) {
gp_Pnt aPnt (points[i][0],points[i][1],points[i][2]);
aGenerator.Add(aPnt);
}
@@ -613,8 +613,8 @@ extern void computeMeanPlane(const std::vector<SPoint3> &points, mean_plane &mea
GFace * OCCFactory::addPlanarFace (GModel *gm, std::vector< std::vector<GEdge *> > wires){
std::set<GVertex*> verts;
- for (int i=0;i<wires.size();i++) {
- for (int j=0;j<wires[i].size();j++) {
+ for (unsigned i=0;i<wires.size();i++) {
+ for (unsigned j=0;j<wires[i].size();j++) {
GEdge *ge = wires[i][j];
verts.insert(ge->getBeginVertex());
verts.insert(ge->getEndVertex());
@@ -631,9 +631,9 @@ GFace * OCCFactory::addPlanarFace (GModel *gm, std::vector< std::vector<GEdge *>
gp_Pln aPlane (meanPlane.a,meanPlane.b,meanPlane.c,meanPlane.d);
BRepBuilderAPI_MakeFace aGenerator (aPlane);
- for (int i=0;i<wires.size();i++) {
+ for (unsigned i=0;i<wires.size();i++) {
BRepBuilderAPI_MakeWire wire_maker;
- for (int j=0;j<wires[i].size();j++) {
+ for (unsigned j=0;j<wires[i].size();j++) {
GEdge *ge = wires[i][j];
OCCEdge *occe = dynamic_cast<OCCEdge*>(ge);
if (occe){
@@ -654,7 +654,7 @@ GFace * OCCFactory::addPlanarFace (GModel *gm, std::vector< std::vector<GEdge *>
GEntity * OCCFactory::addPipe (GModel *gm, GEntity *base, std::vector<GEdge *> wire){
BRepBuilderAPI_MakeWire wire_maker;
- for (int j=0;j<wire.size();j++) {
+ for (unsigned j=0;j<wire.size();j++) {
GEdge *ge = wire[j];
OCCEdge *occe = dynamic_cast<OCCEdge*>(ge);
if (occe){
diff --git a/Solver/function.cpp b/Solver/function.cpp
index 74477dfca3..7f99316263 100644
--- a/Solver/function.cpp
+++ b/Solver/function.cpp
@@ -20,7 +20,7 @@ void function::addFunctionReplace(functionReplace &fr) {
}
dataCacheDouble::~dataCacheDouble()
{
- for(int i = 0; i< functionReplaceCaches.size(); i++) {
+ for(unsigned i = 0; i< functionReplaceCaches.size(); i++) {
delete functionReplaceCaches[i];
}
};
@@ -50,11 +50,11 @@ dataCacheDouble::dataCacheDouble(dataCacheMap *m, function *f):
_nRowByPoint=1;
m->addDataCacheDouble(this, f->isInvalitedOnElement());
_function = f;
- for(int i=0; i<f->_childrenCache.size(); i++) {
+ for(unsigned i=0; i<f->_childrenCache.size(); i++) {
m->addSecondaryCache(m->newChild());
}
_substitutions.resize(f->_substitutedFunctions.size());
- for(int i=0; i<f->_substitutedFunctions.size(); i++) {
+ for(unsigned i=0; i<f->_substitutedFunctions.size(); i++) {
function::substitutedFunction s = f->_substitutedFunctions[i];
_substitutions[i].first = &m->getSecondaryCache(s.iMap)->substitute(s.f0);
_substitutions[i].second = &m->get(s.f1,this);
@@ -65,7 +65,7 @@ dataCacheDouble::dataCacheDouble(dataCacheMap *m, function *f):
const function *f = _function->arguments[i].f;
_dependencies[i] = &m->getSecondaryCache(iCache)->get(f,this);
}
- for (int i = 0; i < f->_functionReplaces.size(); i++) {
+ for (unsigned i = 0; i < f->_functionReplaces.size(); i++) {
functionReplaceCaches.push_back (new functionReplaceCache(m, f->_functionReplaces[i], this));
}
f->registerInDataCacheMap(m, this);
@@ -78,9 +78,9 @@ void dataCacheDouble::_eval() {
for(unsigned int i=0;i<_dependencies.size(); i++){
_function->arguments[i].val->setAsProxy((*_dependencies[i])());
}
- for (int i = 0; i < _function->_functionReplaces.size(); i++) {
+ for (unsigned i = 0; i < _function->_functionReplaces.size(); i++) {
_function->_functionReplaces[i]->currentCache = functionReplaceCaches[i];
- for (int j = 0; j < functionReplaceCaches[i]->toReplace.size() ; j++){
+ for (unsigned j = 0; j < functionReplaceCaches[i]->toReplace.size() ; j++){
_function->_functionReplaces[i]->_toReplace[j].val->setAsProxy((*functionReplaceCaches[i]->toReplace[j])._value);
}
}
--
GitLab