Fix gcc conversion warnings in constants and initializers

ndsev · Dec 13, 2024 · 37c4ee9 · 37c4ee9
1 parent cd5476a
commit 37c4ee9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/extension/freemarker/Constant.h.ftl b/extension/freemarker/Constant.h.ftl
@@ -14,7 +14,7 @@
 <@doc_comments docComments/>
 </#if>
 constexpr ${typeInfo.typeFullName} ${name} = <#rt>
-        <#lt><#if typeInfo.isNumeric>static_cast<${typeInfo.typeFullName}>(</#if>${value}<#rt>
+        <#lt><#if typeInfo.isNumeric>static_cast<${typeInfo.typeFullName}::ValueType>(</#if>${value}<#rt>
         <#lt><#if typeInfo.isNumeric>)</#if>;
 <@namespace_end package.path/>
 

diff --git a/extension/freemarker/Structure.cpp.ftl b/extension/freemarker/Structure.cpp.ftl
@@ -21,7 +21,9 @@ ${name}::${name}(const AllocatorType&<#if fields_need_allocator(fieldList)> allo
         <#lt> :
     <#items as field>
         <#if field.initializer??>
-        ${field.name}(${field.initializer}<#if field_needs_allocator(field)>, allocator</#if>)<#sep>,</#sep>
+        ${field.name}(<#if field.typeInfo.isNumeric>static_cast<${field.typeInfo.typeFullName}::ValueType>(</#if><#rt>
+                <#lt>${field.initializer}<#if field.typeInfo.isNumeric>)</#if><#rt>
+                <#lt><#if field_needs_allocator(field)>, allocator</#if>)<#sep>,</#sep>
         <#else>
         ${field.name}(<#if field_needs_allocator(field)>allocator</#if>)<#sep>,</#sep>
         </#if>