diff options
| author | Rainer Keller <Rainer.Keller@qt.io> | 2018-09-19 14:51:01 +0200 |
|---|---|---|
| committer | Rainer Keller <Rainer.Keller@qt.io> | 2018-09-20 14:00:38 +0000 |
| commit | 2ec17eb452cb7f5dbd987b175b55ea8909f7ffe6 (patch) | |
| tree | e40e512262c2d913a421c0fb1f931ac1f19c1dbc | |
| parent | 910751a66d0093f484fdda5838ae235229d83aa2 (diff) | |
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 <maurice.kalinowski@qt.io>
| -rw-r--r-- | src/plugins/opcua/open62541/qopen62541valueconverter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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<quint64>(std::numeric_limits<int>::max())) + if (var.arrayDimensionsSize > static_cast<quint64>((std::numeric_limits<int>::max)())) return QOpcUa::QMultiDimensionalArray(); QVector<quint32> arrayDimensions; std::copy(var.arrayDimensions, var.arrayDimensions+var.arrayDimensionsSize, std::back_inserter(arrayDimensions)); |