svn commit: r228478 - head/sys/sys

[Bjoern A. Zeeb]

On Tue, 13 Dec 2011, Ed Schouten wrote:

> Author: ed
> Date: Tue Dec 13 19:39:24 2011
> New Revision: 228478
> URL: http://svn.freebsd.org/changeset/base/228478
>
> Log:
>  Reimplement CTASSERT() using _Static_assert().

Cool, can we have a second variant with a custom error message?
Not having file:line and more information is freakingly unhelpful
often when compiling with -j<high n> and our current default compiler.


> Modified:
>  head/sys/sys/systm.h
>
> Modified: head/sys/sys/systm.h
> ==============================================================================
> --- head/sys/sys/systm.h	Tue Dec 13 19:37:27 2011	(r228477)
> +++ head/sys/sys/systm.h	Tue Dec 13 19:39:24 2011	(r228478)
> @@ -92,10 +92,8 @@ enum VM_GUEST { VM_GUEST_NO = 0, VM_GUES
> } while (0)
> #endif
>
> -#ifndef CTASSERT		/* Allow lint to override */
> -#define	CTASSERT(x)		_CTASSERT(x, __LINE__)
> -#define	_CTASSERT(x, y)		__CTASSERT(x, y)
> -#define	__CTASSERT(x, y)	typedef char __assert ## y[(x) ? 1 : -1]
> +#ifndef CTASSERT	/* Allow lint to override */
> +#define	CTASSERT(x)	_Static_assert(x, "compile-time assertion failed")
> #endif
>
> /*
>

-- 
Bjoern A. Zeeb                                 You have to have visions!
          Stop bit received. Insert coin for new address family.