diff --git a/common/Makefile.am b/common/Makefile.am index d0d53951450e57e644ef309fd10ce32777c55638..218cbde8e9a1ab40e9b1996ff4ef67c6f2daf55a 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -20,7 +20,7 @@ commoninclude_HEADERS = dlist.cc stdstreams.cc alignment.hh \ typetraits.hh precision.hh bigunsignedint.hh \ gcd.hh lcm.hh configparser.hh propertymap.hh \ collectivecommunication.hh mpihelper.hh singleton.hh \ - mpicollectivecommunication.hh geometrytype.hh tripel.hh utility.hh \ + mpicollectivecommunication.hh geometrytype.hh utility.hh \ bartonnackmanifcheck.hh binaryfunctions.hh if EXPRESSIONTEMPLATES diff --git a/common/test/fmatrixtest.cc b/common/test/fmatrixtest.cc index 8a2ad16a5d20f9e8f099ed2a423176361685f6a7..1df8af3a1b73df8a0f286dc4b79d764f7865c35f 100644 --- a/common/test/fmatrixtest.cc +++ b/common/test/fmatrixtest.cc @@ -8,7 +8,7 @@ using namespace Dune; -template<typename T, int n> +template<typename T, std::size_t n> int test_invert_solve(T A_data[n*n], T inv_data[n*n], T x_data[n], T b_data[n]) { diff --git a/common/tripel.hh b/common/tripel.hh deleted file mode 100644 index 1cb5946b428651b7df1aecc00f525c45ba1081cf..0000000000000000000000000000000000000000 --- a/common/tripel.hh +++ /dev/null @@ -1,42 +0,0 @@ -// -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- -// vi: set et ts=4 sw=2 sts=2: -#ifndef DUNE_TRIPEL_HH -#define DUNE_TRIPEL_HH - -namespace Dune -{ - // a tripel class similar to std::pair - template<typename T1, typename T2, typename T3> - struct tripel - { - typedef T1 first_type; - typedef T2 second_type; - typedef T3 third_type; - T1 first; - T2 second; - T3 third; - tripel() {} - tripel (const T1& t1, const T2& t2, const T3& t3) - : first(t1), second(t2), third(t3) - {} - bool operator< (const tripel<T1,T2,T3>& y) const - { - if (first<y.first) return true; - if (y.first<first) return false; - - if (second<y.second) return true; - if (y.second<second) return false; - - if (third<y.third) return true; - return false; - } - bool operator== (const tripel<T1,T2,T3>& y) const - { - if (first==y.first && second==y.second && third==y.third) return true; - return false; - } - }; - -} - -#endif