From c07db169f1423e6199b2899516b789c7fb58057f Mon Sep 17 00:00:00 2001 From: nasso Date: Sat, 12 Jun 2021 00:31:34 +0200 Subject: [PATCH] Silence warnings when including Common.h --- include/libnyquist/Common.h | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/include/libnyquist/Common.h b/include/libnyquist/Common.h index 050f146..8847ae9 100644 --- a/include/libnyquist/Common.h +++ b/include/libnyquist/Common.h @@ -26,6 +26,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef LIBNYQUIST_COMMON_H #define LIBNYQUIST_COMMON_H +#if defined(__GNUC__) || defined(__MINGW32__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-parameter" +#elif defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable: 4244) // conversion from X to Y, possible loss of data +#pragma warning(disable: 4100) // unreferenced formal parameter +#endif + #include #include #include @@ -402,7 +411,7 @@ enum WaveFormatCode FORMAT_ADPCM = 0x2, // Microsoft ADPCM Format FORMAT_IEEE = 0x3, // IEEE float/double FORMAT_ALAW = 0x6, // 8-bit ITU-T G.711 A-law - FORMAT_MULAW = 0x7, // 8-bit ITU-T G.711 µ-law + FORMAT_MULAW = 0x7, // 8-bit ITU-T G.711 �-law FORMAT_IMA_ADPCM = 0x11, // IMA ADPCM Format FORMAT_EXT = 0xFFFE // Set via subformat }; @@ -691,4 +700,10 @@ inline void TrimSilenceInterleaved(std::vector & buffer, float v, bool fr } // end namespace nqr +#if defined(__GNUC__) || defined(__MINGW32__) +#pragma GCC diagnostic pop +#elif defined(_MSC_VER) +#pragma warning(pop) +#endif + #endif