Changeset 897:ef09eee53b09 in lemon-0.x for src/hugo/array_map.h

Timestamp:

09/22/04 10:04:31 (20 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

The default constructors are removed from the maps.
The ArrayMap? is the map structure of the graphs.

File:

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

src/hugo/array_map.h

@@ -30 +30 @@
   template <typename MapRegistry, typename Value> 
   class ArrayMap : public MapRegistry::MapBase {
+
+    template <typename MR, typename V> friend class ArrayMap;
                 
   public:
@@ -64 +66 @@
 
         
-    /** Default constructor for the map.
-     */
-    ArrayMap() : capacity(0), values(0) {}
-                        
     /** Graph and Registry initialized map constructor.
      */
@@ -119 +117 @@
     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);
+      
+      if (MapBase::getGraph() != copy.getGraph()) {
+        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) {
@@ -143 +142 @@
     template <typename TT>
     ArrayMap& operator=(const ArrayMap<MapRegistry, TT>& copy) {
-      if (capacity != 0) {
-        MapBase::destroy();
-        allocator.deallocate(values, capacity);
-      }
-
-      MapBase::operator=(copy);
-
-      capacity = copy.capacity;
-      if (capacity == 0) return *this;
-      values = allocator.allocate(capacity);
+
+      if (MapBase::getGraph() != copy.getGraph()) {
+        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) {