[vlc-devel] [vlc-commits] Fix warning on all c++ files

Hugo Beauzée-Luyssen hugo at beauzee.fr
Mon Jun 22 16:04:50 CEST 2015


On 22/06/2015 16:02, Rémi Denis-Courmont wrote:
> Le 2015-06-22 16:52, git at videolan.org a écrit :
>> vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Mon
>> Jun 22 15:51:11 2015 +0200| [59678ec0b489d86f6f62cc987e21a82346f8da42]
>> | committer: Hugo Beauzée-Luyssen
>>
>> Fix warning on all c++ files
>>
>> Since vlc_atomic_float is only used for C files, another option would be
>> to disable this block when building in C++ mode.
>> Related to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64658
>>
>>>
>>> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=59678ec0b489d86f6f62cc987e21a82346f8da42
>>>
>> ---
>>
>>  include/vlc_atomic.h |    5 +++++
>>  1 file changed, 5 insertions(+)
>>
>> diff --git a/include/vlc_atomic.h b/include/vlc_atomic.h
>> index 72590c8..a652391 100644
>> --- a/include/vlc_atomic.h
>> +++ b/include/vlc_atomic.h
>> @@ -115,7 +115,12 @@ static inline void
>> vlc_atomic_init_float(vlc_atomic_float *var, float f)
>>  {
>>      union { float f; uint32_t i; } u;
>>      u.f = f;
>> +#if defined(__cplusplus) && defined(HAVE_CXX11)
>
> We cannot have config.h dependencies in public headers for rather
> obvious reasons. It is a bug in check_headers that this commit did not
> break the build. Please revert.
>

It was reverted since the fix was wrong anyway, but thanks for 
emphasizing the config.h issue to me (again).

Regards,

-- 
Hugo Beauzée-Luyssen



More information about the vlc-devel mailing list