diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2018-07-02 23:38:48 -0700 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-18 11:37:03 +0000 |
| commit | 354842fbc148e26677d99693793bf5f89f18a085 (patch) | |
| tree | 0e3b216dad1f742feee7c79f73506fa75e94dc2b /src/3rdparty/tinycbor/src/cborinternal_p.h | |
| parent | 678b0cf6c3753ac72ca5c538cf24d70ff61c725d (diff) | |
Update TinyCBOR to 1b233087a6e6b6be297e69bfcce5ed36f338c91d
From the fork at https://github.com/thiagomacieira/tinycbor
Change-Id: I117816bf0f5e469b8d34fffd153dc88683051208
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/3rdparty/tinycbor/src/cborinternal_p.h')
| -rw-r--r-- | src/3rdparty/tinycbor/src/cborinternal_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/tinycbor/src/cborinternal_p.h b/src/3rdparty/tinycbor/src/cborinternal_p.h index 9546e44d61..8d77f28466 100644 --- a/src/3rdparty/tinycbor/src/cborinternal_p.h +++ b/src/3rdparty/tinycbor/src/cborinternal_p.h @@ -92,8 +92,8 @@ enum { static inline void copy_current_position(CborValue *dst, const CborValue *src) { - // This "if" is here for pedantry only: the two branches should perform - // the same memory operation. + /* This "if" is here for pedantry only: the two branches should perform + * the same memory operation. */ if (src->parser->flags & CborParserFlag_ExternalSource) dst->source.token = src->source.token; else |