From 8d405b265285c368df2e9cf1c14acee7532e0ee7 Mon Sep 17 00:00:00 2001
From: nancy.liao <huihui.liao@greentest.com.cn>
Date: 周四, 29 5月 2025 18:14:38 +0800
Subject: [PATCH] Merge branch 'develop' of http://139.9.88.116:3000/r/module/open-license-manager into develop

---
 src/library/os/cpu_info.hpp       |    1 +
 src/library/base/base64.h         |    1 +
 src/library/os/linux/os_linux.cpp |    6 +++---
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/library/base/base64.h b/src/library/base/base64.h
index 466a263..65932c1 100644
--- a/src/library/base/base64.h
+++ b/src/library/base/base64.h
@@ -7,6 +7,7 @@
 #if _WIN32
 #include <wtypes.h>
 #endif
+#include <cstdint>
 
 namespace license {
 
diff --git a/src/library/os/cpu_info.hpp b/src/library/os/cpu_info.hpp
index c837493..edbe3c6 100644
--- a/src/library/os/cpu_info.hpp
+++ b/src/library/os/cpu_info.hpp
@@ -7,6 +7,7 @@
 
 #ifndef SRC_LIBRARY_OS_CPU_INFO_H_
 #define SRC_LIBRARY_OS_CPU_INFO_H_
+#include <cstdint>
 #include <string>
 namespace license {
 namespace os {
diff --git a/src/library/os/linux/os_linux.cpp b/src/library/os/linux/os_linux.cpp
index bbf4341..b0edb3c 100644
--- a/src/library/os/linux/os_linux.cpp
+++ b/src/library/os/linux/os_linux.cpp
@@ -17,9 +17,9 @@
 #include <mntent.h>
 #include <dirent.h>
 #include <sys/utsname.h>
-#ifndef NDEBUG
-#include <valgrind/memcheck.h>
-#endif
+// #ifndef NDEBUG
+// #include <valgrind/memcheck.h>
+// #endif
 
 //#ifdef USE_DISK_MODEL
 ///#define PARSE_ID_FUNC parse_disk_id

--
Gitblit v1.9.1