From a3ae3106d895f9091b54140768b2cf9f8d1c68f5 Mon Sep 17 00:00:00 2001 From: Kai Huebl Date: Wed, 14 Sep 2022 10:20:29 +0200 Subject: [PATCH 1/3] fix empty tag value in type description --- src/OpcUaStackServer/NodeSet/NodeSetValueParser.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OpcUaStackServer/NodeSet/NodeSetValueParser.h b/src/OpcUaStackServer/NodeSet/NodeSetValueParser.h index 26c7f939a..8d7466276 100644 --- a/src/OpcUaStackServer/NodeSet/NodeSetValueParser.h +++ b/src/OpcUaStackServer/NodeSet/NodeSetValueParser.h @@ -168,7 +168,7 @@ namespace OpcUaStackServer boost::property_tree::ptree::iterator it; for (it = ptree.begin(); it!=ptree.end(); it++) { std::string tagValue = xmlns.cutPrefix(it->first); - if (tagValue == "") continue; + if (tagValue == "" || tagValue.empty()) continue; if (tagValue != element) { OpcUaStackCore::Log(OpcUaStackCore::Error, "Invalid tag") .parameter("ExpectedTag", element) From 57b155a3945fd4506e924a03b8a292c8e5dbfb54 Mon Sep 17 00:00:00 2001 From: Kai Huebl Date: Wed, 21 Dec 2022 21:23:41 +0100 Subject: [PATCH 2/3] fix some missing namespaces --- build.sh | 1 + src/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 267bfad31..8fd5c85da 100755 --- a/build.sh +++ b/build.sh @@ -105,6 +105,7 @@ build_local() cmake ${DEBUG_OUTPUT} \ ../src \ "${CMAKE_GENERATOR_LOCAL}" \ + #-DOPENSSL_ROOT_DIR=/opt/openssl/ \ -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" \ -DGIT_COMMIT="${GIT_COMMIT}" \ -DGIT_BRANCH="${GIT_BRANCH}" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fe9b79c87..7053ead89 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -18,7 +18,7 @@ set(BOOST_VERSION_MAJOR "1" CACHE STRING "boost major version") set(BOOST_VERSION_MINOR "65" CACHE STRING "boost minor version") set(OPENSSL_VERSION_MAJOR "1" CACHE STRING "major version") -set(OPENSSL_VERSION_MINOR "0" CACHE STRING "minor version") +set(OPENSSL_VERSION_MINOR "1" CACHE STRING "minor version") set(OPENSSL_VERSION_PATCH "0" CACHE STRING "patch version") # ----------------------------------------------------------------------------- @@ -129,7 +129,7 @@ message(STATUS " host system: ${CMAKE_HOST_SYSTEM}") # # ----------------------------------------------------------------------------- # ----------------------------------------------------------------------------- - if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") + if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") set(Boost_USE_DEBUG_LIBS ON) set(Boost_USE_RELEASE_LIBS OFF) else() From 283965638963eb86978d8446e4234a323edf068b Mon Sep 17 00:00:00 2001 From: Kai Huebl Date: Sun, 22 Jan 2023 16:48:49 +0100 Subject: [PATCH 3/3] remove comment --- build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/build.sh b/build.sh index 8fd5c85da..267bfad31 100755 --- a/build.sh +++ b/build.sh @@ -105,7 +105,6 @@ build_local() cmake ${DEBUG_OUTPUT} \ ../src \ "${CMAKE_GENERATOR_LOCAL}" \ - #-DOPENSSL_ROOT_DIR=/opt/openssl/ \ -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" \ -DGIT_COMMIT="${GIT_COMMIT}" \ -DGIT_BRANCH="${GIT_BRANCH}"