From 446e35bbb61df19791aec08df92a779bd2acb38d Mon Sep 17 00:00:00 2001
From: Christian Engwer <christi@dune-project.org>
Date: Mon, 28 Nov 2016 23:42:27 +0100
Subject: [PATCH] [parameterizedobject] fix ambiguities of define
---
dune/common/parameterizedobject.hh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dune/common/parameterizedobject.hh b/dune/common/parameterizedobject.hh
index 1b48bfa37..bf9bbe558 100644
--- a/dune/common/parameterizedobject.hh
+++ b/dune/common/parameterizedobject.hh
@@ -135,7 +135,10 @@ class ParameterizedObjectFactory<TypeT(Args...), KeyT>
* note, this does not work fundamental types
*/
template<class Impl,
- typename std::enable_if<std::is_convertible<Impl, Type>::value, int>::type = 0>
+ typename std::enable_if<
+ std::is_convertible<Impl, Type>::value
+ and not std::is_convertible<Impl, Creator>::value,
+ int>::type = 0>
void define(Key const& key, Impl&& t)
{
registry_[key] = [=](Args...) { return t;};
--
GitLab