summaryrefslogtreecommitdiff
path: root/src/lib/eolian_cxx
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@osg.samsung.com>2017-08-10 14:10:52 +0200
committerDaniel Kolesa <d.kolesa@osg.samsung.com>2017-08-10 14:10:52 +0200
commit9738a6e3d2eb81655978a675a2ad764196ce7929 (patch)
tree5131c3c9660e15697a8a3425c8e33c3b7e73676d /src/lib/eolian_cxx
parent22e27ab0454e4f16c91ecd5e3cc2e0263bbe1bc8 (diff)
eolian cxx: fix the remaining type errors
Diffstat (limited to 'src/lib/eolian_cxx')
-rw-r--r--src/lib/eolian_cxx/grammar/klass_def.hpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/eolian_cxx/grammar/klass_def.hpp b/src/lib/eolian_cxx/grammar/klass_def.hpp
index 2ea8b40fac..63d876f491 100644
--- a/src/lib/eolian_cxx/grammar/klass_def.hpp
+++ b/src/lib/eolian_cxx/grammar/klass_def.hpp
@@ -217,9 +217,9 @@ struct type_def
217 type_def(variant_type original_type, std::string c_type) 217 type_def(variant_type original_type, std::string c_type)
218 : original_type(original_type), c_type(c_type) {} 218 : original_type(original_type), c_type(c_type) {}
219 219
220 type_def(Eolian_Type const* eolian_type, Eolian_Unit const* unit) 220 type_def(Eolian_Type const* eolian_type, Eolian_Unit const* unit, Eolian_C_Type_Type ctype)
221 { 221 {
222 set(eolian_type, unit); 222 set(eolian_type, unit, ctype);
223 } 223 }
224 void set(Eolian_Type const* eolian_type, Eolian_Unit const* unit, Eolian_C_Type_Type ctype); 224 void set(Eolian_Type const* eolian_type, Eolian_Unit const* unit, Eolian_C_Type_Type ctype);
225}; 225};
@@ -293,7 +293,7 @@ inline void type_def::set(Eolian_Type const* eolian_type, Eolian_Unit const* uni
293 Eolian_Type const* stp = eolian_type_base_type_get(eolian_type); 293 Eolian_Type const* stp = eolian_type_base_type_get(eolian_type);
294 while (stp) 294 while (stp)
295 { 295 {
296 complex.subtypes.push_back({stp, unit}); 296 complex.subtypes.push_back({stp, unit, EOLIAN_C_TYPE_DEFAULT});
297 stp = eolian_type_next_type_get(stp); 297 stp = eolian_type_next_type_get(stp);
298 } 298 }
299 original_type = complex; 299 original_type = complex;
@@ -348,7 +348,7 @@ struct parameter_def
348 parameter_def(parameter_direction direction, type_def type, std::string param_name, std::string c_type) 348 parameter_def(parameter_direction direction, type_def type, std::string param_name, std::string c_type)
349 : direction(std::move(direction)), type(std::move(type)), param_name(std::move(param_name)), c_type(std::move(c_type)) {} 349 : direction(std::move(direction)), type(std::move(type)), param_name(std::move(param_name)), c_type(std::move(c_type)) {}
350 parameter_def(Eolian_Function_Parameter const* param, Eolian_Unit const* unit) 350 parameter_def(Eolian_Function_Parameter const* param, Eolian_Unit const* unit)
351 : type( ::eolian_parameter_type_get(param), unit) 351 : type( ::eolian_parameter_type_get(param), unit, EOLIAN_C_TYPE_PARAM)
352 , param_name( ::eolian_parameter_name_get(param)) 352 , param_name( ::eolian_parameter_name_get(param))
353 , c_type( ::eolian_type_c_type_get(::eolian_parameter_type_get(param), EOLIAN_C_TYPE_PARAM)) 353 , c_type( ::eolian_type_c_type_get(::eolian_parameter_type_get(param), EOLIAN_C_TYPE_PARAM))
354 { 354 {
@@ -565,7 +565,7 @@ struct event_def
565 event_def(type_def type, std::string name, std::string c_name, bool beta, bool protect) 565 event_def(type_def type, std::string name, std::string c_name, bool beta, bool protect)
566 : type(type), name(name), c_name(c_name), beta(beta), protect(protect) {} 566 : type(type), name(name), c_name(c_name), beta(beta), protect(protect) {}
567 event_def(Eolian_Event const* event, Eolian_Unit const* unit) 567 event_def(Eolian_Event const* event, Eolian_Unit const* unit)
568 : type( ::eolian_event_type_get(event) ? eina::optional<type_def>{{::eolian_event_type_get(event), unit}} : eina::optional<type_def>{}) 568 : type( ::eolian_event_type_get(event) ? eina::optional<type_def>{{::eolian_event_type_get(event), unit, EOLIAN_C_TYPE_DEFAULT}} : eina::optional<type_def>{})
569 , name( ::eolian_event_name_get(event)) 569 , name( ::eolian_event_name_get(event))
570 , c_name( ::eolian_event_c_name_get(event)) 570 , c_name( ::eolian_event_c_name_get(event))
571 , beta( ::eolian_event_is_beta(event)) 571 , beta( ::eolian_event_is_beta(event))