COIN-OR::LEMON - Graph Library

Changeset 307:a3a69f5bba62 in lemon-1.0 for lemon


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

Fix compilation with Visual Studio 2005.

Location:
lemon
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • lemon/lgf_reader.h

    r295 r307  
    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;
  • lemon/lgf_writer.h

    r295 r307  
    352352  class DigraphWriter;
    353353
     354  /// \brief Return a \ref DigraphWriter class
     355  ///
     356  /// This function just returns a \ref DigraphWriter class.
     357  /// \relates DigraphWriter
    354358  template <typename Digraph>
    355359  DigraphWriter<Digraph> digraphWriter(const Digraph& digraph,
    356                                        std::ostream& os = std::cout);
    357 
     360                                       std::ostream& os = std::cout) {
     361    DigraphWriter<Digraph> tmp(digraph, os);
     362    return tmp;
     363  }
     364
     365  /// \brief Return a \ref DigraphWriter class
     366  ///
     367  /// This function just returns a \ref DigraphWriter class.
     368  /// \relates DigraphWriter
    358369  template <typename Digraph>
    359370  DigraphWriter<Digraph> digraphWriter(const Digraph& digraph,
    360                                        const std::string& fn);
    361 
     371                                       const std::string& fn) {
     372    DigraphWriter<Digraph> tmp(digraph, fn);
     373    return tmp;
     374  }
     375
     376  /// \brief Return a \ref DigraphWriter class
     377  ///
     378  /// This function just returns a \ref DigraphWriter class.
     379  /// \relates DigraphWriter
    362380  template <typename Digraph>
    363381  DigraphWriter<Digraph> digraphWriter(const Digraph& digraph,
    364                                        const char *fn);
     382                                       const char* fn) {
     383    DigraphWriter<Digraph> tmp(digraph, fn);
     384    return tmp;
     385  }
    365386
    366387  /// \ingroup lemon_io
     
    914935  };
    915936
    916   /// \brief Return a \ref DigraphWriter class
    917   ///
    918   /// This function just returns a \ref DigraphWriter class.
    919   /// \relates DigraphWriter
    920   template <typename Digraph>
    921   DigraphWriter<Digraph> digraphWriter(const Digraph& digraph,
    922                                        std::ostream& os = std::cout) {
    923     DigraphWriter<Digraph> tmp(digraph, os);
     937  template <typename Graph>
     938  class GraphWriter;
     939
     940  /// \brief Return a \ref GraphWriter class
     941  ///
     942  /// This function just returns a \ref GraphWriter class.
     943  /// \relates GraphWriter
     944  template <typename Graph>
     945  GraphWriter<Graph> graphWriter(const Graph& graph,
     946                                 std::ostream& os = std::cout) {
     947    GraphWriter<Graph> tmp(graph, os);
    924948    return tmp;
    925949  }
    926950
    927   /// \brief Return a \ref DigraphWriter class
    928   ///
    929   /// This function just returns a \ref DigraphWriter class.
    930   /// \relates DigraphWriter
    931   template <typename Digraph>
    932   DigraphWriter<Digraph> digraphWriter(const Digraph& digraph,
    933                                        const std::string& fn) {
    934     DigraphWriter<Digraph> tmp(digraph, fn);
     951  /// \brief Return a \ref GraphWriter class
     952  ///
     953  /// This function just returns a \ref GraphWriter class.
     954  /// \relates GraphWriter
     955  template <typename Graph>
     956  GraphWriter<Graph> graphWriter(const Graph& graph, const std::string& fn) {
     957    GraphWriter<Graph> tmp(graph, fn);
    935958    return tmp;
    936959  }
    937960
    938   /// \brief Return a \ref DigraphWriter class
    939   ///
    940   /// This function just returns a \ref DigraphWriter class.
    941   /// \relates DigraphWriter
    942   template <typename Digraph>
    943   DigraphWriter<Digraph> digraphWriter(const Digraph& digraph,
    944                                        const char* fn) {
    945     DigraphWriter<Digraph> tmp(digraph, fn);
     961  /// \brief Return a \ref GraphWriter class
     962  ///
     963  /// This function just returns a \ref GraphWriter class.
     964  /// \relates GraphWriter
     965  template <typename Graph>
     966  GraphWriter<Graph> graphWriter(const Graph& graph, const char* fn) {
     967    GraphWriter<Graph> tmp(graph, fn);
    946968    return tmp;
    947969  }
    948 
    949   template <typename Graph>
    950   class GraphWriter;
    951 
    952   template <typename Graph>
    953   GraphWriter<Graph> graphWriter(const Graph& graph,
    954                                  std::ostream& os = std::cout);
    955 
    956   template <typename Graph>
    957   GraphWriter<Graph> graphWriter(const Graph& graph, const std::string& fn);
    958 
    959   template <typename Graph>
    960   GraphWriter<Graph> graphWriter(const Graph& graph, const char *fn);
    961970
    962971  /// \ingroup lemon_io
     
    15261535    /// @}
    15271536  };
    1528 
    1529   /// \brief Return a \ref GraphWriter class
    1530   ///
    1531   /// This function just returns a \ref GraphWriter class.
    1532   /// \relates GraphWriter
    1533   template <typename Graph>
    1534   GraphWriter<Graph> graphWriter(const Graph& graph,
    1535                                  std::ostream& os = std::cout) {
    1536     GraphWriter<Graph> tmp(graph, os);
    1537     return tmp;
    1538   }
    1539 
    1540   /// \brief Return a \ref GraphWriter class
    1541   ///
    1542   /// This function just returns a \ref GraphWriter class.
    1543   /// \relates GraphWriter
    1544   template <typename Graph>
    1545   GraphWriter<Graph> graphWriter(const Graph& graph, const std::string& fn) {
    1546     GraphWriter<Graph> tmp(graph, fn);
    1547     return tmp;
    1548   }
    1549 
    1550   /// \brief Return a \ref GraphWriter class
    1551   ///
    1552   /// This function just returns a \ref GraphWriter class.
    1553   /// \relates GraphWriter
    1554   template <typename Graph>
    1555   GraphWriter<Graph> graphWriter(const Graph& graph, const char* fn) {
    1556     GraphWriter<Graph> tmp(graph, fn);
    1557     return tmp;
    1558   }
    15591537
    15601538  class SectionWriter;
Note: See TracChangeset for help on using the changeset viewer.