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/03 13:07:18 UTC
[celix] 01/01: Merge pull request #324 from
apache/feature/gcc_4_9_0_fixes
This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/celix.git
commit fecab50d37f4128e3fdbf8a6715354fb08097e90
Merge: 7a0cc48 5ac6c8d
Author: Pepijn Noltes <pe...@gmail.com>
AuthorDate: Wed Mar 3 14:07:07 2021 +0100
Merge pull request #324 from apache/feature/gcc_4_9_0_fixes
Feature/gcc 4 9 0 fixes
CMakeLists.txt | 2 +
bundles/shell/shell/CMakeLists.txt | 29 +++++++-------
examples/celix-examples/CMakeLists.txt | 16 ++++----
examples/celix-examples/README.md | 22 -----------
libs/framework/benchmark/CMakeLists.txt | 3 +-
libs/framework/benchmark/src/BenchmarkMain.cc | 3 ++
.../benchmark/src/LookupServicesBenchmark.cc | 16 ++++++--
libs/framework/include/celix/Bundle.h | 2 +-
libs/framework/include/celix/BundleActivator.h | 1 +
libs/framework/include/celix/Properties.h | 46 ++++++++++++++++++++--
libs/framework/include/celix/Trackers.h | 5 +--
libs/framework/include/celix/Utils.h | 8 ++++
libs/promises/CMakeLists.txt | 3 +-
13 files changed, 98 insertions(+), 58 deletions(-)