Backport relevant parts of bugfixes [ad22262328b3], [61fdd06833a6] and [4add05447ca0] to branch 1.2 (#623) 1.2
authorAlpar Juttner <alpar@cs.elte.hu>
Wed, 15 May 2019 13:33:55 +0200
branch1.2
changeset 14247edc220d6244
parent 1374 00769a5f0f5d
Backport relevant parts of bugfixes [ad22262328b3], [61fdd06833a6] and [4add05447ca0] to branch 1.2 (#623)
lemon/list_graph.h
tools/dimacs-solver.cc
tools/dimacs-to-lgf.cc
     1.1 --- a/lemon/list_graph.h	Tue Sep 19 15:19:48 2017 +0200
     1.2 +++ b/lemon/list_graph.h	Wed May 15 13:33:55 2019 +0200
     1.3 @@ -1209,7 +1209,7 @@
     1.4      ///
     1.5      ListGraph() {}
     1.6  
     1.7 -    typedef Parent::OutArcIt IncEdgeIt;
     1.8 +    typedef Parent::IncEdgeIt IncEdgeIt;
     1.9  
    1.10      /// \brief Add a new node to the graph.
    1.11      ///
     2.1 --- a/tools/dimacs-solver.cc	Tue Sep 19 15:19:48 2017 +0200
     2.2 +++ b/tools/dimacs-solver.cc	Wed May 15 13:33:55 2019 +0200
     2.3 @@ -221,11 +221,13 @@
     2.4        if (!output) {
     2.5          throw IoError("Cannot open the file for writing", ap.files()[1]);
     2.6        }
     2.7 +      // fall through
     2.8      case 1:
     2.9        input.open(ap.files()[0].c_str());
    2.10        if (!input) {
    2.11          throw IoError("File cannot be found", ap.files()[0]);
    2.12        }
    2.13 +      // fall through
    2.14      case 0:
    2.15        break;
    2.16      default:
    2.17 @@ -250,6 +252,7 @@
    2.18            break;
    2.19          case DimacsDescriptor::SP:
    2.20            std::cout << "sp";
    2.21 +          break;
    2.22          case DimacsDescriptor::MAT:
    2.23            std::cout << "mat";
    2.24            break;
     3.1 --- a/tools/dimacs-to-lgf.cc	Tue Sep 19 15:19:48 2017 +0200
     3.2 +++ b/tools/dimacs-to-lgf.cc	Wed May 15 13:33:55 2019 +0200
     3.3 @@ -73,11 +73,13 @@
     3.4        if (!output) {
     3.5          throw IoError("Cannot open the file for writing", ap.files()[1]);
     3.6        }
     3.7 +      // fall through
     3.8      case 1:
     3.9        input.open(ap.files()[0].c_str());
    3.10        if (!input) {
    3.11          throw IoError("File cannot be found", ap.files()[0]);
    3.12        }
    3.13 +      // fall through
    3.14      case 0:
    3.15        break;
    3.16      default: