Skip to content

Commit

Permalink
Merge pull request #514 from gruenich/feature/replace-mance-c-style-c…
Browse files Browse the repository at this point in the history 
…asts

Replace many C-style casts
  • Loading branch information
@DrTimothyAldenDavis
DrTimothyAldenDavis authored Nov 11, 2023
2 parents c90fdaf + 1eae20a commit 199f62d
Show file tree
Hide file tree
Showing 14 changed files with 99 additions and 100 deletions.
78 changes: 39 additions & 39 deletions ParU/Source/paru_analyze.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ ParU_Ret ParU_Analyze(cholmod_sparse *A, ParU_Symbolic **S_handle,
double start_time = PARU_OPENMP_GET_WTIME;
#endif
ParU_Symbolic *Sym;
Sym = (ParU_Symbolic *)paru_alloc(1, sizeof(ParU_Symbolic));
Sym = static_cast<ParU_Symbolic*>(paru_alloc(1, sizeof(ParU_Symbolic)));
if (!Sym)
{
return PARU_OUT_OF_MEMORY;
Expand All @@ -106,9 +106,9 @@ ParU_Ret ParU_Analyze(cholmod_sparse *A, ParU_Symbolic **S_handle,
return PARU_INVALID;
}

int64_t *Ap = (int64_t *)A->p;
int64_t *Ai = (int64_t *)A->i;
double *Ax = (double *)A->x;
int64_t *Ap = static_cast<int64_t*>(A->p);
int64_t *Ai = static_cast<int64_t*>(A->i);
double *Ax = static_cast<double*>(A->x);

// Initializaing pointers with NULL; just in case for an early exit
// not to free an uninitialized space
Expand Down Expand Up @@ -483,17 +483,17 @@ ParU_Ret ParU_Analyze(cholmod_sparse *A, ParU_Symbolic **S_handle,
/* ---------------------------------------------------------------------- */
/* Copy the contents of Symbolic in my data structure */
/* ---------------------------------------------------------------------- */
SymbolicType *Sym_umf = (SymbolicType *)Symbolic; // just an alias
SymbolicType *Sym_umf = static_cast<SymbolicType*>(Symbolic); // just an alias
// temp amalgamation data structure
fmap = (int64_t *)paru_alloc((n + 1), sizeof(int64_t));
newParent = (int64_t *)paru_alloc((n + 1), sizeof(int64_t));
fmap = static_cast<int64_t*>(paru_alloc((n + 1), sizeof(int64_t)));
newParent = static_cast<int64_t*>(paru_alloc((n + 1), sizeof(int64_t)));
if (Sym->strategy == PARU_STRATEGY_SYMMETRIC)
Diag_map = Sym_umf->Diagonal_map;
else
Diag_map = NULL;

if (Diag_map)
inv_Diag_map = (int64_t *)paru_alloc(n, sizeof(int64_t));
inv_Diag_map = static_cast<int64_t*>(paru_alloc(n, sizeof(int64_t)));
else
inv_Diag_map = NULL;
if (!fmap || !newParent || (!Diag_map != !inv_Diag_map))
Expand Down Expand Up @@ -638,10 +638,10 @@ ParU_Ret ParU_Analyze(cholmod_sparse *A, ParU_Symbolic **S_handle,

// Parent size is nf+1 potentially smaller than what UMFPACK allocate
size_t size = n + 1;
Parent = (int64_t *)paru_realloc(nf + 1, sizeof(int64_t), Front_parent, &size);
Parent = static_cast<int64_t*>(paru_realloc(nf + 1, sizeof(int64_t), Front_parent, &size));
Sym->Parent = Parent;
ASSERT(size <= (size_t)n + 1);
if (size != (size_t)nf + 1)
ASSERT(size <= static_cast<size_t>(n) + 1);
if (size != static_cast<size_t>(nf) + 1)
{ // should not happen anyway it is always shrinking
PRLEVEL(1, ("ParU: out of memory\n"));
Sym->Parent = NULL;
Expand All @@ -656,8 +656,8 @@ ParU_Ret ParU_Analyze(cholmod_sparse *A, ParU_Symbolic **S_handle,
// like SPQR: Super[f]<= pivotal columns of (f) < Super[f+1]
if (nf > 0)
{
Super = Sym->Super = (int64_t *)paru_alloc((nf + 1), sizeof(int64_t));
Depth = Sym->Depth = (int64_t *)paru_calloc(nf, sizeof(int64_t));
Super = Sym->Super = static_cast<int64_t*>(paru_alloc((nf + 1), sizeof(int64_t)));
Depth = Sym->Depth = static_cast<int64_t*>(paru_calloc(nf, sizeof(int64_t)));
if (Super == NULL || Depth == NULL)
{
PRLEVEL(1, ("ParU: out of memory\n"));
Expand Down Expand Up @@ -758,7 +758,7 @@ ParU_Ret ParU_Analyze(cholmod_sparse *A, ParU_Symbolic **S_handle,
// newParent size is newF+1 potentially smaller than nf
if (newF > 0)
newParent =
(int64_t *)paru_realloc(newF + 1, sizeof(int64_t), newParent, &size);
static_cast<int64_t*>(paru_realloc(newF + 1, sizeof(int64_t), newParent, &size));
if (size != (size_t)newF + 1)
{
PRLEVEL(1, ("ParU: out of memory\n"));
Expand All @@ -781,14 +781,14 @@ ParU_Ret ParU_Analyze(cholmod_sparse *A, ParU_Symbolic **S_handle,
/* ---------------------------------------------------------------------- */
/* Finding the Upper bound of rows and cols */
/* ---------------------------------------------------------------------- */
SWType *mySW = (SWType *)SW;
int64_t *Front_nrows = (int64_t *)mySW->Front_nrows;
int64_t *Front_ncols = (int64_t *)mySW->Front_ncols;
SWType *mySW = static_cast<SWType*>(SW);
int64_t *Front_nrows = static_cast<int64_t*>(mySW->Front_nrows);
int64_t *Front_ncols = static_cast<int64_t*>(mySW->Front_ncols);

if (newNf > 0)
{
Fm = (int64_t *)paru_calloc((newNf + 1), sizeof(int64_t));
Cm = (int64_t *)paru_alloc((newNf + 1), sizeof(int64_t));
Fm = static_cast<int64_t*>(paru_calloc((newNf + 1), sizeof(int64_t)));
Cm = static_cast<int64_t*>(paru_alloc((newNf + 1), sizeof(int64_t)));
// int64_t *roots = (int64_t *)paru_alloc((num_roots), sizeof(int64_t));
Sym->Fm = Fm;
Sym->Cm = Cm;
Expand Down Expand Up @@ -1102,16 +1102,16 @@ ParU_Ret ParU_Analyze(cholmod_sparse *A, ParU_Symbolic **S_handle,

#endif

Ps = (int64_t *)paru_calloc(m - n1, sizeof(int64_t));
Ps = static_cast<int64_t*>(paru_calloc(m - n1, sizeof(int64_t)));
if (cs1 > 0)
{
Sup = Sym->ustons.Sup = (int64_t *)paru_calloc(cs1 + 1, sizeof(int64_t));
cSup = (int64_t *)paru_alloc(cs1 + 1, sizeof(int64_t));
Sup = Sym->ustons.Sup = static_cast<int64_t*>(paru_calloc(cs1 + 1, sizeof(int64_t)));
cSup = static_cast<int64_t*>(paru_alloc(cs1 + 1, sizeof(int64_t)));
}
if (rs1 > 0)
{
Slp = Sym->lstons.Slp = (int64_t *)paru_calloc(rs1 + 1, sizeof(int64_t));
cSlp = (int64_t *)paru_alloc(rs1 + 1, sizeof(int64_t));
Slp = Sym->lstons.Slp = static_cast<int64_t*>(paru_calloc(rs1 + 1, sizeof(int64_t)));
cSlp = static_cast<int64_t*>(paru_alloc(rs1 + 1, sizeof(int64_t)));
}

if (((Slp == NULL || cSlp == NULL) && rs1 != 0) ||
Expand Down Expand Up @@ -1403,18 +1403,18 @@ ParU_Ret ParU_Analyze(cholmod_sparse *A, ParU_Symbolic **S_handle,
Sym->lstons.nnz = slnz;
if (cs1 > 0)
{
Suj = (int64_t *)paru_alloc(sunz, sizeof(int64_t));
Suj = static_cast<int64_t*>(paru_alloc(sunz, sizeof(int64_t)));
}
Sym->ustons.Suj = Suj;

if (rs1 > 0)
{
Sli = (int64_t *)paru_alloc(slnz, sizeof(int64_t));
Sli = static_cast<int64_t*>(paru_alloc(slnz, sizeof(int64_t)));
}
Sym->lstons.Sli = Sli;

// Updating Sj using copy of Sp
Sj = (int64_t *)paru_alloc(snz, sizeof(int64_t));
Sj = static_cast<int64_t*>(paru_alloc(snz, sizeof(int64_t)));
Sym->Sj = Sj;

if (Sj == NULL || (cs1 > 0 && Suj == NULL) || (rs1 > 0 && Sli == NULL))
Expand Down Expand Up @@ -1569,17 +1569,17 @@ ParU_Ret ParU_Analyze(cholmod_sparse *A, ParU_Symbolic **S_handle,

if (nf > 0)
{
Sym->aParent = aParent = (int64_t *)paru_alloc(ms + nf, sizeof(int64_t));
Sym->aChild = aChild = (int64_t *)paru_alloc(ms + nf + 1, sizeof(int64_t));
Sym->aChildp = aChildp = (int64_t *)paru_alloc(ms + nf + 2, sizeof(int64_t));
Sym->first = first = (int64_t *)paru_alloc(nf + 1, sizeof(int64_t));
Sym->row2atree = rM = (int64_t *)paru_alloc(ms, sizeof(int64_t));
Sym->super2atree = snM = (int64_t *)paru_alloc(nf, sizeof(int64_t));
Sym->aParent = aParent = static_cast<int64_t*>(paru_alloc(ms + nf, sizeof(int64_t)));
Sym->aChild = aChild = static_cast<int64_t*>(paru_alloc(ms + nf + 1, sizeof(int64_t)));
Sym->aChildp = aChildp = static_cast<int64_t*>(paru_alloc(ms + nf + 2, sizeof(int64_t)));
Sym->first = first = static_cast<int64_t*>(paru_alloc(nf + 1, sizeof(int64_t)));
Sym->row2atree = rM = static_cast<int64_t*>(paru_alloc(ms, sizeof(int64_t)));
Sym->super2atree = snM = static_cast<int64_t*>(paru_alloc(nf, sizeof(int64_t)));

Sym->front_flop_bound = front_flop_bound =
(double *)paru_alloc(nf + 1, sizeof(double));
static_cast<double*>(paru_alloc(nf + 1, sizeof(double)));
Sym->stree_flop_bound = stree_flop_bound =
(double *)paru_calloc(nf + 1, sizeof(double));
static_cast<double*>(paru_calloc(nf + 1, sizeof(double)));

if (aParent == NULL || aChild == NULL || aChildp == NULL ||
rM == NULL || snM == NULL || first == NULL ||
Expand Down Expand Up @@ -1740,11 +1740,11 @@ ParU_Ret ParU_Analyze(cholmod_sparse *A, ParU_Symbolic **S_handle,
Sym->ntasks = ntasks;
if (nf > 0)
{
Sym->task_map = task_map = (int64_t *)paru_alloc(ntasks + 1, sizeof(int64_t));
Sym->task_parent = task_parent = (int64_t *)paru_alloc(ntasks, sizeof(int64_t));
Sym->task_map = task_map = static_cast<int64_t*>(paru_alloc(ntasks + 1, sizeof(int64_t)));
Sym->task_parent = task_parent = static_cast<int64_t*>(paru_alloc(ntasks, sizeof(int64_t)));
Sym->task_num_child = task_num_child =
(int64_t *)paru_calloc(ntasks, sizeof(int64_t));
Sym->task_depth = task_depth = (int64_t *)paru_calloc(ntasks, sizeof(int64_t));
static_cast<int64_t*>(paru_calloc(ntasks, sizeof(int64_t)));
Sym->task_depth = task_depth = static_cast<int64_t*>(paru_calloc(ntasks, sizeof(int64_t)));

if (task_map == NULL || task_parent == NULL || task_num_child == NULL ||
task_depth == NULL)
Expand Down
2 changes: 1 addition & 1 deletion ParU/Source/paru_backward.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ ParU_Ret paru_backward(double *x1, double &resid, double &anorm, double &xnorm,
}
PRLEVEL(PR, (" \n"));
#endif
double *b = (double *)paru_calloc(m, sizeof(double));
double *b = static_cast<double*>(paru_calloc(m, sizeof(double)));
if (b == NULL)
{
PRLEVEL(1, ("ParU: memory problem inside backward\n"));
Expand Down
2 changes: 1 addition & 1 deletion ParU/Source/paru_create_element.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ paru_element *paru_create_element(int64_t nrows, int64_t ncols)
size_t tot_size = sizeof(paru_element) +
sizeof(int64_t) * (2 * (nrows + ncols)) +
sizeof(double) * nrows * ncols;
curEl = (paru_element *)paru_alloc(1, tot_size);
curEl = static_cast<paru_element*>(paru_alloc(1, tot_size));
if (curEl == NULL) return NULL; // do not do error checking

PRLEVEL(1, (" with size of " LD " in %p\n", tot_size, curEl));
Expand Down
6 changes: 3 additions & 3 deletions ParU/Source/paru_gaxpy.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ int64_t paru_gaxpy(cholmod_sparse *A, const double *x, double *y, double alpha)
DEBUGLEVEL(0);

if (!A || !x || !y) return (0);
int64_t *Ap = (int64_t *)A->p;
int64_t *Ai = (int64_t *)A->i;
double *Ax = (double *)A->x;
int64_t *Ap = static_cast<int64_t*>(A->p);
int64_t *Ai = static_cast<int64_t*>(A->i);
double *Ax = static_cast<double*>(A->x);
int64_t n = A->ncol;

for (int64_t j = 0; j < n; j++)
Expand Down
70 changes: 35 additions & 35 deletions ParU/Source/paru_init_rowFronts.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ ParU_Ret paru_init_rowFronts(paru_work *Work,

// initializing Numeric
ParU_Numeric *Num = NULL;
Num = (ParU_Numeric *)paru_alloc(1, sizeof(ParU_Numeric));
Num = static_cast<ParU_Numeric*>(paru_alloc(1, sizeof(ParU_Numeric)));
if (Num == NULL)
{ // out of memory
PRLEVEL(1, ("ParU: out of memory, Num\n"));
Expand Down Expand Up @@ -83,36 +83,36 @@ ParU_Ret paru_init_rowFronts(paru_work *Work,
if (nf != 0)
{
// Memory allocations for Num
rowMark = Work->rowMark = (int64_t *)paru_alloc(m + nf + 1, sizeof(int64_t));
elRow = Work->elRow = (int64_t *)paru_alloc(m + nf, sizeof(int64_t));
elCol = Work->elCol = (int64_t *)paru_alloc(m + nf, sizeof(int64_t));
rowSize = Work->rowSize = (int64_t *)paru_alloc(m, sizeof(int64_t));
rowMark = Work->rowMark = static_cast<int64_t*>(paru_alloc(m + nf + 1, sizeof(int64_t)));
elRow = Work->elRow = static_cast<int64_t*>(paru_alloc(m + nf, sizeof(int64_t)));
elCol = Work->elCol = static_cast<int64_t*>(paru_alloc(m + nf, sizeof(int64_t)));
rowSize = Work->rowSize = static_cast<int64_t*>(paru_alloc(m, sizeof(int64_t)));
row_degree_bound = Work->row_degree_bound =
(int64_t *)paru_alloc(m, sizeof(int64_t));
static_cast<int64_t*>(paru_alloc(m, sizeof(int64_t)));
RowList = Work->RowList =
(paru_tupleList *)paru_calloc(1, m * sizeof(paru_tupleList));
Work->lacList = (int64_t *)paru_alloc(m + nf, sizeof(int64_t));
Num->frowCount = (int64_t *)paru_alloc(1, nf * sizeof(int64_t));
Num->fcolCount = (int64_t *)paru_alloc(1, nf * sizeof(int64_t));
Num->frowList = (int64_t **)paru_calloc(1, nf * sizeof(int64_t *));
Num->fcolList = (int64_t **)paru_calloc(1, nf * sizeof(int64_t *));
static_cast<paru_tupleList*>(paru_calloc(1, m * sizeof(paru_tupleList)));
Work->lacList = static_cast<int64_t*>(paru_alloc(m + nf, sizeof(int64_t)));
Num->frowCount = static_cast<int64_t*>(paru_alloc(1, nf * sizeof(int64_t)));
Num->fcolCount = static_cast<int64_t*>(paru_alloc(1, nf * sizeof(int64_t)));
Num->frowList = static_cast<int64_t**>(paru_calloc(1, nf * sizeof(int64_t *)));
Num->fcolList = static_cast<int64_t**>(paru_calloc(1, nf * sizeof(int64_t *)));
Num->partial_Us = // Initialize with NULL
(ParU_Factors *)paru_calloc(1, nf * sizeof(ParU_Factors));
static_cast<ParU_Factors*>(paru_calloc(1, nf * sizeof(ParU_Factors)));
Num->partial_LUs = // Initialize with NULL
(ParU_Factors *)paru_calloc(1, nf * sizeof(ParU_Factors));
static_cast<ParU_Factors*>(paru_calloc(1, nf * sizeof(ParU_Factors)));

Work->time_stamp = (int64_t *)paru_alloc(1, nf * sizeof(int64_t));
Work->task_num_child = (int64_t *)paru_alloc(Sym->ntasks, sizeof(int64_t));
heapList = Work->heapList = (std::vector<int64_t> **)paru_calloc(
1, (m + nf + 1) * sizeof(std::vector<int64_t> *));
Work->time_stamp = static_cast<int64_t*>(paru_alloc(1, nf * sizeof(int64_t)));
Work->task_num_child = static_cast<int64_t*>(paru_alloc(Sym->ntasks, sizeof(int64_t)));
heapList = Work->heapList = static_cast<std::vector<int64_t>**>(paru_calloc(
1, (m + nf + 1) * sizeof(std::vector<int64_t> *)));
elementList = Work->elementList = // Initialize with NULL
(paru_element **)paru_calloc(1,
(m + nf + 1) * sizeof(paru_element));
static_cast<paru_element**>(paru_calloc(1,
(m + nf + 1) * sizeof(paru_element)));
if (Sym->strategy == PARU_STRATEGY_SYMMETRIC)
{
Diag_map = Work->Diag_map = (int64_t *)paru_alloc(Sym->n, sizeof(int64_t));
Diag_map = Work->Diag_map = static_cast<int64_t*>(paru_alloc(Sym->n, sizeof(int64_t)));
inv_Diag_map = Work->inv_Diag_map =
(int64_t *)paru_alloc(Sym->n, sizeof(int64_t));
static_cast<int64_t*>(paru_alloc(Sym->n, sizeof(int64_t)));
#ifndef NDEBUG
paru_memset(Diag_map, 0, Sym->n * sizeof(int64_t), Control);
paru_memset(inv_Diag_map, 0, Sym->n * sizeof(int64_t), Control);
Expand All @@ -123,9 +123,9 @@ ParU_Ret paru_init_rowFronts(paru_work *Work,

int64_t snz = Num->snz = Sym->snz;
double *Sx = NULL;
Sx = Num->Sx = (double *)paru_alloc(snz, sizeof(double));
Sx = Num->Sx = static_cast<double*>(paru_alloc(snz, sizeof(double)));
int64_t *cSp = NULL; // copy of Sp, temporary for making Sx
cSp = (int64_t *)paru_alloc(m + 1, sizeof(int64_t));
cSp = static_cast<int64_t*>(paru_alloc(m + 1, sizeof(int64_t)));
double *Sux = NULL;
int64_t *cSup = NULL; // copy of Sup temporary for making Sux
int64_t cs1 = Sym->cs1;
Expand All @@ -134,8 +134,8 @@ ParU_Ret paru_init_rowFronts(paru_work *Work,
if (cs1 > 0)
{
sunz = Sym->ustons.nnz;
Sux = (double *)paru_alloc(sunz, sizeof(double));
cSup = (int64_t *)paru_alloc(cs1 + 1, sizeof(int64_t));
Sux = static_cast<double*>(paru_alloc(sunz, sizeof(double)));
cSup = static_cast<int64_t*>(paru_alloc(cs1 + 1, sizeof(int64_t)));
}
Num->Sux = Sux;
double *Slx = NULL;
Expand All @@ -144,15 +144,15 @@ ParU_Ret paru_init_rowFronts(paru_work *Work,
if (rs1 > 0)
{
slnz = Sym->lstons.nnz;
Slx = (double *)paru_alloc(slnz, sizeof(double));
cSlp = (int64_t *)paru_alloc(rs1 + 1, sizeof(int64_t));
Slx = static_cast<double*>(paru_alloc(slnz, sizeof(double)));
cSlp = static_cast<int64_t*>(paru_alloc(rs1 + 1, sizeof(int64_t)));
}
Num->sunz = sunz;
Num->slnz = slnz;
Num->Slx = Slx;
double *Rs = NULL;
int64_t scale = Control->scale; // if 1 the S will be scaled by max_row
if (scale == 1) Rs = (double *)paru_calloc(Sym->m, sizeof(double));
if (scale == 1) Rs = static_cast<double*>(paru_calloc(Sym->m, sizeof(double)));
Num->Rs = Rs;
if ((nf != 0 &&
(rowMark == NULL || elRow == NULL || elCol == NULL ||
Expand Down Expand Up @@ -197,9 +197,9 @@ ParU_Ret paru_init_rowFronts(paru_work *Work,
}

//////////////////Initializing numerics Sx, Sux and Slx //////////////////{
int64_t *Ap = (int64_t *)A->p;
int64_t *Ai = (int64_t *)A->i;
double *Ax = (double *)A->x;
int64_t *Ap = static_cast<int64_t*>(A->p);
int64_t *Ai = static_cast<int64_t*>(A->i);
double *Ax = static_cast<double*>(A->x);
int64_t *Sp = Sym->Sp;
int64_t *Slp = NULL;
int64_t *Sup = NULL;
Expand Down Expand Up @@ -296,7 +296,7 @@ ParU_Ret paru_init_rowFronts(paru_work *Work,
int64_t srow = newrow - n1;
int64_t scol = newcol - n1;
if (srow >= 0 && scol >= 0)
{ // it is insdie S otherwise it is part of singleton
{ // it is inside S otherwise it is part of singleton
Sx[cSp[srow]++] = (Rs == NULL) ? Ax[p] : Ax[p] / Rs[oldrow];
}
else if (srow < 0 && scol >= 0)
Expand Down Expand Up @@ -456,8 +456,8 @@ ParU_Ret paru_init_rowFronts(paru_work *Work,
int64_t slackRow = 2;

// Allocating Rowlist and updating its tuples
RowList[row].list = (paru_tuple *)paru_alloc(
slackRow * nrows, sizeof(paru_tuple));
RowList[row].list = static_cast<paru_tuple*>(paru_alloc(
slackRow * nrows, sizeof(paru_tuple)));
if (RowList[row].list == NULL)
{ // out of memory
PRLEVEL(1, ("ParU: out of memory, RowList[row].list \n"));
Expand Down
4 changes: 2 additions & 2 deletions ParU/Source/paru_lsolve.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ ParU_Ret ParU_Lsolve(ParU_Symbolic *Sym, ParU_Numeric *Num, double *x, ParU_Cont
BLAS_set_num_threads(control_nthreads (Control)) ;

// gather scatter space for dgemm
double *work = (double *)paru_alloc((Num->max_row_count), sizeof(double));
double *work = static_cast<double*>(paru_alloc((Num->max_row_count), sizeof(double)));
if (work == NULL)
{
PRLEVEL(1, ("ParU: out of memory lsolve\n"));
Expand Down Expand Up @@ -282,7 +282,7 @@ ParU_Ret ParU_Lsolve( ParU_Symbolic *Sym, ParU_Numeric *Num,

// gather scatter space for dgemm
double *work =
(double *)paru_alloc((Num->max_row_count * nrhs), sizeof(double));
static_cast<double*>(paru_alloc((Num->max_row_count * nrhs), sizeof(double)));
if (work == NULL)
{
PRLEVEL(1, ("ParU: out of memory lsolve\n"));
Expand Down
4 changes: 2 additions & 2 deletions ParU/Source/paru_memcpy.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ void paru_memcpy(void *destination, const void *source,
{
size_t chunk = MIN(num - start, mem_chunk);
// void* arithmetic is illegal it is why I am using this
unsigned char *pdest = (unsigned char *)destination + start;
const unsigned char *psrc = (unsigned char *)source + start;
unsigned char *pdest = static_cast<unsigned char*>(destination) + start;
const unsigned char *psrc = static_cast<const unsigned char*>(source) + start;
memcpy(pdest, psrc, chunk);
}
}
Expand Down
Loading

0 comments on commit 199f62d

Please sign in to comment.