Skip to content

Commit 3289c36

Browse files
committed
Remove fixing Mac OS to version 15 and remove warning for libxml2.
1 parent 4af92dc commit 3289c36

3 files changed

Lines changed: 2 additions & 4 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ set(CMAKE_CXX_STANDARD 20)
2727
set(CMAKE_CXX_STANDARD_REQUIRED ON)
2828
set(CMAKE_CXX_EXTENSIONS OFF)
2929
set(CXX_COMPILE_FEATURES cxx_std_20)
30-
set(CMAKE_OSX_DEPLOYMENT_TARGET 15.0)
3130

3231
project(cppagent LANGUAGES C CXX)
3332

‎conan/profiles/macos‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ include(default)
33
[settings]
44
compiler=apple-clang
55
compiler.cppstd=20
6-
os.version=15.0
76

87
[platform_tool_requires]
9-
cmake/>3.26.0
8+
cmake/>4.0
109

1110

1211

‎src/mtconnect/entity/xml_parser.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ namespace mtconnect::entity {
8181
auto count = xmlNodeDump(buf, child->doc, child, 0, 0);
8282
if (count > 0)
8383
{
84-
str << (const char*)buf->content;
84+
str << string((const char*)xmlBufferContent(buf), xmlBufferLength(buf));
8585
}
8686
xmlBufferFree(buf);
8787
}

0 commit comments

Comments
 (0)