diff --git a/compiler/extensions/cpp/freemarker/Bitmask.cpp.ftl b/compiler/extensions/cpp/freemarker/Bitmask.cpp.ftl index dabc4c0af..90ae393bc 100644 --- a/compiler/extensions/cpp/freemarker/Bitmask.cpp.ftl +++ b/compiler/extensions/cpp/freemarker/Bitmask.cpp.ftl @@ -99,14 +99,14 @@ ${types.reflectablePtr.name} ${name}::reflectable(const ${types.allocator.defaul } - ${types.anyHolder.name} getAnyValue(const ${types.allocator.default}& allocator) const override + ${types.anyHolder.name} getAnyValue(const ${types.allocator.default}& alloc) const override { - return ${types.anyHolder.name}(m_bitmask, allocator); + return ${types.anyHolder.name}(m_bitmask, alloc); } - ${types.anyHolder.name} getAnyValue(const ${types.allocator.default}& allocator) override + ${types.anyHolder.name} getAnyValue(const ${types.allocator.default}& alloc) override { - return ${types.anyHolder.name}(m_bitmask, allocator); + return ${types.anyHolder.name}(m_bitmask, alloc); } <#-- bitmask is always unsigned --> @@ -125,9 +125,9 @@ ${types.reflectablePtr.name} ${name}::reflectable(const ${types.allocator.defaul return static_cast(toUInt()); } - ${types.string.name} toString(const ${types.allocator.default}& allocator) const override + ${types.string.name} toString(const ${types.allocator.default}& alloc) const override { - return m_bitmask.toString(allocator); + return m_bitmask.toString(alloc); } private: diff --git a/compiler/extensions/cpp/freemarker/Choice.cpp.ftl b/compiler/extensions/cpp/freemarker/Choice.cpp.ftl index 7652e19ba..667748980 100644 --- a/compiler/extensions/cpp/freemarker/Choice.cpp.ftl +++ b/compiler/extensions/cpp/freemarker/Choice.cpp.ftl @@ -198,9 +198,9 @@ ${I}return {}; using ::zserio::ReflectableConstAllocatorHolderBase::getAnyValue; - explicit Reflectable(<#if isConst>const ${fullName}& object, const allocator_type& allocator) : + explicit Reflectable(<#if isConst>const ${fullName}& object, const allocator_type& alloc) : ::zserio::Reflectable<#if isConst>ConstAllocatorHolderBase(<#rt> - <#lt>${fullName}::typeInfo(), allocator), + <#lt>${fullName}::typeInfo(), alloc), m_object(object) {} <#if !isConst> @@ -269,15 +269,15 @@ ${I}return {}; } - ${types.anyHolder.name} getAnyValue(const allocator_type& allocator) const override + ${types.anyHolder.name} getAnyValue(const allocator_type& alloc) const override { - return ${types.anyHolder.name}(::std::cref(m_object), allocator); + return ${types.anyHolder.name}(::std::cref(m_object), alloc); } <#if !isConst> - ${types.anyHolder.name} getAnyValue(const allocator_type& allocator) override + ${types.anyHolder.name} getAnyValue(const allocator_type& alloc) override { - return ${types.anyHolder.name}(::std::ref(m_object), allocator); + return ${types.anyHolder.name}(::std::ref(m_object), alloc); } diff --git a/compiler/extensions/cpp/freemarker/Structure.cpp.ftl b/compiler/extensions/cpp/freemarker/Structure.cpp.ftl index e7469c6f9..6ac53fb0f 100644 --- a/compiler/extensions/cpp/freemarker/Structure.cpp.ftl +++ b/compiler/extensions/cpp/freemarker/Structure.cpp.ftl @@ -160,9 +160,9 @@ const ${types.typeInfo.name}& ${name}::typeInfo() using ::zserio::ReflectableConstAllocatorHolderBase::getAnyValue; - explicit Reflectable(<#if isConst>const ${fullName}& object, const allocator_type& allocator) : + explicit Reflectable(<#if isConst>const ${fullName}& object, const allocator_type& alloc) : ::zserio::Reflectable<#if isConst>ConstAllocatorHolderBase(<#rt> - <#lt>${fullName}::typeInfo(), allocator), + <#lt>${fullName}::typeInfo(), alloc), m_object(object) {} <#if !isConst> @@ -222,15 +222,15 @@ const ${types.typeInfo.name}& ${name}::typeInfo() - ${types.anyHolder.name} getAnyValue(const allocator_type& allocator) const override + ${types.anyHolder.name} getAnyValue(const allocator_type& alloc) const override { - return ${types.anyHolder.name}(::std::cref(m_object), allocator); + return ${types.anyHolder.name}(::std::cref(m_object), alloc); } <#if !isConst> - ${types.anyHolder.name} getAnyValue(const allocator_type& allocator) override + ${types.anyHolder.name} getAnyValue(const allocator_type& alloc) override { - return ${types.anyHolder.name}(::std::ref(m_object), allocator); + return ${types.anyHolder.name}(::std::ref(m_object), alloc); } diff --git a/compiler/extensions/cpp/freemarker/Union.cpp.ftl b/compiler/extensions/cpp/freemarker/Union.cpp.ftl index fb7ad952e..51fda82a9 100644 --- a/compiler/extensions/cpp/freemarker/Union.cpp.ftl +++ b/compiler/extensions/cpp/freemarker/Union.cpp.ftl @@ -288,8 +288,8 @@ const ${types.typeInfo.name}& ${name}::typeInfo() using ::zserio::ReflectableConstAllocatorHolderBase::getAnyValue; - explicit Reflectable(<#if isConst>const ${fullName}& object, const allocator_type& allocator) : - ::zserio::Reflectable<#if isConst>ConstAllocatorHolderBase(${fullName}::typeInfo(), allocator), + explicit Reflectable(<#if isConst>const ${fullName}& object, const allocator_type& alloc) : + ::zserio::Reflectable<#if isConst>ConstAllocatorHolderBase(${fullName}::typeInfo(), alloc), m_object(object) {} <#if !isConst> @@ -366,15 +366,15 @@ const ${types.typeInfo.name}& ${name}::typeInfo() } - ${types.anyHolder.name} getAnyValue(const allocator_type& allocator) const override + ${types.anyHolder.name} getAnyValue(const allocator_type& alloc) const override { - return ${types.anyHolder.name}(::std::cref(m_object), allocator); + return ${types.anyHolder.name}(::std::cref(m_object), alloc); } <#if !isConst> - ${types.anyHolder.name} getAnyValue(const allocator_type& allocator) override + ${types.anyHolder.name} getAnyValue(const allocator_type& alloc) override { - return ${types.anyHolder.name}(::std::ref(m_object), allocator); + return ${types.anyHolder.name}(::std::ref(m_object), alloc); }