COIN-OR::LEMON - Graph Library

Changeset 2181:b2c38f4f72ff in lemon-0.x for lemon/concept


Ignore:
Timestamp:
08/14/06 18:14:10 (13 years ago)
Author:
Balazs Dezso
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2898
Message:

Omit warnings

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lemon/concept/graph_components.h

    r2129 r2181  
    12951295      /// ReadWrite map of the nodes.
    12961296      ///
    1297       template <typename Value>
    1298       class NodeMap : public GraphMap<Graph, Node, Value> {
     1297      template <typename _Value>
     1298      class NodeMap : public GraphMap<Graph, Node, _Value> {
    12991299      private:
    13001300        NodeMap();
    13011301      public:
    1302         typedef GraphMap<Graph, Node, Value> Parent;
     1302        typedef GraphMap<MappableGraphComponent, Node, _Value> Parent;
    13031303
    13041304        /// \brief Construct a new map.
     
    13061306        /// Construct a new map for the graph.
    13071307        /// \todo call the right parent class constructor
    1308         explicit NodeMap(const Graph& graph) : Parent(graph) {}
     1308        explicit NodeMap(const MappableGraphComponent& graph)
     1309          : Parent(graph) {}
    13091310
    13101311        /// \brief Construct a new map with default value.
    13111312        ///
    13121313        /// Construct a new map for the graph and initalise the values.
    1313         NodeMap(const Graph& graph, const Value& value)
     1314        NodeMap(const MappableGraphComponent& graph, const _Value& value)
    13141315          : Parent(graph, value) {}
    13151316
     
    13241325        template <typename CMap>
    13251326        NodeMap& operator=(const CMap&) {
    1326           checkConcept<ReadMap<Node, Value>, CMap>();
     1327          checkConcept<ReadMap<Node, _Value>, CMap>();
    13271328          return *this;
    13281329        }
     
    13341335      /// ReadWrite map of the edges.
    13351336      ///
    1336       template <typename Value>
    1337       class EdgeMap : public GraphMap<Graph, Edge, Value> {
     1337      template <typename _Value>
     1338      class EdgeMap : public GraphMap<Graph, Edge, _Value> {
    13381339      private:
    13391340        EdgeMap();
    13401341      public:
    1341         typedef GraphMap<Graph, Edge, Value> Parent;
     1342        typedef GraphMap<MappableGraphComponent, Edge, _Value> Parent;
    13421343
    13431344        /// \brief Construct a new map.
     
    13451346        /// Construct a new map for the graph.
    13461347        /// \todo call the right parent class constructor
    1347         explicit EdgeMap(const Graph& graph) : Parent(graph) {}
     1348        explicit EdgeMap(const MappableGraphComponent& graph)
     1349          : Parent(graph) {}
    13481350
    13491351        /// \brief Construct a new map with default value.
    13501352        ///
    13511353        /// Construct a new map for the graph and initalise the values.
    1352         EdgeMap(const Graph& graph, const Value& value)
     1354        EdgeMap(const MappableGraphComponent& graph, const _Value& value)
    13531355          : Parent(graph, value) {}
    13541356
     
    13631365        template <typename CMap>
    13641366        EdgeMap& operator=(const CMap&) {
    1365           checkConcept<ReadMap<Edge, Value>, CMap>();
     1367          checkConcept<ReadMap<Edge, _Value>, CMap>();
    13661368          return *this;
    13671369        }
     
    14321434      /// ReadWrite map of the uedges.
    14331435      ///
    1434       template <typename Value>
    1435       class UEdgeMap : public GraphMap<Graph, UEdge, Value> { 
     1436      template <typename _Value>
     1437      class UEdgeMap : public GraphMap<Graph, UEdge, _Value> { 
    14361438      public:
    1437         typedef GraphMap<Graph, UEdge, Value> Parent;
     1439        typedef GraphMap<MappableUGraphComponent, UEdge, _Value> Parent;
    14381440
    14391441        /// \brief Construct a new map.
     
    14411443        /// Construct a new map for the graph.
    14421444        /// \todo call the right parent class constructor
    1443         explicit UEdgeMap(const Graph& graph) : Parent(graph) {}
     1445        explicit UEdgeMap(const MappableUGraphComponent& graph)
     1446          : Parent(graph) {}
    14441447
    14451448        /// \brief Construct a new map with default value.
    14461449        ///
    14471450        /// Construct a new map for the graph and initalise the values.
    1448         UEdgeMap(const Graph& graph, const Value& value)
     1451        UEdgeMap(const MappableUGraphComponent& graph, const _Value& value)
    14491452          : Parent(graph, value) {}
    14501453
     
    14591462        template <typename CMap>
    14601463        UEdgeMap& operator=(const CMap&) {
    1461           checkConcept<ReadMap<UEdge, Value>, CMap>();
     1464          checkConcept<ReadMap<UEdge, _Value>, CMap>();
    14621465          return *this;
    14631466        }
Note: See TracChangeset for help on using the changeset viewer.