Repository: celix Updated Branches: refs/heads/develop 0aa1f0bec -> e22e05531
CELIX-370: Fixes some small compiler issues Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/e22e0553 Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/e22e0553 Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/e22e0553 Branch: refs/heads/develop Commit: e22e05531ca813437995262cf208c744e51d3fb0 Parents: 0aa1f0b Author: Pepijn Noltes <[email protected]> Authored: Fri Jun 23 16:19:28 2017 +0200 Committer: Pepijn Noltes <[email protected]> Committed: Fri Jun 23 16:19:28 2017 +0200 ---------------------------------------------------------------------- dependency_manager_cxx/include/celix/dm/DmActivator.h | 12 ++++++------ utils/public/include/hash_map.h | 7 +++++-- utils/public/include/properties.h | 1 + 3 files changed, 12 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/e22e0553/dependency_manager_cxx/include/celix/dm/DmActivator.h ---------------------------------------------------------------------- diff --git a/dependency_manager_cxx/include/celix/dm/DmActivator.h b/dependency_manager_cxx/include/celix/dm/DmActivator.h index ba27b7a..32b49e2 100644 --- a/dependency_manager_cxx/include/celix/dm/DmActivator.h +++ b/dependency_manager_cxx/include/celix/dm/DmActivator.h @@ -30,7 +30,7 @@ namespace celix { namespace dm { class DmActivator { public: - DmActivator(DependencyManager& m) : ctx{m.bundleContext()}, mng{m} {} + DmActivator(DependencyManager& m) : mng(m), ctx{m.bundleContext()} {} virtual ~DmActivator() = default; DmActivator(const DmActivator&) = delete; @@ -65,8 +65,8 @@ namespace celix { namespace dm { static DmActivator* create(DependencyManager& mng); protected: - bundle_context_pt ctx; DependencyManager& mng; + bundle_context_pt ctx; private: dm_info_service_t info{}; service_registration_pt reg{nullptr}; @@ -101,10 +101,10 @@ namespace celix { namespace dm { return status; } - friend celix_status_t ::bundleActivator_create(bundle_context_pt, void**); - friend celix_status_t ::bundleActivator_start(void*, bundle_context_pt); - friend celix_status_t ::bundleActivator_stop(void*, bundle_context_pt); - friend celix_status_t ::bundleActivator_destroy(void*, bundle_context_pt); + friend int ::bundleActivator_create(::bundle_context_pt, void**); + friend int ::bundleActivator_start(void*, ::bundle_context_pt); + friend int ::bundleActivator_stop(void*, ::bundle_context_pt); + friend int ::bundleActivator_destroy(void*, ::bundle_context_pt); }; }} http://git-wip-us.apache.org/repos/asf/celix/blob/e22e0553/utils/public/include/hash_map.h ---------------------------------------------------------------------- diff --git a/utils/public/include/hash_map.h b/utils/public/include/hash_map.h index 1ec58ad..28d386b 100644 --- a/utils/public/include/hash_map.h +++ b/utils/public/include/hash_map.h @@ -34,8 +34,11 @@ extern "C" { #endif -typedef struct hashMapEntry *hash_map_entry_pt; -typedef struct hashMap *hash_map_pt; +typedef struct hashMapEntry* hash_map_entry_pt; +typedef struct hasMapEntry hash_map_entry_t; + +typedef struct hashMap* hash_map_pt; +typedef struct hashMap hash_map_t; struct hashMapIterator { hash_map_pt map; http://git-wip-us.apache.org/repos/asf/celix/blob/e22e0553/utils/public/include/properties.h ---------------------------------------------------------------------- diff --git a/utils/public/include/properties.h b/utils/public/include/properties.h index b32197a..cf93ca0 100644 --- a/utils/public/include/properties.h +++ b/utils/public/include/properties.h @@ -36,6 +36,7 @@ extern "C" { #endif typedef hash_map_pt properties_pt; +typedef hash_map_t properties_t; UTILS_EXPORT properties_pt properties_create(void);
