language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-09-30 22:01:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix bad conflict resolution

Browse source
This commit is contained in:
Olivier Goffart 2021-03-19 18:30:16 +01:00
parent f2ffc0ebf6
commit b645860e27
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
api/sixtyfps-cpp/include/sixtyfps_interpreter.h
View file

@ -460,8 +460,6 @@ public:
return *this; return *this;
} }
~ComponentDefinition() { sixtyfps_interpreter_component_definition_destructor(&inner); } ~ComponentDefinition() { sixtyfps_interpreter_component_definition_destructor(&inner); }
}
ComponentHandle<ComponentInstance> create() const { ComponentHandle<ComponentInstance> create() const {
union CI { union CI {
cbindgen_private::ComponentInstance i; cbindgen_private::ComponentInstance i;
@ -472,7 +470,7 @@ public:
} u; } u;
cbindgen_private::sixtyfps_interpreter_component_instance_create(&inner, &u.i); cbindgen_private::sixtyfps_interpreter_component_instance_create(&inner, &u.i);
return *reinterpret_cast<ComponentHandle<ComponentInstance> *>(&u.i); return *reinterpret_cast<ComponentHandle<ComponentInstance> *>(&u.i);
}
}; };
class ComponentCompiler class ComponentCompiler