wrong conversion fix 00/29500/1
authorOleksandr Dmytrenko <o.dmytrenko@samsung.com>
Wed, 15 May 2019 06:18:37 +0000 (09:18 +0300)
committerOleksandr Dmytrenko <o.dmytrenko@samsung.com>
Wed, 15 May 2019 06:18:37 +0000 (09:18 +0300)
error: invalid conversion from 'int64_t {aka long int}' to 'CborError'

Change-Id: Ifbc8e51104fe5af0904b74a927179347e2207073
Signed-off-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
resource/csdk/stack/include/ocpayload.h

index 7d5e31f..a95ea71 100644 (file)
@@ -55,12 +55,12 @@ extern "C"
  * Macro to verify the validity of cbor operation or out of memory condition
  */
 #define VERIFY_CBOR_SUCCESS_OR_OUT_OF_MEMORY(log_tag, err, log_message) \
-    if ((CborNoError != (err)) && !(CborErrorOutOfMemory & (err))) \
+    if ((CborNoError != (CborError)(err)) && !(CborErrorOutOfMemory & (CborError)(err))) \
     { \
         if ((log_tag) && (log_message)) \
         { \
             OIC_LOG_V(ERROR, (log_tag), "%s with cbor error: \'%s\'.", \
-                    (log_message), (cbor_error_string(err))); \
+                    (log_message), (cbor_error_string((CborError)err))); \
         } \
         goto exit; \
     } \