diff --git a/tests/encoder/encoder.pro b/tests/encoder/encoder.pro index 62d9b7e4..180f0d78 100644 --- a/tests/encoder/encoder.pro +++ b/tests/encoder/encoder.pro @@ -3,6 +3,8 @@ SOURCES += tst_encoder.cpp CONFIG += testcase parallel_test c++11 QT = core testlib +DEFINES += QT_NO_FOREACH QT_NO_AS_CONST + INCLUDEPATH += ../../src msvc: POST_TARGETDEPS = ../../lib/tinycbor.lib else: POST_TARGETDEPS += ../../lib/libtinycbor.a diff --git a/tests/encoder/tst_encoder.cpp b/tests/encoder/tst_encoder.cpp index 31c29152..61ce9c99 100644 --- a/tests/encoder/tst_encoder.cpp +++ b/tests/encoder/tst_encoder.cpp @@ -29,6 +29,19 @@ #include #endif +#include +namespace t17 { +#ifdef __cpp_lib_as_const + using std::as_const; +#else + template + constexpr typename std::add_const::type &as_const(T &t) noexcept { return t; } + // prevent rvalue arguments: + template + void as_const(const T &&) = delete; +#endif // __cpp_lib_as_const +} // namespace t17 + Q_DECLARE_METATYPE(CborError) namespace QTest { template<> char *toString(const CborError &err) @@ -153,7 +166,7 @@ CborError encodeVariant(CborEncoder *encoder, const QVariant &v) CborError err = cbor_encoder_create_array(encoder, &sub, len); if (err && !isOomError(err)) return err; - foreach (const QVariant &v2, list) { + for (const QVariant &v2 : t17::as_const(list)) { err = static_cast(err | encodeVariant(&sub, v2)); if (err && !isOomError(err)) return err;