1.1 --- a/lemon/concepts/heap.h Wed Mar 17 12:35:52 2010 +0100
1.2 +++ b/lemon/concepts/heap.h Sat Mar 06 14:35:12 2010 +0000
1.3 @@ -2,7 +2,7 @@
1.4 *
1.5 * This file is a part of LEMON, a generic C++ optimization library.
1.6 *
1.7 - * Copyright (C) 2003-2009
1.8 + * Copyright (C) 2003-2010
1.9 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
1.10 * (Egervary Research Group on Combinatorial Optimization, EGRES).
1.11 *
1.12 @@ -92,7 +92,7 @@
1.13 explicit Heap(ItemIntMap &map) {}
1.14 #else
1.15 explicit Heap(ItemIntMap&) {}
1.16 -#endif
1.17 +#endif
1.18
1.19 /// \brief Constructor.
1.20 ///
1.21 @@ -106,7 +106,7 @@
1.22 explicit Heap(ItemIntMap &map, const CMP &comp) {}
1.23 #else
1.24 explicit Heap(ItemIntMap&, const CMP&) {}
1.25 -#endif
1.26 +#endif
1.27
1.28 /// \brief The number of items stored in the heap.
1.29 ///
1.30 @@ -138,7 +138,7 @@
1.31 void push(const Item &i, const Prio &p) {}
1.32 #else
1.33 void push(const Item&, const Prio&) {}
1.34 -#endif
1.35 +#endif
1.36
1.37 /// \brief Return the item having minimum priority.
1.38 ///
1.39 @@ -168,7 +168,7 @@
1.40 void erase(const Item &i) {}
1.41 #else
1.42 void erase(const Item&) {}
1.43 -#endif
1.44 +#endif
1.45
1.46 /// \brief The priority of the given item.
1.47 ///
1.48 @@ -179,7 +179,7 @@
1.49 Prio operator[](const Item &i) const {}
1.50 #else
1.51 Prio operator[](const Item&) const { return Prio(); }
1.52 -#endif
1.53 +#endif
1.54
1.55 /// \brief Set the priority of an item or insert it, if it is
1.56 /// not stored in the heap.
1.57 @@ -194,7 +194,7 @@
1.58 void set(const Item &i, const Prio &p) {}
1.59 #else
1.60 void set(const Item&, const Prio&) {}
1.61 -#endif
1.62 +#endif
1.63
1.64 /// \brief Decrease the priority of an item to the given value.
1.65 ///
1.66 @@ -206,7 +206,7 @@
1.67 void decrease(const Item &i, const Prio &p) {}
1.68 #else
1.69 void decrease(const Item&, const Prio&) {}
1.70 -#endif
1.71 +#endif
1.72
1.73 /// \brief Increase the priority of an item to the given value.
1.74 ///
1.75 @@ -218,7 +218,7 @@
1.76 void increase(const Item &i, const Prio &p) {}
1.77 #else
1.78 void increase(const Item&, const Prio&) {}
1.79 -#endif
1.80 +#endif
1.81
1.82 /// \brief Return the state of an item.
1.83 ///
1.84 @@ -232,7 +232,7 @@
1.85 State state(const Item &i) const {}
1.86 #else
1.87 State state(const Item&) const { return PRE_HEAP; }
1.88 -#endif
1.89 +#endif
1.90
1.91 /// \brief Set the state of an item in the heap.
1.92 ///
1.93 @@ -245,7 +245,7 @@
1.94 void state(const Item& i, State st) {}
1.95 #else
1.96 void state(const Item&, State) {}
1.97 -#endif
1.98 +#endif
1.99
1.100
1.101 template <typename _Heap>