[MOAB-dev] r4462 - MOAB/trunk/src/io

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2011-01-21 14:13:06 -0600 (Fri, 21 Jan 2011)
New Revision: 4462

Modified:
   MOAB/trunk/src/io/ReadCGM.cpp
Log:
Make MOAB build against merge-cubit12 branch of CGM

Modified: MOAB/trunk/src/io/ReadCGM.cpp
===================================================================
--- MOAB/trunk/src/io/ReadCGM.cpp	2011-01-21 20:02:58 UTC (rev 4461)
+++ MOAB/trunk/src/io/ReadCGM.cpp	2011-01-21 20:13:06 UTC (rev 4462)
@@ -41,6 +41,10 @@
 
 #include "moab/GeomTopoTool.hpp"
 
+#ifdef CUBIT_12
+# include "CubitCompat.hpp"
+#endif
+
 #include <stdio.h>
 #include <algorithm>
 #include <assert.h>
@@ -186,7 +190,11 @@
   if (!file_type || !strcmp(file_type ,"CUBIT")) 
     return MB_FAILURE;
 
+#ifndef CUBIT_12
   s = GeometryQueryTool::instance()->import_solid_model( cgm_file_name, file_type );
+#else
+  s = CubitCompat_import_solid_model( cgm_file_name, file_type );
+#endif
   if (CUBIT_SUCCESS != s) {
     readUtilIface->report_error( "%s: Failed to read file of type \"%s\"", cgm_file_name, file_type );
     return MB_FAILURE;