From a67b78a846e49e1bf5c17822925851c92ba1999c Mon Sep 17 00:00:00 2001
From: Christoph Lehmann <christoph.lehmann@ufz.de>
Date: Tue, 1 Mar 2016 11:20:31 +0100
Subject: [PATCH] [Asm] removed variadic template ambiguity
---
AssemblerLib/GlobalSetup.h | 7 +++++++
AssemblerLib/SerialExecutor.h | 4 ++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/AssemblerLib/GlobalSetup.h b/AssemblerLib/GlobalSetup.h
index 2510b715f60..f53008065da 100644
--- a/AssemblerLib/GlobalSetup.h
+++ b/AssemblerLib/GlobalSetup.h
@@ -46,6 +46,13 @@ struct GlobalSetup
return Executor::execute(std::forward<Args>(args)...);
}
+ template <typename... Args>
+ static
+ void transform(Args&& ... args)
+ {
+ return Executor::transform(std::forward<Args>(args)...);
+ }
+
GlobalSetup() { }
};
diff --git a/AssemblerLib/SerialExecutor.h b/AssemblerLib/SerialExecutor.h
index 22a613d4acb..160dce9f505 100644
--- a/AssemblerLib/SerialExecutor.h
+++ b/AssemblerLib/SerialExecutor.h
@@ -58,9 +58,9 @@ struct SerialExecutor
static
void
#if defined(_MSC_VER) && (_MSC_VER >= 1700)
- execute(F& f, C const& c, Data& data, Args_&&... args)
+ transform(F& f, C const& c, Data& data, Args_&&... args)
#else
- execute(F const& f, C const& c, Data& data, Args_&&... args)
+ transform(F const& f, C const& c, Data& data, Args_&&... args)
#endif
{
assert(c.size() == data.size());
--
GitLab