From 9efd3b1fb45354d3ad1f325fd1654ab8cee867b5 Mon Sep 17 00:00:00 2001
From: Rene Milk <rene.milk@uni-muenster.de>
Date: Mon, 27 Jul 2015 14:07:22 +0200
Subject: [PATCH] [common/float_cmp] use helper tpl again to shorten type name
lenghts
---
dune/stuff/common/float_cmp.hh | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/dune/stuff/common/float_cmp.hh b/dune/stuff/common/float_cmp.hh
index 52f65d3fd..883515391 100644
--- a/dune/stuff/common/float_cmp.hh
+++ b/dune/stuff/common/float_cmp.hh
@@ -69,6 +69,7 @@ template <class V>
struct MT
{
typedef typename VectorAbstraction<V>::S T;
+ typedef typename Dune::FloatCmp::EpsilonType<typename MT<V>::T>::Type Eps;
};
#define DUNE_STUFF_COMMON_FLOAT_CMP_GENERATOR(id) \
@@ -77,14 +78,10 @@ struct MT
bool>::type \
id(const FirstType& first, \
const SecondType& second, \
- const typename Dune::FloatCmp::EpsilonType<typename MT<FirstType>::T>::Type& rtol = \
- DefaultEpsilon<typename MT<FirstType>::T, style>::value(), \
- const typename Dune::FloatCmp::EpsilonType<typename MT<FirstType>::T>::Type& atol = \
- DefaultEpsilon<typename MT<FirstType>::T, style>::value()) \
+ const typename MT<FirstType>::Eps& rtol = DefaultEpsilon<typename MT<FirstType>::T, style>::value(), \
+ const typename MT<FirstType>::Eps& atol = DefaultEpsilon<typename MT<FirstType>::T, style>::value()) \
{ \
- return internal:: \
- Call<FirstType, SecondType, typename Dune::FloatCmp::EpsilonType<typename MT<FirstType>::T>::Type, style>::id( \
- first, second, rtol, atol); \
+ return internal::Call<FirstType, SecondType, typename MT<FirstType>::Eps, style>::id(first, second, rtol, atol); \
} \
\
template <class FirstType, class SecondType> \
@@ -92,9 +89,9 @@ struct MT
bool>::type \
id(const FirstType& first, \
const SecondType& second, \
- const typename Dune::FloatCmp::EpsilonType<typename MT<FirstType>::T>::Type& rtol = \
+ const typename MT<FirstType>::Eps& rtol = \
DefaultEpsilon<typename MT<FirstType>::T, Style::defaultStyle>::value(), \
- const typename Dune::FloatCmp::EpsilonType<typename MT<FirstType>::T>::Type& atol = \
+ const typename MT<FirstType>::Eps& atol = \
DefaultEpsilon<typename MT<FirstType>::T, Style::defaultStyle>::value()) \
{ \
return id<Style::defaultStyle>(first, second, rtol, atol); \
--
GitLab