# HG changeset patch # User deba # Date 1126861218 0 # Node ID 5b37a10234bcea834ad2645da35c4400ff014c3f # Parent df3820d7989d8fe4926ac1ad30dfdac0c6711b27 Some bugfixes diff -r df3820d7989d -r 5b37a10234bc lemon/bits/alteration_notifier.h --- a/lemon/bits/alteration_notifier.h Wed Sep 14 10:00:43 2005 +0000 +++ b/lemon/bits/alteration_notifier.h Fri Sep 16 09:00:18 2005 +0000 @@ -80,6 +80,12 @@ /// ObserverBase() : registry(0) {} + ObserverBase(const ObserverBase& copy) { + if (copy.attached()) { + copy.getRegistry()->attach(*this); + } + } + virtual ~ObserverBase() {} /// \brief Attaches the observer into an AlterationNotifier. @@ -111,10 +117,9 @@ /// Gives back true when the observer is attached into a registry. bool attached() const { return registry != 0; } - + private: - ObserverBase(const ObserverBase& copy); ObserverBase& operator=(const ObserverBase& copy); protected: diff -r df3820d7989d -r 5b37a10234bc lemon/graph_adaptor.h --- a/lemon/graph_adaptor.h Wed Sep 14 10:00:43 2005 +0000 +++ b/lemon/graph_adaptor.h Fri Sep 16 09:00:18 2005 +0000 @@ -679,7 +679,7 @@ EdgeFilterMap, false> { public: typedef SubGraphAdaptor, - EdgeFilterMap> Parent; + EdgeFilterMap, false> Parent; protected: ConstMap const_true_map; public: diff -r df3820d7989d -r 5b37a10234bc lemon/iterable_maps.h --- a/lemon/iterable_maps.h Wed Sep 14 10:00:43 2005 +0000 +++ b/lemon/iterable_maps.h Fri Sep 16 09:00:18 2005 +0000 @@ -140,11 +140,11 @@ template class IterableBoolNodeMap { - typename Graph::NodeMap cmap; + typename Graph::template NodeMap cmap; public: - typedef IterableBoolMap > BimType; + typedef IterableBoolMap > BimType; BimType imap; @@ -198,11 +198,11 @@ template class IterableBoolEdgeMap { - typename Graph::EdgeMap cmap; + typename Graph::template EdgeMap cmap; public: - typedef IterableBoolMap > BimType; + typedef IterableBoolMap > BimType; BimType imap;