[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.

[Oliver Sander]

No, there is not.  Actually, the release branch works nicely with UG-patch10.
(HAVE_UG_PATCH9 actually means "patch9 or later").  The attached patch reverts
the change.  Please somebody apply it for me, as I keep getting

remote: FATAL: C refs/heads/release-2.2 dune-grid sander DENIED by fallthru
remote: error: hook declined to update refs/heads/release-2.2

when pushing, which I don't understand.

Best,
Oliver

Am 13.10.2013 15:22, schrieb 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
>>
> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Revert-previous-patch.patch
Type: text/x-diff
Size: 741 bytes
Desc: not available
URL: <https://lists.dune-project.org/pipermail/dune-devel/attachments/20131013/6b9747c6/attachment.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 551 bytes
Desc: OpenPGP digital signature
URL: <https://lists.dune-project.org/pipermail/dune-devel/attachments/20131013/6b9747c6/attachment.sig>