Merge pull request #382 from rigtorp/fix-trailing-semicolon

Don't generate trailing ; on namespaces

Author: tmontgomery

CMakeLists.txt

@@ -49,7 +49,7 @@ set(GTEST_BINARY_DIR ${binary_dir})
 find_package(Threads)
 
 if(UNIX)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fexceptions -g -Wall")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fexceptions -g -Wall -Wpedantic")
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0")
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Ofast")
 endif()

sbe-tool/src/main/cpp/otf/OtfMessageDecoder.h

@@ -351,7 +351,7 @@ std::pair<size_t, size_t> decodeGroups(
     }
 
     return std::pair<size_t, size_t>(bufferIndex, tokenIndex);
-};
+}
 
 /**
  * Entry point for decoder.

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

@@ -61,8 +61,8 @@ public void generateMessageHeaderStub() throws IOException
             out.append(generateFixedFlyweightCode(messageHeader, tokens.get(0).encodedLength()));
             out.append(generateCompositePropertyElements(
                 messageHeader, tokens.subList(1, tokens.size() - 1), BASE_INDENT));
-
-            out.append(CppUtil.closingBraces(ir.namespaces().length) + "}\n#endif\n");
+            out.append("};\n");
+            out.append(CppUtil.closingBraces(ir.namespaces().length) + "#endif\n");
         }
     }
 
@@ -582,8 +582,8 @@ private void generateChoiceSet(final List<Token> tokens) throws IOException
             ));
 
             out.append(generateChoices(bitSetName, tokens.subList(1, tokens.size() - 1)));
-
-            out.append(CppUtil.closingBraces(ir.namespaces().length) + "}\n#endif\n");
+            out.append("};\n");
+            out.append(CppUtil.closingBraces(ir.namespaces().length) + "#endif\n");
         }
     }
 
@@ -601,7 +601,8 @@ private void generateEnum(final List<Token> tokens) throws IOException
 
             out.append(generateEnumLookupMethod(tokens.subList(1, tokens.size() - 1), enumToken));
 
-            out.append(CppUtil.closingBraces(ir.namespaces().length) + "}\n#endif\n");
+            out.append("};\n");
+            out.append(CppUtil.closingBraces(ir.namespaces().length) + "#endif\n");
         }
     }
 
@@ -618,7 +619,8 @@ private void generateComposite(final List<Token> tokens) throws IOException
 
             out.append(generateCompositePropertyElements(compositeName, tokens.subList(1, tokens.size() - 1), BASE_INDENT));
 
-            out.append(CppUtil.closingBraces(ir.namespaces().length) + "}\n#endif\n");
+            out.append("};\n");
+            out.append(CppUtil.closingBraces(ir.namespaces().length) + "#endif\n");
         }
     }
 

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

@@ -142,6 +142,6 @@ public static String formatByteOrderEncoding(final ByteOrder byteOrder, final Pr
 
     public static String closingBraces(final int count)
     {
-        return new String(new char[count]).replace("\0", "};\n");
+        return new String(new char[count]).replace("\0", "}\n");
     }
 }