[Dune] [Dune-Commit] dune-grid r8391 - in trunk: . dune/grid/albertagrid

[Christian Engwer]

Hi Christoph,

On Tue, Sep 04, 2012 at 03:56:28PM +0200, gruenich at dune-project.org wrote:
> Author: gruenich
> Date: 2012-09-04 15:56:28 +0200 (Tue, 04 Sep 2012)
> New Revision: 8391
> 
> Modified:
>    trunk/COPYING
>    trunk/dune/grid/albertagrid/elementinfo.hh
> Log:
> Fix incompatibility between Alberta and Clang; this fixes FS#1178.
> (thanks to Ansgar Burchardt for the patch)

actually this isn't an inncompatibility, but a real bug. g++ did
accept this, because a pointer (in this case a function-pointer) can
be casted onto an int. So the expression was/is vaid, but not what you
would like to test.

Christian

> 
> 
> Modified: trunk/COPYING
> ===================================================================
> --- trunk/COPYING	2012-09-04 12:29:53 UTC (rev 8390)
> +++ trunk/COPYING	2012-09-04 13:56:28 UTC (rev 8391)
> @@ -2,6 +2,7 @@
>  
>  2003--2009    Peter Bastian
>  2004--2010    Markus Blatt
> +2012          Ansgar Burchardt
>  2004--2005    Adrian Burri
>  2006--2011    Andreas Dedner
>  2010          Martin Drohmann
> 
> Modified: trunk/dune/grid/albertagrid/elementinfo.hh
> ===================================================================
> --- trunk/dune/grid/albertagrid/elementinfo.hh	2012-09-04 12:29:53 UTC (rev 8390)
> +++ trunk/dune/grid/albertagrid/elementinfo.hh	2012-09-04 13:56:28 UTC (rev 8391)
> @@ -261,7 +261,7 @@
>          const bool me = (macroIndex() == other.macroIndex());
>          const bool ll = (level() < other.level());
>          const bool le = (level() == other.level());
> -        const bool pl = (path < other.path());
> +        const bool pl = (path() < other.path());
>          return ml | (me & (ll | (le & pl)));
>        }
>  
> @@ -488,7 +488,7 @@
>          DUNE_THROW( NotImplemented, "Seed for fake elements not implemented." );
>        
>        return Seed( macroElement().index, level, path );
> -    };
> +    }
>  
>  
>      template< int dim >
> 
> 
> _______________________________________________
> Dune-Commit mailing list
> Dune-Commit at dune-project.org
> http://lists.dune-project.org/mailman/listinfo/dune-commit
> 

-- 
Prof. Dr. Christian Engwer 
Institut für Numerische und Angewandte Mathematik
Fachbereich Mathematik und Informatik der Universität Münster
Einsteinstrasse 62
48149 Münster

E-Mail	christian.engwer at uni-muenster.de
Telefon	+49 251 83-35067
FAX		+49 251 83-32729