1.1 --- a/lemon/circulation.h	Thu Mar 05 10:13:20 2009 +0000
     1.2 +++ b/lemon/circulation.h	Sun Mar 29 23:08:20 2009 +0200
     1.3 @@ -215,9 +215,9 @@
     1.4  
     1.5      ///@{
     1.6  
     1.7 -    template <typename _FlowMap>
     1.8 +    template <typename T>
     1.9      struct SetFlowMapTraits : public Traits {
    1.10 -      typedef _FlowMap FlowMap;
    1.11 +      typedef T FlowMap;
    1.12        static FlowMap *createFlowMap(const Digraph&) {
    1.13          LEMON_ASSERT(false, "FlowMap is not initialized");
    1.14          return 0; // ignore warnings
    1.15 @@ -229,17 +229,17 @@
    1.16      ///
    1.17      /// \ref named-templ-param "Named parameter" for setting FlowMap
    1.18      /// type.
    1.19 -    template <typename _FlowMap>
    1.20 +    template <typename T>
    1.21      struct SetFlowMap
    1.22        : public Circulation<Digraph, LCapMap, UCapMap, DeltaMap,
    1.23 -                           SetFlowMapTraits<_FlowMap> > {
    1.24 +                           SetFlowMapTraits<T> > {
    1.25        typedef Circulation<Digraph, LCapMap, UCapMap, DeltaMap,
    1.26 -                          SetFlowMapTraits<_FlowMap> > Create;
    1.27 +                          SetFlowMapTraits<T> > Create;
    1.28      };
    1.29  
    1.30 -    template <typename _Elevator>
    1.31 +    template <typename T>
    1.32      struct SetElevatorTraits : public Traits {
    1.33 -      typedef _Elevator Elevator;
    1.34 +      typedef T Elevator;
    1.35        static Elevator *createElevator(const Digraph&, int) {
    1.36          LEMON_ASSERT(false, "Elevator is not initialized");
    1.37          return 0; // ignore warnings
    1.38 @@ -255,17 +255,17 @@
    1.39      /// \ref elevator(Elevator&) "elevator()" function before calling
    1.40      /// \ref run() or \ref init().
    1.41      /// \sa SetStandardElevator
    1.42 -    template <typename _Elevator>
    1.43 +    template <typename T>
    1.44      struct SetElevator
    1.45        : public Circulation<Digraph, LCapMap, UCapMap, DeltaMap,
    1.46 -                           SetElevatorTraits<_Elevator> > {
    1.47 +                           SetElevatorTraits<T> > {
    1.48        typedef Circulation<Digraph, LCapMap, UCapMap, DeltaMap,
    1.49 -                          SetElevatorTraits<_Elevator> > Create;
    1.50 +                          SetElevatorTraits<T> > Create;
    1.51      };
    1.52  
    1.53 -    template <typename _Elevator>
    1.54 +    template <typename T>
    1.55      struct SetStandardElevatorTraits : public Traits {
    1.56 -      typedef _Elevator Elevator;
    1.57 +      typedef T Elevator;
    1.58        static Elevator *createElevator(const Digraph& digraph, int max_level) {
    1.59          return new Elevator(digraph, max_level);
    1.60        }
    1.61 @@ -283,12 +283,12 @@
    1.62      /// algorithm with the \ref elevator(Elevator&) "elevator()" function
    1.63      /// before calling \ref run() or \ref init().
    1.64      /// \sa SetElevator
    1.65 -    template <typename _Elevator>
    1.66 +    template <typename T>
    1.67      struct SetStandardElevator
    1.68        : public Circulation<Digraph, LCapMap, UCapMap, DeltaMap,
    1.69 -                       SetStandardElevatorTraits<_Elevator> > {
    1.70 +                       SetStandardElevatorTraits<T> > {
    1.71        typedef Circulation<Digraph, LCapMap, UCapMap, DeltaMap,
    1.72 -                      SetStandardElevatorTraits<_Elevator> > Create;
    1.73 +                      SetStandardElevatorTraits<T> > Create;
    1.74      };
    1.75  
    1.76      /// @}
    1.77 @@ -682,7 +682,7 @@
    1.78      /// empty set, so \c bar[v] will be \c false for all nodes \c v.
    1.79      ///
    1.80      /// \note This function calls \ref barrier() for each node,
    1.81 -    /// so it runs in \f$O(n)\f$ time.
    1.82 +    /// so it runs in O(n) time.
    1.83      ///
    1.84      /// \pre Either \ref run() or \ref init() must be called before
    1.85      /// using this function.