From 995d20422cc7878aebe660138622211acc0cc943 Mon Sep 17 00:00:00 2001 From: Peter Ferrie Date: Fri, 3 Feb 2023 18:43:43 -0800 Subject: fix Clang compile [nw] --- src/devices/video/i82730.cpp | 2 +- src/mame/sinclair/atm.cpp | 2 +- src/osd/modules/sound/xaudio2_sound.cpp | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/devices/video/i82730.cpp b/src/devices/video/i82730.cpp index ba853c41680..298ab31e64d 100644 --- a/src/devices/video/i82730.cpp +++ b/src/devices/video/i82730.cpp @@ -17,7 +17,7 @@ #define LOG_COMMANDS (1U << 1) #define LOG_DATASTREAM (1U << 2) //#define VERBOSE (LOG_GENERAL | LOG_COMMANDS | LOG_DATASTREAM) -#define VERBOSE (LOG_GENERAL) +#define VERBOSE (0 != (LOG_GENERAL)) #include "logmacro.h" diff --git a/src/mame/sinclair/atm.cpp b/src/mame/sinclair/atm.cpp index 0f4908683c9..8b5ec1ef49f 100644 --- a/src/mame/sinclair/atm.cpp +++ b/src/mame/sinclair/atm.cpp @@ -74,7 +74,7 @@ void atm_state::atm_update_memory() u16 atm_state::atm_update_memory_get_page(u8 bank) { - return m_pen ? pen_page(bank) : (~PEN_RAMNROM_MASK & ~PEN_DOS7FFD_MASK); + return m_pen ? pen_page(bank) : (u16) (~PEN_RAMNROM_MASK & ~PEN_DOS7FFD_MASK); } void atm_state::atm_ula_w(offs_t offset, u8 data) diff --git a/src/osd/modules/sound/xaudio2_sound.cpp b/src/osd/modules/sound/xaudio2_sound.cpp index e2d4b2ab1c3..15352ebc1b4 100644 --- a/src/osd/modules/sound/xaudio2_sound.cpp +++ b/src/osd/modules/sound/xaudio2_sound.cpp @@ -219,13 +219,13 @@ public: private: // Xaudio callbacks - void STDAPICALLTYPE OnVoiceProcessingPassStart(uint32_t bytes_required) override; - void STDAPICALLTYPE OnVoiceProcessingPassEnd() override {} - void STDAPICALLTYPE OnStreamEnd() override {} - void STDAPICALLTYPE OnBufferStart(void* pBufferContext) override {} - void STDAPICALLTYPE OnLoopEnd(void* pBufferContext) override {} - void STDAPICALLTYPE OnVoiceError(void* pBufferContext, HRESULT error) override {} - void STDAPICALLTYPE OnBufferEnd(void *pBufferContext) override; + void STDAPICALLTYPE OnVoiceProcessingPassStart(uint32_t bytes_required) noexcept override; + void STDAPICALLTYPE OnVoiceProcessingPassEnd() noexcept override {} + void STDAPICALLTYPE OnStreamEnd() noexcept override {} + void STDAPICALLTYPE OnBufferStart(void* pBufferContext) noexcept override {} + void STDAPICALLTYPE OnLoopEnd(void* pBufferContext) noexcept override {} + void STDAPICALLTYPE OnVoiceError(void* pBufferContext, HRESULT error) noexcept override {} + void STDAPICALLTYPE OnBufferEnd(void *pBufferContext) noexcept override; void create_buffers(const WAVEFORMATEX &format); HRESULT create_voices(const WAVEFORMATEX &format); @@ -446,7 +446,7 @@ void sound_xaudio2::set_mastervolume(int attenuation) //============================================================ // The XAudio2 voice callback triggered when a buffer finishes playing -void sound_xaudio2::OnBufferEnd(void *pBufferContext) +void sound_xaudio2::OnBufferEnd(void *pBufferContext) noexcept { BYTE* completed_buffer = static_cast(pBufferContext); if (completed_buffer != nullptr) @@ -463,7 +463,7 @@ void sound_xaudio2::OnBufferEnd(void *pBufferContext) //============================================================ // The XAudio2 voice callback triggered on every pass -void sound_xaudio2::OnVoiceProcessingPassStart(uint32_t bytes_required) +void sound_xaudio2::OnVoiceProcessingPassStart(uint32_t bytes_required) noexcept { if (bytes_required == 0) { -- cgit v1.2.3