mirror of
https://github.com/cimgui/cimgui.git
synced 2025-08-11 12:18:30 +01:00
avoid ImNewDummy issue #80 for MSVC
This commit is contained in:
1
cimgui.h
1
cimgui.h
@@ -588,7 +588,6 @@ typedef struct ImVector_TextRange {int Size;int Capacity;TextRange* Data;} ImVec
|
|||||||
typedef struct ImVector_ImVec4 {int Size;int Capacity;ImVec4* Data;} ImVector_ImVec4;
|
typedef struct ImVector_ImVec4 {int Size;int Capacity;ImVec4* Data;} ImVector_ImVec4;
|
||||||
typedef struct ImVector_ImDrawIdx {int Size;int Capacity;ImDrawIdx* Data;} ImVector_ImDrawIdx;
|
typedef struct ImVector_ImDrawIdx {int Size;int Capacity;ImDrawIdx* Data;} ImVector_ImDrawIdx;
|
||||||
typedef struct ImVector_ImVec2 {int Size;int Capacity;ImVec2* Data;} ImVector_ImVec2;
|
typedef struct ImVector_ImVec2 {int Size;int Capacity;ImVec2* Data;} ImVector_ImVec2;
|
||||||
struct ImNewDummy {};
|
|
||||||
struct ImGuiOnceUponAFrame
|
struct ImGuiOnceUponAFrame
|
||||||
{
|
{
|
||||||
int RefFrame;
|
int RefFrame;
|
||||||
|
@@ -1093,7 +1093,10 @@ local function gen_structs_and_enums(cdefs,templates)
|
|||||||
local desired_linelen = (linelen==0) and 0 or math.max(math.ceil(linelen/10)*10,40)
|
local desired_linelen = (linelen==0) and 0 or math.max(math.ceil(linelen/10)*10,40)
|
||||||
local spaces_to_add = 0 --desired_linelen - linelen
|
local spaces_to_add = 0 --desired_linelen - linelen
|
||||||
local linecom = line..string.rep(" ",spaces_to_add)..comment
|
local linecom = line..string.rep(" ",spaces_to_add)..comment
|
||||||
|
|
||||||
|
-- ImNewDummy drop for MSVC
|
||||||
|
if line:match"ImNewDummy" then break end
|
||||||
|
|
||||||
if line:match(namespace_re) then
|
if line:match(namespace_re) then
|
||||||
in_namespace = true
|
in_namespace = true
|
||||||
end
|
end
|
||||||
@@ -1105,7 +1108,7 @@ local function gen_structs_and_enums(cdefs,templates)
|
|||||||
break
|
break
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- ImVector special treatment
|
-- ImVector special treatment
|
||||||
if structnames[#structnames] == "ImVector" then
|
if structnames[#structnames] == "ImVector" then
|
||||||
if line:match(struct_closing_re) then
|
if line:match(struct_closing_re) then
|
||||||
|
@@ -588,7 +588,6 @@ typedef struct ImVector_TextRange {int Size;int Capacity;TextRange* Data;} ImVec
|
|||||||
typedef struct ImVector_ImVec4 {int Size;int Capacity;ImVec4* Data;} ImVector_ImVec4;
|
typedef struct ImVector_ImVec4 {int Size;int Capacity;ImVec4* Data;} ImVector_ImVec4;
|
||||||
typedef struct ImVector_ImDrawIdx {int Size;int Capacity;ImDrawIdx* Data;} ImVector_ImDrawIdx;
|
typedef struct ImVector_ImDrawIdx {int Size;int Capacity;ImDrawIdx* Data;} ImVector_ImDrawIdx;
|
||||||
typedef struct ImVector_ImVec2 {int Size;int Capacity;ImVec2* Data;} ImVector_ImVec2;
|
typedef struct ImVector_ImVec2 {int Size;int Capacity;ImVec2* Data;} ImVector_ImVec2;
|
||||||
struct ImNewDummy {};
|
|
||||||
struct ImGuiOnceUponAFrame
|
struct ImGuiOnceUponAFrame
|
||||||
{
|
{
|
||||||
int RefFrame;
|
int RefFrame;
|
||||||
|
Reference in New Issue
Block a user