[cgma-dev] r5755 - cgm/trunk/geom

[janehu at mcs.anl.gov]

Author: janehu
Date: 2012-09-26 10:38:58 -0500 (Wed, 26 Sep 2012)
New Revision: 5755

Modified:
   cgm/trunk/geom/CADefines.hpp
   cgm/trunk/geom/CubitGeomConfigure.h
Log:
Chaman didn't change in cgm directory for the new FTGL build of OCC, confirmed with him, and change it back.

Modified: cgm/trunk/geom/CADefines.hpp
===================================================================
--- cgm/trunk/geom/CADefines.hpp	2012-09-26 15:25:19 UTC (rev 5754)
+++ cgm/trunk/geom/CADefines.hpp	2012-09-26 15:38:58 UTC (rev 5755)
@@ -51,7 +51,8 @@
                       // attribute type (eg. for the last index in a loop)
     CA_ASSEMBLY_DATA,
     CA_SIZING_FUNCTION_SKELETON,
-    CA_SOURCE_FEATURE
+    CA_SOURCE_FEATURE,
+    CA_ITAPS_TAG
 #ifdef CAT
 	,CA_PRO_WELD
 #endif

Modified: cgm/trunk/geom/CubitGeomConfigure.h
===================================================================
--- cgm/trunk/geom/CubitGeomConfigure.h	2012-09-26 15:25:19 UTC (rev 5754)
+++ cgm/trunk/geom/CubitGeomConfigure.h	2012-09-26 15:38:58 UTC (rev 5755)
@@ -1,26 +1 @@
-
-#ifndef CUBIT_GEOM_CONFIGURE_H
-#define CUBIT_GEOM_CONFIGURE_H
-
-/* #undef CUBIT_GEOM_BUILD_SHARED_LIBS */
-
-#if defined(CUBIT_GEOM_BUILD_SHARED_LIBS)
-#if defined(cubit_geom_EXPORTS)
-# if defined(WIN32)
-#  define CUBIT_GEOM_EXPORT __declspec(dllexport)
-# elif defined(__GNUC__) && __GNUC__ >= 4
-#  define CUBIT_GEOM_EXPORT __attribute__ ((visibility("default")))
-# endif
-#else
-# if defined(WIN32)
-#  define CUBIT_GEOM_EXPORT __declspec(dllimport)
-# endif
-#endif
-#endif
-
-#ifndef CUBIT_GEOM_EXPORT
 #define CUBIT_GEOM_EXPORT
-#endif
-
-#endif
-