Avoid nested block reservations completely

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

diff --git a/source/libr2c2/layout.h b/source/libr2c2/layout.h
index e06d4fb04f50d8ccb1e581a363e2dce18d13d91a..2211de04987b031eb58fc83c4e289aae35140abb 100644 (file)
--- a/source/libr2c2/layout.h
+++ b/source/libr2c2/layout.h
@@ -70,14 +70,6 @@ private:
                void del();
        };
 
-       struct BlockReservation
-       {
-               Block *block;
-               Train *train;
-
-               BlockReservation(Block &, Train *);
-       };
-
 public:
        typedef std::vector<Zone *> ZoneArray;
 
@@ -102,8 +94,6 @@ private:
        std::map<unsigned, Train *> trains;
        Msp::Time::TimeStamp last_tick;
        unsigned next_turnout_addr;
-       bool emitting_block_reserved;
-       std::deque<BlockReservation> block_reserve_queue;
 
 public:
        Layout(Catalogue &, Driver * = 0);
@@ -161,7 +151,6 @@ public:
        void save_dynamic(const std::string &) const;
 private:
        void sensor_state_changed(Sensor &, Sensor::State);
-       void block_reserved(Block &, Train *);
 };
 
 } // namespace R2C2