Date: Mon, 29 Jul 2013 12:33:04 +0000 (UTC) From: David Chisnall <theraven@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r253766 - head/lib/msun/src Message-ID: <201307291233.r6TCX481078418@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: theraven Date: Mon Jul 29 12:33:03 2013 New Revision: 253766 URL: http://svnweb.freebsd.org/changeset/base/253766 Log: Restore the longer form of the _Generic. The short form does not work in C++. Modified: head/lib/msun/src/math.h Modified: head/lib/msun/src/math.h ============================================================================== --- head/lib/msun/src/math.h Mon Jul 29 10:14:17 2013 (r253765) +++ head/lib/msun/src/math.h Mon Jul 29 12:33:03 2013 (r253766) @@ -83,10 +83,19 @@ extern const union __nan_un { #if (__STDC_VERSION__ >= 201112L && defined(__clang__)) || \ __has_extension(c_generic_selections) -#define __fp_type_select(x, f, d, ld) _Generic((0,(x)), \ +#define __fp_type_select(x, f, d, ld) _Generic((x), \ float: f(x), \ double: d(x), \ - long double: ld(x)) + long double: ld(x), \ + volatile float: f(x), \ + volatile double: d(x), \ + volatile long double: ld(x), \ + volatile const float: f(x), \ + volatile const double: d(x), \ + volatile const long double: ld(x), \ + const float: f(x), \ + const double: d(x), \ + const long double: ld(x)) #elif __GNUC_PREREQ__(3, 1) && !defined(__cplusplus) #define __fp_type_select(x, f, d, ld) __builtin_choose_expr( \ __builtin_types_compatible_p(__typeof(x), long double), ld(x), \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307291233.r6TCX481078418>