Author: janehu Date: 2012-04-09 14:47:32 -0500 (Mon, 09 Apr 2012) New Revision: 5470 Removed: cgm/branches/merge-cubit13.1/geom/temp Modified: cgm/branches/merge-cubit13.1/geom/testing/Makefile.am Log: Removed unnecessary file. Deleted: cgm/branches/merge-cubit13.1/geom/temp =================================================================== --- cgm/branches/merge-cubit13.1/geom/temp 2012-04-09 19:43:09 UTC (rev 5469) +++ cgm/branches/merge-cubit13.1/geom/temp 2012-04-09 19:47:32 UTC (rev 5470) @@ -1,12928 +0,0 @@ -Index: virtual/VirtualQueryEngine.hpp -=================================================================== ---- virtual/VirtualQueryEngine.hpp (revision 5396) -+++ virtual/VirtualQueryEngine.hpp (working copy) -@@ -450,7 +450,7 @@ - if( instance_ == NULL ) - { - instance_ = new VirtualQueryEngine; -- assert( instance != NULL ); -+ assert( instance_ != NULL ); - } - - return instance_; -Index: virtual/Makefile.am -=================================================================== ---- virtual/Makefile.am (revision 5396) -+++ virtual/Makefile.am (working copy) -@@ -3,7 +3,7 @@ - - # Override default defines with the ones we want from the configure script - DEFS = $(TEMPLATE_DEFS_INCLUDED) $(LITTLE_ENDIAN) --INCLUDES = -I$(top_srcdir)/util \ -+AM_CPPFLAGS = -I$(top_srcdir)/util \ - -I$(top_srcdir)/geom \ - -I$(top_srcdir)/geom/facet \ - -I$(top_srcdir)/geom/Cholla -Index: GeometryModifyTool.hpp -=================================================================== ---- GeometryModifyTool.hpp (revision 5396) -+++ GeometryModifyTool.hpp (working copy) -@@ -273,6 +273,11 @@ - bool keep_old = false, - bool nonreg = false ); - -+ CubitStatus hollow( DLIList<Body*>& bodies, -+ DLIList<RefFace*> faces_to_remove, -+ DLIList<Body*>& new_bodies, -+ double depth); -+ - //! \brief Thickens a sheet body (surface) into a solid body. Can do both directions. - CubitStatus thicken( DLIList<Body*>& bodies, - DLIList<Body*>& new_bodies, -Index: ACIS_SRC/AcisModifyEngine.cpp -=================================================================== ---- ACIS_SRC/AcisModifyEngine.cpp (revision 5396) -+++ ACIS_SRC/AcisModifyEngine.cpp (working copy)