summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/cargopacket.cpp4
-rw-r--r--src/cmd_helper.h6
-rw-r--r--src/stdafx.h7
3 files changed, 6 insertions, 11 deletions
diff --git a/src/cargopacket.cpp b/src/cargopacket.cpp
index f5f7c0c03..08b72ec46 100644
--- a/src/cargopacket.cpp
+++ b/src/cargopacket.cpp
@@ -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;
diff --git a/src/cmd_helper.h b/src/cmd_helper.h
index ee5d445c2..a505c1fd8 100644
--- a/src/cmd_helper.h
+++ b/src/cmd_helper.h
@@ -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;
}
diff --git a/src/stdafx.h b/src/stdafx.h
index c421c55aa..5b9281a28 100644
--- a/src/stdafx.h
+++ b/src/stdafx.h
@@ -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 */