GZHM/HM-SPMS
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ref]同步711

Browse Source
This commit is contained in:
shi_jq 2025-03-13 11:04:16 +08:00
parent 5f9e992d7c
commit 6ca6b3d204
5 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
product/src/dbms/db_save_cloud_platform/CDbSaveServiceThread.cpp
View File

@ -1,7 +1,19 @@
 
#include "boost/typeof/typeof.hpp" #include "boost/typeof/typeof.hpp"
//< 屏蔽xml_parser编译告警
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-copy"
#endif
#include "boost/property_tree/xml_parser.hpp" #include "boost/property_tree/xml_parser.hpp"
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
#include "Common.h" #include "Common.h"
#include "MessageChannel.h" #include "MessageChannel.h"
#include "pub_logger_api/logger.h" #include "pub_logger_api/logger.h"

4
product/src/dbms/db_save_cloud_platform/COStreamFile.cpp
View File

@ -101,8 +101,8 @@ void COStreamFile::writeMsg( const std::string &strData )
} }
uint64 ullSize = cn_check_mask | strData.size(); uint64 ullSize = cn_check_mask | strData.size();
m_pStream->WriteLittleEndian64( ullSize ); m_pStream->WriteLittleEndian64( ullSize );
LOGDEBUG( "write little endian64 %llu", ( unsigned long long ) strData.size()); LOGDEBUG( "write little endian64 %d", strData.size());
m_pStream->WriteRaw(( const void * ) strData.data(), strData.size()); m_pStream->WriteRaw(( const void * ) strData.data(), static_cast<int>(strData.size()));
} }
} //< namespace iot_dbms } //< namespace iot_dbms

6
product/src/dbms/db_save_cloud_platform/db_save_cloud_platform.pro
View File

@ -1,3 +1,9 @@
# ARM板上资源有限，不会与云平台混用，不编译
message("Compile only in x86 environment")
# requires(contains(QMAKE_HOST.arch, x86_64))
requires(!contains(QMAKE_HOST.arch, aarch64):!linux-aarch64*)
QT -= gui QT -= gui
QT += sql QT += sql

11
product/src/dbms/tsdb_save_cloud_platform/CNodeMng.cpp
View File

@ -8,8 +8,19 @@
**********************************************************************************/ **********************************************************************************/
#include "boost/typeof/typeof.hpp" #include "boost/typeof/typeof.hpp"
//< 屏蔽xml_parser编译告警
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-copy"
#endif
#include "boost/property_tree/xml_parser.hpp" #include "boost/property_tree/xml_parser.hpp"
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
#include "pub_logger_api/logger.h" #include "pub_logger_api/logger.h"
#include "pub_sysinfo_api/SysInfoApi.h" #include "pub_sysinfo_api/SysInfoApi.h"
#include "pub_utility_api/FileUtil.h" #include "pub_utility_api/FileUtil.h"

5
product/src/dbms/tsdb_save_cloud_platform/tsdb_save_cloud_platform.pro
View File

@ -1,4 +1,9 @@
# ARM板上资源有限，不会与云平台混用，不编译
message("Compile only in x86 environment")
# requires(contains(QMAKE_HOST.arch, x86_64))
requires(!contains(QMAKE_HOST.arch, aarch64))
QT -= gui core QT -= gui core
CONFIG -= qt CONFIG -= qt