aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/generators/gen_eval.lua
diff options
context:
space:
mode:
authorii14 <59243201+ii14@users.noreply.github.com>2023-04-06 22:39:50 +0200
committerGitHub <noreply@github.com>2023-04-06 22:39:50 +0200
commit7190dba017e3aac0409c73ff1c954d18858cb3c9 (patch)
tree321f4b2dd65e4a06047beee876d3c2e0d2dbf7d0 /src/nvim/generators/gen_eval.lua
parent0bc323850410df4c3c1dd8fabded9d2000189270 (diff)
downloadrneovim-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/nvim/generators/gen_eval.lua')
-rw-r--r--src/nvim/generators/gen_eval.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/generators/gen_eval.lua b/src/nvim/generators/gen_eval.lua
index fb1dd82a26..a86dc4233e 100644
--- a/src/nvim/generators/gen_eval.lua
+++ b/src/nvim/generators/gen_eval.lua
@@ -94,12 +94,12 @@ for _, name in ipairs(neworder) do
end
local base = def.base or "BASE_NONE"
local func = def.func or ('f_' .. name)
- local data = def.data or "{ .nullptr = NULL }"
+ local data = def.data or "{ .null = NULL }"
local fast = def.fast and 'true' or 'false'
hashpipe:write((' { "%s", %s, %s, %s, %s, &%s, %s },\n')
:format(name, args[1], args[2], base, fast, func, data))
end
-hashpipe:write(' { NULL, 0, 0, BASE_NONE, false, NULL, { .nullptr = NULL } },\n')
+hashpipe:write(' { NULL, 0, 0, BASE_NONE, false, NULL, { .null = NULL } },\n')
hashpipe:write("};\n\n")
hashpipe:write(hashfun)
hashpipe:close()