summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTeodor Mircea Ionita <teodor@mariadb.org>2018-06-10 16:37:49 +0300
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2018-06-10 16:39:30 +0300
commit953d70f960421ef4a6a2d711b66ef3d04592efc7 (patch)
treea508dfc7573ef94c4c8906bc1f6582f3b6c40d09
parent21246066b296bd9c6e44272a8f93cb7dc73ea43c (diff)
downloadmariadb-git-953d70f960421ef4a6a2d711b66ef3d04592efc7.tar.gz
MDEV-15778: Remove packed attr from omt_ and subtree_ classes
Undo the revert that happened by mystake in commit 7fca4b50ffbe750532cfcdb95bcd425ec1b8e22b.
-rw-r--r--storage/tokudb/ft-index/util/omt.h8
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)));
+} ;
}