From 6a8cc912e15bc69e37f5e7cce6e9847ee6082f60 Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 4 Sep 2016 19:10:43 +0000 Subject: [PATCH] Switch hmp.cpp to use C++ casts --- common/misc/hmp.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/common/misc/hmp.cpp b/common/misc/hmp.cpp index 6cf44350f..ba974295a 100644 --- a/common/misc/hmp.cpp +++ b/common/misc/hmp.cpp @@ -313,10 +313,10 @@ static int fill_buffer(hmp_file *hmp) { } else { *(p++) = ev.delta; *(p++) = 0; - *(p++) = ((static_cast(MEVT_SHORTMSG)) << 24) | - ((DWORD)ev.msg[0]) | - (((DWORD)ev.msg[1]) << 8) | - (((DWORD)ev.msg[2]) << 16); + *(p++) = (static_cast(MEVT_SHORTMSG) << 24) | + static_cast(ev.msg[0]) | + (static_cast(ev.msg[1]) << 8) | + (static_cast(ev.msg[2]) << 16); } } } @@ -329,7 +329,7 @@ static int setup_buffers(hmp_file *hmp) { lastbuf = NULL; for (int i = 0; i < HMP_BUFFERS; i++) { - if (!(buf = (MIDIHDR *)d_malloc(HMP_BUFSIZE + sizeof(MIDIHDR)))) + if (!(buf = reinterpret_cast(d_malloc(HMP_BUFSIZE + sizeof(MIDIHDR))))) return HMP_OUT_OF_MEM; memset(buf, 0, sizeof(MIDIHDR)); buf->lpData = reinterpret_cast(buf) + sizeof(MIDIHDR);