COIN-OR::LEMON - Graph Library

Changeset 44:7bbd94715db5 in lemon-main


Ignore:
Timestamp:
01/07/08 19:44:18 (17 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Parents:
42:3a98515e9bc3 (diff), 43:17e76967c49f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Phase:
public
Message:

Merge

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • lemon/maps.h

    r42 r44  
    116116
    117117    template<typename T1>
    118     struct rebind {
    119       typedef ConstMap<K, T1> other;
    120     };
    121 
    122     template<typename T1>
    123118    ConstMap(const ConstMap<K, T1> &, const T &_v) : v(_v) {}
    124119  };
     
    244239    }   
    245240
    246     template <typename T1, typename C1 = std::less<T1> >
    247     struct rebind {
    248       typedef StdMap<Key, T1, C1> other;
    249     };
    250241  };
    251242
     
    393384  ///Simple wrapping of a map
    394385
    395   ///This \c concepts::ReadMap "read only map" returns the simple
     386  ///This \ref concepts::ReadMap "read only map" returns the simple
    396387  ///wrapping of the given map. Sometimes the reference maps cannot be
    397388  ///combined with simple read maps. This map adaptor wraps the given
     
    416407  };
    417408
    418   ///Simple writable wrapping of the map
    419 
    420   ///This \c concepts::WriteMap "write map" returns the simple
     409  ///Simple writable wrapping of a map
     410
     411  ///This \ref concepts::WriteMap "write map" returns the simple
    421412  ///wrapping of the given map. Sometimes the reference maps cannot be
    422413  ///combined with simple read-write maps. This map adaptor wraps the
     
    15541545    }
    15551546
    1556     /// Setter function of the map
     1547    /// The \c set function of the map
    15571548    void set(const Key& key, Value value) {
    15581549      if (value) {
  • lemon/maps.h

    r43 r44  
    33 * This file is a part of LEMON, a generic C++ optimization library
    44 *
    5  * Copyright (C) 2003-2007
     5 * Copyright (C) 2003-2008
    66 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    77 * (Egervary Research Group on Combinatorial Optimization, EGRES).
     
    170170
    171171    typedef True ReferenceMapTag;
    172     ///\e
     172    ///Key type
    173173    typedef K Key;
    174     ///\e
     174    ///Value type
    175175    typedef T Value;
    176     ///\e
     176    ///Reference Type
    177177    typedef T& Reference;
    178     ///\e
     178    ///Const reference type
    179179    typedef const T& ConstReference;
    180180
Note: See TracChangeset for help on using the changeset viewer.