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 2019/01/07 20:12:08 UTC
[celix] 20/22: CELIX-438: Removes OSX (for now) from travis config
This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch feature/cxx
in repository https://gitbox.apache.org/repos/asf/celix.git
commit aeb19ff6696fe311d17bc4511a40aff83cfd1c74
Author: Pepijn Noltes <pe...@gmail.com>
AuthorDate: Mon Jan 7 17:05:55 2019 +0100
CELIX-438: Removes OSX (for now) from travis config
---
.travis.yml | 10 +++++-----
libs/framework_cxx/src/Framework.cc | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 843e946..dafc512 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,11 +20,11 @@ matrix:
dist: xenial
compiler: clang
language: cpp
- - os: osx
- osx_image: xcode7.3
- compiler: clang
- env: MACOSX_DEPLOYMENT_TARGET=10.11
- language: cpp
+ #- os: osx
+ #osx_image: xcode7.3
+ #compiler: clang
+ #env: MACOSX_DEPLOYMENT_TARGET=10.11
+ #language: cpp
- os: linux
dist: xenial
compiler: gcc
diff --git a/libs/framework_cxx/src/Framework.cc b/libs/framework_cxx/src/Framework.cc
index 1b3ab87..9128c0e 100644
--- a/libs/framework_cxx/src/Framework.cc
+++ b/libs/framework_cxx/src/Framework.cc
@@ -408,8 +408,8 @@ celix::Framework::~Framework() {
pimpl->waitForShutdown();
}
-celix::Framework::Framework(Framework &&rhs) = default;
-celix::Framework& celix::Framework::operator=(Framework&& rhs) = default;
+celix::Framework::Framework(Framework &&) = default;
+celix::Framework& celix::Framework::operator=(Framework&&) = default;
long celix::Framework::installBundle(