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

[iulian at mcs.anl.gov]

Author: iulian
Date: 2013-02-14 11:04:34 -0600 (Thu, 14 Feb 2013)
New Revision: 6002

Modified:
   MOAB/trunk/src/io/ReadCGM.cpp
Log:
remove reference to CUBIT_12, it is not needed anymore, because we are not going to support
cubit 10 anymore, and cubit 13 has the same signature for the import_solid_model and
export_... methods (as cubit 12)


Modified: MOAB/trunk/src/io/ReadCGM.cpp
===================================================================
--- MOAB/trunk/src/io/ReadCGM.cpp	2013-02-13 17:19:42 UTC (rev 6001)
+++ MOAB/trunk/src/io/ReadCGM.cpp	2013-02-14 17:04:34 UTC (rev 6002)
@@ -41,9 +41,7 @@
 
 #include "moab/GeomTopoTool.hpp"
 
-#ifdef CUBIT_12
 # include "CubitCompat.hpp"
-#endif
 
 #include <stdio.h>
 #include <algorithm>
@@ -193,11 +191,7 @@
   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;