[cgma-dev] r6107 - in cgm/trunk: geom geom/Cholla geom/facetbool geom/virtual util

[janehu at mcs.anl.gov]

Author: janehu
Date: 2013-12-02 13:05:48 -0600 (Mon, 02 Dec 2013)
New Revision: 6107

Modified:
   cgm/trunk/geom/Cholla/Makefile.am
   cgm/trunk/geom/RefEntityName.cpp
   cgm/trunk/geom/RefEntityName.hpp
   cgm/trunk/geom/facetbool/Makefile.am
   cgm/trunk/geom/virtual/Makefile.am
   cgm/trunk/util/CubitProcess.hpp
   cgm/trunk/util/Makefile.am
Log:
Added a header file for preprocessor; added CGM_EXT_LDFLAGS to several Makefiles to be able to recognize external libraries; minor change for RefEntityName to be consistante with cubit definitions. Passed occshared build.

Modified: cgm/trunk/geom/Cholla/Makefile.am
===================================================================
--- cgm/trunk/geom/Cholla/Makefile.am	2013-11-26 17:04:09 UTC (rev 6106)
+++ cgm/trunk/geom/Cholla/Makefile.am	2013-12-02 19:05:48 UTC (rev 6107)
@@ -111,3 +111,4 @@
     TDDelaunay.cpp 
 endif
 
+libCholla_la_LIBADD=${CGM_EXT_LDFLAGS}

Modified: cgm/trunk/geom/RefEntityName.cpp
===================================================================
--- cgm/trunk/geom/RefEntityName.cpp	2013-11-26 17:04:09 UTC (rev 6106)
+++ cgm/trunk/geom/RefEntityName.cpp	2013-12-02 19:05:48 UTC (rev 6107)
@@ -358,7 +358,7 @@
 
 int RefEntityName::get_refentity_name(const RefEntity *entity,
                                       DLIList<CubitString> &names,
-                                      CubitBoolean get_only_one)
+                                      int get_only_one)
 {
     // NOTE: There may be multiple names for one RefEntity. Make sure to 
     //       access all of them. 
@@ -374,7 +374,7 @@
 
 int RefEntityName::get_refentity_name(const RefEntity *entity,
                                       RefEntityNameMapList &names,
-                                      CubitBoolean get_only_one)
+                                      int get_only_one)
 {
     // NOTE: There may be multiple names for one RefEntity. Make sure to 
     //       access all of them. 

Modified: cgm/trunk/geom/RefEntityName.hpp
===================================================================
--- cgm/trunk/geom/RefEntityName.hpp	2013-11-26 17:04:09 UTC (rev 6106)
+++ cgm/trunk/geom/RefEntityName.hpp	2013-12-02 19:05:48 UTC (rev 6107)
@@ -65,13 +65,13 @@
     //- add multiple names to the name map for this entity
   
   int        get_refentity_name(const RefEntity *entity, DLIList<CubitString> &names,
-                                CubitBoolean get_only_one_name = CUBIT_FALSE);
+                                int get_only_one_name = CUBIT_FALSE);
   //- Get the list of names corresponding to this RefEntity.
   //- Returns the number of names found for this RefEntity.
 
   int        get_refentity_name(const RefEntity *entity,
                                 RefEntityNameMapList &names,
-                                CubitBoolean get_only_one_name = CUBIT_FALSE);
+                                int get_only_one_name = CUBIT_FALSE);
   //- Get the list of names corresponding to this RefEntity.