diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2022-11-11 22:36:01 +0000 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2022-11-12 01:29:46 +0000 |
| commit | a7f51059fb009dcd7d491d6b2164bce75dbd9975 (patch) | |
| tree | 8b7290aeb5acabe0c1a39da610c30d370b589d20 | |
| parent | 5b6ce16adece24e24a4980a22792b2cb2a84b6d5 (diff) | |
| download | gcc-a7f51059fb009dcd7d491d6b2164bce75dbd9975.zip gcc-a7f51059fb009dcd7d491d6b2164bce75dbd9975.tar.gz gcc-a7f51059fb009dcd7d491d6b2164bce75dbd9975.tar.bz2 | |
libstdc++: Define INSTANTIATE_FACET_ACCESSORS macro in compat source [PR103755]
compatibility-ldbl-alt128.cc re-includes locale-inst-numeric.h and
locale-inst-monetary.h but wasn't defining the macros added in
r13-3888-gb3ac43a3c05744.
Put those macros in a new internal header that can be included everywhere
they're used.
libstdc++-v3/ChangeLog:
PR libstdc++/103755
* src/c++11/locale-inst-monetary.h: Include new header.
* src/c++11/locale-inst-numeric.h: Likewise.
* src/c++11/locale-inst.cc: Likewise.
(INSTANTIATE_USE_FACET, INSTANTIATE_FACET_ACCESSORS): Move
macro definitions to ...
* src/c++11/facet_inst_macros.h: New file.
| -rw-r--r-- | libstdc++-v3/src/c++11/facet_inst_macros.h | 17 | ||||
| -rw-r--r-- | libstdc++-v3/src/c++11/locale-inst-monetary.h | 2 | ||||
| -rw-r--r-- | libstdc++-v3/src/c++11/locale-inst-numeric.h | 2 | ||||
| -rw-r--r-- | libstdc++-v3/src/c++11/locale-inst.cc | 12 |
4 files changed, 22 insertions, 11 deletions
diff --git a/libstdc++-v3/src/c++11/facet_inst_macros.h b/libstdc++-v3/src/c++11/facet_inst_macros.h new file mode 100644 index 0000000..e0a07b1 --- /dev/null +++ b/libstdc++-v3/src/c++11/facet_inst_macros.h @@ -0,0 +1,17 @@ +#ifndef _FACET_INST_MACROS_H +#define _FACET_INST_MACROS_H + +// These macros are used for explicit instantiation definitions in src/c++11/ + +#define INSTANTIATE_USE_FACET(...) \ + template const __VA_ARGS__* \ + __try_use_facet< __VA_ARGS__ >(const locale&) noexcept; \ + template const __VA_ARGS__& \ + use_facet<__VA_ARGS__>(const locale&) + +#define INSTANTIATE_FACET_ACCESSORS(...) \ + INSTANTIATE_USE_FACET(__VA_ARGS__); \ + template bool \ + has_facet<__VA_ARGS__>(const locale&) noexcept + +#endif // _FACET_INST_MACROS_H diff --git a/libstdc++-v3/src/c++11/locale-inst-monetary.h b/libstdc++-v3/src/c++11/locale-inst-monetary.h index ff84398..26b1e33 100644 --- a/libstdc++-v3/src/c++11/locale-inst-monetary.h +++ b/libstdc++-v3/src/c++11/locale-inst-monetary.h @@ -26,6 +26,8 @@ #define "This file should not be compiled directly, only included" #endif +#include "facet_inst_macros.h" + // This header is included multiple times, to instantiate these symbols // for char/wchar_t and for both std::string ABIs, // and (depending on the target) for two long double formats. diff --git a/libstdc++-v3/src/c++11/locale-inst-numeric.h b/libstdc++-v3/src/c++11/locale-inst-numeric.h index 4b970f7..18514e8 100644 --- a/libstdc++-v3/src/c++11/locale-inst-numeric.h +++ b/libstdc++-v3/src/c++11/locale-inst-numeric.h @@ -26,6 +26,8 @@ #define "This file should not be compiled directly, only included" #endif +#include "facet_inst_macros.h" + namespace std _GLIBCXX_VISIBILITY(default) { #if ! _GLIBCXX_USE_CXX11_ABI diff --git a/libstdc++-v3/src/c++11/locale-inst.cc b/libstdc++-v3/src/c++11/locale-inst.cc index b264cb3..6767da7 100644 --- a/libstdc++-v3/src/c++11/locale-inst.cc +++ b/libstdc++-v3/src/c++11/locale-inst.cc @@ -43,19 +43,9 @@ # define C_is_char #endif -#define INSTANTIATE_USE_FACET(...) \ - template const __VA_ARGS__* \ - __try_use_facet< __VA_ARGS__ >(const locale&) noexcept; \ - template const __VA_ARGS__& \ - use_facet<__VA_ARGS__>(const locale&) \ - -#define INSTANTIATE_FACET_ACCESSORS(...) \ - INSTANTIATE_USE_FACET(__VA_ARGS__); \ - template bool \ - has_facet<__VA_ARGS__>(const locale&) noexcept - #include "locale-inst-numeric.h" #include "locale-inst-monetary.h" +#include "facet_inst_macros.h" namespace std _GLIBCXX_VISIBILITY(default) { |