Date: Fri, 25 Aug 2017 14:53:37 +0200 From: Ed Schouten <ed@nuxi.nl> To: Mark Millard <markmi@dsl-only.net> Cc: David Chisnall <theraven@freebsd.org>, Warner Losh <imp@freebsd.org>, svn-src-head@freebsd.org, FreeBSD Current <freebsd-current@freebsd.org>, FreeBSD-STABLE Mailing List <freebsd-stable@freebsd.org>, freebsd-hackers <freebsd-hackers@freebsd.org> Subject: Re: svn commit: r322875 - head/sys/dev/nvme Message-ID: <CABh_MKm-jU0_jdXrQSCjkTcjhzt_bN23br9-vpaPT-y2KqhbGw@mail.gmail.com> In-Reply-To: <E4AB54D2-9535-4345-BB1A-96CE9AADC2F8@dsl-only.net> References: <1C5A448F-C91A-4599-8500-E4E46E6F5205@dsl-only.net> <DCD7947D-DA37-4255-A147-4B9E3B1631ED@FreeBSD.org> <E4AB54D2-9535-4345-BB1A-96CE9AADC2F8@dsl-only.net>
next in thread | previous in thread | raw e-mail | index | archive | help
2017-08-25 9:46 GMT+02:00 Mark Millard <markmi@dsl-only.net>:
> It appears that at least 11.1-STABLE -r322807 does not handle
> -std=c++98 styles of use of _Static_assert for g++7 in that
> g++7 reports an error:
Maybe we need to do something like this?
Index: sys/sys/cdefs.h
===================================================================
--- sys/sys/cdefs.h (revision 322887)
+++ sys/sys/cdefs.h (working copy)
@@ -294,7 +294,7 @@
#if (defined(__cplusplus) && __cplusplus >= 201103L) || \
__has_extension(cxx_static_assert)
#define _Static_assert(x, y) static_assert(x, y)
-#elif __GNUC_PREREQ__(4,6)
+#elif __GNUC_PREREQ__(4,6) && !defined(__cplusplus)
/* Nothing, gcc 4.6 and higher has _Static_assert built-in */
#elif defined(__COUNTER__)
#define _Static_assert(x, y) __Static_assert(x, __COUNTER__)
--
Ed Schouten <ed@nuxi.nl>
Nuxi, 's-Hertogenbosch, the Netherlands
KvK-nr.: 62051717
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CABh_MKm-jU0_jdXrQSCjkTcjhzt_bN23br9-vpaPT-y2KqhbGw>