diff -r 7f6e2bd76654 -r 141f9c0db4a3 lemon/concepts/heap.h --- a/lemon/concepts/heap.h Wed Mar 17 12:35:52 2010 +0100 +++ b/lemon/concepts/heap.h Sat Mar 06 14:35:12 2010 +0000 @@ -2,7 +2,7 @@ * * This file is a part of LEMON, a generic C++ optimization library. * - * Copyright (C) 2003-2009 + * Copyright (C) 2003-2010 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport * (Egervary Research Group on Combinatorial Optimization, EGRES). * @@ -92,7 +92,7 @@ explicit Heap(ItemIntMap &map) {} #else explicit Heap(ItemIntMap&) {} -#endif +#endif /// \brief Constructor. /// @@ -106,7 +106,7 @@ explicit Heap(ItemIntMap &map, const CMP &comp) {} #else explicit Heap(ItemIntMap&, const CMP&) {} -#endif +#endif /// \brief The number of items stored in the heap. /// @@ -138,7 +138,7 @@ void push(const Item &i, const Prio &p) {} #else void push(const Item&, const Prio&) {} -#endif +#endif /// \brief Return the item having minimum priority. /// @@ -168,7 +168,7 @@ void erase(const Item &i) {} #else void erase(const Item&) {} -#endif +#endif /// \brief The priority of the given item. /// @@ -179,7 +179,7 @@ Prio operator[](const Item &i) const {} #else Prio operator[](const Item&) const { return Prio(); } -#endif +#endif /// \brief Set the priority of an item or insert it, if it is /// not stored in the heap. @@ -194,7 +194,7 @@ void set(const Item &i, const Prio &p) {} #else void set(const Item&, const Prio&) {} -#endif +#endif /// \brief Decrease the priority of an item to the given value. /// @@ -206,7 +206,7 @@ void decrease(const Item &i, const Prio &p) {} #else void decrease(const Item&, const Prio&) {} -#endif +#endif /// \brief Increase the priority of an item to the given value. /// @@ -218,7 +218,7 @@ void increase(const Item &i, const Prio &p) {} #else void increase(const Item&, const Prio&) {} -#endif +#endif /// \brief Return the state of an item. /// @@ -232,7 +232,7 @@ State state(const Item &i) const {} #else State state(const Item&) const { return PRE_HEAP; } -#endif +#endif /// \brief Set the state of an item in the heap. /// @@ -245,7 +245,7 @@ void state(const Item& i, State st) {} #else void state(const Item&, State) {} -#endif +#endif template