[GME-commit] GMESRC/GME/ConstraintManager OCLContext.h,1.7,1.8 OCLException.h,1.10,1.11

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

Update of /project/gme-repository/GMESRC/GME/ConstraintManager
In directory escher:/tmp/cvs-serv29921

Modified Files:
	OCLContext.h OCLException.h 
Log Message:
UDM team request.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: OCLException.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/ConstraintManager/OCLException.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** OCLException.h	13 Jul 2005 20:10:55 -0000	1.10
--- OCLException.h	19 Jul 2005 17:57:52 -0000	1.11
***************
*** 312,318 ****
  					ExceptionVector vecTemp( m_vecExceptions );
  					m_vecExceptions.clear();
! 					for ( int i = 0 ; i < from ; i++ )
  						m_vecExceptions.push_back( vecTemp[ i ] );
! 					for ( int i = to ; i < (int) vecTemp.size() ; i++ )
  						m_vecExceptions.push_back( vecTemp[ i ] );
  				}
--- 312,319 ----
  					ExceptionVector vecTemp( m_vecExceptions );
  					m_vecExceptions.clear();
! 					int i;
! 					for ( i = 0 ; i < from ; i++ )
  						m_vecExceptions.push_back( vecTemp[ i ] );
! 					for ( i = to ; i < (int) vecTemp.size() ; i++ )
  						m_vecExceptions.push_back( vecTemp[ i ] );
  				}

Index: OCLContext.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/ConstraintManager/OCLContext.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** OCLContext.h	13 Jul 2005 20:10:55 -0000	1.7
--- OCLContext.h	19 Jul 2005 17:57:52 -0000	1.8
***************
*** 114,118 ****
  				item.object = object;
  				item.bAssignable = bAssignable;
! 				m_mapVariables.insert( typename TMap::value_type( strName, item ) );
  				return true;
  			}
--- 114,122 ----
  				item.object = object;
  				item.bAssignable = bAssignable;
! #if (_MSC_VER == 1200)
! 				m_mapVariables.insert( TMap::value_type( strName, item ) ); 
! #else
! 				m_mapVariables.insert( typename TMap::value_type( strName, item ) ); 
! #endif
  				return true;
  			}
***************
*** 144,148 ****
  				m_mapVariables.erase( strName );
  				item.object = object;
! 				m_mapVariables.insert( typename TMap::value_type( strName, item ) );
  				return true;
  			}
--- 148,156 ----
  				m_mapVariables.erase( strName );
  				item.object = object;
! #if (_MSC_VER == 1200)
! 				m_mapVariables.insert( TMap::value_type( strName, item ) ); 
! #else
! 				m_mapVariables.insert( typename TMap::value_type( strName, item ) ); 
! #endif
  				return true;
  			}