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/corelib/serialization | |
| 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/corelib/serialization')
| -rw-r--r-- | src/corelib/serialization/qcborstream.cpp | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/src/corelib/serialization/qcborstream.cpp b/src/corelib/serialization/qcborstream.cpp index 8b7a1ee0c3..ce1b981f8f 100644 --- a/src/corelib/serialization/qcborstream.cpp +++ b/src/corelib/serialization/qcborstream.cpp @@ -58,12 +58,15 @@ QT_WARNING_DISABLE_GCC("-Wunused-function") QT_WARNING_DISABLE_CLANG("-Wunused-function") QT_WARNING_DISABLE_CLANG("-Wundefined-internal") QT_WARNING_DISABLE_MSVC(4334) // '<<': result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?) + +#define CBOR_ENCODER_NO_CHECK_USER + +#define CBOR_NO_VALIDATION_API 1 +#define CBOR_NO_PRETTY_API 1 #define CBOR_API static inline #define CBOR_PRIVATE_API static inline #define CBOR_INLINE_API static inline -#define CBOR_ENCODER_NO_CHECK_USER - #include <cbor.h> static CborError qt_cbor_encoder_write_callback(void *token, const void *data, size_t len, CborEncoderAppendType); @@ -97,26 +100,6 @@ static CborError _cbor_value_dup_string(const CborValue *, void **, size_t *, Cb Q_UNREACHABLE(); return CborErrorInternalError; } -static CborError cbor_value_to_pretty_stream(CborStreamFunction, void*, CborValue*, int) -{ - Q_UNREACHABLE(); - return CborErrorInternalError; -} -static CborError cbor_value_to_pretty_advance(FILE*, CborValue*) -{ - Q_UNREACHABLE(); - return CborErrorInternalError; -} -static CborError cbor_value_to_pretty_advance_flags(FILE *, CborValue *, int) -{ - Q_UNREACHABLE(); - return CborErrorInternalError; -} -static CborError cbor_value_validate(const CborValue *, int) -{ - Q_UNREACHABLE(); - return CborErrorInternalError; -} QT_WARNING_POP Q_DECLARE_TYPEINFO(CborEncoder, Q_PRIMITIVE_TYPE); |