diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-29 14:52:18 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-29 14:52:18 -0700 |
| commit | 6a3e57bb546b094bfc8ec24a3ec63b2bd4496d65 (patch) | |
| tree | 7941b467caf44ec0c4297e4a6afb1b4ab3f0b9a0 /lib/verify.h | |
| parent | e8cbec34e8ef069f54c1189a7b6109f768047be8 (diff) | |
| download | emacs-6a3e57bb546b094bfc8ec24a3ec63b2bd4496d65.tar.gz | |
Adjust to recent gnulib change for @GUARD_PREFIX@.
Diffstat (limited to 'lib/verify.h')
| -rw-r--r-- | lib/verify.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/verify.h b/lib/verify.h index 3294b303505..c6d30a35af9 100644 --- a/lib/verify.h +++ b/lib/verify.h @@ -164,10 +164,13 @@ (!!sizeof (_GL_VERIFY_TYPE (R, DIAGNOSTIC))) # ifdef __cplusplus +# if !GNULIB_defined_struct__gl_verify_type template <int w> struct _gl_verify_type { unsigned int _gl_verify_error_if_negative: w; }; +# define GNULIB_defined_struct__gl_verify_type 1 +# endif # define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ _gl_verify_type<(R) ? 1 : -1> # elif defined _GL_HAVE__STATIC_ASSERT @@ -206,7 +209,7 @@ template <int w> # endif # endif -# ifdef _GL_VERIFY_H +/* @assert.h omit start@ */ /* Each of these macros verifies that its argument R is nonzero. To be portable, R should be an integer constant expression. Unlike @@ -220,13 +223,13 @@ template <int w> /* Verify requirement R at compile-time, as an integer constant expression. Return 1. */ -# define verify_true(R) _GL_VERIFY_TRUE (R, "verify_true (" #R ")") +# define verify_true(R) _GL_VERIFY_TRUE (R, "verify_true (" #R ")") /* Verify requirement R at compile-time, as a declaration without a trailing ';'. */ -# define verify(R) _GL_VERIFY (R, "verify (" #R ")") +# define verify(R) _GL_VERIFY (R, "verify (" #R ")") -# endif +/* @assert.h omit end@ */ #endif |