diff options
| author | ii14 <59243201+ii14@users.noreply.github.com> | 2023-04-06 22:39:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-06 22:39:50 +0200 |
| commit | 7190dba017e3aac0409c73ff1c954d18858cb3c9 (patch) | |
| tree | 321f4b2dd65e4a06047beee876d3c2e0d2dbf7d0 /src/klib/klist.h | |
| parent | 0bc323850410df4c3c1dd8fabded9d2000189270 (diff) | |
| download | rneovim-7190dba017e3aac0409c73ff1c954d18858cb3c9.tar.gz rneovim-7190dba017e3aac0409c73ff1c954d18858cb3c9.tar.bz2 rneovim-7190dba017e3aac0409c73ff1c954d18858cb3c9.zip | |
refactor: remove use of reserved c++ keywords
libnvim couldn't be easily used in C++ due to the use of reserved keywords.
Additionally, add explicit casts to *alloc function calls used in inline
functions, as C++ doesn't allow implicit casts from void pointers.
Diffstat (limited to 'src/klib/klist.h')
| -rw-r--r-- | src/klib/klist.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/klib/klist.h b/src/klib/klist.h index a9abbc6dc2..4274c53919 100644 --- a/src/klib/klist.h +++ b/src/klib/klist.h @@ -38,7 +38,7 @@ kmptype_t **buf; \ } kmp_##name##_t; \ static inline kmp_##name##_t *kmp_init_##name(void) { \ - return xcalloc(1, sizeof(kmp_##name##_t)); \ + return (kmp_##name##_t *)xcalloc(1, sizeof(kmp_##name##_t)); \ } \ static inline void kmp_destroy_##name(kmp_##name##_t *mp) \ REAL_FATTR_UNUSED; \ @@ -52,7 +52,7 @@ static inline kmptype_t *kmp_alloc_##name(kmp_##name##_t *mp) { \ mp->cnt++; \ if (mp->n == 0) { \ - return xcalloc(1, sizeof(kmptype_t)); \ + return (kmptype_t *)xcalloc(1, sizeof(kmptype_t)); \ } \ return mp->buf[--mp->n]; \ } \ @@ -60,7 +60,7 @@ mp->cnt--; \ if (mp->n == mp->max) { \ mp->max = mp->max ? (mp->max << 1) : 16; \ - mp->buf = xrealloc(mp->buf, sizeof(kmptype_t *) * mp->max); \ + mp->buf = (kmptype_t **)xrealloc(mp->buf, sizeof(kmptype_t *) * mp->max); \ } \ mp->buf[mp->n++] = p; \ } @@ -84,7 +84,7 @@ size_t size; \ } kl_##name##_t; \ static inline kl_##name##_t *kl_init_##name(void) { \ - kl_##name##_t *kl = xcalloc(1, sizeof(kl_##name##_t)); \ + kl_##name##_t *kl = (kl_##name##_t *)xcalloc(1, sizeof(kl_##name##_t)); \ kl->mp = kmp_init(name); \ kl->head = kl->tail = kmp_alloc(name, kl->mp); \ kl->head->next = 0; \ |