On Wed, Nov 9, 2016 at 9:58 PM, Brian Paul <bri...@vmware.com> wrote:
> On 11/07/2016 03:32 PM, George Kyriazis wrote:
>>
>> not having it on windows causes a CANARY assertion in
>> src/util/ralloc.c:get_header()
>>
>> Tested only on MSVC 19.00 (DevStudio 14.0), so #ifdef guards reflect that.
>> ---
>> src/util/macros.h | 5 +++++
>> 1 file changed, 5 insertions(+)
>>
>> diff --git a/src/util/macros.h b/src/util/macros.h
>> index 27d1b62..12b26d3 100644
>> --- a/src/util/macros.h
>> +++ b/src/util/macros.h
>> @@ -175,6 +175,11 @@ do { \
>> # if __has_feature(has_trivial_destructor)
>> # define HAS_TRIVIAL_DESTRUCTOR(T) __has_trivial_destructor(T)
>> # endif
>> +# elif defined(_MSC_VER) && !defined(__INTEL_COMPILER)
>> +# if _MSC_VER >= 1900
>> +# define HAS_TRIVIAL_DESTRUCTOR(T) __has_trivial_destructor(T)
>> +# else
>> +# endif
>> # endif
>> # ifndef HAS_TRIVIAL_DESTRUCTOR
>> /* It's always safe (if inefficient) to assume that a
>>
>
> This seems to fix things for me too. Though I changed the _MSC_VER test to
> compare against 1800 for VS 2013.
>
> Tested-by: Brian Paul <bri...@vmware.com>
>
> If there's no objections, I'd like to commit this soon.
Sounds good to me.
Marek
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
