1.1 --- a/lemon/lemon_reader.h Tue Oct 24 16:49:41 2006 +0000
1.2 +++ b/lemon/lemon_reader.h Tue Oct 24 17:19:16 2006 +0000
1.3 @@ -41,7 +41,7 @@
1.4 #include <lemon/dim2.h>
1.5
1.6 #include <lemon/concept_check.h>
1.7 -#include <lemon/concept/maps.h>
1.8 +#include <lemon/concepts/maps.h>
1.9
1.10 namespace lemon {
1.11
1.12 @@ -831,7 +831,7 @@
1.13 template <typename Reader, typename Map, typename MapParameter>
1.14 NodeSetReader& _readMap(std::string name, MapParameter map,
1.15 const Reader& reader = Reader()) {
1.16 - checkConcept<concept::WriteMap<Node, typename Map::Value>, Map>();
1.17 + checkConcept<concepts::WriteMap<Node, typename Map::Value>, Map>();
1.18 checkConcept<_reader_bits::ItemReader<typename Map::Value>, Reader>();
1.19 if (readers.find(name) != readers.end()) {
1.20 ErrorMessage msg;
1.21 @@ -1061,7 +1061,7 @@
1.22 template <typename Reader, typename Map, typename MapParameter>
1.23 EdgeSetReader& _readMap(std::string name, MapParameter map,
1.24 const Reader& reader = Reader()) {
1.25 - checkConcept<concept::WriteMap<Edge, typename Map::Value>, Map>();
1.26 + checkConcept<concepts::WriteMap<Edge, typename Map::Value>, Map>();
1.27 checkConcept<_reader_bits::ItemReader<typename Map::Value>, Reader>();
1.28 if (readers.find(name) != readers.end()) {
1.29 ErrorMessage msg;
1.30 @@ -1305,7 +1305,7 @@
1.31 template <typename Reader, typename Map, typename MapParameter>
1.32 UEdgeSetReader& _readMap(std::string name, MapParameter map,
1.33 const Reader& reader = Reader()) {
1.34 - checkConcept<concept::WriteMap<UEdge, typename Map::Value>, Map>();
1.35 + checkConcept<concepts::WriteMap<UEdge, typename Map::Value>, Map>();
1.36 checkConcept<_reader_bits::ItemReader<typename Map::Value>, Reader>();
1.37 if (readers.find(name) != readers.end()) {
1.38 ErrorMessage msg;
1.39 @@ -1376,7 +1376,7 @@
1.40 UEdgeSetReader& _readDirMap(std::string name, MapParameter map,
1.41 const Reader& reader = Reader()) {
1.42 checkConcept<_reader_bits::ItemReader<typename Map::Value>, Reader>();
1.43 - checkConcept<concept::WriteMap<Edge, typename Map::Value>, Map>();
1.44 + checkConcept<concepts::WriteMap<Edge, typename Map::Value>, Map>();
1.45 readMap("+" + name,
1.46 _reader_bits::forwardComposeMap(graph, map), reader);
1.47 readMap("-" + name,