[C++] Use constructor rather than wrap method for dimensions of group…

… and tidy up formatting after merge of PR #674.
real-logic · May 3, 2019 · 9233964 · 9233964
1 parent a21cd06
commit 9233964
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/CppGenerator.java b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/CppGenerator.java
@@ -212,13 +212,15 @@ private static void generateGroupClassHeader(
             formatClassName(groupName)));
 
         sb.append(String.format(
-            indent + "    inline void wrapForDecode(char *buffer, std::uint64_t *pos," +
-            " const std::uint64_t actingVersion, const std::uint64_t bufferLength)\n" +
+            indent + "    inline void wrapForDecode(\n" +
+            indent + "        char *buffer,\n" +
+            indent + "        std::uint64_t *pos,\n" +
+            indent + "        const std::uint64_t actingVersion,\n" +
+            indent + "        const std::uint64_t bufferLength)\n" +
             indent + "    {\n" +
-            indent + "        %2$s dimensions;\n" +
+            indent + "        %2$s dimensions(buffer, *pos, bufferLength, actingVersion);\n" +
             indent + "        m_buffer = buffer;\n" +
             indent + "        m_bufferLength = bufferLength;\n" +
-            indent + "        dimensions.wrap(m_buffer, *pos, actingVersion, bufferLength);\n" +
             indent + "        m_blockLength = dimensions.blockLength();\n" +
             indent + "        m_count = dimensions.numInGroup();\n" +
             indent + "        m_index = -1;\n" +
@@ -232,10 +234,13 @@ private static void generateGroupClassHeader(
         final String minCheck = minCount > 0 ? "count < " + minCount + " || " : "";
 
         sb.append(String.format("\n" +
-            indent + "    inline void wrapForEncode(char *buffer, const %3$s count," +
-            " std::uint64_t *pos, const std::uint64_t actingVersion, const std::uint64_t bufferLength)\n" +
+            indent + "    inline void wrapForEncode(\n" +
+            indent + "        char *buffer,\n" +
+            indent + "        const %3$s count,\n" +
+            indent + "        std::uint64_t *pos,\n" +
+            indent + "        const std::uint64_t actingVersion,\n" +
+            indent + "        const std::uint64_t bufferLength)\n" +
             indent + "    {\n" +
-            indent + "        %7$s dimensions;\n" +
             indent + "#if defined(__GNUG__) && !defined(__clang__)\n" +
             indent + "#pragma GCC diagnostic push\n" +
             indent + "#pragma GCC diagnostic ignored \"-Wtype-limits\"\n" +
@@ -249,7 +254,7 @@ private static void generateGroupClassHeader(
             indent + "#endif\n" +
             indent + "        m_buffer = buffer;\n" +
             indent + "        m_bufferLength = bufferLength;\n" +
-            indent + "        dimensions.wrap(m_buffer, *pos, actingVersion, bufferLength);\n" +
+            indent + "        %7$s dimensions(buffer, *pos, bufferLength, actingVersion);\n" +
             indent + "        dimensions.blockLength((%1$s)%2$d);\n" +
             indent + "        dimensions.numInGroup((%3$s)count);\n" +
             indent + "        m_index = -1;\n" +