From de111d22352442fc68a0b099269174f5edd6c5c1 Mon Sep 17 00:00:00 2001
From: Markus Blatt <mblatt@dune-project.org>
Date: Mon, 12 Feb 2007 10:46:41 +0000
Subject: [PATCH] Removed resundant tripel class. We are using Tuple instead
[[Imported from SVN: r4840]]
---
common/Makefile.am | 2 +-
common/test/fmatrixtest.cc | 2 +-
common/tripel.hh | 42 --------------------------------------
3 files changed, 2 insertions(+), 44 deletions(-)
delete mode 100644 common/tripel.hh
diff --git a/common/Makefile.am b/common/Makefile.am
index d0d539514..218cbde8e 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 8a2ad16a5..1df8af3a1 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 1cb5946b4..000000000
--- 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
--
GitLab