From b8f8c60839ac0451ae83333fd2df9b87a1219534 Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 18 Oct 2009 20:26:29 +0000 Subject: (svn r17810) -Codechange/Fix: Add assert_tcompile() and use it. OTTD's traditional assert_compile() does not work inside templates for gcc compilers, static_assert() does though. The new assert_tcompile() resolves into static_assert() if present, or into a runtime assert() else. --- src/industry_gui.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/industry_gui.cpp') diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp index 88fbe93c6..5c9064f96 100644 --- a/src/industry_gui.cpp +++ b/src/industry_gui.cpp @@ -85,7 +85,7 @@ static void GetCargoSuffix(uint cargo, CargoSuffixType cst, const Industry *ind, template static inline void GetAllCargoSuffixes(uint cb_offset, CargoSuffixType cst, const Industry *ind, IndustryType ind_type, const IndustrySpec *indspec, const TC &cargos, TS &suffixes) { - assert_compile(lengthof(cargos) <= lengthof(suffixes)); + assert_tcompile(lengthof(cargos) <= lengthof(suffixes)); for (uint j = 0; j < lengthof(cargos); j++) { if (cargos[j] != CT_INVALID) { GetCargoSuffix(cb_offset + j, cst, ind, ind_type, indspec, suffixes[j], lastof(suffixes[j])); -- cgit v1.2.3-54-g00ecf