Browse Source

#IQBX #comment 自检编译通过

80374374 1 year ago
parent
commit
332f50b562

+ 1 - 0
Module/mod_selfchecker/SelfCheckerFSM.cpp

@@ -668,6 +668,7 @@ void CSelfCheckerFSM::LogActionProcess(const char* pszEntityName, ErrorCodeEnum
 			break;
 		}
 		break;
+		///*TODO: cannot access (80374374@11/23/2023)*/
 		osTimes++;
 		powerTimes++;
 		spConfig->WriteConfigValueInt(pszEntityName, "OsRestart", osTimes);

+ 6 - 2
Module/mod_selfchecker/SelfCheckerFSM.h

@@ -96,7 +96,7 @@ struct EntityRunInfo
 	int eState;
 	int eTest;
 	int loadOpt;
-	int memoryHighCount;//´Ë±äÁ¿·ÏÆúʹÓÃ
+	int memoryHighCount;//此��废弃使用
 	int cpuRatio;
 	FILETIME prevSysKernel, prevSysUser;
 	FILETIME prevProcKernel, prevProcUser;
@@ -118,7 +118,11 @@ struct EntityCfg
 struct EntityNameCompare
 {
 public:
-	bool operator()(const std::string x, const std::string y)
+	bool operator()(std::string x, std::string y)
+	{
+		return x.compare(y) < 0;
+	}
+	bool operator()(const std::string x, const std::string y) const 
 	{
 		return x.compare(y) < 0;
 	}

+ 1 - 1
Other/win/libfilecryption/CMakeLists.txt

@@ -28,7 +28,7 @@ target_link_directories(${MODULE_NAME} PRIVATE
     ${CONAN_LIB_DIRS_LIBKYSM}
 )
 set(${MODULE_PREFIX}_LIBS ${CONAN_PKG_LIBS_LIBKYSM})
-target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
+target_link_libraries(${MODULE_NAME} PRIVATE ${${MODULE_PREFIX}_LIBS})
 
 if(MSVC)
 	install(TARGETS ${MODULE_NAME}