COIN-OR::LEMON - Graph Library

Changeset 517:afd134142111 in lemon for lemon/lgf_reader.h


Ignore:
Timestamp:
02/20/09 21:36:26 (11 years ago)
Author:
Peter Kovacs <kpeter@…>
Branch:
default
Phase:
public
Message:

Various fixes for compiling on AIX (#211, #212)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lemon/lgf_reader.h

    r319 r517  
    391391  class DigraphReader;
    392392
    393   /// \brief Return a \ref DigraphReader class
    394   ///
    395   /// This function just returns a \ref DigraphReader class.
    396   /// \relates DigraphReader
    397393  template <typename Digraph>
    398   DigraphReader<Digraph> digraphReader(Digraph& digraph,
    399                                        std::istream& is = std::cin) {
    400     DigraphReader<Digraph> tmp(digraph, is);
    401     return tmp;
    402   }
    403 
    404   /// \brief Return a \ref DigraphReader class
    405   ///
    406   /// This function just returns a \ref DigraphReader class.
    407   /// \relates DigraphReader
     394  DigraphReader<Digraph> digraphReader(Digraph& digraph,
     395                                       std::istream& is = std::cin);
    408396  template <typename Digraph>
    409   DigraphReader<Digraph> digraphReader(Digraph& digraph,
    410                                        const std::string& fn) {
    411     DigraphReader<Digraph> tmp(digraph, fn);
    412     return tmp;
    413   }
    414 
    415   /// \brief Return a \ref DigraphReader class
    416   ///
    417   /// This function just returns a \ref DigraphReader class.
    418   /// \relates DigraphReader
     397  DigraphReader<Digraph> digraphReader(Digraph& digraph, const std::string& fn);
    419398  template <typename Digraph>
    420   DigraphReader<Digraph> digraphReader(Digraph& digraph, const char* fn) {
    421     DigraphReader<Digraph> tmp(digraph, fn);
    422     return tmp;
    423   }
     399  DigraphReader<Digraph> digraphReader(Digraph& digraph, const char *fn);
    424400
    425401  /// \ingroup lemon_io
     
    585561  private:
    586562
    587     friend DigraphReader<Digraph> digraphReader<>(Digraph& digraph,
    588                                                   std::istream& is);
    589     friend DigraphReader<Digraph> digraphReader<>(Digraph& digraph,
    590                                                   const std::string& fn);
    591     friend DigraphReader<Digraph> digraphReader<>(Digraph& digraph,
    592                                                   const char *fn);
     563    template <typename DGR>
     564    friend DigraphReader<DGR> digraphReader(DGR& digraph, std::istream& is);
     565    template <typename DGR>
     566    friend DigraphReader<DGR> digraphReader(DGR& digraph,
     567                                            const std::string& fn);
     568    template <typename DGR>
     569    friend DigraphReader<DGR> digraphReader(DGR& digraph, const char *fn);
    593570
    594571    DigraphReader(DigraphReader& other)
     
    12111188  };
    12121189
     1190  /// \brief Return a \ref DigraphReader class
     1191  ///
     1192  /// This function just returns a \ref DigraphReader class.
     1193  /// \relates DigraphReader
     1194  template <typename Digraph>
     1195  DigraphReader<Digraph> digraphReader(Digraph& digraph, std::istream& is) {
     1196    DigraphReader<Digraph> tmp(digraph, is);
     1197    return tmp;
     1198  }
     1199
     1200  /// \brief Return a \ref DigraphReader class
     1201  ///
     1202  /// This function just returns a \ref DigraphReader class.
     1203  /// \relates DigraphReader
     1204  template <typename Digraph>
     1205  DigraphReader<Digraph> digraphReader(Digraph& digraph,
     1206                                       const std::string& fn) {
     1207    DigraphReader<Digraph> tmp(digraph, fn);
     1208    return tmp;
     1209  }
     1210
     1211  /// \brief Return a \ref DigraphReader class
     1212  ///
     1213  /// This function just returns a \ref DigraphReader class.
     1214  /// \relates DigraphReader
     1215  template <typename Digraph>
     1216  DigraphReader<Digraph> digraphReader(Digraph& digraph, const char* fn) {
     1217    DigraphReader<Digraph> tmp(digraph, fn);
     1218    return tmp;
     1219  }
     1220
    12131221  template <typename Graph>
    12141222  class GraphReader;
    1215 
    1216   /// \brief Return a \ref GraphReader class
    1217   ///
    1218   /// This function just returns a \ref GraphReader class.
    1219   /// \relates GraphReader
     1223 
    12201224  template <typename Graph>
    1221   GraphReader<Graph> graphReader(Graph& graph, std::istream& is = std::cin) {
    1222     GraphReader<Graph> tmp(graph, is);
    1223     return tmp;
    1224   }
    1225 
    1226   /// \brief Return a \ref GraphReader class
    1227   ///
    1228   /// This function just returns a \ref GraphReader class.
    1229   /// \relates GraphReader
     1225  GraphReader<Graph> graphReader(Graph& graph,
     1226                                 std::istream& is = std::cin);
    12301227  template <typename Graph>
    1231   GraphReader<Graph> graphReader(Graph& graph, const std::string& fn) {
    1232     GraphReader<Graph> tmp(graph, fn);
    1233     return tmp;
    1234   }
    1235 
    1236   /// \brief Return a \ref GraphReader class
    1237   ///
    1238   /// This function just returns a \ref GraphReader class.
    1239   /// \relates GraphReader
     1228  GraphReader<Graph> graphReader(Graph& graph, const std::string& fn);
    12401229  template <typename Graph>
    1241   GraphReader<Graph> graphReader(Graph& graph, const char* fn) {
    1242     GraphReader<Graph> tmp(graph, fn);
    1243     return tmp;
    1244   }
     1230  GraphReader<Graph> graphReader(Graph& graph, const char *fn);
    12451231
    12461232  /// \ingroup lemon_io
     
    13691355
    13701356  private:
    1371     friend GraphReader<Graph> graphReader<>(Graph& graph, std::istream& is);
    1372     friend GraphReader<Graph> graphReader<>(Graph& graph,
    1373                                             const std::string& fn);
    1374     friend GraphReader<Graph> graphReader<>(Graph& graph, const char *fn);
     1357    template <typename GR>
     1358    friend GraphReader<GR> graphReader(GR& graph, std::istream& is);
     1359    template <typename GR>
     1360    friend GraphReader<GR> graphReader(GR& graph, const std::string& fn);
     1361    template <typename GR>
     1362    friend GraphReader<GR> graphReader(GR& graph, const char *fn);
    13751363
    13761364    GraphReader(GraphReader& other)
     
    20402028
    20412029  };
     2030
     2031  /// \brief Return a \ref GraphReader class
     2032  ///
     2033  /// This function just returns a \ref GraphReader class.
     2034  /// \relates GraphReader
     2035  template <typename Graph>
     2036  GraphReader<Graph> graphReader(Graph& graph, std::istream& is) {
     2037    GraphReader<Graph> tmp(graph, is);
     2038    return tmp;
     2039  }
     2040
     2041  /// \brief Return a \ref GraphReader class
     2042  ///
     2043  /// This function just returns a \ref GraphReader class.
     2044  /// \relates GraphReader
     2045  template <typename Graph>
     2046  GraphReader<Graph> graphReader(Graph& graph, const std::string& fn) {
     2047    GraphReader<Graph> tmp(graph, fn);
     2048    return tmp;
     2049  }
     2050
     2051  /// \brief Return a \ref GraphReader class
     2052  ///
     2053  /// This function just returns a \ref GraphReader class.
     2054  /// \relates GraphReader
     2055  template <typename Graph>
     2056  GraphReader<Graph> graphReader(Graph& graph, const char* fn) {
     2057    GraphReader<Graph> tmp(graph, fn);
     2058    return tmp;
     2059  }
    20422060
    20432061  class SectionReader;
Note: See TracChangeset for help on using the changeset viewer.