equal
deleted
inserted
replaced
389 |
389 |
390 template <typename Digraph> |
390 template <typename Digraph> |
391 class DigraphReader; |
391 class DigraphReader; |
392 |
392 |
393 template <typename Digraph> |
393 template <typename Digraph> |
394 DigraphReader<Digraph> digraphReader(Digraph& digraph, |
394 DigraphReader<Digraph> digraphReader(Digraph& digraph, |
395 std::istream& is = std::cin); |
395 std::istream& is = std::cin); |
396 template <typename Digraph> |
396 template <typename Digraph> |
397 DigraphReader<Digraph> digraphReader(Digraph& digraph, const std::string& fn); |
397 DigraphReader<Digraph> digraphReader(Digraph& digraph, const std::string& fn); |
398 template <typename Digraph> |
398 template <typename Digraph> |
399 DigraphReader<Digraph> digraphReader(Digraph& digraph, const char *fn); |
399 DigraphReader<Digraph> digraphReader(Digraph& digraph, const char *fn); |
561 private: |
561 private: |
562 |
562 |
563 template <typename DGR> |
563 template <typename DGR> |
564 friend DigraphReader<DGR> digraphReader(DGR& digraph, std::istream& is); |
564 friend DigraphReader<DGR> digraphReader(DGR& digraph, std::istream& is); |
565 template <typename DGR> |
565 template <typename DGR> |
566 friend DigraphReader<DGR> digraphReader(DGR& digraph, |
566 friend DigraphReader<DGR> digraphReader(DGR& digraph, |
567 const std::string& fn); |
567 const std::string& fn); |
568 template <typename DGR> |
568 template <typename DGR> |
569 friend DigraphReader<DGR> digraphReader(DGR& digraph, const char *fn); |
569 friend DigraphReader<DGR> digraphReader(DGR& digraph, const char *fn); |
570 |
570 |
571 DigraphReader(DigraphReader& other) |
571 DigraphReader(DigraphReader& other) |
1227 return tmp; |
1227 return tmp; |
1228 } |
1228 } |
1229 |
1229 |
1230 template <typename Graph> |
1230 template <typename Graph> |
1231 class GraphReader; |
1231 class GraphReader; |
1232 |
1232 |
1233 template <typename Graph> |
1233 template <typename Graph> |
1234 GraphReader<Graph> graphReader(Graph& graph, |
1234 GraphReader<Graph> graphReader(Graph& graph, |
1235 std::istream& is = std::cin); |
1235 std::istream& is = std::cin); |
1236 template <typename Graph> |
1236 template <typename Graph> |
1237 GraphReader<Graph> graphReader(Graph& graph, const std::string& fn); |
1237 GraphReader<Graph> graphReader(Graph& graph, const std::string& fn); |
1238 template <typename Graph> |
1238 template <typename Graph> |
1239 GraphReader<Graph> graphReader(Graph& graph, const char *fn); |
1239 GraphReader<Graph> graphReader(Graph& graph, const char *fn); |
1364 |
1364 |
1365 private: |
1365 private: |
1366 template <typename GR> |
1366 template <typename GR> |
1367 friend GraphReader<GR> graphReader(GR& graph, std::istream& is); |
1367 friend GraphReader<GR> graphReader(GR& graph, std::istream& is); |
1368 template <typename GR> |
1368 template <typename GR> |
1369 friend GraphReader<GR> graphReader(GR& graph, const std::string& fn); |
1369 friend GraphReader<GR> graphReader(GR& graph, const std::string& fn); |
1370 template <typename GR> |
1370 template <typename GR> |
1371 friend GraphReader<GR> graphReader(GR& graph, const char *fn); |
1371 friend GraphReader<GR> graphReader(GR& graph, const char *fn); |
1372 |
1372 |
1373 GraphReader(GraphReader& other) |
1373 GraphReader(GraphReader& other) |
1374 : _is(other._is), local_is(other.local_is), _graph(other._graph), |
1374 : _is(other._is), local_is(other.local_is), _graph(other._graph), |