summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2018-05-20 14:04:38 +0400
committerSergey Vojtovich <svoj@mariadb.org>2018-05-20 15:55:56 +0400
commit7ad9b3588f53672b3d2d9f345ec9ab7335b50206 (patch)
tree23b92903c0791c62523f9977bdb239ede5898165
parentc8e502695835db022d2a413befe01bee0db372e2 (diff)
downloadmariadb-git-7ad9b3588f53672b3d2d9f345ec9ab7335b50206.tar.gz
OS X warnings fixes
-rw-r--r--storage/innobase/include/sync0policy.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/innobase/include/sync0policy.h b/storage/innobase/include/sync0policy.h
index 56398203117..daa08a91e1e 100644
--- a/storage/innobase/include/sync0policy.h
+++ b/storage/innobase/include/sync0policy.h
@@ -50,7 +50,7 @@ public:
m_mutex(),
m_filename(),
m_line(),
- m_thread_id(os_thread_id_t(ULINT_UNDEFINED))
+ m_thread_id(ULINT_UNDEFINED)
{
/* No op */
}
@@ -76,7 +76,8 @@ public:
{
m_mutex = mutex;
- my_atomic_storelint(&m_thread_id, os_thread_get_curr_id());
+ my_atomic_storelint(&m_thread_id,
+ ulint(os_thread_get_curr_id()));
m_filename = filename;