[MOAB-dev] commit/MOAB: janehu: Cubit14.0 changed signature of RefEntityName::get_refentity_name, so changed the calling function in moab. Builds successfully, make check failed test/io/stl_test.
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Thu Dec 5 12:33:08 CST 2013
1 new commit in MOAB:
https://bitbucket.org/fathomteam/moab/commits/f7523030ebd7/
Changeset: f7523030ebd7
Branch: master
User: janehu
Date: 2013-12-05 19:28:43
Summary: Cubit14.0 changed signature of RefEntityName::get_refentity_name, so changed the calling function in moab. Builds successfully, make check failed test/io/stl_test.
I briefly debugged on it, found the opts.all_seen() in line 499 of Core.cpp didn't get the expected return value. Can someone look into it? Please let me know if it's cgm related.
Affected #: 1 file
diff --git a/src/io/ReadCGM.cpp b/src/io/ReadCGM.cpp
index cc83c9b..bb9eb9a 100644
--- a/src/io/ReadCGM.cpp
+++ b/src/io/ReadCGM.cpp
@@ -326,16 +326,23 @@ ErrorCode ReadCGM::load_file(const char *cgm_file_name,
for (int i = entlist.size(); i--; ) {
RefEntity* grp = entlist.get_and_step();
name_list.clean_out();
- RefEntityName::instance()->get_refentity_name( grp, name_list, true );
+#if CGM_MAJOR_VERSION>13
+ RefEntityName::instance()->get_refentity_name(grp, name_list);
+#else
+ //true argument is optional, but for large multi-names situation, it should save
+ //some cpu time
+ RefEntityName::instance()->get_refentity_name(grp, name_list,true);
+#endif
if (name_list.size() == 0)
continue;
+
name_list.reset();
#if CGM_MAJOR_VERSION>13
CubitString name1 = name_list.get();
#else
CubitString name1 = *name_list.get();
#endif
-
+
EntityHandle h;
rval = mdbImpl->create_meshset( MESHSET_SET, h );
if (MB_SUCCESS != rval)
Repository URL: https://bitbucket.org/fathomteam/moab/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
More information about the moab-dev
mailing list