Changeset 2181:b2c38f4f72ff in lemon0.x
 Timestamp:
 08/14/06 18:14:10 (14 years ago)
 Branch:
 default
 Phase:
 public
 Convert:
 svn:c9d7d8f590d60310b91f818b3a526b0e/lemon/trunk@2898
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

lemon/concept/graph_components.h
r2129 r2181 1295 1295 /// ReadWrite map of the nodes. 1296 1296 /// 1297 template <typename Value>1298 class NodeMap : public GraphMap<Graph, Node, Value> {1297 template <typename _Value> 1298 class NodeMap : public GraphMap<Graph, Node, _Value> { 1299 1299 private: 1300 1300 NodeMap(); 1301 1301 public: 1302 typedef GraphMap< Graph, Node,Value> Parent;1302 typedef GraphMap<MappableGraphComponent, Node, _Value> Parent; 1303 1303 1304 1304 /// \brief Construct a new map. … … 1306 1306 /// Construct a new map for the graph. 1307 1307 /// \todo call the right parent class constructor 1308 explicit NodeMap(const Graph& graph) : Parent(graph) {} 1308 explicit NodeMap(const MappableGraphComponent& graph) 1309 : Parent(graph) {} 1309 1310 1310 1311 /// \brief Construct a new map with default value. 1311 1312 /// 1312 1313 /// Construct a new map for the graph and initalise the values. 1313 NodeMap(const Graph& graph, constValue& value)1314 NodeMap(const MappableGraphComponent& graph, const _Value& value) 1314 1315 : Parent(graph, value) {} 1315 1316 … … 1324 1325 template <typename CMap> 1325 1326 NodeMap& operator=(const CMap&) { 1326 checkConcept<ReadMap<Node, Value>, CMap>();1327 checkConcept<ReadMap<Node, _Value>, CMap>(); 1327 1328 return *this; 1328 1329 } … … 1334 1335 /// ReadWrite map of the edges. 1335 1336 /// 1336 template <typename Value>1337 class EdgeMap : public GraphMap<Graph, Edge, Value> {1337 template <typename _Value> 1338 class EdgeMap : public GraphMap<Graph, Edge, _Value> { 1338 1339 private: 1339 1340 EdgeMap(); 1340 1341 public: 1341 typedef GraphMap< Graph, Edge,Value> Parent;1342 typedef GraphMap<MappableGraphComponent, Edge, _Value> Parent; 1342 1343 1343 1344 /// \brief Construct a new map. … … 1345 1346 /// Construct a new map for the graph. 1346 1347 /// \todo call the right parent class constructor 1347 explicit EdgeMap(const Graph& graph) : Parent(graph) {} 1348 explicit EdgeMap(const MappableGraphComponent& graph) 1349 : Parent(graph) {} 1348 1350 1349 1351 /// \brief Construct a new map with default value. 1350 1352 /// 1351 1353 /// Construct a new map for the graph and initalise the values. 1352 EdgeMap(const Graph& graph, constValue& value)1354 EdgeMap(const MappableGraphComponent& graph, const _Value& value) 1353 1355 : Parent(graph, value) {} 1354 1356 … … 1363 1365 template <typename CMap> 1364 1366 EdgeMap& operator=(const CMap&) { 1365 checkConcept<ReadMap<Edge, Value>, CMap>();1367 checkConcept<ReadMap<Edge, _Value>, CMap>(); 1366 1368 return *this; 1367 1369 } … … 1432 1434 /// ReadWrite map of the uedges. 1433 1435 /// 1434 template <typename Value>1435 class UEdgeMap : public GraphMap<Graph, UEdge, Value> {1436 template <typename _Value> 1437 class UEdgeMap : public GraphMap<Graph, UEdge, _Value> { 1436 1438 public: 1437 typedef GraphMap< Graph, UEdge,Value> Parent;1439 typedef GraphMap<MappableUGraphComponent, UEdge, _Value> Parent; 1438 1440 1439 1441 /// \brief Construct a new map. … … 1441 1443 /// Construct a new map for the graph. 1442 1444 /// \todo call the right parent class constructor 1443 explicit UEdgeMap(const Graph& graph) : Parent(graph) {} 1445 explicit UEdgeMap(const MappableUGraphComponent& graph) 1446 : Parent(graph) {} 1444 1447 1445 1448 /// \brief Construct a new map with default value. 1446 1449 /// 1447 1450 /// Construct a new map for the graph and initalise the values. 1448 UEdgeMap(const Graph& graph, constValue& value)1451 UEdgeMap(const MappableUGraphComponent& graph, const _Value& value) 1449 1452 : Parent(graph, value) {} 1450 1453 … … 1459 1462 template <typename CMap> 1460 1463 UEdgeMap& operator=(const CMap&) { 1461 checkConcept<ReadMap<UEdge, Value>, CMap>();1464 checkConcept<ReadMap<UEdge, _Value>, CMap>(); 1462 1465 return *this; 1463 1466 }
Note: See TracChangeset
for help on using the changeset viewer.