Merge pull request #5023 from rgommers/fix-warnings

martin-frbg · web-flow · commit 70dddacb9f12 · 2024-12-18T16:13:12.000-08:00
Fix two compiler warnings in `memory.c`
diff --git a/driver/others/memory.c b/driver/others/memory.c
@@ -2538,7 +2538,7 @@ static void *alloc_shm(void *address){
 }
 #endif
 
-#if defined OS_LINUX  || defined OS_AIX  || defined __sun__  || defined OS_WINDOWS
+#if ((defined ALLOC_HUGETLB) && (defined OS_LINUX  || defined OS_AIX  || defined __sun__  || defined OS_WINDOWS))
 
 static void alloc_hugetlb_free(struct release_t *release){
 
@@ -3254,7 +3254,7 @@ void blas_shutdown(void){
 #endif
       newmemory[pos].lock   = 0;
     }
-    free(newmemory);
+    free((void*)newmemory);
     newmemory = NULL;
     memory_overflowed = 0;  
   }

Original file line number	Diff line number	Diff line change
`@@ -2538,7 +2538,7 @@ static void alloc_shm(void address){`
`2538`	`2538`	`}`
`2539`	`2539`	`#endif`
`2540`	`2540`
`2541`		`-#if defined OS_LINUX \|\| defined OS_AIX \|\| defined __sun__ \|\| defined OS_WINDOWS`
	`2541`	`+#if ((defined ALLOC_HUGETLB) && (defined OS_LINUX \|\| defined OS_AIX \|\| defined __sun__ \|\| defined OS_WINDOWS))`
`2542`	`2542`
`2543`	`2543`	`static void alloc_hugetlb_free(struct release_t *release){`
`2544`	`2544`
`@@ -3254,7 +3254,7 @@ void blas_shutdown(void){`
`3254`	`3254`	`#endif`
`3255`	`3255`	`newmemory[pos].lock = 0;`
`3256`	`3256`	`}`
`3257`		`- free(newmemory);`
	`3257`	`+ free((void*)newmemory);`
`3258`	`3258`	`newmemory = NULL;`
`3259`	`3259`	`memory_overflowed = 0;`
`3260`	`3260`	`}`