[cgma-dev] r4681 - cgm/branches/merge-cubit12/geom/OCC

[jiangtao_ma at yahoo.com]

Author: janehu
Date: 2011-03-29 13:42:13 -0500 (Tue, 29 Mar 2011)
New Revision: 4681

Added:
   cgm/branches/merge-cubit12/geom/OCC/OCCHistory.lo
   cgm/branches/merge-cubit12/geom/OCC/OCCHistory.o
Modified:
   cgm/branches/merge-cubit12/geom/OCC/OCCBody.cpp
   cgm/branches/merge-cubit12/geom/OCC/OCCCurve.cpp
   cgm/branches/merge-cubit12/geom/OCC/OCCLoop.cpp
   cgm/branches/merge-cubit12/geom/OCC/OCCLump.cpp
   cgm/branches/merge-cubit12/geom/OCC/OCCModifyEngine.cpp
   cgm/branches/merge-cubit12/geom/OCC/OCCModifyEngine.hpp
   cgm/branches/merge-cubit12/geom/OCC/OCCPoint.cpp
   cgm/branches/merge-cubit12/geom/OCC/OCCShell.cpp
   cgm/branches/merge-cubit12/geom/OCC/OCCSurface.cpp
Log:
Restore to previous version in fear of breaking other code. Will change test case for it.

Modified: cgm/branches/merge-cubit12/geom/OCC/OCCBody.cpp
===================================================================
--- cgm/branches/merge-cubit12/geom/OCC/OCCBody.cpp	2011-03-29 17:54:57 UTC (rev 4680)
+++ cgm/branches/merge-cubit12/geom/OCC/OCCBody.cpp	2011-03-29 18:42:13 UTC (rev 4681)
@@ -182,7 +182,10 @@
 OCCBody::~OCCBody() 
 {
   if (myTopoDSShape)
+  {
     delete (TopoDS_Compound*)myTopoDSShape;
+    myTopoDSShape = NULL;
+  }
 }
 
 GeometryQueryEngine* OCCBody::get_geometry_query_engine() const

Modified: cgm/branches/merge-cubit12/geom/OCC/OCCCurve.cpp
===================================================================
--- cgm/branches/merge-cubit12/geom/OCC/OCCCurve.cpp	2011-03-29 17:54:57 UTC (rev 4680)
+++ cgm/branches/merge-cubit12/geom/OCC/OCCCurve.cpp	2011-03-29 18:42:13 UTC (rev 4681)
@@ -114,7 +114,10 @@
 OCCCurve::~OCCCurve() 
 {
   if (myTopoDSEdge)
+  {
     delete (TopoDS_Edge *)myTopoDSEdge;
+    myTopoDSEdge = NULL;
+  }
 }
 
 void OCCCurve::set_TopoDS_Edge(TopoDS_Edge edge)

Added: cgm/branches/merge-cubit12/geom/OCC/OCCHistory.lo
===================================================================
--- cgm/branches/merge-cubit12/geom/OCC/OCCHistory.lo	                        (rev 0)
+++ cgm/branches/merge-cubit12/geom/OCC/OCCHistory.lo	2011-03-29 18:42:13 UTC (rev 4681)
@@ -0,0 +1,12 @@
+# OCCHistory.lo - a libtool object file
+# Generated by ltmain.sh (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.
+pic_object=none
+
+# Name of the non-PIC object
+non_pic_object='OCCHistory.o'
+

Added: cgm/branches/merge-cubit12/geom/OCC/OCCHistory.o