From 6ca6b3d2042b69c7ae2c3efa9255cc2e7214e6a2 Mon Sep 17 00:00:00 2001 From: shi_jq Date: Thu, 13 Mar 2025 11:04:16 +0800 Subject: [PATCH] =?UTF-8?q?[ref]=E5=90=8C=E6=AD=A5711?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db_save_cloud_platform/CDbSaveServiceThread.cpp | 12 ++++++++++++ .../src/dbms/db_save_cloud_platform/COStreamFile.cpp | 6 +++--- .../db_save_cloud_platform.pro | 6 ++++++ .../src/dbms/tsdb_save_cloud_platform/CNodeMng.cpp | 11 +++++++++++ .../tsdb_save_cloud_platform.pro | 5 +++++ 5 files changed, 37 insertions(+), 3 deletions(-) diff --git a/product/src/dbms/db_save_cloud_platform/CDbSaveServiceThread.cpp b/product/src/dbms/db_save_cloud_platform/CDbSaveServiceThread.cpp index 8e51ebe0..20b5f524 100644 --- a/product/src/dbms/db_save_cloud_platform/CDbSaveServiceThread.cpp +++ b/product/src/dbms/db_save_cloud_platform/CDbSaveServiceThread.cpp @@ -1,7 +1,19 @@  #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" + +#ifdef __GNUC__ +#pragma GCC diagnostic pop +#endif + #include "Common.h" #include "MessageChannel.h" #include "pub_logger_api/logger.h" diff --git a/product/src/dbms/db_save_cloud_platform/COStreamFile.cpp b/product/src/dbms/db_save_cloud_platform/COStreamFile.cpp index c37f854a..e5801e5a 100644 --- a/product/src/dbms/db_save_cloud_platform/COStreamFile.cpp +++ b/product/src/dbms/db_save_cloud_platform/COStreamFile.cpp @@ -101,8 +101,8 @@ void COStreamFile::writeMsg( const std::string &strData ) } uint64 ullSize = cn_check_mask | strData.size(); m_pStream->WriteLittleEndian64( ullSize ); - LOGDEBUG( "write little endian64 %llu", ( unsigned long long ) strData.size()); - m_pStream->WriteRaw(( const void * ) strData.data(), strData.size()); + LOGDEBUG( "write little endian64 %d", strData.size()); + m_pStream->WriteRaw(( const void * ) strData.data(), static_cast(strData.size())); } -} //< namespace iot_dbms \ No newline at end of file +} //< namespace iot_dbms diff --git a/product/src/dbms/db_save_cloud_platform/db_save_cloud_platform.pro b/product/src/dbms/db_save_cloud_platform/db_save_cloud_platform.pro index ac1ece08..f041a3e0 100644 --- a/product/src/dbms/db_save_cloud_platform/db_save_cloud_platform.pro +++ b/product/src/dbms/db_save_cloud_platform/db_save_cloud_platform.pro @@ -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 += sql diff --git a/product/src/dbms/tsdb_save_cloud_platform/CNodeMng.cpp b/product/src/dbms/tsdb_save_cloud_platform/CNodeMng.cpp index 5447a2ea..e9f7934d 100644 --- a/product/src/dbms/tsdb_save_cloud_platform/CNodeMng.cpp +++ b/product/src/dbms/tsdb_save_cloud_platform/CNodeMng.cpp @@ -8,8 +8,19 @@ **********************************************************************************/ #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" +#ifdef __GNUC__ +#pragma GCC diagnostic pop +#endif + #include "pub_logger_api/logger.h" #include "pub_sysinfo_api/SysInfoApi.h" #include "pub_utility_api/FileUtil.h" diff --git a/product/src/dbms/tsdb_save_cloud_platform/tsdb_save_cloud_platform.pro b/product/src/dbms/tsdb_save_cloud_platform/tsdb_save_cloud_platform.pro index be2ac957..c5be9eab 100644 --- a/product/src/dbms/tsdb_save_cloud_platform/tsdb_save_cloud_platform.pro +++ b/product/src/dbms/tsdb_save_cloud_platform/tsdb_save_cloud_platform.pro @@ -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 CONFIG -= qt