mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r26333) -Fix: Compilation without static_assert.
This commit is contained in:
parent
470bd0ce24
commit
858e80f3dd
|
@ -557,8 +557,8 @@ void VehicleCargoList::InvalidateCache()
|
|||
template<VehicleCargoList::MoveToAction Tfrom, VehicleCargoList::MoveToAction Tto>
|
||||
uint VehicleCargoList::Reassign(uint max_move, TileOrStationID)
|
||||
{
|
||||
assert_compile(Tfrom != MTA_TRANSFER && Tto != MTA_TRANSFER);
|
||||
assert_compile(Tfrom - Tto == 1 || Tto - Tfrom == 1);
|
||||
assert_tcompile(Tfrom != MTA_TRANSFER && Tto != MTA_TRANSFER);
|
||||
assert_tcompile(Tfrom - Tto == 1 || Tto - Tfrom == 1);
|
||||
max_move = min(this->action_counts[Tfrom], max_move);
|
||||
this->action_counts[Tfrom] -= max_move;
|
||||
this->action_counts[Tto] += max_move;
|
||||
|
|
|
@ -82,7 +82,7 @@ private:
|
|||
template <class Titem, typename Tindex, size_t Tgrowth_step, size_t Tmax_size, PoolType Tpool_type = PT_NORMAL, bool Tcache = false, bool Tzero = true>
|
||||
struct Pool : PoolBase {
|
||||
/* Ensure Tmax_size is within the bounds of Tindex. */
|
||||
assert_compile((Tmax_size - 1) >> 8 * sizeof(Tindex) == 0);
|
||||
assert_compile((uint64)(Tmax_size - 1) >> 8 * sizeof(Tindex) == 0);
|
||||
|
||||
static const size_t MAX_SIZE = Tmax_size; ///< Make template parameter accessible from outside
|
||||
|
||||
|
|
Loading…
Reference in New Issue