# HG changeset patch # User Alpar Juttner # Date 1347463790 -7200 # Node ID 2da3de1c0ebe070a465bc9c05e32eda1d97353ff # Parent 0da74b2d0beaa0303797b0bbdf18d805be6a7f8e# Parent 4bb9e72e1a4178c97f0c0e33c0daa1cb39cea0fa Merge bugfix #448 to branch 1.2 diff -r 0da74b2d0bea -r 2da3de1c0ebe test/adaptors_test.cc --- a/test/adaptors_test.cc Fri Aug 24 15:50:54 2012 +0200 +++ b/test/adaptors_test.cc Wed Sep 12 17:29:50 2012 +0200 @@ -1377,13 +1377,15 @@ dir_map[graph.down(n4)] = graph.u(graph.down(n4)) == n4; // Apply several adaptors on the grid graph - typedef SplitNodes > > - SplitGridGraph; + typedef Orienter< const GridGraph, GridGraph::EdgeMap > + OrientedGridGraph; + typedef SplitNodes SplitGridGraph; typedef Undirector USplitGridGraph; checkConcept(); checkConcept(); - SplitGridGraph adaptor = splitNodes(orienter(graph, dir_map)); + OrientedGridGraph oadaptor = orienter(graph, dir_map); + SplitGridGraph adaptor = splitNodes(oadaptor); USplitGridGraph uadaptor = undirector(adaptor); // Check adaptor