[cgma-dev] r2225 - cgm/trunk/geom/OCC
janehu at mcs.anl.gov
janehu at mcs.anl.gov
Wed Nov 12 11:22:24 CST 2008
Author: janehu
Date: 2008-11-12 11:22:23 -0600 (Wed, 12 Nov 2008)
New Revision: 2225
Modified:
cgm/trunk/geom/OCC/OCCBody.cpp
cgm/trunk/geom/OCC/OCCCoEdge.cpp
cgm/trunk/geom/OCC/OCCCoEdge.hpp
cgm/trunk/geom/OCC/OCCCoFace.cpp
cgm/trunk/geom/OCC/OCCCoFace.hpp
cgm/trunk/geom/OCC/OCCCurve.cpp
cgm/trunk/geom/OCC/OCCLoop.cpp
cgm/trunk/geom/OCC/OCCLump.cpp
cgm/trunk/geom/OCC/OCCModifyEngine.cpp
Log:
removed warnings for several files.
Modified: cgm/trunk/geom/OCC/OCCBody.cpp
===================================================================
--- cgm/trunk/geom/OCC/OCCBody.cpp 2008-11-11 21:16:07 UTC (rev 2224)
+++ cgm/trunk/geom/OCC/OCCBody.cpp 2008-11-12 17:22:23 UTC (rev 2225)
@@ -436,7 +436,7 @@
for(int i = 0; i < points.size(); i++)
points.get_and_step()->set_myMarked(CUBIT_FALSE);
-
+ return CUBIT_SUCCESS;
}
//----------------------------------------------------------------
@@ -477,7 +477,7 @@
//update all attributes first.
TopTools_ListIteratorOfListOfShape it;
it.Initialize(shapes);
- for(it; it.More(); it.Next())
+ for(; it.More(); it.Next())
{
shape = it.Value();
OCCQueryEngine::instance()->copy_attributes(old_shape, shape);
@@ -504,6 +504,7 @@
}
if(!old_shape.IsSame(new_shape))
OCCQueryEngine::instance()->update_OCC_map(old_shape, new_shape);
+ return CUBIT_SUCCESS;
}
//----------------------------------------------------------------
// Function: update_bounding_box
Modified: cgm/trunk/geom/OCC/OCCCoEdge.cpp
===================================================================
--- cgm/trunk/geom/OCC/OCCCoEdge.cpp 2008-11-11 21:16:07 UTC (rev 2224)
+++ cgm/trunk/geom/OCC/OCCCoEdge.cpp 2008-11-12 17:22:23 UTC (rev 2225)
@@ -61,6 +61,7 @@
GeometryQueryEngine*
OCCCoEdge::get_geometry_query_engine() const
{
+ return OCCQueryEngine::instance();
}
void OCCCoEdge::append_simple_attribute_virt(CubitSimpleAttrib* csattrib_ptr)
@@ -78,10 +79,11 @@
CubitStatus OCCCoEdge::get_simple_attribute(DLIList<CubitSimpleAttrib*>&
cubit_simple_attrib_list)
{
+ return CUBIT_FAILURE;
}
CubitStatus OCCCoEdge::get_simple_attribute(const CubitString& name,
DLIList<CubitSimpleAttrib*>& list)
- { }
+ {return CUBIT_FAILURE; }
void OCCCoEdge::get_parents_virt( DLIList<TopologyBridge*>& parents )
{
Modified: cgm/trunk/geom/OCC/OCCCoEdge.hpp
===================================================================
--- cgm/trunk/geom/OCC/OCCCoEdge.hpp 2008-11-11 21:16:07 UTC (rev 2224)
+++ cgm/trunk/geom/OCC/OCCCoEdge.hpp 2008-11-12 17:22:23 UTC (rev 2225)
@@ -120,10 +120,10 @@
protected:
private:
+ int myMark;
+ Curve *myCurve;
LoopSM *myLoop;
- Curve *myCurve;
CubitSense edgeSense;
- int myMark;
};
Modified: cgm/trunk/geom/OCC/OCCCoFace.cpp
===================================================================
--- cgm/trunk/geom/OCC/OCCCoFace.cpp 2008-11-11 21:16:07 UTC (rev 2224)
+++ cgm/trunk/geom/OCC/OCCCoFace.cpp 2008-11-12 17:22:23 UTC (rev 2225)
@@ -60,6 +60,7 @@
GeometryQueryEngine*
OCCCoFace::get_geometry_query_engine() const
{
+ return OCCQueryEngine::instance();
}
Modified: cgm/trunk/geom/OCC/OCCCoFace.hpp
===================================================================
--- cgm/trunk/geom/OCC/OCCCoFace.hpp 2008-11-11 21:16:07 UTC (rev 2224)
+++ cgm/trunk/geom/OCC/OCCCoFace.hpp 2008-11-12 17:22:23 UTC (rev 2225)
@@ -77,8 +77,8 @@
protected:
private:
+ OCCSurface *mySurface;
OCCShell *myShell;
- OCCSurface *mySurface;
CubitSense faceSense;
};
Modified: cgm/trunk/geom/OCC/OCCCurve.cpp
===================================================================
--- cgm/trunk/geom/OCC/OCCCurve.cpp 2008-11-11 21:16:07 UTC (rev 2224)
+++ cgm/trunk/geom/OCC/OCCCurve.cpp 2008-11-12 17:22:23 UTC (rev 2225)
@@ -644,7 +644,7 @@
direction.set(dir.X(), dir.Y(), dir.Z());
else if(myTopoDSEdge->Orientation() == TopAbs_REVERSED)
direction.set(-dir.X(), -dir.Y(), -dir.Z());
-
+ return CUBIT_SUCCESS;
}
//-------------------------------------------------------------------------
@@ -792,7 +792,7 @@
if (gCurve->Continuity() < GeomAbs_G1)
return is_discon;
- assert(first <= param <= last );
+ assert(first <= param && param <= last );
gp_Pnt P;
gp_Vec V1;
@@ -933,7 +933,7 @@
//update all attributes first.
TopTools_ListIteratorOfListOfShape it;
it.Initialize(shapes);
- for(it; it.More(); it.Next())
+ for(; it.More(); it.Next())
{
shape = it.Value();
OCCQueryEngine::instance()->copy_attributes(*get_TopoDS_Edge(), shape);
@@ -1148,6 +1148,7 @@
return OCCQueryEngine::instance()->populate_topology_bridge(new_edge);
}
}
+ return (Curve*) NULL;
}
// ********** END PRIVATE FUNCTIONS **********
Modified: cgm/trunk/geom/OCC/OCCLoop.cpp
===================================================================
--- cgm/trunk/geom/OCC/OCCLoop.cpp 2008-11-11 21:16:07 UTC (rev 2224)
+++ cgm/trunk/geom/OCC/OCCLoop.cpp 2008-11-12 17:22:23 UTC (rev 2225)
@@ -146,6 +146,7 @@
CubitStatus OCCLoop::get_simple_attribute(DLIList<CubitSimpleAttrib*>&
/*cubit_simple_attrib_list*/)
{
+ return CUBIT_FAILURE;
}
CubitStatus OCCLoop::get_simple_attribute(const CubitString&,
DLIList<CubitSimpleAttrib*>&)
@@ -255,5 +256,6 @@
loop = TopoDS::Wire(shape);
OCCQueryEngine::instance()->update_OCC_map(*myTopoDSWire, loop);
}
+ return CUBIT_SUCCESS;
}
Modified: cgm/trunk/geom/OCC/OCCLump.cpp
===================================================================
--- cgm/trunk/geom/OCC/OCCLump.cpp 2008-11-11 21:16:07 UTC (rev 2224)
+++ cgm/trunk/geom/OCC/OCCLump.cpp 2008-11-12 17:22:23 UTC (rev 2225)
@@ -368,7 +368,7 @@
//update all attributes first.
TopTools_ListIteratorOfListOfShape it;
it.Initialize(shapes);
- for(it; it.More(); it.Next())
+ for(; it.More(); it.Next())
{
shape = it.Value();
OCCQueryEngine::instance()->copy_attributes(*get_TopoDS_Solid(),
@@ -397,7 +397,7 @@
shell->update_OCC_entity(aBRepTrsf, op);
}
OCCQueryEngine::instance()->update_OCC_map(*myTopoDSSolid, solid);
-
+ return CUBIT_SUCCESS;
}
//----------------------------------------------------------------
@@ -453,7 +453,7 @@
//update all attributes first.
TopTools_ListIteratorOfListOfShape it;
it.Initialize(shapes);
- for(it; it.More(); it.Next())
+ for(; it.More(); it.Next())
{
shape = it.Value();
OCCQueryEngine::instance()->copy_attributes(shell, shape);
@@ -480,4 +480,5 @@
}
if(!old_solid.IsSame(new_shape))
OCCQueryEngine::instance()->update_OCC_map(old_solid, new_solid);
+ return CUBIT_SUCCESS;
}
Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp
===================================================================
--- cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2008-11-11 21:16:07 UTC (rev 2224)
+++ cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2008-11-12 17:22:23 UTC (rev 2225)
@@ -4357,7 +4357,7 @@
BRepTools_WireExplorer it(wire);
int num_edges = 0;
- for(it; it.More(); it.Next())
+ for(; it.More(); it.Next())
num_edges++;
BRepLib_FuseEdges fuser(wire);
More information about the cgma-dev
mailing list