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

[janehu at mcs.anl.gov]

Author: janehu
Date: 2013-12-05 12:20:29 -0600 (Thu, 05 Dec 2013)
New Revision: 6109

Modified:
   cgm/trunk/geom/RefEntity.cpp
   cgm/trunk/geom/RefEntityName.cpp
   cgm/trunk/geom/RefEntityName.hpp
Log:
cubit14.0 changed signature for RefEntityName::get_refentity_name, although cubit build should look at libcubit_geom.so for definitions, it actually detects the difference in the cgm definition, so change it first in cgm14.0. Passed make check cubit14.0 shared and occshared builds.

Modified: cgm/trunk/geom/RefEntity.cpp
===================================================================
--- cgm/trunk/geom/RefEntity.cpp	2013-12-04 16:25:35 UTC (rev 6108)
+++ cgm/trunk/geom/RefEntity.cpp	2013-12-05 18:20:29 UTC (rev 6109)
@@ -111,7 +111,7 @@
   DLIList<CubitString> names;
   
     // Get the name(s) associated with this RefEntity.
-  RefEntityName::instance()->get_refentity_name(this, names, CUBIT_TRUE);
+  RefEntityName::instance()->get_refentity_name(this, names);
   
   CubitString name;
   

Modified: cgm/trunk/geom/RefEntityName.cpp
===================================================================
--- cgm/trunk/geom/RefEntityName.cpp	2013-12-04 16:25:35 UTC (rev 6108)
+++ cgm/trunk/geom/RefEntityName.cpp	2013-12-05 18:20:29 UTC (rev 6109)
@@ -357,14 +357,13 @@
 }
 
 int RefEntityName::get_refentity_name(const RefEntity *entity,
-                                      DLIList<CubitString> &names,
-                                      int get_only_one)
+                                      DLIList<CubitString> &names)
 {
     // NOTE: There may be multiple names for one RefEntity. Make sure to 
     //       access all of them. 
 
   RefEntityNameMapList temp_list;
-  int found_match = get_refentity_name(entity, temp_list, get_only_one);
+  int found_match = get_refentity_name(entity, temp_list);
   
   for (int i=temp_list.size(); i > 0; i--)
     names.append(temp_list.get_and_step()->key());
@@ -373,8 +372,7 @@
 }
 
 int RefEntityName::get_refentity_name(const RefEntity *entity,
-                                      RefEntityNameMapList &names,
-                                      int get_only_one)
+                                      RefEntityNameMapList &names)
 {
     // NOTE: There may be multiple names for one RefEntity. Make sure to 
     //       access all of them. 
@@ -387,8 +385,6 @@
     {
       names.append(nameEntityList.get());
       found_match++;
-      if (get_only_one)
-        return found_match;