From 6fb489516638aed76ac2c2ffba52ce280ac560c3 Mon Sep 17 00:00:00 2001
From: Deniz Evrenci <denizevrenci@gmail.com>
Date: Tue, 19 Feb 2019 17:36:14 +0900
Subject: [PATCH 1/2] [C++] Remove unused header.

---
 .../java/uk/co/real_logic/sbe/generation/cpp/CppGenerator.java   | 1 -
 1 file changed, 1 deletion(-)

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
index cfaa1c4d1d..0d3aa2e661 100755
--- 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
@@ -937,7 +937,6 @@ private static CharSequence generateFileHeader(
             "#endif\n" +
             "#include <string.h>\n" +
             "#include <stdint.h>\n" +
-            "#include <limits.h>\n" +
             "#include <stdexcept>\n" +
             "#include <cstdint>\n" +
             "#include <limits>\n\n" +

From c9be38f42a196ce50359e0c7ae296ffd44495460 Mon Sep 17 00:00:00 2001
From: Deniz Evrenci <denizevrenci@gmail.com>
Date: Tue, 19 Feb 2019 17:36:53 +0900
Subject: [PATCH 2/2] [C++] Use C++ versions of C headers.

Usage of C headers is deprecated in C++ language.
---
 .../uk/co/real_logic/sbe/generation/cpp/CppGenerator.java  | 7 +++----
 1 file changed, 3 insertions(+), 4 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
index 0d3aa2e661..7b38847ed7 100755
--- 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
@@ -935,11 +935,10 @@ private static CharSequence generateFileHeader(
             "#if !defined(__STDC_LIMIT_MACROS)\n" +
             "#  define __STDC_LIMIT_MACROS 1\n" +
             "#endif\n" +
-            "#include <string.h>\n" +
-            "#include <stdint.h>\n" +
-            "#include <stdexcept>\n" +
             "#include <cstdint>\n" +
-            "#include <limits>\n\n" +
+            "#include <cstring>\n" +
+            "#include <limits>\n" +
+            "#include <stdexcept>\n\n" +
             "#if defined(WIN32) || defined(_WIN32)\n" +
             "#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)\n" +
             "#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)\n" +