[Lemon-commits] Alpar Juttner: Backport relevant parts of bugfix...

Lemon HG hg at lemon.cs.elte.hu
Wed May 15 13:43:04 CEST 2019


details:   http://lemon.cs.elte.hu/hg/lemon/rev/7edc220d6244
changeset: 1424:7edc220d6244
user:      Alpar Juttner <alpar [at] cs.elte.hu>
date:      Wed May 15 13:33:55 2019 +0200
description:
	Backport relevant parts of bugfixes [ad22262328b3], [61fdd06833a6]
	and [4add05447ca0] to branch 1.2 (#623)

diffstat:

 lemon/list_graph.h     |  2 +-
 tools/dimacs-solver.cc |  3 +++
 tools/dimacs-to-lgf.cc |  2 ++
 3 files changed, 6 insertions(+), 1 deletions(-)

diffs (54 lines):

diff --git a/lemon/list_graph.h b/lemon/list_graph.h
--- a/lemon/list_graph.h
+++ b/lemon/list_graph.h
@@ -1209,7 +1209,7 @@
     ///
     ListGraph() {}
 
-    typedef Parent::OutArcIt IncEdgeIt;
+    typedef Parent::IncEdgeIt IncEdgeIt;
 
     /// \brief Add a new node to the graph.
     ///
diff --git a/tools/dimacs-solver.cc b/tools/dimacs-solver.cc
--- a/tools/dimacs-solver.cc
+++ b/tools/dimacs-solver.cc
@@ -221,11 +221,13 @@
       if (!output) {
         throw IoError("Cannot open the file for writing", ap.files()[1]);
       }
+      // fall through
     case 1:
       input.open(ap.files()[0].c_str());
       if (!input) {
         throw IoError("File cannot be found", ap.files()[0]);
       }
+      // fall through
     case 0:
       break;
     default:
@@ -250,6 +252,7 @@
           break;
         case DimacsDescriptor::SP:
           std::cout << "sp";
+          break;
         case DimacsDescriptor::MAT:
           std::cout << "mat";
           break;
diff --git a/tools/dimacs-to-lgf.cc b/tools/dimacs-to-lgf.cc
--- a/tools/dimacs-to-lgf.cc
+++ b/tools/dimacs-to-lgf.cc
@@ -73,11 +73,13 @@
       if (!output) {
         throw IoError("Cannot open the file for writing", ap.files()[1]);
       }
+      // fall through
     case 1:
       input.open(ap.files()[0].c_str());
       if (!input) {
         throw IoError("File cannot be found", ap.files()[0]);
       }
+      // fall through
     case 0:
       break;
     default:


More information about the Lemon-commits mailing list