cpp/openttd-patchpack/source Changeset - r24514:3d2ab9011995

Changeset - r24514:3d2ab9011995

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

Charles Pigott - 4 years ago 2020-12-27 09:56:43
charlespigott@googlemail.com

Cleanup: Remove unnecessary assert_tcompile macro

3 files changed with 6 insertions and 11 deletions:

src/cargopacket.cpp

src/cmd_helper.h

src/stdafx.h

0 comments (0 inline, 0 general)

src/cargopacket.cpp

➞

Show inline comments

@@ @@ -556,8 +556,8 @@ void VehicleCargoList::InvalidateCache() @@
 template<VehicleCargoList::MoveToAction Tfrom, VehicleCargoList::MoveToAction Tto>
 uint VehicleCargoList::Reassign(uint max_move, TileOrStationID)
+{
 	assert_tcompile(Tfrom != MTA_TRANSFER && Tto != MTA_TRANSFER);
 	assert_tcompile(Tfrom - Tto == 1 || Tto - Tfrom == 1);
 	assert_compile(Tfrom != MTA_TRANSFER && Tto != MTA_TRANSFER);
 	assert_compile(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;

src/cmd_helper.h

➞

Show inline comments

@@ @@ -24,9 +24,9 @@ @@
 template<typename T, uint S, uint N, typename U> static inline T Extract(U v)
+{
 	/* Check if there are enough bits in v */
 	assert_tcompile(N == EnumPropsT<T>::num_bits);
 	assert_tcompile(S + N <= sizeof(U) * 8);
 	assert_tcompile(EnumPropsT<T>::end <= (1 << N));
 	assert_compile(N == EnumPropsT<T>::num_bits);
 	assert_compile(S + N <= sizeof(U) * 8);
 	assert_compile(EnumPropsT<T>::end <= (1 << N));
 	U masked = GB(v, S, N);
 	return IsInsideMM(masked, EnumPropsT<T>::begin, EnumPropsT<T>::end) ? (T)masked : EnumPropsT<T>::invalid;
+}

src/stdafx.h

➞

Show inline comments

@@ @@ -348,19 +348,14 @@ typedef unsigned char byte; @@
 #	define PERSONAL_DIR ""
 #endif
 /* Compile time assertions. Prefer c++0x static_assert().
  * Older compilers cannot evaluate some expressions at compile time,
  * typically when templates are involved, try assert_tcompile() in those cases. */
 /* Compile time assertions. Prefer c++0x static_assert(). */
 #if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1600)
 #	define assert_compile(expr) static_assert(expr, #expr )
 #	define assert_tcompile(expr) assert_compile(expr)
 #elif defined(__OS2__)
 	/* Disabled for OS/2 */
 #	define assert_compile(expr)
 #	define assert_tcompile(expr) assert_compile(expr)
 #else
 #	define assert_compile(expr) typedef int __ct_assert__[1 - 2 * !(expr)]
 #	define assert_tcompile(expr) assert(expr)
 #endif
 /* Check if the types have the bitsizes like we are using them */

0 comments (0 inline, 0 general)