!12 修复bug:metaDescriptor初始化时序无法保证

From: @yanansong 
Reviewed-by: @chrisshangguan 
Signed-off-by: @chrisshangguan
This commit is contained in:
openeuler-ci-bot 2023-10-28 01:24:18 +00:00 committed by Gitee
commit 3655492006
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 21 additions and 1 deletions

View File

@ -0,0 +1,15 @@
diff --git a/interfaces/innerkits/ipc_core/include/iremote_broker.h b/interfaces/innerkits/ipc_core/include/iremote_broker.h
index 7105ff7..692f4b0 100644
--- a/interfaces/innerkits/ipc_core/include/iremote_broker.h
+++ b/interfaces/innerkits/ipc_core/include/iremote_broker.h
@@ -50,8 +50,8 @@ public:
};
#define DECLARE_INTERFACE_DESCRIPTOR(DESCRIPTOR) \
- static inline const std::u16string metaDescriptor_ = { DESCRIPTOR }; \
- static inline const std::u16string &GetDescriptor() \
+ static constexpr const char16_t *metaDescriptor_ = { DESCRIPTOR }; \
+ static inline const std::u16string GetDescriptor() \
{ \
return metaDescriptor_; \
}

View File

@ -23,7 +23,7 @@
Name: distributed-utils
Version: 1.0.0
Release: 4
Release: 5
Summary: Distributed middleware used components.
License: Apache-2.0 and MIT
Url: https://gitee.com/openharmony/
@ -59,6 +59,7 @@ Patch10: 0010-adapt-for-build-mbedtls.patch
Patch11: 0011-remove-dependency-and-adapt-for-build-device_manager.patch
Patch12: 0012-remove-dependency-and-adapt-for-build-device_security_level.patch
Patch13: 0013-increase-the-pthread-stack-size-of-x86-and-other-env-dsoftbus.patch
Patch14: 0014-fixbug-metaDescriptor-for-ipc.patch
BuildRequires: python3-jinja2 python3-pyyaml cjson cjson-devel
BuildRequires: libatomic libicu-devel libxml2-devel openssl-devel
@ -115,6 +116,7 @@ rm -rf %{_builddir}/third_party/mbedtls/*
%patch11 -p1 -d %{device_manager_dir}
%patch12 -p1 -d %{device_security_level_dir}
%patch13 -p1 -d %{dsoftbus_dir}
%patch14 -p1 -d %{ipc_dir}
# build all components with build.sh
%build
@ -213,6 +215,9 @@ cp -rvf single_include/nlohmann %{buildroot}/%{_includedir}/nlohmann_json/single
/usr/bin/*
%changelog
* Fri Oct 27 2023 yanansong <songyanan5@huawei.com> - 1.0.0-5
- fixbug metaDescriptor initialization.
* Wed Jul 26 2023 Ge Wang <wang__ge@126.com> - 1.0.0-4
- add deficient component.