Skip to content
Snippets Groups Projects
Commit 94ba0320 authored by Oliver Sander's avatar Oliver Sander
Browse files

remove logic traits. there is no need for them

[[Imported from SVN: r4848]]
parent 49a21131
No related branches found
No related tags found
No related merge requests found
...@@ -14,7 +14,7 @@ commoninclude_HEADERS = dlist.cc stdstreams.cc alignment.hh \ ...@@ -14,7 +14,7 @@ commoninclude_HEADERS = dlist.cc stdstreams.cc alignment.hh \
array.hh arraylist.hh bitfield.hh debugstream.hh dlist.hh \ array.hh arraylist.hh bitfield.hh debugstream.hh dlist.hh \
enumset.hh exceptions.hh fixedarray.hh fmatrix.hh \ enumset.hh exceptions.hh fixedarray.hh fmatrix.hh \
fvector.hh genericiterator.hh \ fvector.hh genericiterator.hh \
helpertemplates.hh interfaces.hh iteratorfacades.hh logictraits.hh \ helpertemplates.hh interfaces.hh iteratorfacades.hh \
misc.hh poolallocator.hh \ misc.hh poolallocator.hh \
sllist.hh smartpointer.hh stack.hh stdstreams.hh timer.hh tuples.hh \ sllist.hh smartpointer.hh stack.hh stdstreams.hh timer.hh tuples.hh \
typetraits.hh precision.hh bigunsignedint.hh \ typetraits.hh precision.hh bigunsignedint.hh \
......
// -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
// vi: set et ts=4 sw=2 sts=2:
// $ Id $
#ifndef DUNE_LOCICTRAITS_H
#define DUNE_LOCICTRAITS_H
namespace Dune {
/** @addtogroup Common
*
* @{
*/
template<bool T1, bool T2>
struct And
{
const static bool value=T1 && T2;
};
template<bool T1, bool T2>
struct Or
{
const static bool value=T1 || T2;
};
/** @} */
}
#endif
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include <dune/common/interfaces.hh> #include <dune/common/interfaces.hh>
#include <dune/common/iteratorfacades.hh> #include <dune/common/iteratorfacades.hh>
#include <dune/common/lcm.hh> #include <dune/common/lcm.hh>
#include <dune/common/logictraits.hh>
#include <dune/common/misc.hh> #include <dune/common/misc.hh>
#include <dune/common/poolallocator.hh> #include <dune/common/poolallocator.hh>
#include <dune/common/precision.hh> #include <dune/common/precision.hh>
......
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
#ifndef DUNE_TYPETRAITS_HH #ifndef DUNE_TYPETRAITS_HH
#define DUNE_TYPETRAITS_HH #define DUNE_TYPETRAITS_HH
#include <dune/common/logictraits.hh>
#ifdef HAVE_TR1_TYPE_TRAITS #ifdef HAVE_TR1_TYPE_TRAITS
#include <tr1/type_traits> #include <tr1/type_traits>
#endif #endif
...@@ -245,8 +243,7 @@ namespace Dune ...@@ -245,8 +243,7 @@ namespace Dune
* @brief True if either a conversion from T1 to T2 or vice versa * @brief True if either a conversion from T1 to T2 or vice versa
* exists. * exists.
*/ */
value=Or<Conversion<T1,T2>::exists, value = Conversion<T1,T2>::exists || Conversion<T2,T1>::exists
Conversion<T2,T1>::exists>::value
}; };
}; };
......
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