Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
953d70f9
Commit
953d70f9
authored
Jun 10, 2018
by
Teodor Mircea Ionita
Committed by
Vicențiu Ciorbaru
Jun 10, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-15778: Remove packed attr from omt_ and subtree_ classes
Undo the revert that happened by mystake in commit
7fca4b50
.
parent
21246066
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
storage/tokudb/ft-index/util/omt.h
storage/tokudb/ft-index/util/omt.h
+4
-4
No files found.
storage/tokudb/ft-index/util/omt.h
View file @
953d70f9
...
@@ -181,7 +181,7 @@ class subtree_templated {
...
@@ -181,7 +181,7 @@ class subtree_templated {
paranoid_invariant
(
index
!=
NODE_NULL
);
paranoid_invariant
(
index
!=
NODE_NULL
);
m_index
=
index
;
m_index
=
index
;
}
}
}
__attribute__
((
__packed__
,
aligned
(
4
)))
;
}
;
template
<
>
template
<
>
class
subtree_templated
<
true
>
{
class
subtree_templated
<
true
>
{
...
@@ -238,7 +238,7 @@ class subtree_templated<true> {
...
@@ -238,7 +238,7 @@ class subtree_templated<true> {
inline
void
disable_bit
(
void
)
{
inline
void
disable_bit
(
void
)
{
m_bitfield
&=
MASK_INDEX
;
m_bitfield
&=
MASK_INDEX
;
}
}
}
__attribute__
((
__packed__
))
;
}
;
template
<
typename
omtdata_t
,
bool
subtree_supports_marks
>
template
<
typename
omtdata_t
,
bool
subtree_supports_marks
>
class
omt_node_templated
{
class
omt_node_templated
{
...
@@ -251,7 +251,7 @@ class omt_node_templated {
...
@@ -251,7 +251,7 @@ class omt_node_templated {
// this needs to be in both implementations because we don't have
// this needs to be in both implementations because we don't have
// a "static if" the caller can use
// a "static if" the caller can use
inline
void
clear_stolen_bits
(
void
)
{}
inline
void
clear_stolen_bits
(
void
)
{}
}
__attribute__
((
__packed__
,
aligned
(
4
)))
;
}
;
template
<
typename
omtdata_t
>
template
<
typename
omtdata_t
>
class
omt_node_templated
<
omtdata_t
,
true
>
{
class
omt_node_templated
<
omtdata_t
,
true
>
{
...
@@ -288,7 +288,7 @@ class omt_node_templated<omtdata_t, true> {
...
@@ -288,7 +288,7 @@ class omt_node_templated<omtdata_t, true> {
this
->
unset_marked_bit
();
this
->
unset_marked_bit
();
this
->
unset_marks_below_bit
();
this
->
unset_marks_below_bit
();
}
}
}
__attribute__
((
__packed__
,
aligned
(
4
)))
;
}
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment