[Pkg-ceph-commits] [ceph] 37/59: d/p/rocksdb-fallthrough-i386.patch: Mark intentional fallthroughs for compatibility with gcc-7.

[James Downing Page]

This is an automated email from the git hooks/post-receive script.

jamespage pushed a commit to branch ubuntu/artful
in repository ceph.

commit 7d402b98d9c66af00fbbcce85fdccc72ecc04f76
Author: James Page <james.page at ubuntu.com>
Date:   Tue Aug 8 11:21:37 2017 +0100

    d/p/rocksdb-fallthrough-i386.patch: Mark intentional fallthroughs for compatibility with gcc-7.
---
 debian/changelog                              |  7 +++++++
 debian/patches/rocksdb-fallthrough-i386.patch | 17 +++++++++++++++++
 debian/patches/series                         |  2 ++
 3 files changed, 26 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 10700e3..707d354 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ceph (12.1.2-0ubuntu2) UNRELEASED; urgency=medium
+
+  * d/p/rocksdb-fallthrough-i386.patch: Mark intentional fallthroughs
+    for compatibility with gcc-7.
+
+ -- James Page <james.page at ubuntu.com>  Tue, 08 Aug 2017 11:21:04 +0100
+
 ceph (12.1.2-0ubuntu1) artful; urgency=medium
 
   * New release candidate for next stable release.
diff --git a/debian/patches/rocksdb-fallthrough-i386.patch b/debian/patches/rocksdb-fallthrough-i386.patch
new file mode 100644
index 0000000..1abb729
--- /dev/null
+++ b/debian/patches/rocksdb-fallthrough-i386.patch
@@ -0,0 +1,17 @@
+Description: Mark intention fallthroughs for i386 codepaths
+Author: James Page <james.page at ubuntu.com>
+Forwarded: no
+
+--- a/src/rocksdb/util/murmurhash.cc
++++ b/src/rocksdb/util/murmurhash.cc
+@@ -113,8 +113,8 @@ unsigned int MurmurHash2 ( const void *
+ 
+     switch(len)
+     {
+-    case 3: h ^= data[2] << 16;
+-    case 2: h ^= data[1] << 8;
++    case 3: h ^= data[2] << 16; // fallthrough
++    case 2: h ^= data[1] << 8; // fallthrough
+     case 1: h ^= data[0];
+         h *= m;
+     };
diff --git a/debian/patches/series b/debian/patches/series
index 189db34..ed76d99 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,6 @@
 # Ubuntu: i386 build failure
+rocksdb-fallthrough-i386.patch
 0001-CoreLocalArray-class.patch
 0002-core-local-array-type-conversions.patch
 0003-Core-local-statistics.patch
+# Ubuntu: rocksdb/i386/gcc-7 compat

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git