[Dune-devel] [Dune-Commit] [Commit] dune-grid - 657029a: Make 2.2 release work with current UG. The macro HAVE_UG_PATCH9 is not available. Moreover, it would not work with patch level 10 then.

[Markus Blatt]

Hi,

is there a special reason to drop support of a grid version in a
release? According to our build sysren tests, users need at least
patch level 7, but this changeset breaks compilation for all patch
levels <9. 

Shouldn't we rather replace "#if 1" with "#if defined(HAVE_UG_PATCH9)
|| defined(HAVE_UG_PATCH10)"?

Markus
On Thu, Oct 10, 2013 at 08:45:41PM +0200, Peter Bastian wrote:
> New commit, appeared at Thu Oct 10 20:45:41 2013 +0200
> as part of the following ref changes:
> 
>     branch refs/heads/releases/2.2    updated from fe2b741 -> 657029a
> 
> Browsable version: http://cgit.dune-project.org/repositories/dune-grid/commit/?id=657029a73b032aa76f410349c98d4ea33bd991ff
> 
> ======================================================================
> 
> commit 657029a73b032aa76f410349c98d4ea33bd991ff
> Author: Peter Bastian <peter.bastian at iwr.uni-heidelberg.de>
> Date:   Thu Oct 10 20:43:57 2013 +0200
> 
>     Make 2.2 release work with current UG.
>     The macro HAVE_UG_PATCH9 is not available. Moreover, it
>     would not work with patch level 10 then.
> 
>  dune/grid/uggrid/ugincludes.hh | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> 
> 
> diff --git a/dune/grid/uggrid/ugincludes.hh b/dune/grid/uggrid/ugincludes.hh
> index 42fd39c..fc3ddf8 100644
> --- a/dune/grid/uggrid/ugincludes.hh
> +++ b/dune/grid/uggrid/ugincludes.hh
> @@ -12,7 +12,7 @@
>     therein.
>   */
>  
> -#ifdef HAVE_UG_PATCH9
> +#if 1
>  
>  #include <ug/gm.h>
>  #include <ug/std_domain.h>
> @@ -53,5 +53,3 @@
>  #endif
>  
>  #endif
> -
> -#endif
> 
> _______________________________________________
> Dune-Commit mailing list
> Dune-Commit at dune-project.org
> http://lists.dune-project.org/mailman/listinfo/dune-commit
> 

-- 
Do you need more support with DUNE or HPC in general? 

Dr. Markus Blatt - HPC-Simulation-Software & Services http://www.dr-blatt.de
Hans-Bunte-Str. 8-10, 69123 Heidelberg, Germany
Tel.: +49 (0) 160 97590858  Fax: +49 (0)322 1108991658