Changeset 897:ef09eee53b09 in lemon-0.x for src/hugo/default_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/default_map.h (modified) (3 diffs)

src/hugo/default_map.h

@@ -38 +38 @@
 typedef typename MapRegistry::Graph Graph; \
 \
-DefaultMap() : Parent() {} \
 DefaultMap(const Graph& g, MapRegistry& r) : Parent(g, r) {} \
 DefaultMap(const Graph& g, MapRegistry& r, const Value& v) \
@@ -45 +44 @@
   : Parent(static_cast<const Parent&>(copy)) {} \
 template <typename TT> \
-DefaultMap(const DefaultMap<MapRegistry, TT>& copy) { \
+DefaultMap(const DefaultMap<MapRegistry, TT>& copy) \
+  : { \
   Parent::MapBase::operator= \
     (static_cast<const typename Parent::MapBase&>(copy)); \
@@ -61 +61 @@
 template <typename TT> \
 DefaultMap& operator=(const DefaultMap<MapRegistry, TT>& copy) { \
-  Parent::clear(); \
-  Parent::MapBase::operator=(copy); \
+  if (Parent::getGraph() != copy.getGraph()) { \
+    Parent::clear(); \
+    Parent::MapBase::operator=(copy); \
+    Parent::construct(); \
+  } \
   if (Parent::getGraph()) { \
     for (typename Parent::KeyIt it(*Parent::getGraph()); it!=INVALID; ++it) {\
-      Parent::add(it); \
       Parent::operator[](it) = copy[it]; \
     } \