diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-22 06:19:21 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-23 14:42:21 +0200 |
| commit | 2565c02ca577c9b4523a61359b908dbb3d04076d (patch) | |
| tree | b66910dc6b8ac2b657544feb5dfb9c386522a5d8 | |
| parent | 5c159c90370fc66007220fda4417f8ed2e028ce2 (diff) | |
| download | mariadb-git-2565c02ca577c9b4523a61359b908dbb3d04076d.tar.gz | |
Remove unnecessary type casts
| -rw-r--r-- | storage/innobase/os/os0file.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc index 26cc70e6e41..bfebc2e1b12 100644 --- a/storage/innobase/os/os0file.cc +++ b/storage/innobase/os/os0file.cc @@ -2,7 +2,7 @@ Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2009, Percona Inc. -Copyright (c) 2013, 2018, MariaDB Corporation. +Copyright (c) 2013, 2019, MariaDB Corporation. Portions of this file contain modifications contributed and copyrighted by Percona Inc.. Those modifications are @@ -1766,6 +1766,8 @@ LinuxAIOHandler::resubmit(Slot* slot) slot->n_bytes = 0; slot->io_already_done = false; + compile_time_assert(sizeof(off_t) >= sizeof(os_offset_t)); + struct iocb* iocb = &slot->control; if (slot->type.is_read()) { @@ -1775,7 +1777,7 @@ LinuxAIOHandler::resubmit(Slot* slot) slot->file, slot->ptr, slot->len, - static_cast<off_t>(slot->offset)); + slot->offset); } else { ut_a(slot->type.is_write()); @@ -1785,7 +1787,7 @@ LinuxAIOHandler::resubmit(Slot* slot) slot->file, slot->ptr, slot->len, - static_cast<off_t>(slot->offset)); + slot->offset); } iocb->data = slot; @@ -6316,7 +6318,7 @@ AIO::reserve_slot( #ifdef _WIN32 slot->len = static_cast<DWORD>(len); #else - slot->len = static_cast<ulint>(len); + slot->len = len; #endif /* _WIN32 */ slot->type = type; slot->buf = static_cast<byte*>(buf); |