diff --git a/executor/cpp-common/CMakeLists.txt b/executor/cpp-common/CMakeLists.txt index bfe08062..0d48cb85 100644 --- a/executor/cpp-common/CMakeLists.txt +++ b/executor/cpp-common/CMakeLists.txt @@ -23,10 +23,11 @@ add_library(deepx_common SHARED find_package(yaml-cpp REQUIRED) -target_link_libraries(deepx_common - PUBLIC - yaml-cpp -) +if (TARGET yaml-cpp::yaml-cpp) + target_link_libraries(deepx_common PUBLIC yaml-cpp::yaml-cpp) +else() + target_link_libraries(deepx_common PUBLIC yaml-cpp) +endif() target_include_directories(deepx_common PUBLIC $ diff --git a/executor/cpp-common/src/client/udpserver.cpp b/executor/cpp-common/src/client/udpserver.cpp index 44759d42..7c5d4e46 100644 --- a/executor/cpp-common/src/client/udpserver.cpp +++ b/executor/cpp-common/src/client/udpserver.cpp @@ -14,7 +14,7 @@ namespace client { if (sockfd > 0) { - close(sockfd); + ::close(sockfd); } } void udpserver::start(queue &queue) @@ -33,16 +33,16 @@ namespace client servaddr.sin_addr.s_addr = INADDR_ANY; servaddr.sin_port = htons(port); - if (bind(sockfd, (const struct sockaddr *)&servaddr, sizeof(servaddr)) < 0) + if (::bind(sockfd, (const struct sockaddr *)&servaddr, (socklen_t)sizeof(servaddr)) < 0) { perror("bind failed"); - close(sockfd); + ::close(sockfd); exit(EXIT_FAILURE); } while (true) { len = sizeof(cliaddr); - n = recvfrom(sockfd, buffer, sizeof(buffer), 0, (struct sockaddr *)&cliaddr, &len); + n = ::recvfrom(sockfd, buffer, sizeof(buffer), 0, (struct sockaddr *)&cliaddr, &len); buffer[n] = '\0'; // 新增换行拆分逻辑 @@ -57,10 +57,10 @@ namespace client } } } - close(sockfd); + ::close(sockfd); } void udpserver::resp(string str){ - sendto(sockfd, str.c_str(), str.size(), 0, // 改为sendto + ::sendto(sockfd, str.c_str(), str.size(), 0, // 改为sendto (const struct sockaddr *)&cliaddr, sizeof(cliaddr)); } } \ No newline at end of file diff --git a/executor/cpp-common/src/deepx/shape_range.cpp b/executor/cpp-common/src/deepx/shape_range.cpp index 45d12320..bd5e2885 100644 --- a/executor/cpp-common/src/deepx/shape_range.cpp +++ b/executor/cpp-common/src/deepx/shape_range.cpp @@ -4,7 +4,6 @@ #include #include -#include #include "deepx/shape.hpp" namespace deepx {