# HG changeset patch # User Alpar Juttner # Date 1557920035 -7200 # Node ID 7edc220d6244aebe93a768b41750bc9199b95a8f # Parent 00769a5f0f5dfc2137ce865118beaa0893f6eeb0 Backport relevant parts of bugfixes [ad22262328b3], [61fdd06833a6] and [4add05447ca0] to branch 1.2 (#623) diff -r 00769a5f0f5d -r 7edc220d6244 lemon/list_graph.h --- a/lemon/list_graph.h Tue Sep 19 15:19:48 2017 +0200 +++ b/lemon/list_graph.h Wed May 15 13:33:55 2019 +0200 @@ -1209,7 +1209,7 @@ /// ListGraph() {} - typedef Parent::OutArcIt IncEdgeIt; + typedef Parent::IncEdgeIt IncEdgeIt; /// \brief Add a new node to the graph. /// diff -r 00769a5f0f5d -r 7edc220d6244 tools/dimacs-solver.cc --- a/tools/dimacs-solver.cc Tue Sep 19 15:19:48 2017 +0200 +++ b/tools/dimacs-solver.cc Wed May 15 13:33:55 2019 +0200 @@ -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 -r 00769a5f0f5d -r 7edc220d6244 tools/dimacs-to-lgf.cc --- a/tools/dimacs-to-lgf.cc Tue Sep 19 15:19:48 2017 +0200 +++ b/tools/dimacs-to-lgf.cc Wed May 15 13:33:55 2019 +0200 @@ -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: