Merge branch 'develop' of http://139.9.88.116:3000/r/module/open-license-ma...

nancy.liao

2025-05-29 8d405b265285c368df2e9cf1c14acee7532e0ee7

Merge branch 'develop' of http://139.9.88.116:3000/r/module/open-license-manager into develop

 src/library/base/base64.h

@@ -7,6 +7,7 @@
#if _WIN32
#include <wtypes.h>
#endif
#include <cstdint>

namespace license {


 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 {

 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