Changeset 1086:97f1760dcd13 in lemon-main for lemon/concepts/graph.h
- Timestamp:
- 08/07/13 07:04:58 (11 years ago)
- Branch:
- default
- Parents:
- 1082:cae19e9eeca4 (diff), 1085:a337a0dd3f75 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - Phase:
- public
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
lemon/concepts/graph.h
r1049 r1086 397 397 /// Sets the iterator to the first arc of the given graph. 398 398 /// 399 explicit ArcIt(const Graph &g) { ignore_unused_variable_warning(g); }399 explicit ArcIt(const Graph &g) { ::lemon::ignore_unused_variable_warning(g); } 400 400 /// Sets the iterator to the given arc. 401 401 … … 443 443 /// 444 444 OutArcIt(const Graph& n, const Node& g) { 445 ignore_unused_variable_warning(n);446 ignore_unused_variable_warning(g);445 ::lemon::ignore_unused_variable_warning(n); 446 ::lemon::ignore_unused_variable_warning(g); 447 447 } 448 448 /// Sets the iterator to the given arc. … … 491 491 /// 492 492 InArcIt(const Graph& g, const Node& n) { 493 ignore_unused_variable_warning(n);494 ignore_unused_variable_warning(g);493 ::lemon::ignore_unused_variable_warning(n); 494 ::lemon::ignore_unused_variable_warning(g); 495 495 } 496 496 /// Sets the iterator to the given arc. -
lemon/concepts/graph.h
r1084 r1086 73 73 class Graph { 74 74 private: 75 /// Graphs are \e not copy constructible. Use DigraphCopy instead.75 /// Graphs are \e not copy constructible. Use GraphCopy instead. 76 76 Graph(const Graph&) {} 77 77 /// \brief Assignment of a graph to another one is \e not allowed. 78 /// Use DigraphCopy instead.78 /// Use GraphCopy instead. 79 79 void operator=(const Graph&) {} 80 80 … … 758 758 /// \brief The base node of the iterator. 759 759 /// 760 /// Returns the base node of the given incom ming arc iterator760 /// Returns the base node of the given incoming arc iterator 761 761 /// (i.e. the target node of the corresponding arc). 762 762 Node baseNode(InArcIt) const { return INVALID; } … … 764 764 /// \brief The running node of the iterator. 765 765 /// 766 /// Returns the running node of the given incom ming arc iterator766 /// Returns the running node of the given incoming arc iterator 767 767 /// (i.e. the source node of the corresponding arc). 768 768 Node runningNode(InArcIt) const { return INVALID; }
Note: See TracChangeset
for help on using the changeset viewer.