abian/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix compile on GCC 4.1, where the ArraySize function trick did not work.

Browse Source 
This was SVN commit r5418.
This commit is contained in:
Matei 2007-10-17 07:36:12 +00:00
parent e6604e7c0e
commit 41d3ef5fa5
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/lib/lib.h
View File

@ -61,6 +61,17 @@ const size_t GiB = 1ul << 30;
// number of array elements
//
#if GCC_VERSION
// The function trick below does not work in GCC. Instead use the old fashioned
// divide-by-sizeof-element. This causes problems when the argument to
// ARRAY_SIZE is a pointer and not an array, but we will catch those when we
// compile on something other than GCC.
#define ARRAY_SIZE(name) (sizeof(name) / (sizeof((name)[0])))
#else
// (function taking a reference to an array and returning a pointer to
// an array of characters. it's only declared and never defined; we just
// need it to determine n, the size of the array that was passed.)
@ -71,6 +82,7 @@ template<typename T, size_t n> char (*ArraySizeDeducer(T (&)[n]))[n];
// pointer is passed, which can easily happen under maintenance.)
#define ARRAY_SIZE(name) (sizeof(*ArraySizeDeducer(name)))
#endif // GCC_VERSION
//-----------------------------------------------------------------------------
// code-generating macros