From 6894d10d789dafd5c95eea54c7373a45338cc912 Mon Sep 17 00:00:00 2001 From: David Reid Date: Sun, 19 Jan 2020 11:18:22 +1000 Subject: [PATCH] Warning fixes. --- extras/speex_resampler/ma_speex_resampler.h | 1 + research/ma_resampler.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/extras/speex_resampler/ma_speex_resampler.h b/extras/speex_resampler/ma_speex_resampler.h index d7945a30..c439c5ff 100644 --- a/extras/speex_resampler/ma_speex_resampler.h +++ b/extras/speex_resampler/ma_speex_resampler.h @@ -13,6 +13,7 @@ #pragma warning(push) #pragma warning(disable:4244) /* conversion from 'x' to 'y', possible loss of data */ #pragma warning(disable:4018) /* signed/unsigned mismatch */ + #pragma warning(disable:4706) /* assignment within conditional expression */ #else #pragma GCC diagnostic push #endif diff --git a/research/ma_resampler.h b/research/ma_resampler.h index 62537c1d..ddd8d1c4 100644 --- a/research/ma_resampler.h +++ b/research/ma_resampler.h @@ -587,7 +587,7 @@ static ma_result ma_resampler_process__read(ma_resampler* pResampler, const void #endif } - default: return MA_INVALID_ARGS; /* Should never hit this. */ + default: break; } /* Should never get here. */ @@ -723,7 +723,7 @@ ma_uint64 ma_resampler_get_required_input_frame_count(ma_resampler* pResampler, case ma_resample_algorithm_speex: { #if defined(MA_HAS_SPEEX_RESAMPLER) - /* TODO: Implement me. */ + return 0; #else break; #endif