cpp/openttd-patchpack/source Changeset - r26018:e7110597313b

Changeset - r26018:e7110597313b

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

Patric Stout - 3 years ago 2021-10-16 20:06:08
truebrain@openttd.org

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.

1 file changed with 3 insertions and 1 deletions:

src/order_cmd.cpp

0 comments (0 inline, 0 general)

src/order_cmd.cpp

➞

Show inline comments

@@ @@ -606,12 +606,13 @@ bool OrderList::IsCompleteTimetable() co @@
 		if (o->IsType(OT_IMPLICIT)) continue;
 		if (!o->IsCompletelyTimetabled()) return false;
+	}
 	return true;
+}
 #ifdef WITH_ASSERT
 /**
  * Checks for internal consistency of order list. Triggers assertion if something is wrong.
  */
 void OrderList::DebugCheckSanity() const
+{
 	VehicleOrderID check_num_orders = 0;
@@ @@ -639,12 +640,13 @@ void OrderList::DebugCheckSanity() const @@
+	}
 	assert(this->num_vehicles == check_num_vehicles);
 	Debug(misc, 6, "... detected {} orders ({} manual), {} vehicles, {} timetabled, {} total",
 			(uint)this->num_orders, (uint)this->num_manual_orders,
 			this->num_vehicles, this->timetable_duration, this->total_duration);
+}
 #endif
 /**
  * Checks whether the order goes to a station or not, i.e. whether the
  * destination is a station
  * @param v the vehicle to check for
  * @param o the order to check
@@ @@ -1779,13 +1781,13 @@ void CheckOrders(const Vehicle *v) @@
+			}
+		}
 		/* 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;
-#ifndef NDEBUG
+#ifdef WITH_ASSERT
 		if (v->orders.list != nullptr) v->orders.list->DebugCheckSanity();
 #endif
 		/* We don't have a problem */
 		if (message == INVALID_STRING_ID) return;

0 comments (0 inline, 0 general)