From 96d3aaacc5aaa0e325eff344dd7ae0e0fbf4b418 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 7 Feb 2023 14:30:54 -0800 Subject: [PATCH] nullptr: rename from c-nullptr * NEWS, doc/gnulib.texi: Mention this. * m4/nullptr.m4: Rename from m4/c-nullptr.m4. (gl_NULLPTR): Rename from gl_C_NULLPTR. * modules/nullptr: Rename from modules/nullptr. * modules/nullptr-c++-tests: Rename from modules/c-nullptr-c++-tests. * modules/nullptr-tests: Rename from modules/c-nullptr-tests. All uses changed. --- ChangeLog | 11 +++++++++++ NEWS | 2 ++ doc/gnulib.texi | 11 ++++++----- m4/{c-nullptr.m4 => nullptr.m4} | 2 +- modules/{c-nullptr => nullptr} | 4 ++-- modules/{c-nullptr-c++-tests => nullptr-c++-tests} | 0 modules/{c-nullptr-tests => nullptr-tests} | 2 +- 7 files changed, 23 insertions(+), 9 deletions(-) rename m4/{c-nullptr.m4 => nullptr.m4} (98%) rename modules/{c-nullptr => nullptr} (82%) rename modules/{c-nullptr-c++-tests => nullptr-c++-tests} (100%) rename modules/{c-nullptr-tests => nullptr-tests} (87%) diff --git a/ChangeLog b/ChangeLog index b6eec570be..defcef16e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2023-02-07 Paul Eggert + + nullptr: rename from c-nullptr + * NEWS, doc/gnulib.texi: Mention this. + * m4/nullptr.m4: Rename from m4/c-nullptr.m4. + (gl_NULLPTR): Rename from gl_C_NULLPTR. + * modules/nullptr: Rename from modules/nullptr. + * modules/nullptr-c++-tests: Rename from modules/c-nullptr-c++-tests. + * modules/nullptr-tests: Rename from modules/c-nullptr-tests. + All uses changed. + 2023-02-07 Bruno Haible Fix a copyright header - module license mismatch. diff --git a/NEWS b/NEWS index f3b508f950..0ec377915c 100644 --- a/NEWS +++ b/NEWS @@ -74,6 +74,8 @@ User visible incompatible changes Date Modules Changes +2023-02-07 c-nullptr Rename this module to nullptr. + 2023-01-21 getprogname The include file is changed from "getprogname.h" to . diff --git a/doc/gnulib.texi b/doc/gnulib.texi index b3f011818c..6fe2678834 100644 --- a/doc/gnulib.texi +++ b/doc/gnulib.texi @@ -920,13 +920,13 @@ On pre-C23 platforms, the keyword substitutes assume C99 or later. @node nullptr @section @code{nullptr} -Gnulib module: c-nullptr +Gnulib module: nullptr @cindex null pointer -The @code{c-nullptr} module arranges for @code{nullptr} to act -like standard C@. +The @code{nullptr} module arranges for @code{nullptr} to act +like standard C and C++. -The C @code{nullptr} keyword yields a null pointer. It differs from +The @code{nullptr} keyword yields a null pointer. It differs from the @code{NULL} macro, in that @code{NULL} might be an integer whereas @code{nullptr} is of a special @code{nullptr_t} type with only one value, namely @code{nullptr} itself. Using @code{nullptr} can help @@ -939,7 +939,8 @@ Portability problems fixed by Gnulib: @itemize @item Some platforms lack @code{nullptr}: -GCC 12, Clang 15, and other pre-2023 C compilers. +For C: GCC 12, Clang 15, and other pre-2023 C compilers. +For C++: pre-2011 C++ compilers. @end itemize Portability problems not fixed by Gnulib: diff --git a/m4/c-nullptr.m4 b/m4/nullptr.m4 similarity index 98% rename from m4/c-nullptr.m4 rename to m4/nullptr.m4 index 960eeff18d..e1218ccd49 100644 --- a/m4/c-nullptr.m4 +++ b/m4/nullptr.m4 @@ -5,7 +5,7 @@ dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. -AC_DEFUN([gl_C_NULLPTR], +AC_DEFUN([gl_NULLPTR], [ AC_CACHE_CHECK([for nullptr], [gl_cv_c_nullptr], [AC_COMPILE_IFELSE( diff --git a/modules/c-nullptr b/modules/nullptr similarity index 82% rename from modules/c-nullptr rename to modules/nullptr index bc5fa43200..41330854b9 100644 --- a/modules/c-nullptr +++ b/modules/nullptr @@ -2,12 +2,12 @@ Description: A nullptr that is like C23. Files: -m4/c-nullptr.m4 +m4/nullptr.m4 Depends-on: configure.ac: -gl_C_NULLPTR +gl_NULLPTR Makefile.am: diff --git a/modules/c-nullptr-c++-tests b/modules/nullptr-c++-tests similarity index 100% rename from modules/c-nullptr-c++-tests rename to modules/nullptr-c++-tests diff --git a/modules/c-nullptr-tests b/modules/nullptr-tests similarity index 87% rename from modules/c-nullptr-tests rename to modules/nullptr-tests index 40e28d200b..21a7caf00d 100644 --- a/modules/c-nullptr-tests +++ b/modules/nullptr-tests @@ -3,7 +3,7 @@ tests/test-nullptr.c tests/macros.h Depends-on: -c-nullptr-c++-tests +nullptr-c++-tests configure.ac: -- 2.39.5