Fix memory leaks and other bad stuff

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

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index 5ef23537a4710b9f3e4e8832f9056d73c10e2813..4e8734fdb2d3411979ab64f844f4f786c8644613 100644 (file)
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -69,7 +69,6 @@ private:
        Block *pending_block;
        unsigned target_speed;
        const Route *route;
-       Msp::Time::TimeStamp try_reserve;
        std::string status;
 
        Msp::Time::TimeStamp last_entry_time;
@@ -107,6 +106,7 @@ private:
        void sensor_event(bool, Sensor *);
        void turnout_path_changing(unsigned, Turnout *);
        void turnout_path_changed(unsigned, Turnout *);
+       void block_reserved(const Block &, const Train *);
        unsigned reserve_more();
        void update_speed();
        float get_real_speed(unsigned) const;
@@ -114,6 +114,7 @@ private:
        void set_status(const std::string &);
        void set_position(const Block::Endpoint &);
        void release_blocks(std::list<BlockRef> &);
+       void release_blocks(std::list<BlockRef> &, std::list<BlockRef>::iterator, std::list<BlockRef>::iterator);
        void reverse_blocks(std::list<BlockRef> &) const;
 };