[GME-commit] GMESRC/SDK/BON BONImpl.cpp,1.20,1.21 Events.cpp,1.3,1.4

[gme-commit at list.isis.vanderbilt.edu]

Update of /var/lib/gme/GMESRC/SDK/BON
In directory braindrain:/tmp/cvs-serv17019

Modified Files:
	BONImpl.cpp Events.cpp 
Log Message:
Updated for VC7 compilability.
It is possible to compile with VC7's own STL library.



CVS User: zolmol

Index: BONImpl.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/SDK/BON/BONImpl.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** BONImpl.cpp	26 Jul 2004 08:30:16 -0000	1.20
--- BONImpl.cpp	20 Oct 2004 19:42:57 -0000	1.21
***************
*** 20,29 ****
  */
  
  #include "BONImpl.h"
  #include "Extensions.h"
  #include <ComponentConfig.h>
  
- #define TEST_META_CONFORMANCE_INSIDE_BON // by ZolMol
- 
  namespace BON
  {
--- 20,29 ----
  */
  
+ #define TEST_META_CONFORMANCE_INSIDE_BON // by ZolMol
+ 
  #include "BONImpl.h"
  #include "Extensions.h"
  #include <ComponentConfig.h>
  
  namespace BON
  {
***************
*** 69,73 ****
  		MON::ContainmentPtr spMeta;
  		COMTHROW( spFCO->get_MetaRole( spMeta.Addr() ) );
! 		return spMeta;
  	}
  
--- 69,73 ----
  		MON::ContainmentPtr spMeta;
  		COMTHROW( spFCO->get_MetaRole( spMeta.Addr() ) );
! 		return MON::Containment(spMeta);
  	}
  
***************
*** 2422,2425 ****
--- 2422,2427 ----
  			}
  			if ( ! bFound )
+ 			{
+ #ifdef TEST_META_CONFORMANCE_INSIDE_BON
  				if ( strRole.empty() ) {
  					ASSERTTHROW( MON::Exception( "? cannot be target of ?!", "ss", getFCOHelper()->getObjectMeta().infoString().c_str(), meta.infoString().c_str() ) );
***************
*** 2428,2431 ****
--- 2430,2437 ----
  					ASSERTTHROW( MON::Exception( "? cannot be target of ? with role ?!", "sss", getFCOHelper()->getObjectMeta().infoString().c_str(), meta.infoString().c_str(), strRole.c_str() ) );
  				}
+ #else
+ 				return std::multiset<ConnectionEnd>();
+ #endif
+ 			}
  
  			specs = meta.specifications();
***************
*** 2441,2446 ****
  				}
  			}
! 			if ( ! bFound )
! 				ASSERTTHROW( MON::Exception( "? cannot be target of simple MON::Connection!", "ss", getFCOHelper()->getObjectMeta().infoString().c_str() ) );
  		}
  
--- 2447,2454 ----
  				}
  			}
! 
! 			return std::multiset<ConnectionEnd>();
! 			/*if ( ! bFound ) commented out by ZolMol: do not throw if -- meta NOT specified --
! 				ASSERTTHROW( MON::Exception( "? cannot be target of simple MON::Connection!", "ss", getFCOHelper()->getObjectMeta().infoString().c_str() ) );*/
  		}
  
***************
*** 2616,2620 ****
--- 2624,2634 ----
  			}
  			if ( ! bFound )
+ 			{
+ #ifdef TEST_META_CONFORMANCE_INSIDE_BON
  				ASSERTTHROW( MON::Exception( "? cannot be target of ?!", "ss", getFCOHelper()->getObjectMeta().infoString().c_str(), meta.infoString().c_str() ) );
+ #else				
+ 				return std::multiset<ConnectionEnd>();
+ #endif
+ 			}
  
  			specs = meta.specifications();
***************
*** 2630,2635 ****
  				}
  			}
! 			if ( ! bFound )
! 				ASSERTTHROW( MON::Exception( "? cannot be target of simple MON::Connection!", "ss", getFCOHelper()->getObjectMeta().infoString().c_str() ) );
  		}
  
--- 2644,2651 ----
  				}
  			}
! 
! 			return std::multiset<ConnectionEnd>();
! 			/*if ( ! bFound ) commented out by ZolMol: do not throw -- if meta NOT specified --
! 				ASSERTTHROW( MON::Exception( "? cannot be target of simple MON::Connection!", "ss", getFCOHelper()->getObjectMeta().infoString().c_str() ) );*/
  		}
  
***************
*** 3505,3509 ****
  	void FCOImpl::onObjectCreated()
  	{
! 		FCO( getType() );
  		getReferencePorts();
  
--- 3521,3525 ----
  	void FCOImpl::onObjectCreated()
  	{
! 		FCO( this->getType() );
  		getReferencePorts();
  
***************
*** 5871,5875 ****
  		std::map<std::string, FCOsPtr> mapRefSeqs;
  		std::map<std::string,FCO> mapEnds;
! 		for ( std::set<Connection::Pair>::iterator it = ends.begin() ; it != ends.end() ; it++ ) {
  			THROW_CANNOT_BE_NULL( it->second, "BON::ConnectionEnd" );
  			if ( parent->getProject() != it->second->getProject() )
--- 5887,5891 ----
  		std::map<std::string, FCOsPtr> mapRefSeqs;
  		std::map<std::string,FCO> mapEnds;
! 		for ( std::set<Connection::Pair>::const_iterator it = ends.begin() ; it != ends.end() ; it++ ) {
  			THROW_CANNOT_BE_NULL( it->second, "BON::ConnectionEnd" );
  			if ( parent->getProject() != it->second->getProject() )
***************
*** 6632,6634 ****
  	}
  
! }; // namespace BON
\ No newline at end of file
--- 6648,6650 ----
  	}
  
! }; // namespace BON

Index: Events.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/SDK/BON/Events.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Events.cpp	3 Feb 2004 10:53:05 -0000	1.3
--- Events.cpp	20 Oct 2004 19:42:57 -0000	1.4
***************
*** 24,28 ****
  #include "Events.h"
  #include "BONImpl.h"
! 
  namespace BON
  {
--- 24,28 ----
  #include "Events.h"
  #include "BONImpl.h"
! #include <algorithm> // needed for vc7 if used with its own stl
  namespace BON
  {