Use 0 when initializing CmiNodeLock, which may be pointer or int
authorPhil Miller <mille121@illinois.edu>
Sun, 25 Dec 2011 05:11:10 +0000 (23:11 -0600)
committerPhil Miller <mille121@illinois.edu>
Sun, 25 Dec 2011 07:49:16 +0000 (01:49 -0600)
src/conv-core/cputopology.C

index b6149245a27d37b070b2bedd07e0983bbaaaa50d..fcf2d8a764f5521667d283363a8e6c7a52c66a54 100644 (file)
@@ -213,7 +213,7 @@ CkVec<int> *CpuTopology::bynodes = NULL;
 int CpuTopology::supported = 0;
 
 static CpuTopology cpuTopo;
-static CmiNodeLock topoLock = NULL;
+static CmiNodeLock topoLock = 0; /* Not spelled 'NULL' to quiet warnings when CmiNodeLock is just 'int' */
 static int done = 0;
 
 /* called on PE 0 */