Changeset 891:74589d20dbc3 in lemon-0.x for src/hugo/array_map.h

Timestamp:

09/21/04 00:57:48 (20 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

template<typename CMap> Map(const CMap&) like constructors and
assigns are removed.

File:

• src/hugo/array_map.h (modified) (4 diffs)

src/hugo/array_map.h

@@ -66 +66 @@
     /** Default constructor for the map.
      */
-    ArrayMap() : values(0), capacity(0) {}
+    ArrayMap() : capacity(0), values(0) {}
                         
     /** Graph and Registry initialized map constructor.
@@ -91 +91 @@
     /** Constructor to copy a map of the same map type.
      */
-    ArrayMap(const ArrayMap& copy) : MapBase(*copy.graph, *copy.registry) {
+    ArrayMap(const ArrayMap& copy) : MapBase(copy) {
       capacity = copy.capacity;
       if (capacity == 0) return;
@@ -103 +103 @@
     /** Constructor to copy a map of an other map type.
      */
-    template <typename CMap> ArrayMap(const CMap& copy) 
-      : MapBase(copy), capacity(0), values(0) {
-      if (MapBase::getGraph()) {
-        allocate_memory();
-        for (KeyIt it(*MapBase::getGraph()); it != INVALID; ++it) {
-          set(it, copy[it]);
-        }
+    template <typename TT>
+    ArrayMap(const ArrayMap<MapRegistry, TT>& copy) 
+      : MapBase(copy) {
+      capacity = copy.capacity;
+      if (capacity == 0) return;
+      values = allocator.allocate(capacity);
+      for (KeyIt it(*MapBase::getGraph()); it != INVALID; ++it) {
+        int id = KeyInfo<Graph, KeyIt>::id(*MapBase::getGraph(), it);
+        allocator.construct(&(values[id]), copy.values[id]);
       }
     }
@@ -117 +119 @@
     ArrayMap& operator=(const ArrayMap& copy) {
       if (&copy == this) return *this;
+
       if (capacity != 0) {
         MapBase::destroy();
         allocator.deallocate(values, capacity);
       }
+
+      MapBase::operator=(copy);
+
       capacity = copy.capacity;
       if (capacity == 0) return *this;
       values = allocator.allocate(capacity);
+
       for (KeyIt it(*MapBase::getGraph()); it != INVALID; ++it) {
         int id = KeyInfo<Graph, KeyIt>::id(*MapBase::getGraph(), it);
         allocator.construct(&(values[id]), copy.values[id]);
       }
+
       return *this;
     }
 
-    /** Assign operator to copy a map an other map type.
-     */
-    template <typename CMap> ArrayMap& operator=(const CMap& copy) {
+    /** Assign operator to copy a map of an other map type.
+     */
+    template <typename TT>
+    ArrayMap& operator=(const ArrayMap<MapRegistry, TT>& copy) {
       if (capacity != 0) {
         MapBase::destroy();
         allocator.deallocate(values, capacity);
       }
+
       MapBase::operator=(copy);
-      if (MapBase::getGraph()) {
-        allocate_memory();
-        for (KeyIt it(*MapBase::getGraph()); it != INVALID; ++it) {
-          set(it, copy[it]);
-        }
-      }
+
+      capacity = copy.capacity;
+      if (capacity == 0) return *this;
+      values = allocator.allocate(capacity);
+
+      for (KeyIt it(*MapBase::getGraph()); it != INVALID; ++it) {
+        int id = KeyInfo<Graph, KeyIt>::id(*MapBase::getGraph(), it);
+        allocator.construct(&(values[id]), copy.values[id]);
+      }
+
       return *this;
     }