gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Resolve GCC-4.4 warnings & fix ambiguous op=() in graph_components.h
0 1 0
default
1 file changed with 8 insertions and 7 deletions:
↑ Collapse diff ↑
Show white space 8 line context
... ...
@@ -70,8 +70,13 @@
70 70
      ///
71 71
      /// Assignment operator for the item.
72 72
      GraphItem& operator=(const GraphItem&) { return *this; }
73 73

	
74
      /// \brief Assignment operator for INVALID.
75
      ///
76
      /// This operator makes the item invalid.
77
      GraphItem& operator=(Invalid) { return *this; }
78

	
74 79
      /// \brief Equality operator.
75 80
      ///
76 81
      /// Equality operator.
77 82
      bool operator==(const GraphItem&) const { return false; }
... ...
@@ -95,8 +100,9 @@
95 100
      template<typename _GraphItem>
96 101
      struct Constraints {
97 102
        void constraints() {
98 103
          _GraphItem i1;
104
          i1=INVALID;
99 105
          _GraphItem i2 = i1;
100 106
          _GraphItem i3 = INVALID;
101 107

	
102 108
          i1 = i2 = i3;
... ...
@@ -220,15 +226,8 @@
220 226
        /// Constructor for conversion from an arc.
221 227
        /// Besides the core graph item functionality each arc should
222 228
        /// be convertible to the represented edge.
223 229
        Edge(const Arc&) {}
224

	
225
        /// \brief Assign an arc to an edge.
226
        ///
227
        /// This function assigns an arc to an edge.
228
        /// Besides the core graph item functionality each arc should
229
        /// be convertible to the represented edge.
230
        Edge& operator=(const Arc&) { return *this; }
231 230
      };
232 231

	
233 232
      /// \brief Return one end node of an edge.
234 233
      ///
... ...
@@ -352,12 +351,14 @@
352 351

	
353 352
        void constraints() {
354 353
          checkConcept<Base, _Digraph >();
355 354
          typename _Digraph::Node node;
355
          node=INVALID;
356 356
          int nid = digraph.id(node);
357 357
          nid = digraph.id(node);
358 358
          node = digraph.nodeFromId(nid);
359 359
          typename _Digraph::Arc arc;
360
          arc=INVALID;
360 361
          int eid = digraph.id(arc);
361 362
          eid = digraph.id(arc);
362 363
          arc = digraph.arcFromId(eid);
363 364

	
0 comments (0 inline)