Silence GCC 8's warning about using realloc/memmove on non-POD

tautschnig · tautschnig · commit 91e33ea4dd07 · 2018-06-20T07:35:05.000+01:00
diff --git a/src/util/small_map.h b/src/util/small_map.h
@@ -146,7 +146,7 @@ class small_mapt
     if(n == 0)
       return nullptr;
 
-    T *mem = (T *)realloc(ptr, sizeof(T) * n);
+    T *mem = (T *)realloc((char *)ptr, sizeof(T) * n);
 
     if(!mem)
       throw std::bad_alloc();
@@ -486,7 +486,7 @@ class small_mapt
       std::size_t n = size();
       if(ii < n - 1)
       {
-        memmove(p + ii, p + ii + 1, sizeof(T) * (n - ii - 1));
+        memmove((char *)(p + ii), p + ii + 1, sizeof(T) * (n - ii - 1));
       }
 
       p = allocate(p, n - 1);

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ class small_mapt`
`146`	`146`	`if(n == 0)`
`147`	`147`	`return nullptr;`
`148`	`148`
`149`		`- T mem = (T )realloc(ptr, sizeof(T) * n);`
	`149`	`+ T mem = (T )realloc((char )ptr, sizeof(T) n);`
`150`	`150`
`151`	`151`	`if(!mem)`
`152`	`152`	`throw std::bad_alloc();`
`@@ -486,7 +486,7 @@ class small_mapt`
`486`	`486`	`std::size_t n = size();`
`487`	`487`	`if(ii < n - 1)`
`488`	`488`	`{`
`489`		`- memmove(p + ii, p + ii + 1, sizeof(T) * (n - ii - 1));`
	`489`	`+ memmove((char )(p + ii), p + ii + 1, sizeof(T) (n - ii - 1));`
`490`	`490`	`}`
`491`	`491`
`492`	`492`	`p = allocate(p, n - 1);`