[cig-commits] commit: Add casting for C++

[Mercurial]

changeset:   419:30b92a50dd23
tag:         tip
user:        Walter Landry <wlandry at caltech.edu>
date:        Fri May 13 08:08:29 2011 -0700
files:       MaterialPoints/src/OneToManyMapper.cxx MaterialPoints/src/OneToOneMapper.cxx
description:
Add casting for C++


diff -r 285af3102548 -r 30b92a50dd23 MaterialPoints/src/OneToManyMapper.cxx
--- a/MaterialPoints/src/OneToManyMapper.cxx	Thu May 12 11:18:04 2011 -0700
+++ b/MaterialPoints/src/OneToManyMapper.cxx	Fri May 13 08:08:29 2011 -0700
@@ -170,7 +170,7 @@ double _OneToManyMapper_GetDoubleFromExt
 
     ref = OneToManyMapper_GetMaterialRef(mapper, intPoint);
     for(ii = 0; ii < ref->numParticles; ii++) {
-      c = *(double*)(MaterialPointsSwarm_GetExtensionAt(self->materialSwarm, ref->particleInds[ii], extHandle) + offs);
+      c = *(double*)((char*)MaterialPointsSwarm_GetExtensionAt(self->materialSwarm, ref->particleInds[ii], extHandle) + offs);
       v += ((double)ref->weights[ii])*c;
     }
 
@@ -185,7 +185,7 @@ double _OneToManyMapper_GetDoubleFromMat
 
     ref = OneToManyMapper_GetMaterialRef(mapper, intPoint);
     for(ii = 0; ii < ref->numParticles; ii++) {
-      c = *(double*)(MaterialPointsSwarm_GetMaterialExtensionAt(self->materialSwarm, ref->particleInds[ii], extHandle) + offs);
+      c = *(double*)((char*)MaterialPointsSwarm_GetMaterialExtensionAt(self->materialSwarm, ref->particleInds[ii], extHandle) + offs);
       v += ((double)ref->weights[ii])*c;
     }
 
diff -r 285af3102548 -r 30b92a50dd23 MaterialPoints/src/OneToOneMapper.cxx
--- a/MaterialPoints/src/OneToOneMapper.cxx	Thu May 12 11:18:04 2011 -0700
+++ b/MaterialPoints/src/OneToOneMapper.cxx	Fri May 13 08:08:29 2011 -0700
@@ -199,7 +199,7 @@ void* _OneToOneMapper_GetExtensionOn( vo
 }
 
 double _OneToOneMapper_GetDoubleFromExtension(void* mapper, void* intPoint, ExtensionInfo_Index extHandle, int offs) {
-    return *(double*)(IntegrationPointMapper_GetExtensionOn(mapper, intPoint, extHandle) + offs);
+    return *(double*)((char*)IntegrationPointMapper_GetExtensionOn(mapper, intPoint, extHandle) + offs);
 }
 
 double _OneToOneMapper_GetDoubleFromMaterial(void* mapper, void* intPoint, ExtensionInfo_Index extHandle, int offs) {
@@ -207,5 +207,5 @@ double _OneToOneMapper_GetDoubleFromMate
     MaterialPoint *matPoint;
 
     matPoint = OneToOneMapper_GetMaterialPoint(mapper, intPoint, &matSwarm);
-    return *(double*)(MaterialPointsSwarm_GetMaterialExtensionOn(matSwarm, matPoint, extHandle) + offs);
+    return *(double*)((char*)MaterialPointsSwarm_GetMaterialExtensionOn(matSwarm, matPoint, extHandle) + offs);
 }