From c6ef2f73629ab170b2209ff153860579ea82e8e6 Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Thu, 24 Jan 2019 14:12:12 +0100
Subject: [PATCH] general improvements in abstraction
---
alib2abstraction/src/abstraction/AnyaryOperationAbstraction.hpp | 2 +-
alib2abstraction/src/abstraction/NaryOperationAbstraction.hpp | 2 +-
alib2abstraction/src/abstraction/WrapperAbstraction.hpp | 2 +-
alib2abstraction/src/common/AbstractionHelpers.hpp | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/alib2abstraction/src/abstraction/AnyaryOperationAbstraction.hpp b/alib2abstraction/src/abstraction/AnyaryOperationAbstraction.hpp
index ffec9d0171..7bed05b845 100644
--- a/alib2abstraction/src/abstraction/AnyaryOperationAbstraction.hpp
+++ b/alib2abstraction/src/abstraction/AnyaryOperationAbstraction.hpp
@@ -27,7 +27,7 @@ private:
if ( input == nullptr )
return false;
- if ( checkInput && ! abstraction::CheckInput < ValueProvider < ParamType > >::checkInput ( input->getProxyAbstraction ( ), 0 /* Note: yes index zero */ ) )
+ if ( checkInput && ! abstraction::CheckInput < ValueProvider < ParamType > >::checkInput ( input, 0 /* Note: yes index zero */ ) )
return false;
if ( m_params.size ( ) < index + 1 )
diff --git a/alib2abstraction/src/abstraction/NaryOperationAbstraction.hpp b/alib2abstraction/src/abstraction/NaryOperationAbstraction.hpp
index 6558523359..5df783dbae 100644
--- a/alib2abstraction/src/abstraction/NaryOperationAbstraction.hpp
+++ b/alib2abstraction/src/abstraction/NaryOperationAbstraction.hpp
@@ -31,7 +31,7 @@ private:
if ( input == nullptr )
return false;
- if ( checkInput && ! abstraction::CheckInput < ValueProvider < ParamTypes > ... >::checkInput ( input->getProxyAbstraction ( ), index ) )
+ if ( checkInput && ! abstraction::CheckInput < ValueProvider < ParamTypes > ... >::checkInput ( input, index ) )
return false;
m_params [ index ].first = input;
diff --git a/alib2abstraction/src/abstraction/WrapperAbstraction.hpp b/alib2abstraction/src/abstraction/WrapperAbstraction.hpp
index 69b3c78c7c..c397b27317 100644
--- a/alib2abstraction/src/abstraction/WrapperAbstraction.hpp
+++ b/alib2abstraction/src/abstraction/WrapperAbstraction.hpp
@@ -37,7 +37,7 @@ private:
if ( input == nullptr )
return false;
- if ( checkInput && ! CheckInput < ValueProvider < ParamTypes > ... >::checkInput ( input->getProxyAbstraction ( ), index ) )
+ if ( checkInput && ! CheckInput < ValueProvider < ParamTypes > ... >::checkInput ( input, index ) )
return false;
m_params [ index ].first = input;
diff --git a/alib2abstraction/src/common/AbstractionHelpers.hpp b/alib2abstraction/src/common/AbstractionHelpers.hpp
index 7fca861d91..25ce77edbf 100644
--- a/alib2abstraction/src/common/AbstractionHelpers.hpp
+++ b/alib2abstraction/src/common/AbstractionHelpers.hpp
@@ -68,7 +68,7 @@ template < class Param, class ... Params >
struct ParamType < Param, Params ... > {
static ext::type_index paramType ( unsigned index ) {
if ( index == 0 )
- return ext::type_index ( typeid ( typename std::decay < Param >::type ) );
+ return ext::type_index ( typeid ( Param ) );
else
return ParamType < Params ... >::paramType ( index - 1);
}
--
GitLab