Merge remote-tracking branch 'origin/master'

Author: mjpt777

build.gradle

@@ -163,7 +163,7 @@ def validationXsdPath = project(':sbe-tool').projectDir.toString() + '/src/main/
 
 project(':sbe-tool') {
     dependencies {
-        compile 'org.agrona:agrona:0.9.5'
+        compile 'org.agrona:agrona:0.9.6'
 
         testCompile files('build/classes/generated')
     }

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

@@ -223,13 +223,17 @@ private static void generateGroupClassHeader(
             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 + "    {\n" +
+            indent + "#if defined(__GNUG__) && !defined(__clang__)\n" +
             indent + "#pragma GCC diagnostic push\n" +
             indent + "#pragma GCC diagnostic ignored \"-Wtype-limits\"\n" +
+            indent + "#endif\n" +
             indent + "        if (count < %5$d || count > %6$d)\n" +
             indent + "        {\n" +
             indent + "            throw std::runtime_error(\"count outside of allowed range [E110]\");\n" +
             indent + "        }\n" +
+            indent + "#if defined(__GNUG__) && !defined(__clang__)\n" +
             indent + "#pragma GCC diagnostic pop\n" +
+            indent + "#endif\n" +
             indent + "        m_buffer = buffer;\n" +
             indent + "        m_bufferLength = bufferLength;\n" +
             indent + "        m_dimensions.wrap(m_buffer, *pos, actingVersion, bufferLength);\n" +
@@ -363,10 +367,14 @@ private static CharSequence generateGroupProperty(
             indent + "    }\n\n" +
             indent + "    bool %1$sInActingVersion()\n" +
             indent + "    {\n" +
+            indent + "#if defined(__clang__)\n" +
             indent + "#pragma clang diagnostic push\n" +
             indent + "#pragma clang diagnostic ignored \"-Wtautological-compare\"\n" +
+            indent + "#endif\n" +
             indent + "        return m_actingVersion >= %1$sSinceVersion();\n" +
+            indent + "#if defined(__clang__)\n" +
             indent + "#pragma clang diagnostic pop\n" +
+            indent + "#endif\n" +
             indent + "    }\n",
             propertyName,
             token.version()));
@@ -522,10 +530,14 @@ private void generateVarDataDescriptors(
             indent + "    }\n\n" +
             indent + "    bool %1$sInActingVersion()\n" +
             indent + "    {\n" +
+            indent + "#if defined(__clang__)\n" +
             indent + "#pragma clang diagnostic push\n" +
             indent + "#pragma clang diagnostic ignored \"-Wtautological-compare\"\n" +
+            indent + "#endif\n" +
             indent + "        return m_actingVersion >= %1$sSinceVersion();\n" +
+            indent + "#if defined(__clang__)\n" +
             indent + "#pragma clang diagnostic pop\n" +
+            indent + "#endif\n" +
             indent + "    }\n\n" +
             indent + "    static SBE_CONSTEXPR std::uint16_t %1$sId()\n" +
             indent + "    {\n" +
@@ -1414,10 +1426,14 @@ private CharSequence generateFields(final String containingClassName, final List
                     indent + "    }\n\n" +
                     indent + "    bool %1$sInActingVersion()\n" +
                     indent + "    {\n" +
+                    indent + "#if defined(__clang__)\n" +
                     indent + "#pragma clang diagnostic push\n" +
                     indent + "#pragma clang diagnostic ignored \"-Wtautological-compare\"\n" +
+                    indent + "#endif\n" +
                     indent + "        return m_actingVersion >= %1$sSinceVersion();\n" +
+                    indent + "#if defined(__clang__)\n" +
                     indent + "#pragma clang diagnostic pop\n" +
+                    indent + "#endif\n" +
                     indent + "    }\n\n",
                     propertyName,
                     signalToken.version()));

version.txt

@@ -1 +1 @@
-1.7.0-SNAPSHOT
+1.7.1-SNAPSHOT