From c072aaf3ed47169105fbb23dec64644e4277d9ec Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Wed, 18 Dec 2013 13:35:21 +0100 Subject: [PATCH] argp: fix compilation with g++-4.6 -std=c++0x. * lib/argp.h (__option_is_short, __option_is_end) Do not declare with __NTH. The 'leaf' attribute is unwelcome in the case ARGP_EI is implemented with 'static' (this occurs when compiling argp.hh with g++-4.6 -std=c++0x). --- ChangeLog | 9 +++++++++ lib/argp.h | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1753c8e..8dbcdf3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2013-12-18 Alexandre Duret-Lutz + + argp: fix compilation with g++-4.6 -std=c++0x. + + * lib/argp.h (__option_is_short, __option_is_end) Do not declare + with __NTH. The 'leaf' attribute is unwelcome in the case ARGP_EI + is implemented with 'static' (this occurs when compiling argp.hh + with g++-4.6 -std=c++0x). + 2013-12-17 Paul Eggert gettimeofday: port recent C++ fix to Emacs diff --git a/lib/argp.h b/lib/argp.h index a5f686a..99ea26a 100644 --- a/lib/argp.h +++ b/lib/argp.h @@ -620,7 +620,7 @@ __argp_usage (const struct argp_state *__state) } ARGP_EI int -__NTH (__option_is_short (const struct argp_option *__opt)) +__option_is_short (const struct argp_option *__opt) { if (__opt->flags & OPTION_DOC) return 0; @@ -632,7 +632,7 @@ __NTH (__option_is_short (const struct argp_option *__opt)) } ARGP_EI int -__NTH (__option_is_end (const struct argp_option *__opt)) +__option_is_end (const struct argp_option *__opt) { return !__opt->key && !__opt->name && !__opt->doc && !__opt->group; } -- 1.8.5.1