X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fblock.h;h=2f898b0992af7e14799fc576532265f8b808bff8;hb=708a7e00bf24e3abc08f96ba1cef0ce246a8c0e1;hp=c3b7c8742fe8faa247b5af2948c885eea7c522a7;hpb=cf38d0a8208fab7ba7aaafc5eed9a86dfc3722a5;p=r2c2.git diff --git a/source/libr2c2/block.h b/source/libr2c2/block.h index c3b7c87..2f898b0 100644 --- a/source/libr2c2/block.h +++ b/source/libr2c2/block.h @@ -32,8 +32,8 @@ public: private: unsigned id; - unsigned sensor_id; - unsigned turnout_id; + unsigned sensor_addr; + unsigned turnout_addr; bool conflict; TrackCircuit *sensor; std::vector endpoints; @@ -49,8 +49,8 @@ private: public: unsigned get_id() const { return id; } - unsigned get_sensor_id() const { return sensor_id; } - unsigned get_turnout_id() const { return turnout_id; } + unsigned get_sensor_address() const { return sensor_addr; } + unsigned get_turnout_address() const { return turnout_addr; } TrackCircuit *get_sensor() const { return sensor; } const std::vector &get_endpoints() const { return endpoints; } const Endpoint &get_endpoint(unsigned) const;