COIN-OR::LEMON - Graph Library

Changeset 303:a3a69f5bba62 in lemon-main for lemon/lgf_reader.h


Ignore:
Timestamp:
10/08/08 12:59:06 (16 years ago)
Author:
Akos Ladanyi <ladanyi@…>
Branch:
default
Phase:
public
Message:

Fix compilation with Visual Studio 2005.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lemon/lgf_reader.h

    r295 r303  
    392392  class DigraphReader;
    393393
     394  /// \brief Return a \ref DigraphReader class
     395  ///
     396  /// This function just returns a \ref DigraphReader class.
     397  /// \relates DigraphReader
    394398  template <typename Digraph>
    395399  DigraphReader<Digraph> digraphReader(Digraph& digraph,
    396                                        std::istream& is = std::cin);
    397 
     400                                       std::istream& is = std::cin) {
     401    DigraphReader<Digraph> tmp(digraph, is);
     402    return tmp;
     403  }
     404
     405  /// \brief Return a \ref DigraphReader class
     406  ///
     407  /// This function just returns a \ref DigraphReader class.
     408  /// \relates DigraphReader
    398409  template <typename Digraph>
    399   DigraphReader<Digraph> digraphReader(Digraph& digraph, const std::string& fn);
    400 
     410  DigraphReader<Digraph> digraphReader(Digraph& digraph,
     411                                       const std::string& fn) {
     412    DigraphReader<Digraph> tmp(digraph, fn);
     413    return tmp;
     414  }
     415
     416  /// \brief Return a \ref DigraphReader class
     417  ///
     418  /// This function just returns a \ref DigraphReader class.
     419  /// \relates DigraphReader
    401420  template <typename Digraph>
    402   DigraphReader<Digraph> digraphReader(Digraph& digraph, const char *fn);
     421  DigraphReader<Digraph> digraphReader(Digraph& digraph, const char* fn) {
     422    DigraphReader<Digraph> tmp(digraph, fn);
     423    return tmp;
     424  }
    403425
    404426  /// \ingroup lemon_io
     
    11901212  };
    11911213
    1192   /// \brief Return a \ref DigraphReader class
     1214  template <typename Graph>
     1215  class GraphReader;
     1216
     1217  /// \brief Return a \ref GraphReader class
    11931218  ///
    1194   /// This function just returns a \ref DigraphReader class.
    1195   /// \relates DigraphReader
    1196   template <typename Digraph>
    1197   DigraphReader<Digraph> digraphReader(Digraph& digraph,
    1198                                        std::istream& is = std::cin) {
    1199     DigraphReader<Digraph> tmp(digraph, is);
     1219  /// This function just returns a \ref GraphReader class.
     1220  /// \relates GraphReader
     1221  template <typename Graph>
     1222  GraphReader<Graph> graphReader(Graph& graph, std::istream& is = std::cin) {
     1223    GraphReader<Graph> tmp(graph, is);
    12001224    return tmp;
    12011225  }
    12021226
    1203   /// \brief Return a \ref DigraphReader class
     1227  /// \brief Return a \ref GraphReader class
    12041228  ///
    1205   /// This function just returns a \ref DigraphReader class.
    1206   /// \relates DigraphReader
    1207   template <typename Digraph>
    1208   DigraphReader<Digraph> digraphReader(Digraph& digraph,
    1209                                        const std::string& fn) {
    1210     DigraphReader<Digraph> tmp(digraph, fn);
     1229  /// This function just returns a \ref GraphReader class.
     1230  /// \relates GraphReader
     1231  template <typename Graph>
     1232  GraphReader<Graph> graphReader(Graph& graph, const std::string& fn) {
     1233    GraphReader<Graph> tmp(graph, fn);
    12111234    return tmp;
    12121235  }
    12131236
    1214   /// \brief Return a \ref DigraphReader class
     1237  /// \brief Return a \ref GraphReader class
    12151238  ///
    1216   /// This function just returns a \ref DigraphReader class.
    1217   /// \relates DigraphReader
    1218   template <typename Digraph>
    1219   DigraphReader<Digraph> digraphReader(Digraph& digraph, const char* fn) {
    1220     DigraphReader<Digraph> tmp(digraph, fn);
     1239  /// This function just returns a \ref GraphReader class.
     1240  /// \relates GraphReader
     1241  template <typename Graph>
     1242  GraphReader<Graph> graphReader(Graph& graph, const char* fn) {
     1243    GraphReader<Graph> tmp(graph, fn);
    12211244    return tmp;
    12221245  }
    1223 
    1224   template <typename Graph>
    1225   class GraphReader;
    1226 
    1227   template <typename Graph>
    1228   GraphReader<Graph> graphReader(Graph& graph,
    1229                                  std::istream& is = std::cin);
    1230 
    1231   template <typename Graph>
    1232   GraphReader<Graph> graphReader(Graph& graph, const std::string& fn);
    1233 
    1234   template <typename Graph>
    1235   GraphReader<Graph> graphReader(Graph& graph, const char *fn);
    12361246
    12371247  /// \ingroup lemon_io
     
    20312041
    20322042  };
    2033 
    2034   /// \brief Return a \ref GraphReader class
    2035   ///
    2036   /// This function just returns a \ref GraphReader class.
    2037   /// \relates GraphReader
    2038   template <typename Graph>
    2039   GraphReader<Graph> graphReader(Graph& graph, std::istream& is = std::cin) {
    2040     GraphReader<Graph> tmp(graph, is);
    2041     return tmp;
    2042   }
    2043 
    2044   /// \brief Return a \ref GraphReader class
    2045   ///
    2046   /// This function just returns a \ref GraphReader class.
    2047   /// \relates GraphReader
    2048   template <typename Graph>
    2049   GraphReader<Graph> graphReader(Graph& graph, const std::string& fn) {
    2050     GraphReader<Graph> tmp(graph, fn);
    2051     return tmp;
    2052   }
    2053 
    2054   /// \brief Return a \ref GraphReader class
    2055   ///
    2056   /// This function just returns a \ref GraphReader class.
    2057   /// \relates GraphReader
    2058   template <typename Graph>
    2059   GraphReader<Graph> graphReader(Graph& graph, const char* fn) {
    2060     GraphReader<Graph> tmp(graph, fn);
    2061     return tmp;
    2062   }
    20632043
    20642044  class SectionReader;
Note: See TracChangeset for help on using the changeset viewer.