From f823297b9952017ab5ba841960df10be50e6a5d8 Mon Sep 17 00:00:00 2001
From: Julien Michel <julien.michel@cnes.fr>
Date: Tue, 20 Nov 2018 14:10:29 +0100
Subject: [PATCH] COMP: Attempt to fix vcs build
---
Modules/Core/Functor/include/otbFunctorImageFilter.h | 2 +-
Modules/Core/Functor/include/otbFunctorImageFilter.hxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Modules/Core/Functor/include/otbFunctorImageFilter.h b/Modules/Core/Functor/include/otbFunctorImageFilter.h
index 7aeb4e7efc..8df52febc3 100644
--- a/Modules/Core/Functor/include/otbFunctorImageFilter.h
+++ b/Modules/Core/Functor/include/otbFunctorImageFilter.h
@@ -174,7 +174,7 @@ template <class T> struct ImageTypeDeduction<itk::VariableLengthVector<T>>
*/
-template <typename T, typename TNameMap> struct FunctorFilterSuperclassHelper : public FunctorFilterSuperclassHelper<decltype(&T::operator()),TNameMap> {};
+template <typename T, typename TNameMap> struct FunctorFilterSuperclassHelper : public FunctorFilterSuperclassHelper<decltype(&std::remove_reference<T>::type::operator()),TNameMap> {};
namespace functor_filter_details
{
diff --git a/Modules/Core/Functor/include/otbFunctorImageFilter.hxx b/Modules/Core/Functor/include/otbFunctorImageFilter.hxx
index 42a93c2f2e..47bba7bbab 100644
--- a/Modules/Core/Functor/include/otbFunctorImageFilter.hxx
+++ b/Modules/Core/Functor/include/otbFunctorImageFilter.hxx
@@ -141,7 +141,7 @@ template <typename T> struct GetProxy<itk::ConstNeighborhoodIterator<T> >
}
};
-template <class Oper> struct OperProxy : public OperProxy<decltype(&Oper::operator())> {};
+template <class Oper> struct OperProxy : public OperProxy<decltype(&std::remove_reference<Oper>::type::operator())> {};
template<class Out, class ... In> struct OperProxy<Out(*)(In...)>
{
--
GitLab