This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to refs/heads/develop by this push:
new 27d240b CELIX-426: Updates travis config to use the (current) default
osx image
27d240b is described below
commit 27d240bfacfb1b69144ab0cf8a9534d17bed28fa
Author: Pepijn Noltes <[email protected]>
AuthorDate: Fri Apr 26 21:37:19 2019 +0200
CELIX-426: Updates travis config to use the (current) default osx image
---
.travis.yml | 3 +--
examples/celix-examples/dm_example_cxx/phase3/src/Phase3Activator.h | 1 +
.../celix-examples/dm_example_cxx/phase3/src/Phase3BaseActivator.h | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 8d2adb4..7af9b80 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,9 +25,8 @@ matrix:
dist: trusty
compiler: clang
- os: osx
- osx_image: xcode7.3
+ osx_image: xcode9.4
compiler: clang
- env: MACOSX_DEPLOYMENT_TARGET=10.11
- os: linux
dist: trusty
compiler: gcc
diff --git
a/examples/celix-examples/dm_example_cxx/phase3/src/Phase3Activator.h
b/examples/celix-examples/dm_example_cxx/phase3/src/Phase3Activator.h
index fbb8ad3..74c86fb 100644
--- a/examples/celix-examples/dm_example_cxx/phase3/src/Phase3Activator.h
+++ b/examples/celix-examples/dm_example_cxx/phase3/src/Phase3Activator.h
@@ -27,6 +27,7 @@ using namespace celix::dm;
class Phase3Activator : public Phase3BaseActivator {
public:
Phase3Activator(std::shared_ptr<DependencyManager> mng);
+ virtual ~Phase3Activator() = default;
};
#endif //CELIX_PHASE2AACTIVATOR_H
diff --git
a/examples/celix-examples/dm_example_cxx/phase3/src/Phase3BaseActivator.h
b/examples/celix-examples/dm_example_cxx/phase3/src/Phase3BaseActivator.h
index 2eb6097..4c18b08 100644
--- a/examples/celix-examples/dm_example_cxx/phase3/src/Phase3BaseActivator.h
+++ b/examples/celix-examples/dm_example_cxx/phase3/src/Phase3BaseActivator.h
@@ -27,6 +27,7 @@ using namespace celix::dm;
class Phase3BaseActivator {
public:
Phase3BaseActivator(std::shared_ptr<DependencyManager> mng);
+ virtual ~Phase3BaseActivator() = default;
protected:
celix::dm::Component<Phase3Cmp>& cmp;
};