# HG changeset patch # User Alpar Juttner # Date 1228140478 0 # Node ID 26fd85a3087e8bb6b9c4d0a78770f22ad0ec99c5 # Parent fa341dd6ab2325fa86afd80e1c6eeaa31bba2822 Def->Set change in lemon/circulation.h diff -r fa341dd6ab23 -r 26fd85a3087e lemon/circulation.h --- a/lemon/circulation.h Mon Dec 01 14:11:31 2008 +0000 +++ b/lemon/circulation.h Mon Dec 01 14:07:58 2008 +0000 @@ -169,7 +169,7 @@ ///@{ template - struct DefFlowMapTraits : public Traits { + struct SetFlowMapTraits : public Traits { typedef _FlowMap FlowMap; static FlowMap *createFlowMap(const Digraph&) { LEMON_ASSERT(false, "FlowMap is not initialized"); @@ -183,15 +183,15 @@ /// \ref named-templ-param "Named parameter" for setting FlowMap /// type template - struct DefFlowMap + struct SetFlowMap : public Circulation > { + SetFlowMapTraits<_FlowMap> > { typedef Circulation > Create; + SetFlowMapTraits<_FlowMap> > Create; }; template - struct DefElevatorTraits : public Traits { + struct SetElevatorTraits : public Traits { typedef _Elevator Elevator; static Elevator *createElevator(const Digraph&, int) { LEMON_ASSERT(false, "Elevator is not initialized"); @@ -205,15 +205,15 @@ /// \ref named-templ-param "Named parameter" for setting Elevator /// type template - struct DefElevator + struct SetElevator : public Circulation > { + SetElevatorTraits<_Elevator> > { typedef Circulation > Create; + SetElevatorTraits<_Elevator> > Create; }; template - struct DefStandardElevatorTraits : public Traits { + struct SetStandardElevatorTraits : public Traits { typedef _Elevator Elevator; static Elevator *createElevator(const Digraph& digraph, int max_level) { return new Elevator(digraph, max_level); @@ -227,11 +227,11 @@ /// type. The Elevator should be standard constructor interface, ie. /// the digraph and the maximum level should be passed to it. template - struct DefStandardElevator + struct SetStandardElevator : public Circulation > { + SetStandardElevatorTraits<_Elevator> > { typedef Circulation > Create; + SetStandardElevatorTraits<_Elevator> > Create; }; /// @}