From e797f53c33f54b07b0777f5eda876b1d505a049c Mon Sep 17 00:00:00 2001 From: rubidium Date: Sat, 22 Jun 2013 07:44:59 +0000 Subject: [PATCH] (svn r25432) -Fix [FS#5608]: clang compiler error; sometimes it's more strict than others --- src/station_gui.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/station_gui.cpp b/src/station_gui.cpp index 67a5d68d84..1a0923949d 100644 --- a/src/station_gui.cpp +++ b/src/station_gui.cpp @@ -956,6 +956,16 @@ public: */ CargoDataSet::iterator End() const { return this->children->end(); } + /** + * Has this entry transfers. + */ + bool HasTransfers() const { return this->transfers; } + + /** + * Set the transfers state. + */ + void SetTransfers(bool value) { this->transfers = value; } + void Clear(); private: @@ -1322,7 +1332,7 @@ struct StationViewWindow : public Window { case GR_CARGO: assert(i == 0); data = data->InsertOrRetrieve(cargo); - data->transfers = (source != this->window_number); + data->SetTransfers(source != this->window_number); expand = expand->Retrieve(cargo); break; case GR_SOURCE: @@ -1759,7 +1769,7 @@ struct StationViewWindow : public Window { } else { /* Only draw '+' if there is something to be shown. */ const StationCargoList &list = Station::Get(this->window_number)->goods[cargo].cargo; - if (grouping == GR_CARGO && (list.ReservedCount() > 0 || cd->transfers)) { + if (grouping == GR_CARGO && (list.ReservedCount() > 0 || cd->HasTransfers())) { sym = "+"; } }