From 2ec17eb452cb7f5dbd987b175b55ea8909f7ffe6 Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Wed, 19 Sep 2018 14:51:01 +0200 Subject: Fix Windows compile errors Fixes missed occurrence. qopen62541utils.cpp(66): warning C4003: not enough actual parameters for macro 'max' qopen62541utils.cpp(66): error C2589: '(': illegal token on right side of '::' qopen62541utils.cpp(66): error C2059: syntax error: '::' qopen62541utils.cpp(68): error C2181: illegal else without matching if qopen62541utils.cpp(59): fatal error C1903: unable to recover from previous error(s); stopping compilation Change-Id: Ib8b123530e71f066f7f1939e3b776f2beeb58260 Reviewed-by: Maurice Kalinowski --- src/plugins/opcua/open62541/qopen62541valueconverter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/opcua/open62541/qopen62541valueconverter.cpp b/src/plugins/opcua/open62541/qopen62541valueconverter.cpp index 81091dd..f342a8e 100644 --- a/src/plugins/opcua/open62541/qopen62541valueconverter.cpp +++ b/src/plugins/opcua/open62541/qopen62541valueconverter.cpp @@ -474,7 +474,7 @@ QVariant arrayToQVariant(const UA_Variant &var, QMetaType::Type type) if (var.arrayDimensionsSize > 0) { // Ensure that the array dimensions fit in a QVector - if (var.arrayDimensionsSize > static_cast(std::numeric_limits::max())) + if (var.arrayDimensionsSize > static_cast((std::numeric_limits::max)())) return QOpcUa::QMultiDimensionalArray(); QVector arrayDimensions; std::copy(var.arrayDimensions, var.arrayDimensions+var.arrayDimensionsSize, std::back_inserter(arrayDimensions)); -- cgit v1.2.3