COIN-OR::LEMON - Graph Library

Changeset 783:81bf2d766164 in lemon-0.x for src


Ignore:
Timestamp:
09/02/04 12:54:26 (16 years ago)
Author:
Balazs Dezso
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1076
Message:
 
Location:
src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • src/hugo/array_map_factory.h

    r782 r783  
    2525
    2626      typedef V Value;
     27      typedef V ValueType;
    2728      typedef A Allocator;
    2829
     
    5758
    5859      template <typename CMap> Map(const CMap& copy)
    59         : capacity(0), values(0), MapBase(copy) {
     60        : MapBase(copy), capacity(0), values(0) {
    6061        if (MapBase::getGraph()) {
    6162          allocate_memory();
  • src/hugo/map_registry.h

    r782 r783  
    5757      */       
    5858       
    59       MapBase(const MapBase& copy) : registry(0), graph(copy.graph) {
     59      MapBase(const MapBase& copy) : graph(copy.graph), registry(0) {
    6060        if (copy.registry) {
    6161          copy.registry->attach(*this);
     
    7575          copy.registry->attach(*this);
    7676        }
     77        return *this;
    7778      }
    7879       
     
    233234     * Notify all the registered maps about a Key added.
    234235     */
    235     virtual void add(Key& key) {
     236    void add(Key& key) {
    236237      typename Container::iterator it;
    237238      for (it = container.begin(); it != container.end(); ++it) {
     
    243244     * Notify all the registered maps about a Key erased.
    244245     */
    245     virtual void erase(Key& key) {
     246    void erase(Key& key) {
    246247      typename Container::iterator it;
    247248      for (it = container.begin(); it != container.end(); ++it) {
     
    253254     * Notify all the registered maps about the map should be cleared.
    254255     */
    255     virtual void clear() {
     256    void clear() {
    256257      typename Container::iterator it;
    257258      for (it = container.begin(); it != container.end(); ++it) {
  • src/test/graph_test.cc

    r774 r783  
    321321//Compile SmartGraph
    322322template void checkCompile<SmartGraph>(SmartGraph &);
     323
    323324//Compile SymSmartGraph
    324325template void checkCompile<SymSmartGraph>(SymSmartGraph &);
     
    328329template void checkCompileErase<ListGraph>(ListGraph &);
    329330template void checkCompileFindEdge<ListGraph>(ListGraph &);
     331
    330332
    331333//Compile SymListGraph
  • src/work/deba/map_defines.h

    r703 r783  
    6262} \
    6363template <typename CMap>NodeMap& operator=(const CMap& copy) { \
    64   this->Factory::Map<V>::operator=<CMap>(copy); \
     64  this->Factory::Map<V>::operator=<CMap>(static_cast<Factory::Map<V>&>(copy));\
    6565  return *this; \
    6666} \
     
    8888} \
    8989template <typename CMap>EdgeMap& operator=(const CMap& copy) { \
    90   this->Factory::Map<V>::operator=<CMap>(copy); \
     90  this->Factory::Map<V>::operator=<CMap>(static_cast<Factory::Map<V>&>(copy));\
    9191  return *this; \
    9292} \
Note: See TracChangeset for help on using the changeset viewer.