diff --git a/dune/stuff/common/tuple.hh b/dune/stuff/common/tuple.hh
index ffa7ae5dba59dfa5b6cbe9981a367bfd60ffe949..612681afdf62f8df77b5fb4f66b6cc876771ddb4 100644
--- a/dune/stuff/common/tuple.hh
+++ b/dune/stuff/common/tuple.hh
@@ -5,131 +5,6 @@
#include <dune/common/typetraits.hh>
-// uncomment if you want to use a more(?) optimized version
-//#define NEWTUPLE_TYPEDEFS_2_TUPLE
-
-#ifndef NEWTUPLE_TYPEDEFS_2_TUPLE
-
-/////// old version
-
-#define TMAX(t_, no_) (Dune::tuple_size<t_>::value <= (no_ + 1) ? 0 : no_)
-#define TELE(t_, s_, no_) typename Dune::tuple_element<TMAX(t_, no_), t_>::type::s_
-#define TCOND(t_, no_) (Dune::tuple_size<t_>::value <= no_)
-#define TUPLE_TYPEDEFS_2_TUPLE(t_, s_) \
- typename Dune:: \
- SelectType<TCOND(t_, 1), \
- Dune::tuple<TELE(t_, s_, 0)>, \
- typename Dune:: \
- SelectType<TCOND(t_, 2), \
- Dune::tuple<TELE(t_, s_, 0), TELE(t_, s_, 1)>, \
- typename Dune:: \
- SelectType<TCOND(t_, 3), \
- Dune::tuple<TELE(t_, s_, 0), TELE(t_, s_, 1), TELE(t_, s_, 2)>, \
- typename Dune:: \
- SelectType<TCOND(t_, 4), \
- Dune::tuple<TELE(t_, s_, 0), \
- TELE(t_, s_, 1), \
- TELE(t_, s_, 2), \
- TELE(t_, s_, 3)>, \
- typename Dune:: \
- SelectType<TCOND(t_, 5), \
- Dune::tuple<TELE(t_, s_, 0), \
- TELE(t_, s_, 1), \
- TELE(t_, s_, 2), \
- TELE(t_, s_, 3), \
- TELE(t_, s_, 4)>, \
- typename Dune:: \
- SelectType<TCOND(t_, 6), \
- Dune:: \
- tuple<TELE(t_, s_, 0), \
- TELE(t_, s_, 1), \
- TELE(t_, s_, 2), \
- TELE(t_, s_, 3), \
- TELE(t_, s_, 4), \
- TELE( \
- t_, s_, 5)>, \
- typename Dune::SelectType<TCOND( \
- t_, \
- 7), \
- Dune:: \
- tuple<TELE( \
- t_, \
- s_, \
- 0), \
- TELE( \
- t_, \
- s_, \
- 1), \
- TELE( \
- t_, \
- s_, \
- 2), \
- TELE( \
- t_, \
- s_, \
- 3), \
- TELE( \
- t_, \
- s_, \
- 4), \
- TELE( \
- t_, \
- s_, \
- 5), \
- TELE( \
- t_, \
- s_, \
- 6)>, \
- typename Dune::SelectType<TCOND( \
- t_, \
- 8), \
- Dune::tuple<TELE(t_, s_, 0), TELE(t_, s_, 1), TELE(t_, s_, 2), TELE(t_, s_, 3), TELE(t_, s_, 4), TELE(t_, s_, 5), TELE(t_, s_, 6), TELE(t_, s_, 7)>, \
- typename Dune::SelectType<TCOND( \
- t_, \
- 9), \
- Dune::tuple<TELE( \
- t_, \
- s_, \
- 0), \
- TELE( \
- t_, \
- s_, \
- 1), \
- TELE( \
- t_, \
- s_, \
- 2), \
- TELE(t_, s_, 3), \
- TELE( \
- t_, \
- s_, \
- 4), \
- TELE( \
- t_, \
- s_, \
- 5), \
- TELE( \
- t_, \
- s_, \
- 6), \
- TELE( \
- t_, \
- s_, \
- 7), \
- TELE( \
- t_, \
- s_, \
- 8)>, \
- Dune::tuple<TELE(t_, s_, 0), TELE(t_, s_, 1), TELE(t_, s_, 2), TELE(t_, s_, 3), TELE(t_, s_, 4), TELE(t_, s_, 5), TELE(t_, s_, 6), TELE(t_, s_, 7), TELE(t_, s_, 8)>>:: \
- Type>:: \
- Type>:: \
- Type>::Type>::Type>:: \
- Type>::Type>::Type>::Type
-
-#else
-
-////// new version
-
struct NoElement
{
};
@@ -196,7 +71,6 @@ struct RightTrimTuple<T1, T2, T3, T4, T5, T6, T7, NoElement>
TELE(t_, s_, 7), \
TEL(t_, s_, 8)>::type
-#endif
/**
* @def TUPLE_TYPEDEFS_2_TUPLE( t_, s_ )
*