Skip to content
Snippets Groups Projects
Commit 28700941 authored by Jorrit Fahlke's avatar Jorrit Fahlke
Browse files

redefinition of default argument not allowed, not even to same value (thanks automatic build test)

[[Imported from SVN: r5554]]
parent 3a6e5179
No related branches found
No related tags found
No related merge requests found
...@@ -117,42 +117,42 @@ namespace Dune { ...@@ -117,42 +117,42 @@ namespace Dune {
template <class T, CmpStyle style> template <class T, CmpStyle style>
bool eq(const T &first, bool eq(const T &first,
const T &second, const T &second,
typename EpsilonType<T>::Type epsilon = DefaultEpsilon<T, style>::value()) typename EpsilonType<T>::Type epsilon)
{ {
return Detail::eq_t<T, style>::eq(first, second, epsilon); return Detail::eq_t<T, style>::eq(first, second, epsilon);
} }
template <class T, CmpStyle style> template <class T, CmpStyle style>
bool ne(const T &first, bool ne(const T &first,
const T &second, const T &second,
typename EpsilonType<T>::Type epsilon = DefaultEpsilon<T, style>::value()) typename EpsilonType<T>::Type epsilon)
{ {
return !eq<T, style>(first, second, epsilon); return !eq<T, style>(first, second, epsilon);
} }
template <class T, CmpStyle style> template <class T, CmpStyle style>
bool gt(const T &first, bool gt(const T &first,
const T &second, const T &second,
typename EpsilonType<T>::Type epsilon = DefaultEpsilon<T, style>::value()) typename EpsilonType<T>::Type epsilon)
{ {
return first > second && ne<T, style>(first, second, epsilon); return first > second && ne<T, style>(first, second, epsilon);
} }
template <class T, CmpStyle style> template <class T, CmpStyle style>
bool lt(const T &first, bool lt(const T &first,
const T &second, const T &second,
typename EpsilonType<T>::Type epsilon = DefaultEpsilon<T, style>::value()) typename EpsilonType<T>::Type epsilon)
{ {
return first < second && ne<T, style>(first, second, epsilon); return first < second && ne<T, style>(first, second, epsilon);
} }
template <class T, CmpStyle style> template <class T, CmpStyle style>
bool ge(const T &first, bool ge(const T &first,
const T &second, const T &second,
typename EpsilonType<T>::Type epsilon = DefaultEpsilon<T, style>::value()) typename EpsilonType<T>::Type epsilon)
{ {
return first > second || eq<T, style>(first, second, epsilon); return first > second || eq<T, style>(first, second, epsilon);
} }
template <class T, CmpStyle style> template <class T, CmpStyle style>
bool le(const T &first, bool le(const T &first,
const T &second, const T &second,
typename EpsilonType<T>::Type epsilon = DefaultEpsilon<T, style>::value()) typename EpsilonType<T>::Type epsilon)
{ {
return first < second || eq<T, style>(first, second, epsilon); return first < second || eq<T, style>(first, second, epsilon);
} }
...@@ -282,7 +282,7 @@ namespace Dune { ...@@ -282,7 +282,7 @@ namespace Dune {
}; };
} // namespace Detail } // namespace Detail
template<class I, class T, CmpStyle cstyle, RoundingStyle rstyle> template<class I, class T, CmpStyle cstyle, RoundingStyle rstyle>
I round(const T &val, typename EpsilonType<T>::Type epsilon = DefaultEpsilon<T, cstyle>::value()) I round(const T &val, typename EpsilonType<T>::Type epsilon /*= DefaultEpsilon<T, cstyle>::value()*/)
{ {
return Detail::round_t<I, T, cstyle, rstyle>::round(val, epsilon); return Detail::round_t<I, T, cstyle, rstyle>::round(val, epsilon);
} }
...@@ -378,7 +378,7 @@ namespace Dune { ...@@ -378,7 +378,7 @@ namespace Dune {
}; };
} // namespace Detail } // namespace Detail
template<class I, class T, CmpStyle cstyle, RoundingStyle rstyle> template<class I, class T, CmpStyle cstyle, RoundingStyle rstyle>
I trunc(const T &val, typename EpsilonType<T>::Type epsilon = DefaultEpsilon<T, cstyle>::value()) I trunc(const T &val, typename EpsilonType<T>::Type epsilon /*= DefaultEpsilon<T, cstyle>::value()*/)
{ {
return Detail::trunc_t<I, T, cstyle, rstyle>::trunc(val, epsilon); return Detail::trunc_t<I, T, cstyle, rstyle>::trunc(val, epsilon);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment