diff options
author | Teodor Mircea Ionita <teodor@mariadb.org> | 2018-05-09 16:54:16 +0300 |
---|---|---|
committer | Vicențiu-Marian Ciorbaru <cvicentiu@gmail.com> | 2018-06-10 09:54:00 +0300 |
commit | 1735fa340a9d7ca8683f18fe2ecc148423e78ba7 (patch) | |
tree | 26e384ae41b831375f7ceeb8370762e50f4cbfb7 | |
parent | b8e267c0c5007dbfebc2dee8a4f408f28b637ba5 (diff) | |
download | mariadb-git-1735fa340a9d7ca8683f18fe2ecc148423e78ba7.tar.gz |
MDEV-15778: Remove packed attr from omt_ and subtree_ classes
This is happening because they are declared as packed
and clang has -Waddress-of-packed-member when passing the
address of a packed member, a legit concern on different
architectures. The easiest way to get rid of the errors is to
remove the packed attribute from said structs.
-rw-r--r-- | storage/tokudb/ft-index/util/omt.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/tokudb/ft-index/util/omt.h b/storage/tokudb/ft-index/util/omt.h index 02f3f0d759a..6cf3f80d2bc 100644 --- a/storage/tokudb/ft-index/util/omt.h +++ b/storage/tokudb/ft-index/util/omt.h @@ -181,7 +181,7 @@ public: paranoid_invariant(index != NODE_NULL); m_index = index; } -} __attribute__((__packed__,aligned(4))); +} ; template<> class subtree_templated<true> { @@ -238,7 +238,7 @@ public: inline void disable_bit(void) { m_bitfield &= MASK_INDEX; } -} __attribute__((__packed__)) ; +} ; template<typename omtdata_t, bool subtree_supports_marks> class omt_node_templated { @@ -251,7 +251,7 @@ public: // this needs to be in both implementations because we don't have // a "static if" the caller can use inline void clear_stolen_bits(void) {} -} __attribute__((__packed__,aligned(4))); +} ; template<typename omtdata_t> class omt_node_templated<omtdata_t, true> { @@ -288,7 +288,7 @@ public: this->unset_marked_bit(); this->unset_marks_below_bit(); } -} __attribute__((__packed__,aligned(4))); +} ; } |