[GME-commit]
GMESRC/SDK/BON BONImpl.cpp,1.21,1.22 Extensions.cpp,1.8,1.9
MON.cpp,1.6,1.7 MONImpl.cpp,1.7,1.8
gme-commit at list.isis.vanderbilt.edu
gme-commit at list.isis.vanderbilt.edu
Tue Apr 12 20:20:53 CDT 2005
Update of /project/gme-repository/GMESRC/SDK/BON
In directory escher:/tmp/cvs-serv9337
Modified Files:
BONImpl.cpp Extensions.cpp MON.cpp MONImpl.cpp
Log Message:
BON corrected to compile with standard compliant C++ compiler.
Now compiles with or without the /Zc:forScope compiler flag.
CVS User: Zoltan Molnar, ISIS (zolmol)
Index: MON.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/SDK/BON/MON.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MON.cpp 29 Apr 2004 18:22:35 -0000 1.6
--- MON.cpp 12 Apr 2005 19:20:51 -0000 1.7
***************
*** 534,538 ****
{
const std::set<AttributeAggregationImpl*>& setAggregations = ( (ProjectImpl*) project().getCounted() )->getAttributeAggregations();
! for ( std::set<AttributeAggregationImpl*>::const_iterator it = setAggregations.begin() ; it != setAggregations.end() ; it++ )
if ( (*it)->getFCO() == getCounted() && (*it)->getAttribute() == attribute.getCounted( false ) )
return true;
--- 534,539 ----
{
const std::set<AttributeAggregationImpl*>& setAggregations = ( (ProjectImpl*) project().getCounted() )->getAttributeAggregations();
! std::set<AttributeAggregationImpl*>::const_iterator it;
! for ( it = setAggregations.begin() ; it != setAggregations.end() ; it++ )
if ( (*it)->getFCO() == getCounted() && (*it)->getAttribute() == attribute.getCounted( false ) )
return true;
***************
*** 540,544 ****
const std::set<AttributeImpl*>& setLocals = ( (FCOImpl*) getCounted() )->getAttributes();
for ( std::set<AttributeImpl*>::const_iterator ita = setLocals.begin() ; ita != setLocals.end() ; ita++ )
! if ( (*it)->getAttribute() == attribute.getCounted( false ) )
return true;
}
--- 541,545 ----
const std::set<AttributeImpl*>& setLocals = ( (FCOImpl*) getCounted() )->getAttributes();
for ( std::set<AttributeImpl*>::const_iterator ita = setLocals.begin() ; ita != setLocals.end() ; ita++ )
! if ( *ita == attribute.getCounted( false ) )
return true;
}
Index: Extensions.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/SDK/BON/Extensions.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Extensions.cpp 4 May 2004 13:58:19 -0000 1.8
--- Extensions.cpp 12 Apr 2005 19:20:51 -0000 1.9
***************
*** 78,82 ****
}
! for ( int i = 0 ; i < vecKinds.size() ; i++ ) {
if ( isMetaKindMatched( vecKinds[ i ], strBEType ) || vecKinds[ i ] == strKind || ! strRole.empty() && vecKinds[ i ] == strRole )
return pObject;
--- 78,83 ----
}
! int i;
! for ( i = 0 ; i < vecKinds.size() ; i++ ) {
if ( isMetaKindMatched( vecKinds[ i ], strBEType ) || vecKinds[ i ] == strKind || ! strRole.empty() && vecKinds[ i ] == strRole )
return pObject;
Index: MONImpl.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/SDK/BON/MONImpl.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MONImpl.cpp 22 Jun 2004 21:23:32 -0000 1.7
--- MONImpl.cpp 12 Apr 2005 19:20:51 -0000 1.8
***************
*** 392,396 ****
// "setModels" will contain the models pKind may be part of
std::set<ModelImpl*> setModels;
! for ( std::set<ObjectImpl*>::const_iterator it = ( (ProjectImpl* ) this )->m_mapObjectsByType[ OT_Role ].begin() ; it != ( (ProjectImpl* ) this )->m_mapObjectsByType[ OT_Role ].end() ; ++it )
if ( ( ( ContainmentImpl*) (*it) )->getChild() == pKind )
setModels.insert( ( ( ContainmentImpl*) (*it) )->getParent() );
--- 392,397 ----
// "setModels" will contain the models pKind may be part of
std::set<ModelImpl*> setModels;
! std::set<ObjectImpl*>::const_iterator it;
! for ( it = ( (ProjectImpl* ) this )->m_mapObjectsByType[ OT_Role ].begin() ; it != ( (ProjectImpl* ) this )->m_mapObjectsByType[ OT_Role ].end() ; ++it )
if ( ( ( ContainmentImpl*) (*it) )->getChild() == pKind )
setModels.insert( ( ( ContainmentImpl*) (*it) )->getParent() );
Index: BONImpl.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/SDK/BON/BONImpl.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** BONImpl.cpp 20 Oct 2004 19:42:57 -0000 1.21
--- BONImpl.cpp 12 Apr 2005 19:20:51 -0000 1.22
***************
*** 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() )
--- 5887,5893 ----
std::map<std::string, FCOsPtr> mapRefSeqs;
std::map<std::string,FCO> mapEnds;
!
! std::set<Connection::Pair>::const_iterator it;
! for ( it = ends.begin() ; it != ends.end() ; it++ ) {
THROW_CANNOT_BE_NULL( it->second, "BON::ConnectionEnd" );
if ( parent->getProject() != it->second->getProject() )
***************
*** 5893,5898 ****
mapRefSeqs[ it->first ] = FCOsPtr();
- //<!> ZolMol remove upon working with new GME //t //temporary line
- //COMTHROW( mapRefSeqs[ it->first ].CoCreateInstance( L"Mga.MgaFCOs"));
if ( it->second->isReferencePort() ) {
ReferencePort port( it->second );
--- 5895,5898 ----
***************
*** 5912,5916 ****
if ( roles.size() != mapEnds.size() )
ASSERTTHROW( Exception( "Number of MON::ConnectionEnds of ? is ?, not ?", "sll", meta.infoString().c_str(), (long) roles.size(), (long) mapEnds.size() ) );
! for ( std::set<MON::ConnectionRole>::iterator itR = roles.begin() ; itR != roles.end() ; itR++ )
if ( mapEnds.find( itR->name() ) == mapEnds.end() )
ASSERTTHROW( Exception( "BON::ConnectionEnd of ? at role [ ? ] is unspecified.", "ss", meta.infoString().c_str(), itR->name().c_str() ) );
--- 5912,5918 ----
if ( roles.size() != mapEnds.size() )
ASSERTTHROW( Exception( "Number of MON::ConnectionEnds of ? is ?, not ?", "sll", meta.infoString().c_str(), (long) roles.size(), (long) mapEnds.size() ) );
!
! std::set<MON::ConnectionRole>::iterator itR;
! for ( itR = roles.begin() ; itR != roles.end() ; itR++ )
if ( mapEnds.find( itR->name() ) == mapEnds.end() )
ASSERTTHROW( Exception( "BON::ConnectionEnd of ? at role [ ? ] is unspecified.", "ss", meta.infoString().c_str(), itR->name().c_str() ) );
***************
*** 6239,6243 ****
FCOSet fcos1 = m_pFCO->getDerivedFCOs( false );
FCOSet fcos2 = m_pFCO->getDerivedFCOs( true );
! for ( FCOSet::iterator it = fcos1.begin() ; it != fcos1.end() ; it++ )
setResult.insert( (*it)->getTypeInhObject() );
for ( it = fcos2.begin() ; it != fcos2.end() ; it++ )
--- 6241,6247 ----
FCOSet fcos1 = m_pFCO->getDerivedFCOs( false );
FCOSet fcos2 = m_pFCO->getDerivedFCOs( true );
!
! FCOSet::iterator it;
! for ( it = fcos1.begin() ; it != fcos1.end() ; it++ )
setResult.insert( (*it)->getTypeInhObject() );
for ( it = fcos2.begin() ; it != fcos2.end() ; it++ )
***************
*** 6346,6350 ****
return Point( 0, 0 );
! for ( std::set<MON::ContainmentPart>::iterator it = parts.begin() ; it != parts.end() ; it++ )
if ( it->isPrimary() ) {
Point point;
--- 6350,6355 ----
return Point( 0, 0 );
! std::set<MON::ContainmentPart>::iterator it;
! for ( it = parts.begin() ; it != parts.end() ; it++ )
if ( it->isPrimary() ) {
Point point;
More information about the GME-commit
mailing list