Repository: celix Updated Branches: refs/heads/develop 6c158a378 -> 976026c44
CELIX-438: Removes usage of a deprecated function and update some struct initializations. Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/976026c4 Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/976026c4 Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/976026c4 Branch: refs/heads/develop Commit: 976026c446caafac57072c47341987c65144c7e6 Parents: 6c158a3 Author: Pepijn Noltes <[email protected]> Authored: Sun Dec 2 09:39:04 2018 +0100 Committer: Pepijn Noltes <[email protected]> Committed: Sun Dec 2 09:39:04 2018 +0100 ---------------------------------------------------------------------- libs/framework/include/celix/dm/ServiceDependency_Impl.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/976026c4/libs/framework/include/celix/dm/ServiceDependency_Impl.h ---------------------------------------------------------------------- diff --git a/libs/framework/include/celix/dm/ServiceDependency_Impl.h b/libs/framework/include/celix/dm/ServiceDependency_Impl.h index 5254728..67f7657 100644 --- a/libs/framework/include/celix/dm/ServiceDependency_Impl.h +++ b/libs/framework/include/celix/dm/ServiceDependency_Impl.h @@ -59,7 +59,7 @@ CServiceDependency<T,I>& CServiceDependency<T,I>::setAddLanguageFilter(bool addL // if (!this->valid) { // *this; // } - serviceDependency_setAddCLanguageFilter(this->cServiceDependency(), addLang); + celix_serviceDependency_setAddCLanguageFilter(this->cServiceDependency(), addLang); this->setupService(); return *this; }; @@ -182,7 +182,8 @@ void CServiceDependency<T,I>::setupCallbacks() { }; } celix_dmServiceDependency_setCallbackHandle(this->cServiceDependency(), this); - celix_dm_service_dependency_callback_options_t opts{}; + celix_dm_service_dependency_callback_options_t opts; + std::memset(&opts, 0, sizeof(opts)); opts.addWithProps = cadd; opts.removeWithProps = crem; opts.setWithProps = cset; @@ -438,7 +439,8 @@ void ServiceDependency<T,I>::setupCallbacks() { } celix_dmServiceDependency_setCallbackHandle(this->cServiceDependency(), this); - celix_dm_service_dependency_callback_options_t opts{}; + celix_dm_service_dependency_callback_options_t opts; + std::memset(&opts, 0, sizeof(opts)); opts.setWithProps = cset; opts.addWithProps = cadd; opts.removeWithProps = crem;
