1.1 --- a/src/hugo/array_map_factory.h	Thu Sep 02 10:07:30 2004 +0000
     1.2 +++ b/src/hugo/array_map_factory.h	Thu Sep 02 10:54:26 2004 +0000
     1.3 @@ -24,6 +24,7 @@
     1.4        public:
     1.5  
     1.6        typedef V Value;
     1.7 +      typedef V ValueType;
     1.8        typedef A Allocator;
     1.9  
    1.10  	
    1.11 @@ -56,7 +57,7 @@
    1.12        }
    1.13  
    1.14        template <typename CMap> Map(const CMap& copy) 
    1.15 -	: capacity(0), values(0), MapBase(copy) {
    1.16 +	: MapBase(copy), capacity(0), values(0) {
    1.17  	if (MapBase::getGraph()) {
    1.18  	  allocate_memory();
    1.19  	  for (KeyIt it(*MapBase::getGraph()); it != INVALID; ++it) {

     2.1 --- a/src/hugo/map_registry.h	Thu Sep 02 10:07:30 2004 +0000
     2.2 +++ b/src/hugo/map_registry.h	Thu Sep 02 10:54:26 2004 +0000
     2.3 @@ -56,7 +56,7 @@
     2.4         * Copy constructor to register into the registry.
     2.5        */	
     2.6  	
     2.7 -      MapBase(const MapBase& copy) : registry(0), graph(copy.graph) {
     2.8 +      MapBase(const MapBase& copy) : graph(copy.graph), registry(0) {
     2.9  	if (copy.registry) {
    2.10  	  copy.registry->attach(*this);
    2.11  	}
    2.12 @@ -74,6 +74,7 @@
    2.13  	if (copy.registry) {
    2.14  	  copy.registry->attach(*this);
    2.15  	}
    2.16 +	return *this;
    2.17        }
    2.18  	
    2.19  
    2.20 @@ -232,7 +233,7 @@
    2.21      /**
    2.22       * Notify all the registered maps about a Key added.
    2.23       */
    2.24 -    virtual void add(Key& key) {
    2.25 +    void add(Key& key) {
    2.26        typename Container::iterator it;
    2.27        for (it = container.begin(); it != container.end(); ++it) {
    2.28  	(*it)->add(key);
    2.29 @@ -242,7 +243,7 @@
    2.30      /**
    2.31       * Notify all the registered maps about a Key erased.
    2.32       */ 
    2.33 -    virtual void erase(Key& key) {
    2.34 +    void erase(Key& key) {
    2.35        typename Container::iterator it;
    2.36        for (it = container.begin(); it != container.end(); ++it) {
    2.37  	(*it)->erase(key);
    2.38 @@ -252,7 +253,7 @@
    2.39      /**
    2.40       * Notify all the registered maps about the map should be cleared.
    2.41       */ 
    2.42 -    virtual void clear() {
    2.43 +    void clear() {
    2.44        typename Container::iterator it;
    2.45        for (it = container.begin(); it != container.end(); ++it) {
    2.46  	(*it)->clear();

     3.1 --- a/src/test/graph_test.cc	Thu Sep 02 10:07:30 2004 +0000
     3.2 +++ b/src/test/graph_test.cc	Thu Sep 02 10:54:26 2004 +0000
     3.3 @@ -320,6 +320,7 @@
     3.4  
     3.5  //Compile SmartGraph
     3.6  template void checkCompile<SmartGraph>(SmartGraph &);
     3.7 +
     3.8  //Compile SymSmartGraph
     3.9  template void checkCompile<SymSmartGraph>(SymSmartGraph &);
    3.10  
    3.11 @@ -328,6 +329,7 @@
    3.12  template void checkCompileErase<ListGraph>(ListGraph &);
    3.13  template void checkCompileFindEdge<ListGraph>(ListGraph &);
    3.14  
    3.15 +
    3.16  //Compile SymListGraph
    3.17  template void checkCompile<SymListGraph>(SymListGraph &);
    3.18  template void checkCompileErase<SymListGraph>(SymListGraph &);

     4.1 --- a/src/work/deba/map_defines.h	Thu Sep 02 10:07:30 2004 +0000
     4.2 +++ b/src/work/deba/map_defines.h	Thu Sep 02 10:54:26 2004 +0000
     4.3 @@ -61,7 +61,7 @@
     4.4    return *this; \
     4.5  } \
     4.6  template <typename CMap>NodeMap& operator=(const CMap& copy) { \
     4.7 -  this->Factory::Map<V>::operator=<CMap>(copy); \
     4.8 +  this->Factory::Map<V>::operator=<CMap>(static_cast<Factory::Map<V>&>(copy));\
     4.9    return *this; \
    4.10  } \
    4.11  };
    4.12 @@ -87,7 +87,7 @@
    4.13    return *this; \
    4.14  } \
    4.15  template <typename CMap>EdgeMap& operator=(const CMap& copy) { \
    4.16 -  this->Factory::Map<V>::operator=<CMap>(copy); \
    4.17 +  this->Factory::Map<V>::operator=<CMap>(static_cast<Factory::Map<V>&>(copy));\
    4.18    return *this; \
    4.19  } \
    4.20  };