diff options
| author |   Craig Andrews <candrews@gentoo.org> | 2018-06-25 15:40:02 -0400 |
|---|---|---|
| committer | Craig Andrews <candrews@gentoo.org> | 2018-06-25 15:40:20 -0400 |
| commit | ccaf30cef6253b2071e1d8796003b0cae04767a9 (patch) | |
| tree | faa2c7246156ae293658ac3255107526624f1deb /dev-libs/rapidjson/files | |
| parent | media-gfx/pqiv: version bump to 2.10.4 (diff) | |
| download | gentoo-ccaf30cef6253b2071e1d8796003b0cae04767a9.tar.gz gentoo-ccaf30cef6253b2071e1d8796003b0cae04767a9.tar.bz2 gentoo-ccaf30cef6253b2071e1d8796003b0cae04767a9.zip | |
dev-libs/rapidjson: Fix "this statement may fall through" error
Closes: https://bugs.gentoo.org/659170
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Diffstat (limited to 'dev-libs/rapidjson/files')
| -rw-r--r-- | dev-libs/rapidjson/files/rapidjson-1.1.0-gcc-7.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/dev-libs/rapidjson/files/rapidjson-1.1.0-gcc-7.patch b/dev-libs/rapidjson/files/rapidjson-1.1.0-gcc-7.patch new file mode 100644 index 000000000000..925d175a8990 --- /dev/null +++ b/dev-libs/rapidjson/files/rapidjson-1.1.0-gcc-7.patch @@ -0,0 +1,46 @@ +From fe19b7b6016d446722621fb407738209d1a911e8 Mon Sep 17 00:00:00 2001 +From: Harry Wong <harrywong@live.com> +Date: Thu, 4 May 2017 10:08:48 +0800 +Subject: [PATCH 1/2] Supress implicit fallthrough in GCC + +--- + include/rapidjson/internal/regex.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/rapidjson/internal/regex.h b/include/rapidjson/internal/regex.h +index 1369ea266..6d110bdbd 100644 +--- a/include/rapidjson/internal/regex.h ++++ b/include/rapidjson/internal/regex.h +@@ -29,6 +29,7 @@ RAPIDJSON_DIAG_OFF(implicit-fallthrough) + #ifdef __GNUC__ + RAPIDJSON_DIAG_PUSH + RAPIDJSON_DIAG_OFF(effc++) ++RAPIDJSON_DIAG_OFF(implicit-fallthrough) + #endif + + #ifdef _MSC_VER + +From cba45fe9de6923b858edb0780e257b7257aa4f7b Mon Sep 17 00:00:00 2001 +From: Harry Wong <harrywong@live.com> +Date: Thu, 4 May 2017 10:32:45 +0800 +Subject: [PATCH 2/2] Onley apply to GCC 7 + +--- + include/rapidjson/internal/regex.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/rapidjson/internal/regex.h b/include/rapidjson/internal/regex.h +index 6d110bdbd..e1a2faae5 100644 +--- a/include/rapidjson/internal/regex.h ++++ b/include/rapidjson/internal/regex.h +@@ -29,8 +29,10 @@ RAPIDJSON_DIAG_OFF(implicit-fallthrough) + #ifdef __GNUC__ + RAPIDJSON_DIAG_PUSH + RAPIDJSON_DIAG_OFF(effc++) ++#if __GNUC__ >= 7 + RAPIDJSON_DIAG_OFF(implicit-fallthrough) + #endif ++#endif + + #ifdef _MSC_VER + RAPIDJSON_DIAG_PUSH |