commit 93c0118d802df62e53dcbd10252d4ff226a0a790
author Dave Thaler <dthaler@microsoft.com> Sat Aug 06 15:08:35 2022 -0400
committer GitHub <noreply@github.com> Sat Aug 06 15:08:35 2022 -0400
tree a1854bc8805921fbec7a14307fd5d823d96883d4
parent 79789771f71b631a8e399d1439d042e7a08db288

Get rid of warnings when compiling with MSVC (#157)

Signed-off-by: Dave Thaler <dthaler@microsoft.com>

inc/qcbor/UsefulBuf.h

diff --git a/inc/qcbor/UsefulBuf.h b/inc/qcbor/UsefulBuf.h
index 2b85833..8a101fd 100644
--- a/inc/qcbor/UsefulBuf.h
+++ b/inc/qcbor/UsefulBuf.h
@@ -674,10 +674,14 @@
    UsefulBuf UB;
 
    // See UsefulBuf_Unconst() implementation for comment on pragmas
+#ifndef _MSC_VER
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wcast-qual"
+#endif
    UB.ptr = (void *)UBC.ptr;
+#ifndef _MSC_VER
 #pragma GCC diagnostic pop
+#endif
 
    UB.len = UBC.len;
 
@@ -1757,10 +1761,14 @@
    /* -Wcast-qual is a good warning flag to use in general. This is
     * the one place in UsefulBuf where it needs to be quieted. Since
     * clang supports GCC pragmas, this works for clang too. */
+#ifndef _MSC_VER
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wcast-qual"
+#endif
    UB.ptr = (void *)UBC.ptr;
+#ifndef _MSC_VER
 #pragma GCC diagnostic pop
+#endif
 
    UB.len = UBC.len;
 

src/qcbor_decode.c

diff --git a/src/qcbor_decode.c b/src/qcbor_decode.c
index faa0218..46c4f12 100644
--- a/src/qcbor_decode.c
+++ b/src/qcbor_decode.c
@@ -505,10 +505,14 @@
     * gcc and clang. This is the one place where the const needs to be
     * cast away so const can be use in the rest of the code.
     */
+#ifndef _MSC_VER
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wcast-qual"
+#endif
    (pMe->pfAllocator)(pMe->pAllocateCxt, (void *)pMem, 0);
+#ifndef _MSC_VER
 #pragma GCC diagnostic pop
+#endif
 }
 
 // StringAllocator_Reallocate called with pMem NULL is
@@ -519,10 +523,14 @@
                            size_t uSize)
 {
    /* See comment in StringAllocator_Free() */
+#ifndef _MSC_VER
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wcast-qual"
+#endif
    return (pMe->pfAllocator)(pMe->pAllocateCxt, (void *)pMem, uSize);
+#ifndef _MSC_VER
 #pragma GCC diagnostic pop
+#endif
 }
 
 static inline UsefulBuf
@@ -535,12 +543,16 @@
 StringAllocator_Destruct(const QCBORInternalAllocator *pMe)
 {
    /* See comment in StringAllocator_Free() */
+#ifndef _MSC_VER
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wcast-qual"
+#endif
    if(pMe->pfAllocator) {
       (pMe->pfAllocator)(pMe->pAllocateCxt, NULL, 0);
    }
+#ifndef _MSC_VER
 #pragma GCC diagnostic pop
+#endif
 }
 #endif /* QCBOR_DISABLE_INDEFINITE_LENGTH_STRINGS */
 
@@ -2738,12 +2750,19 @@
                                   bool bAllStrings)
 {
    // The pool size and free mem offset are packed into the beginning
-   // of the pool memory. This compile time check make sure the
+   // of the pool memory. This compile time check makes sure the
    // constant in the header is correct.  This check should optimize
    // down to nothing.
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4127) // conditional expression is constant
+#endif
    if(QCBOR_DECODE_MIN_MEM_POOL_SIZE < 2 * sizeof(uint32_t)) {
       return QCBOR_ERR_MEM_POOL_SIZE;
    }
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 
    // The pool size and free offset packed in to the beginning of pool
    // memory are only 32-bits. This check will optimize out on 32-bit