Skip to content
Snippets Groups Projects
Commit ad63e457 authored by Andreas Dedner's avatar Andreas Dedner
Browse files

revert r6278 and r6277 - if possible we should not keep the trunk...

revert r6278 and r6277 - if possible we should not keep the trunk dysfunctional for more than a few hours (I need alugrid)

[[Imported from SVN: r6280]]
parent fff31a54
No related branches found
No related tags found
No related merge requests found
...@@ -40,8 +40,6 @@ namespace Dune ...@@ -40,8 +40,6 @@ namespace Dune
template<int k> template<int k>
class bigunsignedint { class bigunsignedint {
public: public:
typedef bigunsignedint real_type;
typedef bigunsignedint field_type;
// unsigned short is 16 bits wide, n is the number of digits needed // unsigned short is 16 bits wide, n is the number of digits needed
enum { bits=std::numeric_limits<unsigned short>::digits, n=k/bits+(k%bits!=0), enum { bits=std::numeric_limits<unsigned short>::digits, n=k/bits+(k%bits!=0),
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#define DUNE_FTRAITS_HH #define DUNE_FTRAITS_HH
#include <complex> #include <complex>
#include "typetraits.hh"
namespace Dune { namespace Dune {
/** /**
...@@ -19,28 +19,11 @@ namespace Dune { ...@@ -19,28 +19,11 @@ namespace Dune {
struct FieldTraits struct FieldTraits
{ {
//! export the type representing the field //! export the type representing the field
typedef typename T::field_type field_type; typedef T field_type;
//! export the type representing the real type of the field //! export the type representing the real type of the field
typedef typename T::real_type real_type; typedef T real_type;
}; };
#define ComposeFTraits(p,f,r) \
template<> \
struct FieldTraits<p>{ \
typedef remove_const<f>::type field_type; \
typedef remove_const<r>::type real_type; \
}; \
ComposeFTraits(double,double,double);
ComposeFTraits(float,float,float);
ComposeFTraits(int,int,int);
ComposeFTraits(long,long,long);
ComposeFTraits(std::size_t,std::size_t,std::size_t);
ComposeFTraits(bool,bool,bool);
#undef ComposeFTraits
template<class T> template<class T>
struct FieldTraits<const T> struct FieldTraits<const T>
{ {
......
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