This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch feature/CELIX-426-cxx-api
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to refs/heads/feature/CELIX-426-cxx-api by
this push:
new ce09837 CELIX-438: Updates travis config to use ubuntu Xenial
ce09837 is described below
commit ce098375b6e831c07b77a74da7b052fb42b38948
Author: Pepijn Noltes <[email protected]>
AuthorDate: Wed Dec 12 20:45:11 2018 +0100
CELIX-438: Updates travis config to use ubuntu Xenial
---
.travis.yml | 4 ++--
libs/framework/include/celix/BundleActivator.h | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index ff86367..368890b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,10 +19,10 @@ env:
matrix:
include:
- os: linux
- dist: trusty
+ dist: xenial
compiler: gcc
- os: linux
- dist: trusty
+ dist: xenial
compiler: clang
- os: osx
osx_image: xcode7.3
diff --git a/libs/framework/include/celix/BundleActivator.h
b/libs/framework/include/celix/BundleActivator.h
index 7c36448..62cbdd4 100644
--- a/libs/framework/include/celix/BundleActivator.h
+++ b/libs/framework/include/celix/BundleActivator.h
@@ -79,23 +79,23 @@ namespace celix {
* adapt the C bundle activator calls to the provided C++ bundle activator
class.
*/
#define CELIX_GEN_CXX_BUNDLE_ACTIVATOR(clazz)
\
-extern "C" celix_status_t bundleActivator_create(celix_bundle_context_t
*c_ctx, void **userData) { \
+extern "C" celix_status_t celix_bundleActivator_create(celix_bundle_context_t
*c_ctx, void **userData) { \
auto *data = new celix::BundleActivatorAdapter<clazz>{c_ctx};
\
*userData = data;
\
return CELIX_SUCCESS;
\
}
\
\
-extern "C" celix_status_t bundleActivator_start(void *userData,
celix_bundle_context_t *) { \
+extern "C" celix_status_t celix_bundleActivator_start(void *userData,
celix_bundle_context_t *) { \
auto *data = static_cast<celix::BundleActivatorAdapter<clazz>*>(userData);
\
return data->start();
\
}
\
\
-extern "C" celix_status_t bundleActivator_stop(void *userData,
celix_bundle_context_t *) { \
+extern "C" celix_status_t celix_bundleActivator_stop(void *userData,
celix_bundle_context_t *) { \
auto *data = static_cast<celix::BundleActivatorAdapter<clazz>*>(userData);
\
return data->stop();
\
}
\
\
-extern "C" celix_status_t bundleActivator_destroy(void *userData,
celix_bundle_context_t*) { \
+extern "C" celix_status_t celix_bundleActivator_destroy(void *userData,
celix_bundle_context_t*) { \
auto *data = static_cast<celix::BundleActivatorAdapter<clazz>*>(userData);
\
delete data;
\
return CELIX_SUCCESS;
\
