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

Timestamp:

09/02/04 12:54:26 (20 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1076

Message:

 

Location:

src

Files:

• hugo/array_map_factory.h (modified) (2 diffs)
• hugo/map_registry.h (modified) (5 diffs)
• test/graph_test.cc (modified) (2 diffs)
• work/deba/map_defines.h (modified) (2 diffs)

src/hugo/array_map_factory.h

@@ -25 +25 @@
 
       typedef V Value;
+      typedef V ValueType;
       typedef A Allocator;
 
@@ -57 +58 @@
 
       template <typename CMap> Map(const CMap& copy) 
-        : capacity(0), values(0), MapBase(copy) {
+        : MapBase(copy), capacity(0), values(0) {
         if (MapBase::getGraph()) {
           allocate_memory();

src/hugo/map_registry.h

@@ -57 +57 @@
       */        
         
-      MapBase(const MapBase& copy) : registry(0), graph(copy.graph) {
+      MapBase(const MapBase& copy) : graph(copy.graph), registry(0) {
         if (copy.registry) {
           copy.registry->attach(*this);
@@ -75 +75 @@
           copy.registry->attach(*this);
         }
+        return *this;
       }
         
@@ -233 +234 @@
      * Notify all the registered maps about a Key added.
      */
-    virtual void add(Key& key) {
+    void add(Key& key) {
       typename Container::iterator it;
       for (it = container.begin(); it != container.end(); ++it) {
@@ -243 +244 @@
      * Notify all the registered maps about a Key erased.
      */ 
-    virtual void erase(Key& key) {
+    void erase(Key& key) {
       typename Container::iterator it;
       for (it = container.begin(); it != container.end(); ++it) {
@@ -253 +254 @@
      * Notify all the registered maps about the map should be cleared.
      */ 
-    virtual void clear() {
+    void clear() {
       typename Container::iterator it;
       for (it = container.begin(); it != container.end(); ++it) {

src/test/graph_test.cc

@@ -321 +321 @@
 //Compile SmartGraph
 template void checkCompile<SmartGraph>(SmartGraph &);
+
 //Compile SymSmartGraph
 template void checkCompile<SymSmartGraph>(SymSmartGraph &);
@@ -328 +329 @@
 template void checkCompileErase<ListGraph>(ListGraph &);
 template void checkCompileFindEdge<ListGraph>(ListGraph &);
+
 
 //Compile SymListGraph

src/work/deba/map_defines.h

@@ -62 +62 @@
 } \
 template <typename CMap>NodeMap& operator=(const CMap& copy) { \
-  this->Factory::Map<V>::operator=<CMap>(copy); \
+  this->Factory::Map<V>::operator=<CMap>(static_cast<Factory::Map<V>&>(copy));\
   return *this; \
 } \
@@ -88 +88 @@
 } \
 template <typename CMap>EdgeMap& operator=(const CMap& copy) { \
-  this->Factory::Map<V>::operator=<CMap>(copy); \
+  this->Factory::Map<V>::operator=<CMap>(static_cast<Factory::Map<V>&>(copy));\
   return *this; \
 } \