[GME-commit] GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep AspectRep.cpp,1.14,1.15

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

Update of /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep
In directory escher:/tmp/cvs-serv22247/Rep

Modified Files:
	AspectRep.cpp 
Log Message:
In stl a set's key comparison predicate must be a strict weak ordering:
if AspNamePriorityComp(a,b)==true then 
assert(AspNamePriorityComp(b,a) == false)

[as well as transitiveness]



CVS User: Zoltan Molnar, ISIS (zolmol)

Index: AspectRep.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/AspectRep.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** AspectRep.cpp	7 Apr 2005 21:26:24 -0000	1.14
--- AspectRep.cpp	16 May 2005 18:41:01 -0000	1.15
***************
*** 36,40 ****
  bool AspNamePriorityComp::operator()( const Type& p1, const Type& p2) const
  {
! 	return p1.second < p2.second;
  }
  
--- 36,40 ----
  bool AspNamePriorityComp::operator()( const Type& p1, const Type& p2) const
  {
! 	return p1.second != p2.second ? p1.second < p2.second : (p1.first.compare( p2.first) < 0);
  }