X-Git-Url: http://git.tdb.fi/?p=r2c2.git;a=blobdiff_plain;f=source%2Flibr2c2%2Flayout.h;h=2211de04987b031eb58fc83c4e289aae35140abb;hp=e06d4fb04f50d8ccb1e581a363e2dce18d13d91a;hb=d0881a98a6240758ac1aeceaa9443d718ab1ad5c;hpb=dfe3dd563981883f3b7c826102fed33c7ff0d12d diff --git a/source/libr2c2/layout.h b/source/libr2c2/layout.h index e06d4fb..2211de0 100644 --- 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 ZoneArray; @@ -102,8 +94,6 @@ private: std::map trains; Msp::Time::TimeStamp last_tick; unsigned next_turnout_addr; - bool emitting_block_reserved; - std::deque 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