From e356be0380cefc234b0b33f6a337ad28c234455c Mon Sep 17 00:00:00 2001 From: Matthias Dornaus Date: Mon, 18 Sep 2023 13:38:27 +0200 Subject: [PATCH] Removed empty brackets. Changed Operator* to dereferenced pointer. Added check if NodeId is of BaseDataVariableType. --- DashboardClient/OpcUaTypeReader.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/DashboardClient/OpcUaTypeReader.cpp b/DashboardClient/OpcUaTypeReader.cpp index 11381d99..a80cb16c 100644 --- a/DashboardClient/OpcUaTypeReader.cpp +++ b/DashboardClient/OpcUaTypeReader.cpp @@ -134,9 +134,7 @@ } if (!node->SpecifiedChildNodes->empty()){ for (auto childNodesIterator = node->SpecifiedChildNodes->begin(); childNodesIterator != node->SpecifiedChildNodes->end(); childNodesIterator++){ - updateBaseDataVariableTypes(childNodesIterator.operator*()); - if ((childNodesIterator != node->SpecifiedChildNodes->end()) && (childNodesIterator != --node->SpecifiedChildNodes->end())) { - } + updateBaseDataVariableTypes(*childNodesIterator); } } } @@ -312,7 +310,9 @@ const std::weak_ptr &parent, ModelOpcUa::ModellingRule_t modellingRule, bool ofBaseDataVariableType) { - this->BaseDataVariableTypes.push_back(entry.NodeId); + if(ofBaseDataVariableType) { + this->BaseDataVariableTypes.push_back(entry.NodeId); + } bool isObjectType = ModelOpcUa::ObjectType == entry.NodeClass; bool isVariableType = ModelOpcUa::VariableType == entry.NodeClass; ModelOpcUa::StructureBiNode node(