diff --git a/Doc/一体化二进制数据包软件详细设计说明-V1.0.docx b/Doc/一体化二进制数据包软件详细设计说明-V1.0.docx index 5064a6d..e506168 100644 Binary files a/Doc/一体化二进制数据包软件详细设计说明-V1.0.docx and b/Doc/一体化二进制数据包软件详细设计说明-V1.0.docx differ diff --git a/Release/database/XNSim.db b/Release/database/XNSim.db index 20de98e..add6004 100644 Binary files a/Release/database/XNSim.db and b/Release/database/XNSim.db differ diff --git a/Release/include/XNMonitor/TopicManager.h b/Release/include/XNMonitor/TopicManager.h index 3e3cf81..231c97e 100644 --- a/Release/include/XNMonitor/TopicManager.h +++ b/Release/include/XNMonitor/TopicManager.h @@ -286,12 +286,12 @@ private: /** * @brief 单例指针 */ - static TopicManager *instance; + inline static TopicManager *instance{nullptr}; /** * @brief 单例互斥锁 */ - static std::mutex instanceMutex; + inline static std::mutex instanceMutex{}; /** * @brief 参与者 diff --git a/XNMonitorServer/CMakeLists.txt b/XNMonitorServer/CMakeLists.txt index a57eae7..d9e9021 100644 --- a/XNMonitorServer/CMakeLists.txt +++ b/XNMonitorServer/CMakeLists.txt @@ -29,7 +29,6 @@ find_package(SQLite3 REQUIRED) add_library(XNMonitorServer SHARED XNMonitorServer_global.h TopicManager.h - TopicManager.cpp XNDataReaderListenerImpl.h TypeDefine.h XNMonitorInterface.h diff --git a/XNMonitorServer/TopicManager.cpp b/XNMonitorServer/TopicManager.cpp deleted file mode 100755 index 9dc57fa..0000000 --- a/XNMonitorServer/TopicManager.cpp +++ /dev/null @@ -1,16 +0,0 @@ -/** - * @file TopicManager.cpp - * @author jinchao - * @brief 主题管理类 - * @version 1.0 - * @date 2025-03-10 - * - * @copyright Copyright (c) 2025 COMAC - * - */ -#include "TopicManager.h" - -// 静态成员变量定义 -TopicManager *TopicManager::instance = nullptr; -// 互斥锁 -std::mutex TopicManager::instanceMutex; \ No newline at end of file diff --git a/XNMonitorServer/TopicManager.h b/XNMonitorServer/TopicManager.h index 3e3cf81..231c97e 100755 --- a/XNMonitorServer/TopicManager.h +++ b/XNMonitorServer/TopicManager.h @@ -286,12 +286,12 @@ private: /** * @brief 单例指针 */ - static TopicManager *instance; + inline static TopicManager *instance{nullptr}; /** * @brief 单例互斥锁 */ - static std::mutex instanceMutex; + inline static std::mutex instanceMutex{}; /** * @brief 参与者