equal
deleted
inserted
replaced
868 void skipSection() { |
868 void skipSection() { |
869 char c; |
869 char c; |
870 while (readSuccess() && line >> c && c != '@') { |
870 while (readSuccess() && line >> c && c != '@') { |
871 readLine(); |
871 readLine(); |
872 } |
872 } |
873 line.putback(c); |
873 if (readSuccess()) { |
|
874 line.putback(c); |
|
875 } |
874 } |
876 } |
875 |
877 |
876 void readNodes() { |
878 void readNodes() { |
877 |
879 |
878 std::vector<int> map_index(_node_maps.size()); |
880 std::vector<int> map_index(_node_maps.size()); |
1697 void skipSection() { |
1699 void skipSection() { |
1698 char c; |
1700 char c; |
1699 while (readSuccess() && line >> c && c != '@') { |
1701 while (readSuccess() && line >> c && c != '@') { |
1700 readLine(); |
1702 readLine(); |
1701 } |
1703 } |
1702 line.putback(c); |
1704 if (readSuccess()) { |
|
1705 line.putback(c); |
|
1706 } |
1703 } |
1707 } |
1704 |
1708 |
1705 void readNodes() { |
1709 void readNodes() { |
1706 |
1710 |
1707 std::vector<int> map_index(_node_maps.size()); |
1711 std::vector<int> map_index(_node_maps.size()); |
2224 void skipSection() { |
2228 void skipSection() { |
2225 char c; |
2229 char c; |
2226 while (readSuccess() && line >> c && c != '@') { |
2230 while (readSuccess() && line >> c && c != '@') { |
2227 readLine(); |
2231 readLine(); |
2228 } |
2232 } |
2229 line.putback(c); |
2233 if (readSuccess()) { |
|
2234 line.putback(c); |
|
2235 } |
2230 } |
2236 } |
2231 |
2237 |
2232 public: |
2238 public: |
2233 |
2239 |
2234 |
2240 |
2565 void skipSection() { |
2571 void skipSection() { |
2566 char c; |
2572 char c; |
2567 while (readSuccess() && line >> c && c != '@') { |
2573 while (readSuccess() && line >> c && c != '@') { |
2568 readLine(); |
2574 readLine(); |
2569 } |
2575 } |
2570 line.putback(c); |
2576 if (readSuccess()) { |
|
2577 line.putback(c); |
|
2578 } |
2571 } |
2579 } |
2572 |
2580 |
2573 void readMaps(std::vector<std::string>& maps) { |
2581 void readMaps(std::vector<std::string>& maps) { |
2574 char c; |
2582 char c; |
2575 if (!readLine() || !(line >> c) || c == '@') { |
2583 if (!readLine() || !(line >> c) || c == '@') { |