Changeset 1424:7edc220d6244 in lemon

Timestamp:

05/15/19 13:33:55 (5 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

1.2

Phase:

public

Amend:

64656133343266303432616633616532343038303566396637363761343462333836636530353933

Message:

Backport relevant parts of bugfixes [ad22262328b3], [61fdd06833a6] and [4add05447ca0] to branch 1.2 (#623)

Files:

• lemon/list_graph.h (modified) (1 diff)
• tools/dimacs-solver.cc (modified) (3 diffs)
• tools/dimacs-to-lgf.cc (modified) (2 diffs)

lemon/list_graph.h

@@ -1210 +1210 @@
     ListGraph() {}
 
-    typedef Parent::OutArcIt IncEdgeIt;
+    typedef Parent::IncEdgeIt IncEdgeIt;
 
     /// \brief Add a new node to the graph.

tools/dimacs-solver.cc

@@ -222 +222 @@
         throw IoError("Cannot open the file for writing", ap.files()[1]);
       }
+      // fall through
     case 1:
       input.open(ap.files()[0].c_str());
@@ -227 +228 @@
         throw IoError("File cannot be found", ap.files()[0]);
       }
+      // fall through
     case 0:
       break;
@@ -251 +253 @@
         case DimacsDescriptor::SP:
           std::cout << "sp";
+          break;
         case DimacsDescriptor::MAT:
           std::cout << "mat";

tools/dimacs-to-lgf.cc

@@ -74 +74 @@
         throw IoError("Cannot open the file for writing", ap.files()[1]);
       }
+      // fall through
     case 1:
       input.open(ap.files()[0].c_str());
@@ -79 +80 @@
         throw IoError("File cannot be found", ap.files()[0]);
       }
+      // fall through
     case 0:
       break;