Do not require unique names for routes

[r2c2.git] / source / libmarklin / layout.h

diff --git a/source/libmarklin/layout.h b/source/libmarklin/layout.h
index f820cb5dc73e6c6fc05166ab6816de11b7922c06..4e7bcd96ce83a8da61cd1396cfab41d90168cd3a 100644 (file)
--- a/source/libmarklin/layout.h
+++ b/source/libmarklin/layout.h
@@ -35,6 +35,7 @@ public:
                Loader(Layout &);
        private:
                virtual void finish();
+               void route();
                void route(const std::string &);
                void track(unsigned);
                void train(unsigned, unsigned);
@@ -57,7 +58,7 @@ private:
        Driver *driver;
        std::string base;
        std::set<Track *> tracks;
-       std::map<std::string, Route *> routes;
+       std::set<Route *> routes;
        std::set<Block *> blocks;
        std::map<unsigned, Train *> trains;
        std::set<Vehicle *> vehicles;
@@ -87,7 +88,7 @@ public:
        void remove_block(Block &);
 
        void add_route(Route &);
-       const std::map<std::string, Route *> &get_routes() const { return routes; }
+       const std::set<Route *> &get_routes() const { return routes; }
        Route &get_route(const std::string &) const;
        void update_routes();
        void remove_route(Route &);