[C++]: change name of C++ codec generator to drop 98 suffix and just use Cpp. Change include files to be relative for codec generation. Change name convention for header files to .h instead of .hpp for codecs.

Author: tmontgomery

build.gradle

@@ -365,19 +365,19 @@ task(generateJavaIrCodecs, type: JavaExec) {
  args = ['sbe-tool/src/main/resources/sbe-ir.xml']
 }
 
-task(generateCpp98IrCodecs, type: JavaExec) {
+task(generateCppIrCodecs, type: JavaExec) {
  main = 'uk.co.real_logic.sbe.SbeTool'
  classpath = project(':sbe-all').sourceSets.main.runtimeClasspath
  systemProperties(
  'sbe.output.dir': 'sbe-tool/src/main/cpp',
- 'sbe.target.language': 'Cpp98',
+ 'sbe.target.language': 'Cpp',
  'sbe.validation.xsd': validationXsdPath)
  args = ['sbe-tool/src/main/resources/sbe-ir.xml']
 }
 
 task generateIrCodecs {
  description = 'Generate Java and C++ IR Codecs'
- dependsOn 'generateJavaIrCodecs', 'generateCpp98IrCodecs'
+ dependsOn 'generateJavaIrCodecs', 'generateCppIrCodecs'
 }
 
 task runBenchmarks(type: Exec) {

sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/TargetCodeGenerator.java

@@ -16,8 +16,8 @@
 package uk.co.real_logic.sbe.generation;
 
 import uk.co.real_logic.agrona.generation.PackageOutputManager;
-import uk.co.real_logic.sbe.generation.cpp98.Cpp98Generator;
-import uk.co.real_logic.sbe.generation.cpp98.NamespaceOutputManager;
+import uk.co.real_logic.sbe.generation.cpp.CppGenerator;
+import uk.co.real_logic.sbe.generation.cpp.NamespaceOutputManager;
 import uk.co.real_logic.sbe.generation.java.JavaGenerator;
 import uk.co.real_logic.sbe.ir.Ir;
 
@@ -43,11 +43,11 @@ public CodeGenerator newInstance(final Ir ir, final String outputDir) throws IOE
  }
  },
 
- CPP98()
+ CPP()
  {
  public CodeGenerator newInstance(final Ir ir, final String outputDir) throws IOException
  {
- return new Cpp98Generator(ir, new NamespaceOutputManager(outputDir, ir.applicableNamespace()));
+ return new CppGenerator(ir, new NamespaceOutputManager(outputDir, ir.applicableNamespace()));
  }
  };
 

sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp98/Cpp98Generator.java renamed to sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/CppGenerator.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.sbe.generation.cpp98;
+package uk.co.real_logic.sbe.generation.cpp;
 
 import uk.co.real_logic.sbe.PrimitiveType;
 import uk.co.real_logic.sbe.generation.CodeGenerator;
@@ -26,20 +26,20 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static uk.co.real_logic.sbe.generation.cpp98.Cpp98Util.*;
+import static uk.co.real_logic.sbe.generation.cpp.CppUtil.*;
 import static uk.co.real_logic.sbe.ir.GenerationUtil.collectDataFields;
 import static uk.co.real_logic.sbe.ir.GenerationUtil.collectGroups;
 import static uk.co.real_logic.sbe.ir.GenerationUtil.collectRootFields;
 
-public class Cpp98Generator implements CodeGenerator
+public class CppGenerator implements CodeGenerator
 {
  private static final String BASE_INDENT = "";
  private static final String INDENT = " ";
 
  private final Ir ir;
  private final OutputManager outputManager;
 
- public Cpp98Generator(final Ir ir, final OutputManager outputManager)
+ public CppGenerator(final Ir ir, final OutputManager outputManager)
  throws IOException
  {
  Verify.notNull(ir, "ir");
@@ -799,6 +799,7 @@ private CharSequence generateFileHeader(final String namespaceName, final String
  "# define SBE_DOUBLE_NAN NAN\n" +
  "#endif\n\n" +
  "#if __cplusplus >= 201103L\n" +
+ "# include <cstdint>\n" +
  "# include <functional>\n" +
  "# include <string>\n" +
  "#endif\n\n" +
@@ -812,8 +813,7 @@ private CharSequence generateFileHeader(final String namespaceName, final String
  for (final String incName : typesToInclude)
  {
  sb.append(String.format(
- "#include <%1$s/%2$s.hpp>\n",
- namespaceName,
+ "#include \"%1$s.h\"\n",
  toUpperFirstChar(incName)
  ));
  }

sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp98/Cpp98Util.java renamed to sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/CppUtil.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.sbe.generation.cpp98;
+package uk.co.real_logic.sbe.generation.cpp;
 
 import uk.co.real_logic.sbe.PrimitiveType;
 
@@ -24,7 +24,7 @@
 /**
  * Utilities for mapping between IR and the C++ language.
  */
-public class Cpp98Util
+public class CppUtil
 {
  private static Map<PrimitiveType, String> typeNameByPrimitiveTypeMap = new EnumMap<>(PrimitiveType.class);
 

sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp98/NamespaceOutputManager.java renamed to sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/NamespaceOutputManager.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.sbe.generation.cpp98;
+package uk.co.real_logic.sbe.generation.cpp;
 
 import uk.co.real_logic.agrona.generation.OutputManager;
 import uk.co.real_logic.agrona.Verify;
@@ -66,7 +66,7 @@ public NamespaceOutputManager(final String baseDirectoryName, final String names
  */
  public Writer createOutput(final String name) throws IOException
  {
- final File targetFile = new File(outputDir, name + ".hpp");
+ final File targetFile = new File(outputDir, name + ".h");
  return new BufferedWriter(new OutputStreamWriter(new FileOutputStream(targetFile), "UTF-8"));
  }
 }