Renamed a virtual function which has twin with less parameters.

generator/Header_Template.h

@@ -145,25 +145,24 @@ inline {{_field.type}}::FIELD_TYPE get_{{_field.name}}() const { return {{_field
 {% if _field.is_repeated_field %}
 if(result)
 {
-  result = {{_field.variable_full_name}}.serialize(static_cast<uint32_t>(id::{{_field.variable_id_name}}), buffer);
+  result = {{_field.variable_full_name}}.serialize_with_id(static_cast<uint32_t>(id::{{_field.variable_id_name}}), buffer);
 }
 {% elif _field.of_type_message %}
 if(result)
 {
-  const ::EmbeddedProto::MessageInterface* x = &{{_field.variable_full_name}};
-  result = x->serialize(static_cast<uint32_t>(id::{{_field.variable_id_name}}), buffer);
+  result = {{_field.variable_full_name}}.serialize_with_id(static_cast<uint32_t>(id::{{_field.variable_id_name}}), buffer);
 }
 {% elif _field.of_type_enum %}
 if(({{_field.default_value}} != {{_field.variable_full_name}}) && result)
 {
   EmbeddedProto::uint32 value;
   value.set(static_cast<uint32_t>({{_field.variable_full_name}}));
-  result = value.serialize(static_cast<uint32_t>(id::{{_field.variable_id_name}}), buffer);
+  result = value.serialize_with_id(static_cast<uint32_t>(id::{{_field.variable_id_name}}), buffer);
 }
 {% else %}
 if(({{_field.default_value}} != {{_field.variable_full_name}}.get()) && result)
 {
-  result = {{_field.variable_full_name}}.serialize(static_cast<uint32_t>(id::{{_field.variable_id_name}}), buffer);
+  result = {{_field.variable_full_name}}.serialize_with_id(static_cast<uint32_t>(id::{{_field.variable_id_name}}), buffer);
 } {% endif %} {% endmacro %}
 {# #}
 {# ------------------------------------------------------------------------------------------------------------------ #}

src/Fields.cpp

@@ -11,67 +11,67 @@ namespace EmbeddedProto
     return calcBuffer.get_size();
   }
 
-  bool int32::serialize(uint32_t field_number, WriteBufferInterface& buffer) const
+  bool int32::serialize_with_id(uint32_t field_number, WriteBufferInterface& buffer) const
   { 
     return WireFormatter::SerializeVarint(WireFormatter::MakeTag(field_number, WireFormatter::WireType::VARINT), buffer) && serialize(buffer);
   }
 
-  bool int64::serialize(uint32_t field_number, WriteBufferInterface& buffer) const
+  bool int64::serialize_with_id(uint32_t field_number, WriteBufferInterface& buffer) const
   { 
     return WireFormatter::SerializeVarint(WireFormatter::MakeTag(field_number, WireFormatter::WireType::VARINT), buffer) && serialize(buffer);
   }
 
-  bool uint32::serialize(uint32_t field_number, WriteBufferInterface& buffer) const
+  bool uint32::serialize_with_id(uint32_t field_number, WriteBufferInterface& buffer) const
   { 
     return WireFormatter::SerializeVarint(WireFormatter::MakeTag(field_number, WireFormatter::WireType::VARINT), buffer) && serialize(buffer);
   }
 
-  bool uint64::serialize(uint32_t field_number, WriteBufferInterface& buffer) const
+  bool uint64::serialize_with_id(uint32_t field_number, WriteBufferInterface& buffer) const
   { 
     return WireFormatter::SerializeVarint(WireFormatter::MakeTag(field_number, WireFormatter::WireType::VARINT), buffer) && serialize(buffer);
   }
 
-  bool sint32::serialize(uint32_t field_number, WriteBufferInterface& buffer) const
+  bool sint32::serialize_with_id(uint32_t field_number, WriteBufferInterface& buffer) const
   { 
     return WireFormatter::SerializeVarint(WireFormatter::MakeTag(field_number, WireFormatter::WireType::VARINT), buffer) && serialize(buffer);
   }
 
-  bool sint64::serialize(uint32_t field_number, WriteBufferInterface& buffer) const
+  bool sint64::serialize_with_id(uint32_t field_number, WriteBufferInterface& buffer) const
   { 
     return WireFormatter::SerializeVarint(WireFormatter::MakeTag(field_number, WireFormatter::WireType::VARINT), buffer) && serialize(buffer);
   }
 
-  bool boolean::serialize(uint32_t field_number, WriteBufferInterface& buffer) const
+  bool boolean::serialize_with_id(uint32_t field_number, WriteBufferInterface& buffer) const
   { 
     return WireFormatter::SerializeVarint(WireFormatter::MakeTag(field_number, WireFormatter::WireType::VARINT), buffer) && serialize(buffer);
   }
 
-  bool fixed32::serialize(uint32_t field_number, WriteBufferInterface& buffer) const
+  bool fixed32::serialize_with_id(uint32_t field_number, WriteBufferInterface& buffer) const
   { 
     return WireFormatter::SerializeVarint(WireFormatter::MakeTag(field_number, WireFormatter::WireType::FIXED32), buffer) && serialize(buffer);
   }
 
-  bool fixed64::serialize(uint32_t field_number, WriteBufferInterface& buffer) const
+  bool fixed64::serialize_with_id(uint32_t field_number, WriteBufferInterface& buffer) const
   { 
     return WireFormatter::SerializeVarint(WireFormatter::MakeTag(field_number, WireFormatter::WireType::FIXED64), buffer) && serialize(buffer);
   }
 
-  bool sfixed32::serialize(uint32_t field_number, WriteBufferInterface& buffer) const
+  bool sfixed32::serialize_with_id(uint32_t field_number, WriteBufferInterface& buffer) const
   { 
     return WireFormatter::SerializeVarint(WireFormatter::MakeTag(field_number, WireFormatter::WireType::FIXED32), buffer) && serialize(buffer);
   }
 
-  bool sfixed64::serialize(uint32_t field_number, WriteBufferInterface& buffer) const
+  bool sfixed64::serialize_with_id(uint32_t field_number, WriteBufferInterface& buffer) const
   { 
     return WireFormatter::SerializeVarint(WireFormatter::MakeTag(field_number, WireFormatter::WireType::FIXED64), buffer) && serialize(buffer);
   }
 
-  bool floatfixed::serialize(uint32_t field_number, WriteBufferInterface& buffer) const
+  bool floatfixed::serialize_with_id(uint32_t field_number, WriteBufferInterface& buffer) const
   { 
     return WireFormatter::SerializeVarint(WireFormatter::MakeTag(field_number, WireFormatter::WireType::FIXED32), buffer) && serialize(buffer);
   }
 
-  bool doublefixed::serialize(uint32_t field_number, WriteBufferInterface& buffer) const
+  bool doublefixed::serialize_with_id(uint32_t field_number, WriteBufferInterface& buffer) const
   { 
     return WireFormatter::SerializeVarint(WireFormatter::MakeTag(field_number, WireFormatter::WireType::FIXED64), buffer) && serialize(buffer);
   }

src/Fields.h

@@ -14,7 +14,7 @@ namespace EmbeddedProto
       Field() = default;
       virtual ~Field() = default;
 
-      virtual bool serialize(uint32_t field_number, WriteBufferInterface& buffer) const = 0;
+      virtual bool serialize_with_id(uint32_t field_number, WriteBufferInterface& buffer) const = 0;
 
       virtual bool serialize(WriteBufferInterface& buffer) const = 0;
 
@@ -83,7 +83,7 @@ namespace EmbeddedProto
 
       ~int32() override = default;
 
-      bool serialize(uint32_t field_number, WriteBufferInterface& buffer) const final;
+      bool serialize_with_id(uint32_t field_number, WriteBufferInterface& buffer) const final;
       bool serialize(WriteBufferInterface& buffer) const final;
       bool deserialize(ReadBufferInterface& buffer) final; 
   };
@@ -97,7 +97,7 @@ namespace EmbeddedProto
 
       ~int64() override = default;
       
-      bool serialize(uint32_t field_number, WriteBufferInterface& buffer) const final;
+      bool serialize_with_id(uint32_t field_number, WriteBufferInterface& buffer) const final;
       bool serialize(WriteBufferInterface& buffer) const final;
       bool deserialize(ReadBufferInterface& buffer) final; 
   };
@@ -111,7 +111,7 @@ namespace EmbeddedProto
 
       ~uint32() override = default;
       
-      bool serialize(uint32_t field_number, WriteBufferInterface& buffer) const final;
+      bool serialize_with_id(uint32_t field_number, WriteBufferInterface& buffer) const final;
       bool serialize(WriteBufferInterface& buffer) const final;
       bool deserialize(ReadBufferInterface& buffer) final; 
   };
@@ -125,7 +125,7 @@ namespace EmbeddedProto
 
       ~uint64() override = default;
       
-      bool serialize(uint32_t field_number, WriteBufferInterface& buffer) const final;
+      bool serialize_with_id(uint32_t field_number, WriteBufferInterface& buffer) const final;
       bool serialize(WriteBufferInterface& buffer) const final;
       bool deserialize(ReadBufferInterface& buffe) final; 
   };
@@ -139,7 +139,7 @@ namespace EmbeddedProto
 
       ~sint32() override = default;
       
-      bool serialize(uint32_t field_number, WriteBufferInterface& buffer) const final;
+      bool serialize_with_id(uint32_t field_number, WriteBufferInterface& buffer) const final;
       bool serialize(WriteBufferInterface& buffer) const final;
       bool deserialize(ReadBufferInterface& buffer) final; 
   };
@@ -153,7 +153,7 @@ namespace EmbeddedProto
 
       ~sint64() override = default;
       
-      bool serialize(uint32_t field_number, WriteBufferInterface& buffer) const final;
+      bool serialize_with_id(uint32_t field_number, WriteBufferInterface& buffer) const final;
       bool serialize(WriteBufferInterface& buffer) const final;
       bool deserialize(ReadBufferInterface& buffer) final; 
   };
@@ -167,7 +167,7 @@ namespace EmbeddedProto
 
       ~boolean() override = default;
       
-      bool serialize(uint32_t field_number, WriteBufferInterface& buffer) const final;
+      bool serialize_with_id(uint32_t field_number, WriteBufferInterface& buffer) const final;
       bool serialize(WriteBufferInterface& buffer) const final;
       bool deserialize(ReadBufferInterface& buffer) final; 
   };
@@ -181,7 +181,7 @@ namespace EmbeddedProto
 
       ~fixed32() override = default;
       
-      bool serialize(uint32_t field_number, WriteBufferInterface& buffer) const final;
+      bool serialize_with_id(uint32_t field_number, WriteBufferInterface& buffer) const final;
       bool serialize(WriteBufferInterface& buffer) const final;
       bool deserialize(ReadBufferInterface& buffer) final; 
   };
@@ -195,7 +195,7 @@ namespace EmbeddedProto
 
       ~fixed64() override = default;
       
-      bool serialize(uint32_t field_number, WriteBufferInterface& buffer) const final;
+      bool serialize_with_id(uint32_t field_number, WriteBufferInterface& buffer) const final;
       bool serialize(WriteBufferInterface& buffer) const final;
       bool deserialize(ReadBufferInterface& buffer) final; 
   };
@@ -209,7 +209,7 @@ namespace EmbeddedProto
 
       ~sfixed32() override = default;
       
-      bool serialize(uint32_t field_number, WriteBufferInterface& buffer) const final;
+      bool serialize_with_id(uint32_t field_number, WriteBufferInterface& buffer) const final;
       bool serialize(WriteBufferInterface& buffer) const final;
       bool deserialize(ReadBufferInterface& buffer) final; 
   };
@@ -223,7 +223,7 @@ namespace EmbeddedProto
 
       ~sfixed64() override = default;
       
-      bool serialize(uint32_t field_number, WriteBufferInterface& buffer) const final;
+      bool serialize_with_id(uint32_t field_number, WriteBufferInterface& buffer) const final;
       bool serialize(WriteBufferInterface& buffer) const final;
       bool deserialize(ReadBufferInterface& buffer) final; 
   };
@@ -237,7 +237,7 @@ namespace EmbeddedProto
 
       ~floatfixed() override = default;
       
-      bool serialize(uint32_t field_number, WriteBufferInterface& buffer) const final;
+      bool serialize_with_id(uint32_t field_number, WriteBufferInterface& buffer) const final;
       bool serialize(WriteBufferInterface& buffer) const final;
       bool deserialize(ReadBufferInterface& buffer) final; 
   };
@@ -251,7 +251,7 @@ namespace EmbeddedProto
 
       ~doublefixed() override = default;
       
-      bool serialize(uint32_t field_number, WriteBufferInterface& buffer) const final;
+      bool serialize_with_id(uint32_t field_number, WriteBufferInterface& buffer) const final;
       bool serialize(WriteBufferInterface& buffer) const final;
       bool deserialize(ReadBufferInterface& buffer) final; 
   };

src/MessageInterface.cpp

@@ -4,7 +4,7 @@
 namespace EmbeddedProto
 {
 
-  bool MessageInterface::MessageInterface::serialize(uint32_t field_number, ::EmbeddedProto::WriteBufferInterface& buffer) const
+  bool MessageInterface::MessageInterface::serialize_with_id(uint32_t field_number, ::EmbeddedProto::WriteBufferInterface& buffer) const
   {
     const uint32_t size_x = this->serialized_size();
     bool result = (size_x < buffer.get_available_size());

src/MessageInterface.h

@@ -20,7 +20,7 @@ class MessageInterface : public ::EmbeddedProto::Field
     virtual ~MessageInterface() = default;
 
     // TODO doc
-    bool serialize(uint32_t field_number, ::EmbeddedProto::WriteBufferInterface& buffer) const final;
+    bool serialize_with_id(uint32_t field_number, ::EmbeddedProto::WriteBufferInterface& buffer) const final;
 
     //! Clear the content of this message and set it to it's default state.
     /*!

src/RepeatedField.h

@@ -101,7 +101,7 @@ namespace EmbeddedProto
         return false;
       }
 
-      bool serialize(uint32_t field_number, WriteBufferInterface& buffer) const final
+      bool serialize_with_id(uint32_t field_number, WriteBufferInterface& buffer) const final
       {
         bool result = true;