AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename ARRAYSIZE to CELLSARRAYSIZE to avoid conflict with a macro with the same name defined in Windows headers

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2009-06-06 23:16:27 +00:00
parent 3bcd8f9790
commit 23a6a62ffa
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
demos/life/game.cpp
View File

@ -31,7 +31,7 @@
#include <string.h> // for memset
#define ARRAYSIZE 1024 // static array for BeginFind & co.
#define CELLSARRAYSIZE 1024 // static array for BeginFind & co.
#define ALLOCBOXES 16 // number of cellboxes to alloc at once
#define MAXDEAD 8 // tics before removing cellbox from list
@ -123,7 +123,7 @@ Life::Life()
m_boxes[i] = NULL;
// state vars for BeginFind & FindMore
m_cells = new LifeCell[ARRAYSIZE];
m_cells = new LifeCell[CELLSARRAYSIZE];
m_ncells = 0;
m_findmore = false;
m_changed = false;
@ -524,7 +524,7 @@ bool Life::FindMore(LifeCell *cells[], size_t *ncells)
continue;
// check whether there is enough space left in the array
if (m_ncells > (ARRAYSIZE - 64))
if (m_ncells > (CELLSARRAYSIZE - 64))
{
*ncells = m_ncells;
return false;
@ -549,7 +549,7 @@ bool Life::FindMore(LifeCell *cells[], size_t *ncells)
continue;
// check whether there is enough space left in the array
if (m_ncells > (ARRAYSIZE - 64))
if (m_ncells > (CELLSARRAYSIZE - 64))
{
*ncells = m_ncells;
return false;