From 39e83c80c23e30324aa2788ac34a79494fbc95c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <gruenich@dune-project.org>
Date: Fri, 21 Nov 2014 07:10:06 +0100
Subject: [PATCH] [hash] Remove remaining TR1 and Boost fall-back code.
---
dune/common/test/CMakeLists.txt | 1 -
dune/common/test/Makefile.am | 2 +-
dune/common/test/bigunsignedinttest.cc | 37 +++-----------------------
3 files changed, 5 insertions(+), 35 deletions(-)
diff --git a/dune/common/test/CMakeLists.txt b/dune/common/test/CMakeLists.txt
index cc90aab94..65131327a 100644
--- a/dune/common/test/CMakeLists.txt
+++ b/dune/common/test/CMakeLists.txt
@@ -63,7 +63,6 @@ add_executable("arraytest" arraytest.cc)
add_executable("bigunsignedinttest" bigunsignedinttest.cc)
target_link_libraries("bigunsignedinttest" "dunecommon")
-add_dune_boost_flags("bigunsignedinttest")
add_executable("bitsetvectortest" bitsetvectortest.cc)
add_executable("check_fvector_size" check_fvector_size.cc)
diff --git a/dune/common/test/Makefile.am b/dune/common/test/Makefile.am
index 72fea70ad..36a4bee51 100644
--- a/dune/common/test/Makefile.am
+++ b/dune/common/test/Makefile.am
@@ -87,7 +87,7 @@ arraylisttest_SOURCES = arraylisttest.cc
arraytest_SOURCES = arraytest.cc
bigunsignedinttest_SOURCES=bigunsignedinttest.cc
-bigunsignedinttest_CPPFLAGS = $(AM_CPPFLAGS) $(BOOST_CPPFLAGS)
+bigunsignedinttest_CPPFLAGS = $(AM_CPPFLAGS)
bitsetvectortest_SOURCES = bitsetvectortest.cc
diff --git a/dune/common/test/bigunsignedinttest.cc b/dune/common/test/bigunsignedinttest.cc
index 4f1177e30..8db7375af 100644
--- a/dune/common/test/bigunsignedinttest.cc
+++ b/dune/common/test/bigunsignedinttest.cc
@@ -4,13 +4,11 @@
#include "config.h"
#endif
-#include <dune/common/bigunsignedint.hh>
#include <limits>
#include <iostream>
-#if HAVE_BOOST_HASH
-#include <boost/functional/hash.hpp>
-#endif
+#include <dune/common/bigunsignedint.hh>
+#include <dune/common/hash.hh>
int main()
{
@@ -68,35 +66,8 @@ int main()
a=a*b*b;
std::cout<<a.todouble()<<std::endl;
-#if HAVE_DUNE_HASH
-
- {
- Dune::hash<Dune::bigunsignedint<100> > hasher;
- std::cout << "Dune::hash: " << hasher(a) << std::endl;
- }
-
-#if HAVE_STD_HASH
- {
- std::hash<Dune::bigunsignedint<100> > hasher;
- std::cout << "std::hash: " << hasher(a) << std::endl;
- }
-#endif
-
-#if HAVE_TR1_HASH
- {
- std::tr1::hash<Dune::bigunsignedint<100> > hasher;
- std::cout << "std::tr1::hash: " << hasher(a) << std::endl;
- }
-#endif
-
-#if HAVE_BOOST_HASH
- {
- boost::hash<Dune::bigunsignedint<100> > hasher;
- std::cout << "boost::hash: " << hasher(a) << std::endl;
- }
-#endif
-
-#endif // HAVE_DUNE_HASH
+ Dune::hash<Dune::bigunsignedint<100> > hasher;
+ std::cout << "Dune::hash: " << hasher(a) << std::endl;
}
catch(Dune::MathError e) {
--
GitLab