diff options
| author | CoprDistGit <infra@openeuler.org> | 2025-03-04 12:23:00 +0000 |
|---|---|---|
| committer | CoprDistGit <infra@openeuler.org> | 2025-03-04 12:23:00 +0000 |
| commit | 434d8166bff360cdb7039326bb617ebaca98face (patch) | |
| tree | 1b0333fc674186afc80e2193efebadf8d521d51f /0140-remove-meaningless-code.patch | |
| parent | 2ccdcb50a81459161cf6b42f0b45c2b86e1bbf76 (diff) | |
automatic import of iSuladopeneuler22.03_LTS
Diffstat (limited to '0140-remove-meaningless-code.patch')
| -rw-r--r-- | 0140-remove-meaningless-code.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/0140-remove-meaningless-code.patch b/0140-remove-meaningless-code.patch new file mode 100644 index 0000000..136e541 --- /dev/null +++ b/0140-remove-meaningless-code.patch @@ -0,0 +1,38 @@ +From e7778ed261d2550ea6e2179b856d0ee22241b858 Mon Sep 17 00:00:00 2001 +From: zhongtao <zhongtao17@huawei.com> +Date: Mon, 14 Oct 2024 20:42:58 +0800 +Subject: [PATCH 149/149] remove meaningless code + +Signed-off-by: zhongtao <zhongtao17@huawei.com> +--- + src/daemon/entry/cri/v1/v1_cri_runtime_service_impl.cc | 1 - + src/daemon/entry/cri/v1/v1_cri_runtime_service_impl.h | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/src/daemon/entry/cri/v1/v1_cri_runtime_service_impl.cc b/src/daemon/entry/cri/v1/v1_cri_runtime_service_impl.cc +index 56c89c1e..23b620c3 100644 +--- a/src/daemon/entry/cri/v1/v1_cri_runtime_service_impl.cc ++++ b/src/daemon/entry/cri/v1/v1_cri_runtime_service_impl.cc +@@ -24,7 +24,6 @@ CRIRuntimeServiceImpl::CRIRuntimeServiceImpl(const std::string &podSandboxImage, + , m_containerManager(new ContainerManagerService(cb)) + , m_podSandboxManager(new PodSandboxManagerService(podSandboxImage, cb, pluginManager, enablePodEvents)) + , m_runtimeManager(new RuntimeManagerService(cb, pluginManager)) +- , m_enablePodEvents(enablePodEvents) + { + } + +diff --git a/src/daemon/entry/cri/v1/v1_cri_runtime_service_impl.h b/src/daemon/entry/cri/v1/v1_cri_runtime_service_impl.h +index 33539a32..1d399a85 100644 +--- a/src/daemon/entry/cri/v1/v1_cri_runtime_service_impl.h ++++ b/src/daemon/entry/cri/v1/v1_cri_runtime_service_impl.h +@@ -104,7 +104,6 @@ protected: + private: + std::string m_podSandboxImage; + std::shared_ptr<Network::PluginManager> m_pluginManager { nullptr }; +- [[maybe_unused]] bool m_enablePodEvents; + }; + } // namespace CRIV1 + #endif // DAEMON_ENTRY_CRI_V1_CRI_RUNTIME_SERVICE_IMPL_H +-- +2.25.1 + |