Changes in lemon/edge_set.h [559:c5fd2d996909:617:4137ef9aacc6] in lemon-1.2
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
lemon/edge_set.h
r559 r617 34 34 public: 35 35 36 typedef GR Graph;37 36 typedef typename GR::Node Node; 38 37 typedef typename GR::NodeIt NodeIt; … … 209 208 template <typename V> 210 209 class NodeMap : public GR::template NodeMap<V> { 210 typedef typename GR::template NodeMap<V> Parent; 211 211 212 public: 212 213 typedef typename GR::template NodeMap<V> Parent;214 213 215 214 explicit NodeMap(const ListArcSetBase<GR>& arcset) … … 260 259 template <typename GR> 261 260 class ListArcSet : public ArcSetExtender<ListArcSetBase<GR> > { 262 263 public:264 265 261 typedef ArcSetExtender<ListArcSetBase<GR> > Parent; 262 263 public: 266 264 267 265 typedef typename Parent::Node Node; 268 266 typedef typename Parent::Arc Arc; 269 270 typedef GR Graph;271 272 267 273 268 typedef typename Parent::NodesImplBase NodesImplBase; … … 293 288 294 289 class NodesImpl : public NodesImplBase { 290 typedef NodesImplBase Parent; 291 295 292 public: 296 typedef NodesImplBase Parent;297 298 293 NodesImpl(const GR& graph, ListArcSet& arcset) 299 294 : Parent(graph), _arcset(arcset) {} … … 355 350 public: 356 351 357 typedef GR Graph;358 352 typedef typename GR::Node Node; 359 353 typedef typename GR::NodeIt NodeIt; … … 638 632 template <typename V> 639 633 class NodeMap : public GR::template NodeMap<V> { 634 typedef typename GR::template NodeMap<V> Parent; 635 640 636 public: 641 642 typedef typename GR::template NodeMap<V> Parent;643 637 644 638 explicit NodeMap(const ListEdgeSetBase<GR>& arcset) … … 689 683 template <typename GR> 690 684 class ListEdgeSet : public EdgeSetExtender<ListEdgeSetBase<GR> > { 691 692 public:693 694 685 typedef EdgeSetExtender<ListEdgeSetBase<GR> > Parent; 686 687 public: 695 688 696 689 typedef typename Parent::Node Node; 697 690 typedef typename Parent::Arc Arc; 698 691 typedef typename Parent::Edge Edge; 699 700 typedef GR Graph;701 702 692 703 693 typedef typename Parent::NodesImplBase NodesImplBase; … … 718 708 719 709 class NodesImpl : public NodesImplBase { 710 typedef NodesImplBase Parent; 711 720 712 public: 721 typedef NodesImplBase Parent;722 723 713 NodesImpl(const GR& graph, ListEdgeSet& arcset) 724 714 : Parent(graph), _arcset(arcset) {} … … 780 770 public: 781 771 782 typedef GR Graph; 783 typedef typename Graph::Node Node; 784 typedef typename Graph::NodeIt NodeIt; 772 typedef typename GR::Node Node; 773 typedef typename GR::NodeIt NodeIt; 785 774 786 775 protected: … … 901 890 template <typename V> 902 891 class NodeMap : public GR::template NodeMap<V> { 892 typedef typename GR::template NodeMap<V> Parent; 893 903 894 public: 904 905 typedef typename GR::template NodeMap<V> Parent;906 895 907 896 explicit NodeMap(const SmartArcSetBase<GR>& arcset) … … 957 946 template <typename GR> 958 947 class SmartArcSet : public ArcSetExtender<SmartArcSetBase<GR> > { 959 960 public:961 962 948 typedef ArcSetExtender<SmartArcSetBase<GR> > Parent; 949 950 public: 963 951 964 952 typedef typename Parent::Node Node; 965 953 typedef typename Parent::Arc Arc; 966 967 typedef GR Graph;968 954 969 955 protected: … … 984 970 985 971 class NodesImpl : public NodesImplBase { 972 typedef NodesImplBase Parent; 973 986 974 public: 987 typedef NodesImplBase Parent;988 989 975 NodesImpl(const GR& graph, SmartArcSet& arcset) 990 976 : Parent(graph), _arcset(arcset) {} … … 1063 1049 public: 1064 1050 1065 typedef GR Graph;1066 1051 typedef typename GR::Node Node; 1067 1052 typedef typename GR::NodeIt NodeIt; … … 1250 1235 template <typename V> 1251 1236 class NodeMap : public GR::template NodeMap<V> { 1237 typedef typename GR::template NodeMap<V> Parent; 1238 1252 1239 public: 1253 1254 typedef typename GR::template NodeMap<V> Parent;1255 1240 1256 1241 explicit NodeMap(const SmartEdgeSetBase<GR>& arcset) … … 1305 1290 template <typename GR> 1306 1291 class SmartEdgeSet : public EdgeSetExtender<SmartEdgeSetBase<GR> > { 1307 1308 public:1309 1310 1292 typedef EdgeSetExtender<SmartEdgeSetBase<GR> > Parent; 1293 1294 public: 1311 1295 1312 1296 typedef typename Parent::Node Node; … … 1314 1298 typedef typename Parent::Edge Edge; 1315 1299 1316 typedef GR Graph;1317 1318 1300 protected: 1319 1301 … … 1332 1314 1333 1315 class NodesImpl : public NodesImplBase { 1316 typedef NodesImplBase Parent; 1317 1334 1318 public: 1335 typedef NodesImplBase Parent;1336 1337 1319 NodesImpl(const GR& graph, SmartEdgeSet& arcset) 1338 1320 : Parent(graph), _arcset(arcset) {}
Note: See TracChangeset
for help on using the changeset viewer.