fix incorrect type for QDLDL_bool

Author: bodono

linsys/cpu/direct/private.c

@@ -51,7 +51,7 @@ static scs_int ldl_prepare(ScsLinSysWork *p) {
   L->i = (scs_int *)scs_calloc(nzmax, sizeof(scs_int));
   p->Dinv = (scs_float *)scs_calloc(n, sizeof(scs_float));
   p->D = (scs_float *)scs_calloc(n, sizeof(scs_float));
-  p->bwork = (scs_int *)scs_calloc(n, sizeof(scs_int));
+  p->bwork = (QDLDL_bool *)scs_calloc(n, sizeof(QDLDL_bool));
   p->fwork = (scs_float *)scs_calloc(n, sizeof(scs_float));
   return nzmax;
 }

linsys/cpu/direct/private.h

@@ -22,7 +22,8 @@ struct SCS_LIN_SYS_WORK {
   scs_int factorizations;
   /* ldl factorization workspace */
   scs_float *D, *fwork;
-  scs_int *etree, *iwork, *Lnz, *bwork;
+  scs_int *etree, *iwork, *Lnz;
+  QDLDL_bool *bwork;
   scs_float *diag_p;
 };
 

linsys/external/qdldl/qdldl_types.h

@@ -12,7 +12,7 @@ extern "C" {
 
 #define QDLDL_int scs_int
 #define QDLDL_float scs_float
-#define QDLDL_bool scs_int
+#define QDLDL_bool unsigned char
 
 /* Maximum value of the signed type QDLDL_int */
 #ifdef DLONG

scs.mk

@@ -64,7 +64,7 @@ CUDSS_LDFLAGS = $(CULDFLAGS) -L$(CUDSS_PATH)/lib -lcudss
 # Add on default CFLAGS
 OPT = -O3
 INCLUDE = -I. -Iinclude -Ilinsys
-override CFLAGS += -g -Wall -Wwrite-strings -pedantic -funroll-loops -Wstrict-prototypes $(INCLUDE) $(OPT)
+override CFLAGS += -g -Wall -Wwrite-strings -pedantic -funroll-loops -Wstrict-prototypes $(INCLUDE) $(OPT) -Werror=incompatible-pointer-types
 ifneq ($(ISWINDOWS), 1)
 override CFLAGS += -fPIC
 endif