Commit 8ac19be8 authored by Marko Mäkelä's avatar Marko Mäkelä

Cleanup: Fix build problems with the Intel compiler

fil_space_t::flush_low(): Define and declare without inline.

ut_is_2pow(): Remove UNIV_LIKELY. This is almost exclusively
used in debug assertions. UNIV_LIKELY is not compatible with
static_assert in some compilers.
parent 9c455945
...@@ -492,7 +492,7 @@ void fil_node_t::prepare_to_close_or_detach() ...@@ -492,7 +492,7 @@ void fil_node_t::prepare_to_close_or_detach()
} }
/** Flush any writes cached by the file system. */ /** Flush any writes cached by the file system. */
inline void fil_space_t::flush_low() void fil_space_t::flush_low()
{ {
ut_ad(!mutex_own(&fil_system.mutex)); ut_ad(!mutex_own(&fil_system.mutex));
......
...@@ -156,7 +156,7 @@ store the given number of bits. ...@@ -156,7 +156,7 @@ store the given number of bits.
/** Determines if a number is zero or a power of two. /** Determines if a number is zero or a power of two.
@param[in] n number @param[in] n number
@return nonzero if n is zero or a power of two; zero otherwise */ @return nonzero if n is zero or a power of two; zero otherwise */
#define ut_is_2pow(n) UNIV_LIKELY(!((n) & ((n) - 1))) #define ut_is_2pow(n) (!((n) & ((n) - 1)))
/** Functor that compares two C strings. Can be used as a comparator for /** Functor that compares two C strings. Can be used as a comparator for
e.g. std::map that uses char* as keys. */ e.g. std::map that uses char* as keys. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment