[cig-commits] commit: Fix a casting warning

[Mercurial]

changeset:   835:823ca31cccd8
tag:         tip
user:        Walter Landry <wlandry at caltech.edu>
date:        Wed Jun 20 13:23:34 2012 -0700
files:       Discretisation/src/ElementType.cxx
description:
Fix a casting warning


diff -r 22a75f32f824 -r 823ca31cccd8 Discretisation/src/ElementType.cxx
--- a/Discretisation/src/ElementType.cxx	Mon Apr 30 13:51:37 2012 -0700
+++ b/Discretisation/src/ElementType.cxx	Wed Jun 20 13:23:34 2012 -0700
@@ -497,7 +497,7 @@ void ElementType_Jacobian_AxisIndependen
 	inc = (unsigned*)IArray_GetPtr((self->inc) );
 	
 	/* If GNi isn't passed in - then evaluate them for you */
-	if (_GNi == NULL) {
+	if (static_cast<void *>(_GNi) == NULL) {
 		/* Using 3 here instead of dim so that you can pass in dim = 2 and use axes 0 and 2 for your jacobian */
 		GNi = Memory_Alloc_2DArray( double, 3, nodesPerEl, (Name)"Temporary GNi"  );
 		self->_evaluateShapeFunctionLocalDerivsAt( self, xi, GNi );