[cgma-dev] r4461 - cgm/branches/merge-cubit12/geom

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2011-01-21 14:02:58 -0600 (Fri, 21 Jan 2011)
New Revision: 4461

Modified:
   cgm/branches/merge-cubit12/geom/CubitCompat.cpp
   cgm/branches/merge-cubit12/geom/GeometryQueryTool.hpp
Log:
minor corrections to previous checkin

Modified: cgm/branches/merge-cubit12/geom/CubitCompat.cpp
===================================================================
--- cgm/branches/merge-cubit12/geom/CubitCompat.cpp	2011-01-21 19:47:04 UTC (rev 4460)
+++ cgm/branches/merge-cubit12/geom/CubitCompat.cpp	2011-01-21 20:02:58 UTC (rev 4461)
@@ -3,7 +3,7 @@
 #include "GeometryQueryTool.hpp"
 #include <string.h>
 
-#if defined(CUBIT_12) && CUBIT_12 == 2
+#if CUBIT_12 == 2
 
   #define CUBIT_COMPAT_FT_ELIF(TYPE) \
     else if (!strcmp(file_type,#TYPE)) \
@@ -57,7 +57,7 @@
                                 CubitBoolean free_surfaces,
 				DLIList<RefEntity*> *imported_entities)
 {
-#if defined(CUBIT_12) && CUBIT_12 > 0
+#if CUBIT_12 > 0
   const bool print_results = false;
   const bool merge_globally = false;
   const bool no_assembly_level_features = false;

Modified: cgm/branches/merge-cubit12/geom/GeometryQueryTool.hpp
===================================================================
--- cgm/branches/merge-cubit12/geom/GeometryQueryTool.hpp	2011-01-21 19:47:04 UTC (rev 4460)
+++ cgm/branches/merge-cubit12/geom/GeometryQueryTool.hpp	2011-01-21 20:02:58 UTC (rev 4461)
@@ -28,7 +28,7 @@
 #include "GeometryQueryEngine.hpp"
 #include "IntermediateGeomEngine.hpp"
 #include "CGMHistory.hpp"
-#include "CubitCompat.hpp"
+#include "CubitCompat.h"
 
 class RefGroup;
 class Body;
@@ -366,7 +366,7 @@
   //! that are of the same geometry engine. 
   CubitStatus export_solid_model( DLIList<RefEntity*>& ref_entity_list,
                                   const char* filename,
-#if !defined CUBIT_12 || CUBIT_12 != 2
+#if CUBIT_12 != 2
                                   const char * filetype,
 #else // CUBIT_12 == 2
                                   Model_File_Type filetype,
@@ -410,12 +410,12 @@
     */
   //! \brief Import a geometry file. 
   CubitStatus import_solid_model(const char* file_name,
-#if !defined(CUBIT_12) || CUBIT_12 != 2
+#if CUBIT_12 != 2