[GME-commit] GMESRC/SDK/BON BONImpl.cpp,1.24,1.25

gme-commit at list.isis.vanderbilt.edu gme-commit at list.isis.vanderbilt.edu
Mon Jun 6 23:59:22 CDT 2005


Update of /project/gme-repository/GMESRC/SDK/BON
In directory escher:/tmp/cvs-serv25928

Modified Files:
	BONImpl.cpp 
Log Message:
Made consistent for connections in case user doesn't want meta conformance testing.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: BONImpl.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/SDK/BON/BONImpl.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** BONImpl.cpp	6 Jun 2005 17:44:08 -0000	1.24
--- BONImpl.cpp	6 Jun 2005 22:59:20 -0000	1.25
***************
*** 2368,2372 ****
--- 2368,2377 ----
  		if ( ! strConnection.empty() ) {
  			meta = MON::Connection( getProject()->getProjectMeta().findByName( strConnection ) );
+ #ifdef TEST_META_CONFORMANCE_INSIDE_BON
  			THROW_METAPROJECT_DOES_NOT_HAVE( meta, Connection, strConnection );
+ #else
+ 			if( !meta)
+ 				return std::set<Connection>();
+ #endif
  		}
  		return getConnLinks( meta, strRole, bAsFCO, aspect );
***************
*** 2510,2514 ****
--- 2515,2524 ----
  		if ( ! strConnection.empty() ) {
  			meta = MON::Connection( getProject()->getProjectMeta().findByName( strConnection ) );
+ #ifdef TEST_META_CONFORMANCE_INSIDE_BON
  			THROW_METAPROJECT_DOES_NOT_HAVE( meta, Connection, strConnection );
+ #else
+ 			if( !meta)
+ 				return std::multiset<ConnectionEnd>();
+ #endif
  		}
  		return getConnEndsAs( meta, strRole, bAsFCO, aspect );
***************
*** 2716,2720 ****
--- 2726,2735 ----
  		if ( ! strConnection.empty() ) {
  			meta = MON::Connection( getProject()->getProjectMeta().findByName( strConnection ) );
+ #ifdef TEST_META_CONFORMANCE_INSIDE_BON
  			THROW_METAPROJECT_DOES_NOT_HAVE( meta, Connection, strConnection );
+ #else
+ 			if( !meta)
+ 				return std::multiset<ConnectionEnd>();
+ #endif
  		}
  		return getConnEnds( meta, strRole, bAsFCO, aspect );



More information about the GME-commit mailing list