diff options
| author | tradke <tradke@b61c5cb5-eaca-4651-9a7a-d64986f99364> | 2002-01-07 13:51:27 +0000 |
|---|---|---|
| committer | tradke <tradke@b61c5cb5-eaca-4651-9a7a-d64986f99364> | 2002-01-07 13:51:27 +0000 |
| commit | 135911aa32bdd626cc98b46a7c981d03a914fa8d (patch) | |
| tree | 2d6d18a8c101e3cb1c31b68599805d9e26bf7e10 | |
| parent | df51aeb6104319a24fea096dd26bb4c914815829 (diff) | |
Fixed some compiler warnings.
git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGH/PUGH/trunk@366 b61c5cb5-eaca-4651-9a7a-d64986f99364
| -rw-r--r-- | src/LoadAware.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/LoadAware.c b/src/LoadAware.c index fcff53d..a98d9ba 100644 --- a/src/LoadAware.c +++ b/src/LoadAware.c @@ -176,33 +176,39 @@ int PUGH_GetBounds (int dim, int *bounds[], int nprocs[], int nsize[]) if (dim == 1) { external_manual = partition_1D[0] != NULL; - partition_info = external_manual ? partition_1D[0] : partition_1d_x; + partition_info = external_manual ? (const char *) partition_1D[0] : + partition_1d_x; PUGH_GetSliceSizes (nprocs[0], nsize[0], partition_info, &bounds[0], manual || external_manual); } else if (dim == 2) { external_manual = partition_2D[0] != NULL; - partition_info = external_manual ? partition_2D[0] : partition_2d_x; + partition_info = external_manual ? (const char *) partition_2D[0] : + partition_2d_x; PUGH_GetSliceSizes (nprocs[0], nsize[0], partition_info, &bounds[0], manual || external_manual); external_manual = partition_2D[1] != NULL; - partition_info = external_manual ? partition_2D[1] : partition_2d_y; + partition_info = external_manual ? (const char *) partition_2D[1] : + partition_2d_y; PUGH_GetSliceSizes (nprocs[1], nsize[1], partition_info, &bounds[1], manual || external_manual); } else if (dim == 3) { external_manual = partition_3D[0] != NULL; - partition_info = external_manual ? partition_3D[0] : partition_3d_x; + partition_info = external_manual ? (const char *) partition_3D[0] : + partition_3d_x; PUGH_GetSliceSizes (nprocs[0], nsize[0], partition_info, &bounds[0], manual || external_manual); external_manual = partition_3D[1] != NULL; - partition_info = external_manual ? partition_3D[1] : partition_3d_y; + partition_info = external_manual ? (const char *) partition_3D[1] : + partition_3d_y; PUGH_GetSliceSizes (nprocs[1], nsize[1], partition_info, &bounds[1], manual || external_manual); external_manual = partition_3D[2] != NULL; - partition_info = external_manual ? partition_3D[2] : partition_3d_z; + partition_info = external_manual ? (const char *) partition_3D[2] : + partition_3d_z; PUGH_GetSliceSizes (nprocs[2], nsize[2], partition_info, &bounds[2], manual || external_manual); } |