[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r1693472 - /subversion/trunk/subversion/libsvn_client/resolved.c

From: Branko Čibej <brane_at_wandisco.com>
Date: Fri, 31 Jul 2015 01:44:12 +0200

On 30.07.2015 23:04, Stefan Sperling wrote:
> On Thu, Jul 30, 2015 at 10:28:48PM +0200, Branko Čibej wrote:
>> On 30.07.2015 20:50, stsp_at_apache.org wrote:
>>> Author: stsp
>>> Date: Thu Jul 30 18:50:50 2015
>>> New Revision: 1693472
>>>
>>> URL: http://svn.apache.org/r1693472
>>> Log:
>>> * subversion/libsvn_client/resolved.c
>>> (resolve_conflict): Use local variable 'err' as intended.
>>>
>>> Modified:
>>> subversion/trunk/subversion/libsvn_client/resolved.c
>>
>> .../subversion/libsvn_client/resolved.c:306:35: warning: implicit conversion from enumeration type
>> 'svn_client_conflict_option_id_t' (aka 'enum svn_client_conflict_option_id_t') to different enumeration type
>> 'svn_wc_conflict_choice_t' (aka 'enum svn_wc_conflict_choice_t') [-Wenum-conversion]
>> option_id, /* id is backwards compatible */
>> ^~~~~~~~~
>>
> That's on purpose and had been in the code since before this commit.
> The new enum is using the same values as the old one but the compiler
> can't see that.
>
> If this warning is too upsetting I can write a function that maps
> from one enum type to another. FWIW my gcc does not give a warning.

Looks like this is in the default -Wall of the newest clang on OSX. I
think that a mapping function (that only performs a cast, perhaps) is
the way to go here, because I'd rather not suppress this warning.

-- Brane
Received on 2015-07-31 01:45:52 CEST

This is an archived mail posted to the Subversion Dev mailing list.