mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: "set but not used" warning when disabling assert() (#9613) 

DebugCheckSanity() is unused when asserts are disabled. While at it,
use WITH_ASSERT over NDEBUG, as that means we also run this code
during beta/RC.
pull/9615/head
Patric Stout 2021-10-16 22:06:08 +02:00 committed by GitHub
parent d66dea5d83
commit 78eece71d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/order_cmd.cpp
View File

@ -609,6 +609,7 @@ bool OrderList::IsCompleteTimetable() const
return true; return true;
} }
#ifdef WITH_ASSERT
/** /**
* Checks for internal consistency of order list. Triggers assertion if something is wrong. * Checks for internal consistency of order list. Triggers assertion if something is wrong.
*/ */
@ -642,6 +643,7 @@ void OrderList::DebugCheckSanity() const
(uint)this->num_orders, (uint)this->num_manual_orders, (uint)this->num_orders, (uint)this->num_manual_orders,
this->num_vehicles, this->timetable_duration, this->total_duration); this->num_vehicles, this->timetable_duration, this->total_duration);
} }
#endif
/** /**
* Checks whether the order goes to a station or not, i.e. whether the * Checks whether the order goes to a station or not, i.e. whether the
@ -1782,7 +1784,7 @@ void CheckOrders(const Vehicle *v)
/* Do we only have 1 station in our order list? */ /* Do we only have 1 station in our order list? */
if (n_st < 2 && message == INVALID_STRING_ID) message = STR_NEWS_VEHICLE_HAS_TOO_FEW_ORDERS; if (n_st < 2 && message == INVALID_STRING_ID) message = STR_NEWS_VEHICLE_HAS_TOO_FEW_ORDERS;
#ifndef NDEBUG #ifdef WITH_ASSERT
if (v->orders.list != nullptr) v->orders.list->DebugCheckSanity(); if (v->orders.list != nullptr) v->orders.list->DebugCheckSanity();
#endif #endif