COIN-OR::LEMON - Graph Library

Changeset 987:87f7c54892df in lemon-0.x for src/lemon/map_defines.h


Ignore:
Timestamp:
11/13/04 18:07:10 (17 years ago)
Author:
Alpar Juttner
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1377
Message:

Naming changes:

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/lemon/map_defines.h

    r937 r987  
    5252 */
    5353#define CREATE_NODE_MAP(DynMap) \
    54 template <typename Value> \
    55 class NodeMap : public DynMap<NodeMapRegistry, Value> { \
    56 public: \
    57 typedef DynMap<NodeMapRegistry, Value> Parent; \
     54template <typename _Value> \
     55class NodeMap : public DynMap<NodeMapRegistry, _Value> { \
     56public: \
     57typedef DynMap<NodeMapRegistry, _Value> Parent; \
    5858NodeMap(const typename Parent::Graph& g) \
    5959  : Parent(g, g.node_maps) {} \
    60 NodeMap(const typename Parent::Graph& g, const Value& v) \
     60NodeMap(const typename Parent::Graph& g, const _Value& v) \
    6161  : Parent(g, g.node_maps, v) {} \
    6262NodeMap(const NodeMap& copy) : Parent(static_cast<const Parent&>(copy)) {} \
     
    8282 */
    8383#define CREATE_EDGE_MAP(DynMap) \
    84 template <typename Value> \
    85 class EdgeMap : public DynMap<EdgeMapRegistry, Value> { \
    86 public: \
    87 typedef DynMap<EdgeMapRegistry, Value> Parent; \
     84template <typename _Value> \
     85class EdgeMap : public DynMap<EdgeMapRegistry, _Value> { \
     86public: \
     87typedef DynMap<EdgeMapRegistry, _Value> Parent; \
    8888\
    8989EdgeMap(const typename Parent::Graph& g) \
    9090  : Parent(g, g.edge_maps) {} \
    91 EdgeMap(const typename Parent::Graph& g, const Value& v) \
     91EdgeMap(const typename Parent::Graph& g, const _Value& v) \
    9292  : Parent(g, g.edge_maps, v) {} \
    9393EdgeMap(const EdgeMap& copy) : Parent(static_cast<const Parent&>(copy)) {} \
     
    126126 */
    127127#define CREATE_SYM_EDGE_MAP(DynMap) \
    128 template <typename Value> \
    129 class SymEdgeMap : public DynMap<SymEdgeMapRegistry, Value> { \
    130 public: \
    131 typedef DynMap<SymEdgeMapRegistry, Value> Parent; \
     128template <typename _Value> \
     129class SymEdgeMap : public DynMap<SymEdgeMapRegistry, _Value> { \
     130public: \
     131typedef DynMap<SymEdgeMapRegistry, _Value> Parent; \
    132132\
    133133SymEdgeMap(const typename Parent::Graph& g) \
    134134  : Parent(g, g.sym_edge_maps) {} \
    135 SymEdgeMap(const typename Parent::Graph& g, const Value& v) \
     135SymEdgeMap(const typename Parent::Graph& g, const _Value& v) \
    136136  : Parent(g, g.sym_edge_maps, v) {} \
    137137SymEdgeMap(const SymEdgeMap& copy) \
     
    154154 */
    155155#define IMPORT_NODE_MAP(From, from, To, to) \
    156 template <typename Value> \
    157 class NodeMap : public From::template NodeMap<Value> { \
    158 \
    159 public: \
    160 typedef typename From::template NodeMap<Value> Parent; \
     156template <typename _Value> \
     157class NodeMap : public From::template NodeMap<_Value> { \
     158\
     159public: \
     160typedef typename From::template NodeMap<_Value> Parent; \
    161161\
    162162NodeMap(const To& to) \
    163163  : Parent(static_cast<const From&>(from)) { } \
    164 NodeMap(const To& to, const Value& value) \
     164NodeMap(const To& to, const _Value& value) \
    165165  : Parent(static_cast<const From&>(from), value) { } \
    166166NodeMap(const NodeMap& copy) \
     
    183183 */
    184184#define IMPORT_EDGE_MAP(From, from, To, to) \
    185 template <typename Value> \
    186 class EdgeMap : public From::template EdgeMap<Value> { \
    187 \
    188 public: \
    189 typedef typename From::template EdgeMap<Value> Parent; \
     185template <typename _Value> \
     186class EdgeMap : public From::template EdgeMap<_Value> { \
     187\
     188public: \
     189typedef typename From::template EdgeMap<_Value> Parent; \
    190190\
    191191EdgeMap(const To& to) \
    192192  : Parent(static_cast<const From&>(from)) { } \
    193 EdgeMap(const To& to, const Value& value) \
     193EdgeMap(const To& to, const _Value& value) \
    194194  : Parent(static_cast<const From&>(from), value) { } \
    195195EdgeMap(const EdgeMap& copy) \
Note: See TracChangeset for help on using the changeset viewer.