From 9bf9b18f0a705dfd6d50b98056463a55de6a1bf9 Mon Sep 17 00:00:00 2001 From: Wouter van Oortmerssen Date: Mon, 25 Feb 2019 11:42:37 -0800 Subject: [PATCH] Added -Wc++98-compat-extra-semi And fixed 2 more extra semi-colons. Change-Id: I1ee08e5b2f67cd0c886847c05cd4d63cfcafec3e --- CMakeLists.txt | 4 ++-- include/flatbuffers/flatbuffers.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5bace820a..9f640ac35 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ option(FLATBUFFERS_PACKAGE_REDHAT option(FLATBUFFERS_PACKAGE_DEBIAN "Build an deb using the 'package' target." OFF) - + if(NOT FLATBUFFERS_BUILD_FLATC AND FLATBUFFERS_BUILD_TESTS) message(WARNING "Cannot build tests without building the compiler. Tests will be disabled.") @@ -193,7 +193,7 @@ elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -pedantic -Werror -Wextra -Wno-unused-parameter") set(FLATBUFFERS_PRIVATE_CXX_FLAGS "-Wold-style-cast") if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.8) - list(APPEND FLATBUFFERS_PRIVATE_CXX_FLAGS "-Wimplicit-fallthrough" "-Wextra-semi" "-Werror=unused-private-field") # enable warning + list(APPEND FLATBUFFERS_PRIVATE_CXX_FLAGS "-Wimplicit-fallthrough" "-Wextra-semi" "-Wc++98-compat-extra-semi" "-Werror=unused-private-field") # enable warning endif() if(FLATBUFFERS_LIBCXX_WITH_CLANG) if(NOT "${CMAKE_SYSTEM_NAME}" MATCHES "Linux") diff --git a/include/flatbuffers/flatbuffers.h b/include/flatbuffers/flatbuffers.h index d7b6427b4..a1a95f00e 100644 --- a/include/flatbuffers/flatbuffers.h +++ b/include/flatbuffers/flatbuffers.h @@ -2468,10 +2468,10 @@ inline int LookupEnum(const char **names, const char *name) { // clang-format off #if defined(_MSC_VER) #define FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(alignment) \ - __pragma(pack(1)); \ + __pragma(pack(1)) \ struct __declspec(align(alignment)) #define FLATBUFFERS_STRUCT_END(name, size) \ - __pragma(pack()); \ + __pragma(pack()) \ static_assert(sizeof(name) == size, "compiler breaks packing rules") #elif defined(__GNUC__) || defined(__clang__) #define FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(alignment) \