reorganize code

alib2abstraction/src/abstraction/AnyaryOperationAbstraction.hpp

@@ -31,7 +31,7 @@ private:
 		if ( input == nullptr )
 			return false;
-		if ( checkInput && ! abstraction::CheckInput < ValueProvider < ParamType > >::checkInput ( input, 0 /* Note: yes index zero */ ) )
+		if ( checkInput && ! abstraction::checkInput < ValueProvider < ParamType > > ( input, 0 /* Note: yes index zero */ ) )
 			return false;
 		if ( m_params.size ( ) < index + 1 )

alib2abstraction/src/abstraction/NaryOperationAbstraction.hpp

@@ -35,7 +35,7 @@ private:
 		if ( input == nullptr )
 			return false;
-		if ( checkInput && ! abstraction::CheckInput < ValueProvider < ParamTypes > ... >::checkInput ( input, index ) )
+		if ( checkInput && ! abstraction::checkInput < ValueProvider < ParamTypes > ... > ( input, index ) )
 			return false;
 		m_params [ index ].first = input;
@@ -89,11 +89,11 @@ public:
 	}
 	ext::type_index getParamTypeIndex ( size_t index ) const override {
-		return abstraction::ParamType < ParamTypes ... >::paramType ( index );
+		return abstraction::paramType < ParamTypes ... > ( index );
 	}
 	ext::set < abstraction::ParamQualifiers::ParamQualifier > getParamTypeQualifiers ( size_t index ) const override {
-		return abstraction::ParamType < ParamTypes ... >::paramTypeQualifiers ( index );
+		return abstraction::paramTypeQualifiers < ParamTypes ... > ( index );
 	}
 };

alib2abstraction/src/abstraction/WrapperAbstraction.hpp

@@ -49,7 +49,7 @@ private:
 		if ( input == nullptr )
 			return false;
-		if ( checkInput && ! CheckInput < ValueProvider < ParamTypes > ... >::checkInput ( input, index ) )
+		if ( checkInput && ! abstraction::checkInput < ValueProvider < ParamTypes > ... > ( input, index ) )
 			return false;
 		m_params [ index ].first = input;
@@ -105,11 +105,11 @@ public:
 	}
 	ext::type_index getParamTypeIndex ( size_t index ) const override {
-		return ParamType < ParamTypes ... >::paramType ( index );
+		return abstraction::paramType < ParamTypes ... > ( index );
 	}
 	ext::set < abstraction::ParamQualifiers::ParamQualifier > getParamTypeQualifiers ( size_t index ) const override {
-		return ParamType < ParamTypes ... >::paramTypeQualifiers ( index );
+		return abstraction::paramTypeQualifiers < ParamTypes ... > ( index );
 	}
 	std::shared_ptr < abstraction::OperationAbstraction > getProxyAbstraction ( ) override {

alib2abstraction/src/common/AbstractionHelpers.hpp

@@ -35,46 +35,43 @@ constexpr decltype ( auto ) apply ( F && f, Tuple && t ) {
 }
 template < class ... Params >
-struct CheckInput {
-	static bool checkInput ( const std::shared_ptr < OperationAbstraction > & operation, unsigned index ) {
-		bool res = false;
-		auto lambda = [ & ] ( auto I ) {
-			 res = ( bool ) std::dynamic_pointer_cast < std::decay_t < std::tuple_element_t < decltype ( I )::value, std::tuple < Params ... > > > > ( operation->getProxyAbstraction ( ) );
-		};
-		ext::constexpr_switch < sizeof ... ( Params ) > ( index, lambda );
-		return res;
-	}
-};
+bool checkInput ( const std::shared_ptr < OperationAbstraction > & operation, unsigned index ) {
+	bool res = false;
+	auto lambda = [ & ] ( auto I ) {
+		 res = ( bool ) std::dynamic_pointer_cast < std::decay_t < std::tuple_element_t < decltype ( I )::value, std::tuple < Params ... > > > > ( operation->getProxyAbstraction ( ) );
+	};
+	ext::constexpr_switch < sizeof ... ( Params ) > ( index, lambda );
+	return res;
+}
 template < class ... Params >
-struct ParamType {
-	static ext::type_index paramType ( unsigned index ) {
-		ext::type_index res ( typeid ( void ) );
-		auto lambda = [ & ] ( auto I ) {
-			res = ext::type_index ( typeid ( std::tuple_element_t < decltype ( I )::value, std::tuple < Params ... > > ) );
-		};
-		ext::constexpr_switch < sizeof ... ( Params ) > ( index, lambda );
-		return res;
-	}
-	static ext::set < abstraction::ParamQualifiers::ParamQualifier > paramTypeQualifiers ( unsigned index ) {
-		ext::set < abstraction::ParamQualifiers::ParamQualifier > res;
-		auto lambda = [ & ] ( auto I ) {
-			res = abstraction::ParamQualifiers::paramQualifiers < std::tuple_element_t < decltype ( I )::value, std::tuple < Params ... > > > ( );
-		};
-		ext::constexpr_switch < sizeof ... ( Params ) > ( index, lambda );
-		return res;
-	}
-};
+static ext::type_index paramType ( unsigned index ) {
+	ext::type_index res ( typeid ( void ) );
+	auto lambda = [ & ] ( auto I ) {
+		res = ext::type_index ( typeid ( std::tuple_element_t < decltype ( I )::value, std::tuple < Params ... > > ) );
+	};
+	ext::constexpr_switch < sizeof ... ( Params ) > ( index, lambda );
+	return res;
+}
+template < class ... Params >
+ext::set < abstraction::ParamQualifiers::ParamQualifier > paramTypeQualifiers ( unsigned index ) {
+	ext::set < abstraction::ParamQualifiers::ParamQualifier > res;
+	auto lambda = [ & ] ( auto I ) {
+		res = abstraction::ParamQualifiers::paramQualifiers < std::tuple_element_t < decltype ( I )::value, std::tuple < Params ... > > > ( );
+	};
+	ext::constexpr_switch < sizeof ... ( Params ) > ( index, lambda );
+	return res;
+}
 } /* namespace abstraction */