This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a commit to branch feature/macos-workflow-update in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to refs/heads/feature/macos-workflow-update by this push: new 3d1890a1f Remove unneeded comments 3d1890a1f is described below commit 3d1890a1fcdc9ba7e7d887b27cf6c8adc9b55e91 Author: Pepijn Noltes <pnol...@apache.org> AuthorDate: Sun Sep 14 19:50:24 2025 +0200 Remove unneeded comments --- conanfile.py | 2 -- libs/framework/include/celix/dm/Component_Impl.h | 1 - libs/framework/include/celix/dm/ServiceDependency_Impl.h | 1 - libs/promises/api/celix/Promise.h | 2 -- 4 files changed, 6 deletions(-) diff --git a/conanfile.py b/conanfile.py index 30f6d190a..8bf09911e 100644 --- a/conanfile.py +++ b/conanfile.py @@ -378,8 +378,6 @@ class CelixConan(ConanFile): # the following is workaround for https://github.com/conan-io/conan/issues/7192 if self.settings.os == "Linux": tc.cache_variables["CMAKE_EXE_LINKER_FLAGS"] = "-Wl,--unresolved-symbols=ignore-in-shared-libs" - #elif self.settings.os == "Macos": - # tc.cache_variables["CMAKE_EXE_LINKER_FLAGS"] = "-Wl,undefined -Wl,dynamic_lookup" v = Version(self.version) tc.cache_variables["CELIX_MAJOR"] = str(v.major.value) tc.cache_variables["CELIX_MINOR"] = str(v.minor.value) diff --git a/libs/framework/include/celix/dm/Component_Impl.h b/libs/framework/include/celix/dm/Component_Impl.h index f6b50ad6f..520c8e472 100644 --- a/libs/framework/include/celix/dm/Component_Impl.h +++ b/libs/framework/include/celix/dm/Component_Impl.h @@ -385,7 +385,6 @@ Component<T>& Component<T>::removeCallbacks() { template<class T> Component<T>& Component<T>::addContext(std::shared_ptr<void> context) { std::lock_guard<std::mutex> lock{mutex}; - //Removed superfluous 'template' keyword which triggered '-Wmissing-template-arg-list-after-template-kw' componentContexts.emplace_back(std::move(context)); return *this; } diff --git a/libs/framework/include/celix/dm/ServiceDependency_Impl.h b/libs/framework/include/celix/dm/ServiceDependency_Impl.h index 7af3c1978..4867db910 100644 --- a/libs/framework/include/celix/dm/ServiceDependency_Impl.h +++ b/libs/framework/include/celix/dm/ServiceDependency_Impl.h @@ -541,7 +541,6 @@ void ServiceDependency<T,I>::setupCallbacks() { std::weak_ptr<const celix::Properties> removedProps = it->second.second; dep->removeFpUsingSharedPtr(it->second.first, it->second.second); dep->addedServices.erase(it); - //Removed superfluous 'template' keyword (no explicit template args supplied) dep->waitForExpired(removedSvc, svcId, "service pointer"); dep->waitForExpired(removedProps, svcId, "service properties"); } diff --git a/libs/promises/api/celix/Promise.h b/libs/promises/api/celix/Promise.h index e4481ce51..5f85227e5 100644 --- a/libs/promises/api/celix/Promise.h +++ b/libs/promises/api/celix/Promise.h @@ -659,14 +659,12 @@ inline celix::Promise<void> celix::Promise<void>::timeout(std::chrono::duration< template<typename T> template<typename Rep, typename Period> inline celix::Promise<T>& celix::Promise<T>::setTimeout(std::chrono::duration<Rep, Period> duration) { - //Removed superfluous 'template' keyword (no explicit template args supplied) state->setTimeout(duration); return *this; } template<typename Rep, typename Period> inline celix::Promise<void>& celix::Promise<void>::setTimeout(std::chrono::duration<Rep, Period> duration) { - //Removed superfluous 'template' keyword (no explicit template args supplied) state->setTimeout(duration); return *this; }