Skip to content
Snippets Groups Projects
Commit 7fb93bfa authored by Laurent Van Migroet's avatar Laurent Van Migroet
Browse files

waring remove msvc

parent 1e995b79
No related branches found
No related tags found
No related merge requests found
...@@ -558,9 +558,9 @@ std::vector<GFace *> OCCFactory::addRuledFaces (GModel *gm, std::vector< std::ve ...@@ -558,9 +558,9 @@ std::vector<GFace *> OCCFactory::addRuledFaces (GModel *gm, std::vector< std::ve
Standard_Boolean anIsRuled = Standard_True; Standard_Boolean anIsRuled = Standard_True;
BRepOffsetAPI_ThruSections aGenerator (anIsSolid,anIsRuled); 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; 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]; GEdge *ge = wires[i][j];
printf("edge %d\n",ge->tag()); printf("edge %d\n",ge->tag());
OCCEdge *occe = dynamic_cast<OCCEdge*>(ge); OCCEdge *occe = dynamic_cast<OCCEdge*>(ge);
...@@ -590,14 +590,14 @@ GFace * OCCFactory::addFace (GModel *gm, std::vector<GEdge *> edges, std::vector ...@@ -590,14 +590,14 @@ GFace * OCCFactory::addFace (GModel *gm, std::vector<GEdge *> edges, std::vector
BRepOffsetAPI_MakeFilling aGenerator; BRepOffsetAPI_MakeFilling aGenerator;
for (int i=0;i<edges.size();i++) { for (unsigned i=0;i<edges.size();i++) {
GEdge *ge = edges[i]; GEdge *ge = edges[i];
OCCEdge *occe = dynamic_cast<OCCEdge*>(ge); OCCEdge *occe = dynamic_cast<OCCEdge*>(ge);
if (occe){ if (occe){
aGenerator.Add(occe->getTopoDS_Edge(),GeomAbs_C0); 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]); gp_Pnt aPnt (points[i][0],points[i][1],points[i][2]);
aGenerator.Add(aPnt); aGenerator.Add(aPnt);
} }
...@@ -613,8 +613,8 @@ extern void computeMeanPlane(const std::vector<SPoint3> &points, mean_plane &mea ...@@ -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){ GFace * OCCFactory::addPlanarFace (GModel *gm, std::vector< std::vector<GEdge *> > wires){
std::set<GVertex*> verts; std::set<GVertex*> verts;
for (int i=0;i<wires.size();i++) { for (unsigned i=0;i<wires.size();i++) {
for (int j=0;j<wires[i].size();j++) { for (unsigned j=0;j<wires[i].size();j++) {
GEdge *ge = wires[i][j]; GEdge *ge = wires[i][j];
verts.insert(ge->getBeginVertex()); verts.insert(ge->getBeginVertex());
verts.insert(ge->getEndVertex()); verts.insert(ge->getEndVertex());
...@@ -631,9 +631,9 @@ GFace * OCCFactory::addPlanarFace (GModel *gm, std::vector< std::vector<GEdge *> ...@@ -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); gp_Pln aPlane (meanPlane.a,meanPlane.b,meanPlane.c,meanPlane.d);
BRepBuilderAPI_MakeFace aGenerator (aPlane); BRepBuilderAPI_MakeFace aGenerator (aPlane);
for (int i=0;i<wires.size();i++) { for (unsigned i=0;i<wires.size();i++) {
BRepBuilderAPI_MakeWire wire_maker; 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]; GEdge *ge = wires[i][j];
OCCEdge *occe = dynamic_cast<OCCEdge*>(ge); OCCEdge *occe = dynamic_cast<OCCEdge*>(ge);
if (occe){ if (occe){
...@@ -654,7 +654,7 @@ GFace * OCCFactory::addPlanarFace (GModel *gm, std::vector< std::vector<GEdge *> ...@@ -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){ GEntity * OCCFactory::addPipe (GModel *gm, GEntity *base, std::vector<GEdge *> wire){
BRepBuilderAPI_MakeWire wire_maker; BRepBuilderAPI_MakeWire wire_maker;
for (int j=0;j<wire.size();j++) { for (unsigned j=0;j<wire.size();j++) {
GEdge *ge = wire[j]; GEdge *ge = wire[j];
OCCEdge *occe = dynamic_cast<OCCEdge*>(ge); OCCEdge *occe = dynamic_cast<OCCEdge*>(ge);
if (occe){ if (occe){
......
...@@ -20,7 +20,7 @@ void function::addFunctionReplace(functionReplace &fr) { ...@@ -20,7 +20,7 @@ void function::addFunctionReplace(functionReplace &fr) {
} }
dataCacheDouble::~dataCacheDouble() dataCacheDouble::~dataCacheDouble()
{ {
for(int i = 0; i< functionReplaceCaches.size(); i++) { for(unsigned i = 0; i< functionReplaceCaches.size(); i++) {
delete functionReplaceCaches[i]; delete functionReplaceCaches[i];
} }
}; };
...@@ -50,11 +50,11 @@ dataCacheDouble::dataCacheDouble(dataCacheMap *m, function *f): ...@@ -50,11 +50,11 @@ dataCacheDouble::dataCacheDouble(dataCacheMap *m, function *f):
_nRowByPoint=1; _nRowByPoint=1;
m->addDataCacheDouble(this, f->isInvalitedOnElement()); m->addDataCacheDouble(this, f->isInvalitedOnElement());
_function = f; _function = f;
for(int i=0; i<f->_childrenCache.size(); i++) { for(unsigned i=0; i<f->_childrenCache.size(); i++) {
m->addSecondaryCache(m->newChild()); m->addSecondaryCache(m->newChild());
} }
_substitutions.resize(f->_substitutedFunctions.size()); _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]; function::substitutedFunction s = f->_substitutedFunctions[i];
_substitutions[i].first = &m->getSecondaryCache(s.iMap)->substitute(s.f0); _substitutions[i].first = &m->getSecondaryCache(s.iMap)->substitute(s.f0);
_substitutions[i].second = &m->get(s.f1,this); _substitutions[i].second = &m->get(s.f1,this);
...@@ -65,7 +65,7 @@ dataCacheDouble::dataCacheDouble(dataCacheMap *m, function *f): ...@@ -65,7 +65,7 @@ dataCacheDouble::dataCacheDouble(dataCacheMap *m, function *f):
const function *f = _function->arguments[i].f; const function *f = _function->arguments[i].f;
_dependencies[i] = &m->getSecondaryCache(iCache)->get(f,this); _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)); functionReplaceCaches.push_back (new functionReplaceCache(m, f->_functionReplaces[i], this));
} }
f->registerInDataCacheMap(m, this); f->registerInDataCacheMap(m, this);
...@@ -78,9 +78,9 @@ void dataCacheDouble::_eval() { ...@@ -78,9 +78,9 @@ void dataCacheDouble::_eval() {
for(unsigned int i=0;i<_dependencies.size(); i++){ for(unsigned int i=0;i<_dependencies.size(); i++){
_function->arguments[i].val->setAsProxy((*_dependencies[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]; _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); _function->_functionReplaces[i]->_toReplace[j].val->setAsProxy((*functionReplaceCaches[i]->toReplace[j])._value);
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment