From 8742534db819cf9c2a8c8034c6142164f7b7ffeb Mon Sep 17 00:00:00 2001 From: Alan Mishchenko Date: Wed, 1 Mar 2023 01:12:36 -0800 Subject: [PATCH] More compiler warnings. --- src/sat/glucose/Vec.h | 2 +- src/sat/glucose2/Vec.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sat/glucose/Vec.h b/src/sat/glucose/Vec.h index dd1bc20a1..da815e301 100644 --- a/src/sat/glucose/Vec.h +++ b/src/sat/glucose/Vec.h @@ -99,7 +99,7 @@ template void vec::capacity(int min_cap) { if (cap >= min_cap) return; int add = imax((min_cap - cap + 1) & ~1, ((cap >> 1) + 2) & ~1); // NOTE: grow by approximately 3/2 - if (add > INT_MAX - cap || (((data = (T*)::realloc(data, (cap += add) * sizeof(T))) == NULL) && errno == ENOMEM)) + if (add > INT_MAX - cap || (((data = (T*)::realloc((void*)data, (cap += add) * sizeof(T))) == NULL) && errno == ENOMEM)) throw OutOfMemoryException(); } diff --git a/src/sat/glucose2/Vec.h b/src/sat/glucose2/Vec.h index eaeed2074..a087f29b3 100644 --- a/src/sat/glucose2/Vec.h +++ b/src/sat/glucose2/Vec.h @@ -101,14 +101,14 @@ template void vec::capacity(int min_cap) { if (cap >= min_cap) return; int add = imax((min_cap - cap + 1) & ~1, ((cap >> 1) + 2) & ~1); // NOTE: grow by approximately 3/2 - if (add > INT_MAX - cap || (((data = (T*)::realloc(data, (cap += add) * sizeof(T))) == NULL) && errno == ENOMEM)) + if (add > INT_MAX - cap || (((data = (T*)::realloc((void*)data, (cap += add) * sizeof(T))) == NULL) && errno == ENOMEM)) throw OutOfMemoryException(); } template void vec::prelocate(int ext_cap) { if (cap >= ext_cap) return; - if (ext_cap > INT_MAX || (((data = (T*)::realloc(data, ext_cap * sizeof(T))) == NULL) && errno == ENOMEM)) + if (ext_cap > INT_MAX || (((data = (T*)::realloc((void*)data, ext_cap * sizeof(T))) == NULL) && errno == ENOMEM)) throw OutOfMemoryException(); cap = ext_cap; }