1.1 --- a/lemon/smart_graph.h	Wed Feb 22 12:45:59 2006 +0000
     1.2 +++ b/lemon/smart_graph.h	Wed Feb 22 18:26:56 2006 +0000
     1.3 @@ -27,16 +27,13 @@
     1.4  
     1.5  #include <lemon/invalid.h>
     1.6  
     1.7 -#include <lemon/bits/clearable_graph_extender.h>
     1.8 -#include <lemon/bits/extendable_graph_extender.h>
     1.9 -#include <lemon/bits/iterable_graph_extender.h>
    1.10 -#include <lemon/bits/alteration_notifier.h>
    1.11 -#include <lemon/bits/default_map.h>
    1.12  #include <lemon/bits/graph_extender.h>
    1.13  
    1.14  #include <lemon/utility.h>
    1.15  #include <lemon/error.h>
    1.16  
    1.17 +#include <lemon/bits/graph_extender.h>
    1.18 +
    1.19  namespace lemon {
    1.20  
    1.21    class SmartGraph;
    1.22 @@ -222,12 +219,7 @@
    1.23  
    1.24    };
    1.25  
    1.26 -  typedef ClearableGraphExtender<
    1.27 -    ExtendableGraphExtender<
    1.28 -    MappableGraphExtender<
    1.29 -    IterableGraphExtender<
    1.30 -    AlterableGraphExtender<
    1.31 -    GraphExtender<SmartGraphBase> > > > > > ExtendedSmartGraphBase;
    1.32 +  typedef GraphExtender<SmartGraphBase> ExtendedSmartGraphBase;
    1.33  
    1.34    /// \ingroup graphs
    1.35  
    1.36 @@ -244,7 +236,9 @@
    1.37    ///\author Alpar Juttner
    1.38    class SmartGraph : public ExtendedSmartGraphBase {
    1.39    public:
    1.40 -    
    1.41 +
    1.42 +    typedef ExtendedSmartGraphBase Parent;
    1.43 +
    1.44      class Snapshot;
    1.45      friend class Snapshot;
    1.46  
    1.47 @@ -355,12 +349,8 @@
    1.48  
    1.49    /**************** Undirected List Graph ****************/
    1.50  
    1.51 -  typedef ClearableUGraphExtender<
    1.52 -    ExtendableUGraphExtender<
    1.53 -    MappableUGraphExtender<
    1.54 -    IterableUGraphExtender<
    1.55 -    AlterableUGraphExtender<
    1.56 -    UGraphExtender<SmartGraphBase> > > > > > ExtendedSmartUGraphBase;
    1.57 +  typedef UGraphExtender<UGraphBaseExtender<SmartGraphBase> >
    1.58 +  ExtendedSmartUGraphBase;
    1.59  
    1.60    /// \ingroup graphs
    1.61    ///
    1.62 @@ -587,14 +577,8 @@
    1.63    };
    1.64  
    1.65  
    1.66 -  typedef ClearableBpUGraphExtender<
    1.67 -    ExtendableBpUGraphExtender<
    1.68 -    MappableBpUGraphExtender<
    1.69 -    IterableBpUGraphExtender<
    1.70 -    AlterableBpUGraphExtender<
    1.71 -    BpUGraphExtender <
    1.72 -    SmartBpUGraphBase> > > > > >
    1.73 -  ExtendedSmartBpUGraphBase;
    1.74 +  typedef BpUGraphExtender< BpUGraphBaseExtender<
    1.75 +    SmartBpUGraphBase> > ExtendedSmartBpUGraphBase;
    1.76  
    1.77    /// \ingroup graphs
    1.78    ///