*** HepMC_Version1.24/HepMC/GenVertex.h	Mon Jul 14 22:34:57 2003
--- HepMC_Version1.24_Factor/HepMC/OLD/GenVertex.h	Tue Oct  7 17:49:03 2003
***************
*** 50,59 ****
  #include <set>
  #include <algorithm>
  
  namespace HepMC {
  
-     enum IteratorRange { parents, children, family, 
- 			 ancestors, descendants, relatives };
      class GenParticle;
      class GenEvent;
  
--- 50,59 ----
  #include <set>
  #include <algorithm>
  
+ #include "HepMC/IteratorRange.h"
+ 
  namespace HepMC {
  
      class GenParticle;
      class GenEvent;
  
***************
*** 157,163 ****
  	// use particle_iterator with IteratorRange = family, parents, children
  	//
  	class edge_iterator :
! 	    public std::forward_iterator<GenVertex*,ptrdiff_t>{
  	    // iterate over the family of edges connected to m_vertex begins 
  	    // with parents (incoming particles) then children (outgoing)
  	    // This is not a recursive iterator ... it is a building block
--- 157,163 ----
  	// use particle_iterator with IteratorRange = family, parents, children
  	//
  	class edge_iterator :
! 	public std::iterator<std::forward_iterator_tag, GenParticle*> {  // ANSI C++ FIX LESTER SPECIAL: note change from GenVertex* to GenParticle* !
  	    // iterate over the family of edges connected to m_vertex begins 
  	    // with parents (incoming particles) then children (outgoing)
  	    // This is not a recursive iterator ... it is a building block
***************
*** 194,200 ****
  	// vertex_iterator           //
  	///////////////////////////////
  	class vertex_iterator :
! 	    public std::forward_iterator<GenVertex*,ptrdiff_t>{
  	    // Iterates over all vertices connected via a graph to this vertex.
  	    // this is made friend to that it can access protected edge
  	    // iterator the range can be IteratorRange= ( parents, children, 
--- 194,200 ----
  	// vertex_iterator           //
  	///////////////////////////////
  	class vertex_iterator :
! 	public std::iterator<std::forward_iterator_tag, GenVertex*> {  // ANSI C++ FIX LESTER
  	    // Iterates over all vertices connected via a graph to this vertex.
  	    // this is made friend to that it can access protected edge
  	    // iterator the range can be IteratorRange= ( parents, children, 
***************
*** 251,257 ****
  	// particle_iterator         //
  	///////////////////////////////
  	class particle_iterator :
! 	    public std::forward_iterator<GenVertex*,ptrdiff_t>{
  	    // Iterates over all particles connected via a graph.
  	    // by iterating through all vertices in the m_range. For each
  	    // vertex it returns orphaned parent particles 
--- 251,257 ----
  	// particle_iterator         //
  	///////////////////////////////
  	class particle_iterator :
! 	public std::iterator<std::forward_iterator_tag, GenParticle*> {  // ANSI C++ FIX LESTER SPECIAL: note change from GenVertex* to GenParticle* !
  	    // Iterates over all particles connected via a graph.
  	    // by iterating through all vertices in the m_range. For each
  	    // vertex it returns orphaned parent particles