diff options
| author | Ivan Maidanski <ivmai@mail.ru> | 2018-02-14 09:54:29 +0300 |
|---|---|---|
| committer | Ivan Maidanski <ivmai@mail.ru> | 2018-02-14 09:54:29 +0300 |
| commit | d354f258eaa9788e00c490d93860a6b28abf79af (patch) | |
| tree | 42c893c8428e7ab0dec02587e040c6d8e0daf771 /src | |
| parent | a05abf6c9d5fb6ffa916e121a22eb5b6604262c4 (diff) | |
| download | libatomic_ops-d354f258eaa9788e00c490d93860a6b28abf79af.tar.gz | |
Convert atomic_ops_malloc.c to valid C++ code
Explicit pointer casts are added where necessary.
* src/atomic_ops_malloc.c [HAVE_MMAP] (get_mmaped): Cast result of
mmap() to char* (when assigned to "result" local variable).
* src/atomic_ops_malloc.c (AO_free): Cast AO_free_large() argument
to char*.
Diffstat (limited to 'src')
| -rw-r--r-- | src/atomic_ops_malloc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/atomic_ops_malloc.c b/src/atomic_ops_malloc.c index f86585d..7e4bbb3 100644 --- a/src/atomic_ops_malloc.c +++ b/src/atomic_ops_malloc.c @@ -145,8 +145,9 @@ static char *get_mmaped(size_t sz) if (zero_fd == -1) return 0; # endif - result = mmap(0, sz, PROT_READ | PROT_WRITE, - GC_MMAP_FLAGS | OPT_MAP_ANON, zero_fd, 0/* offset */); + result = (char *)mmap(0, sz, PROT_READ | PROT_WRITE, + GC_MMAP_FLAGS | OPT_MAP_ANON, + zero_fd, 0 /* offset */); # ifndef USE_MMAP_ANON close(zero_fd); # endif @@ -361,7 +362,7 @@ AO_free(void *p) log_sz > LOG_MAX_SIZE ? (unsigned)log_sz : 1UL << log_sz); # endif if (AO_EXPECT_FALSE(log_sz > LOG_MAX_SIZE)) { - AO_free_large(p); + AO_free_large((char *)p); } else { ASAN_POISON_MEMORY_REGION(base + 1, ((size_t)1 << log_sz) - sizeof(AO_t)); AO_stack_push(AO_free_list + log_sz, base); |