1.1 --- a/lemon/concepts/heap.h	Thu Dec 20 15:21:22 2007 +0000
     1.2 +++ b/lemon/concepts/heap.h	Thu Dec 27 13:40:16 2007 +0000
     1.3 @@ -52,7 +52,7 @@
     1.4        ///
     1.5        /// The ItemIntMap _should_ be initialized in such way, that it maps
     1.6        /// PRE_HEAP (-1) to any element to be put in the heap...
     1.7 -      enum state_enum {
     1.8 +      enum State {
     1.9  	IN_HEAP = 0,
    1.10  	PRE_HEAP = -1,
    1.11  	POST_HEAP = -2
    1.12 @@ -155,7 +155,7 @@
    1.13        /// otherwise. In the latter case it is possible that \c item will
    1.14        /// get back to the heap again.
    1.15        /// \param i The item.
    1.16 -      state_enum state(const Item &i) const {}
    1.17 +      State state(const Item &i) const {}
    1.18  
    1.19        /// \brief Sets the state of the \c item in the heap.
    1.20        ///
    1.21 @@ -164,7 +164,7 @@
    1.22        /// better time complexity.
    1.23        /// \param i The item.
    1.24        /// \param st The state. It should not be \c IN_HEAP. 
    1.25 -      void state(const Item& i, state_enum st) {}
    1.26 +      void state(const Item& i, State st) {}
    1.27  
    1.28  
    1.29        template <typename _Heap>
    1.30 @@ -181,8 +181,8 @@
    1.31  	  ignore_unused_variable_warning(item);
    1.32  	  ignore_unused_variable_warning(prio);
    1.33  
    1.34 -	  typedef typename _Heap::state_enum state_enum;
    1.35 -	  state_enum state;
    1.36 +	  typedef typename _Heap::State State;
    1.37 +	  State state;
    1.38  
    1.39  	  ignore_unused_variable_warning(state);
    1.40