[Dune] compiler fixes

Christian Engwer christi at uni-hd.de
Tue Jun 3 20:08:39 CEST 2008


Hi Andreas,

> today I updated all dune modules from SVN, but afterwards my own project
> didn't compile anymore because of some errors in DUNE-disc. the attached
> patch also fixes a unnecessary signedness warning.

you didn't update dune-disc. These patches are already in dune-disc
sind 1 1/2 months.

But never the less... thanks :-)

Christian

> 
> cheers
>   AND
> 

> diff --git a/disc/operators/localstiffness.hh b/disc/operators/localstiffness.hh
> index 9c1bb46..32c1501 100644
> --- a/disc/operators/localstiffness.hh
> +++ b/disc/operators/localstiffness.hh
> @@ -75,7 +75,7 @@ namespace Dune
>  	// types for matrics, vectors and boundary conditions
>  	typedef FieldMatrix<RT,m,m> MBlockType;                      // one entry in the stiffness matrix
>  	typedef FieldVector<RT,m> VBlockType;                        // one entry in the global vectors
> -	typedef FixedArray<BoundaryConditions::Flags,m> BCBlockType; // componentwise boundary conditions
> +	typedef array<BoundaryConditions::Flags,m> BCBlockType;      // componentwise boundary conditions
>  
>  	/*! initialize local stiffness matrix */
>  	LocalStiffness ()
> diff --git a/disc/operators/p1operator.hh b/disc/operators/p1operator.hh
> index 1c7481f..49a0d2d 100644
> --- a/disc/operators/p1operator.hh
> +++ b/disc/operators/p1operator.hh
> @@ -720,7 +720,7 @@ namespace Dune
>  		
>  	{
>  	  // Check for the TypeTag
> -	  IsTrue<SameType<TypeTag,LeafTag>::value || SameType<TypeTag,LevelTag>::value>::yes();
> +	  IsTrue<is_same<TypeTag,LeafTag>::value || is_same<TypeTag,LevelTag>::value>::yes();
>  
>  	  // be verbose
>  //  	  std::cout << g.comm().rank() << ": " << "vector size = " << vertexmapper.size() << " + " << extraDOFs << std::endl;
> @@ -731,7 +731,7 @@ namespace Dune
>  //  	  std::cout << g.comm().rank() << ": " << "hanging nodes=" << hangingnodes << " links=" << links.size() << std::endl;
>     
>  	  // set size of all rows to zero
> -	  for (int i=0; i<is.size(n); i++)
> +	  for (unsigned i=0; i<is.size(n); i++)
>  		A.setrowsize(i,0); 
>  
>  	  // build needs a flag for all entities of all codims
> @@ -931,7 +931,7 @@ namespace Dune
>  	typedef typename MatrixType::RowIterator rowiterator;
>  	typedef typename MatrixType::ColIterator coliterator;
>  	typedef typename P1OperatorBase<TypeTag,G,RT,IS,LC,m>::VM VM;
> -	typedef FixedArray<BoundaryConditions::Flags,m> BCBlockType;     // componentwise boundary conditions
> +        typedef array<BoundaryConditions::Flags,m> BCBlockType;     // componentwise boundary conditions
>  
>  
>  	// A DataHandle class to exchange border rows

> _______________________________________________
> Dune mailing list
> Dune at dune-project.org
> http://lists.dune-project.org/mailman/listinfo/dune





More information about the Dune mailing list