You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pn...@apache.org on 2021/03/01 18:30:07 UTC
[celix] 02/04: Small fix needed for gcc 4.9.0
This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch feature/gcc_4_9_0_fixes
in repository https://gitbox.apache.org/repos/asf/celix.git
commit 81f1a9db18f19665a5832e0db94b39db90f4e1fe
Author: Pepijn Noltes <pe...@gmail.com>
AuthorDate: Mon Mar 1 19:13:17 2021 +0100
Small fix needed for gcc 4.9.0
---
libs/framework/include/celix/Bundle.h | 2 +-
libs/framework/include/celix/Trackers.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libs/framework/include/celix/Bundle.h b/libs/framework/include/celix/Bundle.h
index f1516d8..a1e97b8 100644
--- a/libs/framework/include/celix/Bundle.h
+++ b/libs/framework/include/celix/Bundle.h
@@ -35,7 +35,7 @@ namespace celix {
*/
class Bundle {
public:
- explicit Bundle(celix_bundle_t *_cBnd) : cBnd{_cBnd, [](celix_bundle_t*){/*nop*/}}{}
+ explicit Bundle(celix_bundle_t* _cBnd) : cBnd{_cBnd, [](celix_bundle_t*){/*nop*/}}{}
/**
* @brief get the bundle id.
diff --git a/libs/framework/include/celix/Trackers.h b/libs/framework/include/celix/Trackers.h
index d39a0b9..77f9114 100644
--- a/libs/framework/include/celix/Trackers.h
+++ b/libs/framework/include/celix/Trackers.h
@@ -449,7 +449,7 @@ namespace celix {
long svcRanking = celix_properties_getAsLong(cProps, OSGI_FRAMEWORK_SERVICE_RANKING, 0);
auto svc = std::shared_ptr<I>{static_cast<I*>(voidSvc), [](I*){/*nop*/}};
auto props = celix::Properties::wrap(cProps);
- auto owner = std::make_shared<const celix::Bundle>(const_cast<celix_bundle_t*>(cBnd));
+ auto owner = std::shared_ptr<celix::Bundle>{new celix::Bundle{const_cast<celix_bundle_t*>(cBnd)}};
return std::make_shared<SvcEntry>(svcId, svcRanking, svc, props, owner);
}