COIN-OR::LEMON - Graph Library

Changeset 799:3393abe30678 in lemon-0.x for src/hugo/vector_map_factory.h


Ignore:
Timestamp:
09/03/04 17:32:03 (16 years ago)
Author:
Balazs Dezso
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1093
Message:
 
File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/hugo/vector_map_factory.h

    r798 r799  
    129129       * actual keys of the graph.
    130130       */
    131 <<<<<<< .mine
    132       Reference operator[](const Key& key) {
    133 =======
    134       typename Container::reference operator[](const KeyType& key) {
    135 >>>>>>> .r1091
     131      Reference operator[](const KeyType& key) {
    136132        int id = getGraph()->id(key);
    137133        return container[id];
     
    142138       * actual keys of the graph.
    143139       */
    144 <<<<<<< .mine
    145       ConstReference operator[](const Key& key) const {
    146 =======
    147       typename Container::const_reference operator[](const KeyType& key) const {
    148 >>>>>>> .r1091
     140      ConstReference operator[](const KeyType& key) const {
    149141        int id = getGraph()->id(key);
    150142        return container[id];
     
    210202        private:
    211203          Reference data;
    212           Pointer(const KeyType& key, Value& val) : data(key, val) {}
     204          Pointer(const KeyType& key, Map::Reference val) : data(key, val) {}
    213205        public:
    214206          Reference* operator->() {return &data;}
     
    301293        private:
    302294          Reference data;
    303           Pointer(const KeyType& key, const Value& val) : data(key, val) {}
     295          Pointer(const KeyType& key, Map::ConstReference val)
     296            : data(key, val) {}
    304297        public:
    305298          Reference* operator->() {return &data;}
Note: See TracChangeset for help on using the changeset viewer.