[cgma-dev] r3160 - cgm/trunk/itaps

[sjackson at cae.wisc.edu]

Author: sjackson
Date: 2009-09-22 14:24:46 -0500 (Tue, 22 Sep 2009)
New Revision: 3160

Modified:
   cgm/trunk/itaps/testgeom.cc
Log:
Fix spurious use of undefined macro USE_OCC.

Modified: cgm/trunk/itaps/testgeom.cc
===================================================================
--- cgm/trunk/itaps/testgeom.cc	2009-09-22 17:01:48 UTC (rev 3159)
+++ cgm/trunk/itaps/testgeom.cc	2009-09-22 19:24:46 UTC (rev 3160)
@@ -140,7 +140,7 @@
   #elif defined(HAVE_ACIS)
     std::string filename = STRINGIFY(SRCDIR) "/testgeom.sat";
     std::string engine_opt = ";engine=ACIS";
-  #elif defined(USE_OCC)
+  #elif defined(HAVE_OCC)
     std::string filename = STRINGIFY(SRCDIR) "/../test/LeverArm.brep";
     std::string engine_opt = ";engine=OCC";
   #else
@@ -1391,9 +1391,11 @@
 {
   int err;
 
-#ifdef HAVE_ACIS
+#ifdef FORCE_OCC
+  std::string filename = STRINGIFY(SRCDIR) "/testout.brep";
+#elif defined (HAVE_ACIS)
   std::string filename = STRINGIFY(SRCDIR) "/testout.sat";
-#elif defined(USE_OCC)
+#elif defined (HAVE_OCC)
   std::string filename = STRINGIFY(SRCDIR) "/testout.brep";
 #else
   std::string filename = STRINGIFY(SRCDIR) "/testout.sat";