[cgma-dev] r2246 - in cgm/trunk: init itaps

[kraftche at mcs.anl.gov]

Author: kraftche
Date: 2008-11-14 12:12:43 -0600 (Fri, 14 Nov 2008)
New Revision: 2246

Modified:
   cgm/trunk/init/InitCGMA.cpp
   cgm/trunk/itaps/Makefile.am
Log:
fix issues building with Cubit

Modified: cgm/trunk/init/InitCGMA.cpp
===================================================================
--- cgm/trunk/init/InitCGMA.cpp	2008-11-14 03:24:24 UTC (rev 2245)
+++ cgm/trunk/init/InitCGMA.cpp	2008-11-14 18:12:43 UTC (rev 2246)
@@ -62,7 +62,8 @@
       AcisQueryEngine::instance_ = new (reinterpret_cast<AcisQueryEngine*>(new dummym)) AcisQueryEngine;
     if (!AcisModifyEngine::instance_)
       AcisModifyEngine::instance_ = new (reinterpret_cast<AcisModifyEngine*>(new dummym)) AcisModifyEngine;
-    acis_engine_ptr = AcisModfyEngine::instance();
+    acis_engine_ptr = reinterpret_cast<GeometryModifyEngine*>
+                         (AcisModifyEngine::instance_);
   #else
     AcisQueryEngine::instance();
     AcisModifyEngine::instance();

Modified: cgm/trunk/itaps/Makefile.am
===================================================================
--- cgm/trunk/itaps/Makefile.am	2008-11-14 03:24:24 UTC (rev 2245)
+++ cgm/trunk/itaps/Makefile.am	2008-11-14 18:12:43 UTC (rev 2246)
@@ -56,7 +56,7 @@
 testgeom_SOURCES = testgeom.cc
 testgeom_LDADD = libiGeom.la
 testgeom_CPPFLAGS = $(CPPFLAGS) -DSRCDIR=$(srcdir)
-testgeom_LDFLAGS = $(CGM_EXT_LTFLAGS)
+testgeom_LDFLAGS = $(CGM_EXT_LTFLAGS) $(CGM_EXT_LDFLAGS)
 testgeom_occ_SOURCES = $(testgeom_SOURCES)
 testgeom_occ_LDADD = $(testgeom_LDADD)
 testgeom_occ_CPPFLAGS = $(testgeom_CPPFLAGS) -DFORCE_OCC