diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2017-12-08 12:54:13 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2017-12-08 12:54:13 +0400 |
| commit | 5c65a21df130bf3c22d2baa97ab4b7a1b1d3a4aa (patch) | |
| tree | b870a0d4b2afc98db3ce4cda7371c31a25fee229 | |
| parent | 0708631e59a4c83d3a90e25c0d7ffaf6bd38bc40 (diff) | |
| download | mariadb-git-bb-10.3-MDEV-14529.tar.gz | |
Fixup castsbb-10.3-MDEV-14529
| -rw-r--r-- | storage/innobase/include/sync0rw.ic | 8 | ||||
| -rw-r--r-- | storage/innobase/sync/sync0rw.cc | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/storage/innobase/include/sync0rw.ic b/storage/innobase/include/sync0rw.ic index d68f8fc6d25..cbbf421d9f2 100644 --- a/storage/innobase/include/sync0rw.ic +++ b/storage/innobase/include/sync0rw.ic @@ -77,7 +77,7 @@ rw_lock_get_writer( /*===============*/ const rw_lock_t* lock) /*!< in: rw-lock */ { - int32_t lock_word = my_atomic_load32_explicit(&lock->lock_word, + int32_t lock_word = my_atomic_load32_explicit(const_cast<int32_t*>(&lock->lock_word), MY_MEMORY_ORDER_RELAXED); ut_ad(lock_word <= X_LOCK_DECR); @@ -110,7 +110,7 @@ rw_lock_get_reader_count( /*=====================*/ const rw_lock_t* lock) /*!< in: rw-lock */ { - int32_t lock_word = my_atomic_load32_explicit(&lock->lock_word, + int32_t lock_word = my_atomic_load32_explicit(const_cast<int32_t*>(&lock->lock_word), MY_MEMORY_ORDER_RELAXED); ut_ad(lock_word <= X_LOCK_DECR); @@ -147,7 +147,7 @@ rw_lock_get_x_lock_count( /*=====================*/ const rw_lock_t* lock) /*!< in: rw-lock */ { - int32_t lock_copy = my_atomic_load32_explicit(&lock->lock_word, + int32_t lock_copy = my_atomic_load32_explicit(const_cast<int32_t*>(&lock->lock_word), MY_MEMORY_ORDER_RELAXED); ut_ad(lock_copy <= X_LOCK_DECR); @@ -181,7 +181,7 @@ rw_lock_get_sx_lock_count( const rw_lock_t* lock) /*!< in: rw-lock */ { #ifdef UNIV_DEBUG - int32_t lock_copy = my_atomic_load32_explicit(&lock->lock_word, + int32_t lock_copy = my_atomic_load32_explicit(const_cast<int32_t*>(&lock->lock_word), MY_MEMORY_ORDER_RELAXED); ut_ad(lock_copy <= X_LOCK_DECR); diff --git a/storage/innobase/sync/sync0rw.cc b/storage/innobase/sync/sync0rw.cc index 9bcde929e34..509fd9cf19b 100644 --- a/storage/innobase/sync/sync0rw.cc +++ b/storage/innobase/sync/sync0rw.cc @@ -893,11 +893,11 @@ rw_lock_validate( ut_ad(lock); - lock_word = my_atomic_load32_explicit(&lock->lock_word, + lock_word = my_atomic_load32_explicit(const_cast<int32_t*>(&lock->lock_word), MY_MEMORY_ORDER_RELAXED); ut_ad(lock->magic_n == RW_LOCK_MAGIC_N); - ut_ad(my_atomic_load32_explicit(&lock->waiters, + ut_ad(my_atomic_load32_explicit(const_cast<int32_t*>(&lock->waiters), MY_MEMORY_ORDER_RELAXED) < 2); ut_ad(lock_word > -(2 * X_LOCK_DECR)); ut_ad(lock_word <= X_LOCK_DECR); @@ -1162,11 +1162,11 @@ rw_lock_list_print_info( count++; - if (my_atomic_load32_explicit(&lock->lock_word, MY_MEMORY_ORDER_RELAXED) != X_LOCK_DECR) { + if (my_atomic_load32_explicit(const_cast<int32_t*>(&lock->lock_word), MY_MEMORY_ORDER_RELAXED) != X_LOCK_DECR) { fprintf(file, "RW-LOCK: %p ", (void*) lock); - if (int32_t waiters= my_atomic_load32_explicit(&lock->waiters, MY_MEMORY_ORDER_RELAXED)) { + if (int32_t waiters= my_atomic_load32_explicit(const_cast<int32_t*>(&lock->waiters), MY_MEMORY_ORDER_RELAXED)) { fprintf(file, " (%d waiters)\n", waiters); } else { putc('\n', file); |