Revise C++ code gen

Remove unused header includes

compiler/lib/src/main/scala/codegen/CppWriter/ArrayCppWriter.scala

@@ -98,22 +98,11 @@ case class ArrayCppWriter (
   }
 
   private def getCppIncludes: CppDoc.Member = {
-    val systemHeaders = List(
-      "cstdio",
-      "cstring",
-    ).map(CppWriter.systemHeaderString).map(line)
     val userHeaders = List(
       "Fw/Types/Assert.hpp",
-      "Fw/Types/StringUtils.hpp",
       s"${s.getRelativePath(fileName).toString}.hpp"
     ).sorted.map(CppWriter.headerString).map(line)
-    linesMember(
+    linesMember(Line.blank :: userHeaders, CppDoc.Lines.Cpp)
-      List(
-        Line.blank :: systemHeaders,
-        Line.blank :: userHeaders
-      ).flatten,
-      CppDoc.Lines.Cpp
-    )
   }
 
   private def getClassMembers: List[CppDoc.Class.Member] =

compiler/lib/src/main/scala/codegen/CppWriter/StructCppWriter.scala

@@ -114,7 +114,6 @@ case class StructCppWriter(
   private def getCppIncludes: CppDoc.Member = {
     val userHeaders = List(
       "Fw/Types/Assert.hpp",
-      "Fw/Types/StringUtils.hpp",
       s"${s.getRelativePath(fileName).toString}.hpp",
     ).sorted.map(CppWriter.headerString).map(line)
     linesMember(Line.blank :: userHeaders, CppDoc.Lines.Cpp)

compiler/tools/fpp-to-cpp/test/array/AArrayAc.ref.cpp

@@ -4,12 +4,8 @@
 // \brief  cpp file for A array
 // ======================================================================
 
-#include <cstdio>
-#include <cstring>
-
 #include "AArrayAc.hpp"
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 
 // ----------------------------------------------------------------------
 // Constructors

compiler/tools/fpp-to-cpp/test/array/AbsTypeArrayAc.ref.cpp

@@ -4,12 +4,8 @@
 // \brief  cpp file for AbsType array
 // ======================================================================
 
-#include <cstdio>
-#include <cstring>
-
 #include "AbsTypeArrayAc.hpp"
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 
 // ----------------------------------------------------------------------
 // Constructors

compiler/tools/fpp-to-cpp/test/array/BuiltInTypeArrayAc.ref.cpp

@@ -4,12 +4,8 @@
 // \brief  cpp file for BuiltInType array
 // ======================================================================
 
-#include <cstdio>
-#include <cstring>
-
 #include "BuiltInTypeArrayAc.hpp"
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 
 // ----------------------------------------------------------------------
 // Constructors

compiler/tools/fpp-to-cpp/test/array/C_AArrayAc.ref.cpp

@@ -4,12 +4,8 @@
 // \brief  cpp file for C_A array
 // ======================================================================
 
-#include <cstdio>
-#include <cstring>
-
 #include "C_AArrayAc.hpp"
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 
 // ----------------------------------------------------------------------
 // Constructors

compiler/tools/fpp-to-cpp/test/array/Enum1ArrayAc.ref.cpp

@@ -4,12 +4,8 @@
 // \brief  cpp file for Enum1 array
 // ======================================================================
 
-#include <cstdio>
-#include <cstring>
-
 #include "Enum1ArrayAc.hpp"
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 
 // ----------------------------------------------------------------------
 // Constructors

compiler/tools/fpp-to-cpp/test/array/Enum2ArrayAc.ref.cpp

@@ -4,12 +4,8 @@
 // \brief  cpp file for Enum2 array
 // ======================================================================
 
-#include <cstdio>
-#include <cstring>
-
 #include "Enum2ArrayAc.hpp"
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 
 // ----------------------------------------------------------------------
 // Constructors

compiler/tools/fpp-to-cpp/test/array/HeaderPathArrayAc.ref.cpp

@@ -4,11 +4,7 @@
 // \brief  cpp file for HeaderPath array
 // ======================================================================
 
-#include <cstdio>
-#include <cstring>
-
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 #include "HeaderPathArrayAc.hpp"
 
 // ----------------------------------------------------------------------

compiler/tools/fpp-to-cpp/test/array/PrimitiveArrayArrayAc.ref.cpp

@@ -4,11 +4,7 @@
 // \brief  cpp file for PrimitiveArray array
 // ======================================================================
 
-#include <cstdio>
-#include <cstring>
-
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 #include "PrimitiveArrayArrayAc.hpp"
 
 // ----------------------------------------------------------------------

compiler/tools/fpp-to-cpp/test/array/PrimitiveBoolArrayAc.ref.cpp

@@ -4,11 +4,7 @@
 // \brief  cpp file for PrimitiveBool array
 // ======================================================================
 
-#include <cstdio>
-#include <cstring>
-
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 #include "PrimitiveBoolArrayAc.hpp"
 
 namespace M {

compiler/tools/fpp-to-cpp/test/array/PrimitiveF32eArrayAc.ref.cpp

@@ -4,11 +4,7 @@
 // \brief  cpp file for PrimitiveF32e array
 // ======================================================================
 
-#include <cstdio>
-#include <cstring>
-
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 #include "PrimitiveF32eArrayAc.hpp"
 
 namespace M {

compiler/tools/fpp-to-cpp/test/array/PrimitiveF32fArrayAc.ref.cpp

@@ -4,11 +4,7 @@
 // \brief  cpp file for PrimitiveF32f array
 // ======================================================================
 
-#include <cstdio>
-#include <cstring>
-
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 #include "PrimitiveF32fArrayAc.hpp"
 
 namespace M {

compiler/tools/fpp-to-cpp/test/array/PrimitiveF64ArrayAc.ref.cpp

@@ -4,11 +4,7 @@
 // \brief  cpp file for PrimitiveF64 array
 // ======================================================================
 
-#include <cstdio>
-#include <cstring>
-
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 #include "PrimitiveF64ArrayAc.hpp"
 
 namespace M {

compiler/tools/fpp-to-cpp/test/array/PrimitiveI32ArrayAc.ref.cpp

@@ -4,11 +4,7 @@
 // \brief  cpp file for PrimitiveI32 array
 // ======================================================================
 
-#include <cstdio>
-#include <cstring>
-
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 #include "PrimitiveI32ArrayAc.hpp"
 
 namespace M {

compiler/tools/fpp-to-cpp/test/array/PrimitiveI64ArrayAc.ref.cpp

@@ -4,11 +4,7 @@
 // \brief  cpp file for PrimitiveI64 array
 // ======================================================================
 
-#include <cstdio>
-#include <cstring>
-
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 #include "PrimitiveI64ArrayAc.hpp"
 
 namespace M {

compiler/tools/fpp-to-cpp/test/array/PrimitiveU16ArrayAc.ref.cpp

@@ -4,11 +4,7 @@
 // \brief  cpp file for PrimitiveU16 array
 // ======================================================================
 
-#include <cstdio>
-#include <cstring>
-
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 #include "PrimitiveU16ArrayAc.hpp"
 
 namespace M {

compiler/tools/fpp-to-cpp/test/array/PrimitiveU8ArrayAc.ref.cpp

@@ -4,11 +4,7 @@
 // \brief  cpp file for PrimitiveU8 array
 // ======================================================================
 
-#include <cstdio>
-#include <cstring>
-
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 #include "PrimitiveU8ArrayAc.hpp"
 
 namespace M {

compiler/tools/fpp-to-cpp/test/array/S1SerializableAc.ref.cpp

@@ -5,7 +5,6 @@
 // ======================================================================
 
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 #include "S1SerializableAc.hpp"
 
 namespace M {

compiler/tools/fpp-to-cpp/test/array/S2SerializableAc.ref.cpp

@@ -5,7 +5,6 @@
 // ======================================================================
 
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 #include "S2SerializableAc.hpp"
 
 // ----------------------------------------------------------------------

compiler/tools/fpp-to-cpp/test/array/S3SerializableAc.ref.cpp

@@ -5,7 +5,6 @@
 // ======================================================================
 
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 #include "S3SerializableAc.hpp"
 
 namespace S {

compiler/tools/fpp-to-cpp/test/array/SingleElementArrayAc.ref.cpp

@@ -4,11 +4,7 @@
 // \brief  cpp file for SingleElement array
 // ======================================================================
 
-#include <cstdio>
-#include <cstring>
-
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 #include "SingleElementArrayAc.hpp"
 
 // ----------------------------------------------------------------------

compiler/tools/fpp-to-cpp/test/array/String1ArrayAc.ref.cpp

@@ -4,11 +4,7 @@
 // \brief  cpp file for String1 array
 // ======================================================================
 
-#include <cstdio>
-#include <cstring>
-
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 #include "String1ArrayAc.hpp"
 
 // ----------------------------------------------------------------------

compiler/tools/fpp-to-cpp/test/array/String2ArrayAc.ref.cpp

@@ -4,11 +4,7 @@
 // \brief  cpp file for String2 array
 // ======================================================================
 
-#include <cstdio>
-#include <cstring>
-
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 #include "String2ArrayAc.hpp"
 
 // ----------------------------------------------------------------------

compiler/tools/fpp-to-cpp/test/array/StringArrayArrayAc.ref.cpp

@@ -4,11 +4,7 @@
 // \brief  cpp file for StringArray array
 // ======================================================================
 
-#include <cstdio>
-#include <cstring>
-
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 #include "StringArrayArrayAc.hpp"
 
 // ----------------------------------------------------------------------

compiler/tools/fpp-to-cpp/test/array/Struct1ArrayAc.ref.cpp

@@ -4,11 +4,7 @@
 // \brief  cpp file for Struct1 array
 // ======================================================================
 
-#include <cstdio>
-#include <cstring>
-
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 #include "Struct1ArrayAc.hpp"
 
 // ----------------------------------------------------------------------

compiler/tools/fpp-to-cpp/test/array/Struct2ArrayAc.ref.cpp

@@ -4,11 +4,7 @@
 // \brief  cpp file for Struct2 array
 // ======================================================================
 
-#include <cstdio>
-#include <cstring>
-
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 #include "Struct2ArrayAc.hpp"
 
 // ----------------------------------------------------------------------

compiler/tools/fpp-to-cpp/test/array/Struct3ArrayAc.ref.cpp

@@ -4,11 +4,7 @@
 // \brief  cpp file for Struct3 array
 // ======================================================================
 
-#include <cstdio>
-#include <cstring>
-
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 #include "Struct3ArrayAc.hpp"
 
 // ----------------------------------------------------------------------

compiler/tools/fpp-to-cpp/test/component/base/AArrayAc.ref.cpp

@@ -4,11 +4,7 @@
 // \brief  cpp file for A array
 // ======================================================================
 
-#include <cstdio>
-#include <cstring>
-
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 #include "base/AArrayAc.hpp"
 
 // ----------------------------------------------------------------------

compiler/tools/fpp-to-cpp/test/component/base/SSerializableAc.ref.cpp

@@ -5,7 +5,6 @@
 // ======================================================================
 
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 #include "base/SSerializableAc.hpp"
 
 // ----------------------------------------------------------------------

compiler/tools/fpp-to-cpp/test/struct/AbsTypeSerializableAc.ref.cpp

@@ -6,7 +6,6 @@
 
 #include "AbsTypeSerializableAc.hpp"
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 
 // ----------------------------------------------------------------------
 // Constructors

compiler/tools/fpp-to-cpp/test/struct/C_SSerializableAc.ref.cpp

@@ -6,7 +6,6 @@
 
 #include "C_SSerializableAc.hpp"
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 
 // ----------------------------------------------------------------------
 // Constructors

compiler/tools/fpp-to-cpp/test/struct/DefaultSerializableAc.ref.cpp

@@ -6,7 +6,6 @@
 
 #include "DefaultSerializableAc.hpp"
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 
 // ----------------------------------------------------------------------
 // Constructors

compiler/tools/fpp-to-cpp/test/struct/EnumSerializableAc.ref.cpp

@@ -6,7 +6,6 @@
 
 #include "EnumSerializableAc.hpp"
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 
 // ----------------------------------------------------------------------
 // Constructors

compiler/tools/fpp-to-cpp/test/struct/FormatSerializableAc.ref.cpp

@@ -6,7 +6,6 @@
 
 #include "FormatSerializableAc.hpp"
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 
 // ----------------------------------------------------------------------
 // Constructors

compiler/tools/fpp-to-cpp/test/struct/IncludedSerializableAc.ref.cpp

@@ -5,7 +5,6 @@
 // ======================================================================
 
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 #include "IncludedSerializableAc.hpp"
 
 // ----------------------------------------------------------------------

compiler/tools/fpp-to-cpp/test/struct/IncludingSerializableAc.ref.cpp

@@ -5,7 +5,6 @@
 // ======================================================================
 
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 #include "IncludingSerializableAc.hpp"
 
 // ----------------------------------------------------------------------

compiler/tools/fpp-to-cpp/test/struct/Modules1SerializableAc.ref.cpp

@@ -5,7 +5,6 @@
 // ======================================================================
 
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 #include "Modules1SerializableAc.hpp"
 
 namespace M {

compiler/tools/fpp-to-cpp/test/struct/Modules2SerializableAc.ref.cpp

@@ -5,7 +5,6 @@
 // ======================================================================
 
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 #include "Modules2SerializableAc.hpp"
 
 namespace M {

compiler/tools/fpp-to-cpp/test/struct/Modules3SerializableAc.ref.cpp

@@ -5,7 +5,6 @@
 // ======================================================================
 
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 #include "Modules3SerializableAc.hpp"
 
 // ----------------------------------------------------------------------

compiler/tools/fpp-to-cpp/test/struct/Modules4SerializableAc.ref.cpp

@@ -5,7 +5,6 @@
 // ======================================================================
 
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 #include "Modules4SerializableAc.hpp"
 
 // ----------------------------------------------------------------------

compiler/tools/fpp-to-cpp/test/struct/PrimitiveSerializableAc.ref.cpp

@@ -5,7 +5,6 @@
 // ======================================================================
 
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 #include "PrimitiveSerializableAc.hpp"
 
 // ----------------------------------------------------------------------

compiler/tools/fpp-to-cpp/test/struct/PrimitiveStructSerializableAc.ref.cpp

@@ -5,7 +5,6 @@
 // ======================================================================
 
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 #include "PrimitiveStructSerializableAc.hpp"
 
 // ----------------------------------------------------------------------

compiler/tools/fpp-to-cpp/test/struct/SSerializableAc.ref.cpp

@@ -5,7 +5,6 @@
 // ======================================================================
 
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 #include "SSerializableAc.hpp"
 
 // ----------------------------------------------------------------------

compiler/tools/fpp-to-cpp/test/struct/StringArraySerializableAc.ref.cpp

@@ -5,7 +5,6 @@
 // ======================================================================
 
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 #include "StringArraySerializableAc.hpp"
 
 // ----------------------------------------------------------------------

compiler/tools/fpp-to-cpp/test/struct/StringSerializableAc.ref.cpp

@@ -5,7 +5,6 @@
 // ======================================================================
 
 #include "Fw/Types/Assert.hpp"
-#include "Fw/Types/StringUtils.hpp"
 #include "StringSerializableAc.hpp"
 
 // ----------------------------------------------------------------------