diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2021-08-16 15:35:58 +0100 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2021-08-16 17:52:02 +0100 |
| commit | 6c25932ac399423b09b730fb8f894ada568deb2a (patch) | |
| tree | 351d4c9262127bcd5638b57c3398c7e62621697a | |
| parent | db853ff78a34fef25bc16133e0367a64526f9f4e (diff) | |
| download | gcc-6c25932ac399423b09b730fb8f894ada568deb2a.zip gcc-6c25932ac399423b09b730fb8f894ada568deb2a.tar.gz gcc-6c25932ac399423b09b730fb8f894ada568deb2a.tar.bz2 | |
libstdc++: Use qualified-id for class member constant [PR101937]
The expression ctx._M_indent is not a constant expression when ctx is a
reference parameter, even though _M_indent is an enumerator. Rename it
to _S_indent to be consistent with our conventions, and refer to it as
PrintContext::_S_indent to be valid C++ code (at least until P2280 is
accepted as a DR).
Signed-off-by: Jonathan Wakely <jwakely@redhat.com>
libstdc++-v3/ChangeLog:
PR libstdc++/101937
* src/c++11/debug.cc (PrintContext::_M_indent): Replace with a
static data member.
(print_word): Use qualified-id to access it.
| -rw-r--r-- | libstdc++-v3/src/c++11/debug.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libstdc++-v3/src/c++11/debug.cc b/libstdc++-v3/src/c++11/debug.cc index 33d76bf..0128535 100644 --- a/libstdc++-v3/src/c++11/debug.cc +++ b/libstdc++-v3/src/c++11/debug.cc @@ -573,8 +573,8 @@ namespace : _M_max_length(78), _M_column(1), _M_first_line(true), _M_wordwrap(false) { get_max_length(_M_max_length); } + static constexpr int _S_indent = 4; std::size_t _M_max_length; - enum { _M_indent = 4 } ; std::size_t _M_column; bool _M_first_line; bool _M_wordwrap; @@ -603,7 +603,7 @@ namespace if (length == 0) return; - // Consider first '\n' at begining cause it impacts column. + // First consider '\n' at the beginning because it impacts the column. if (word[0] == '\n') { fprintf(stderr, "\n"); @@ -625,8 +625,8 @@ namespace // If this isn't the first line, indent if (ctx._M_column == 1 && !ctx._M_first_line) { - const char spacing[ctx._M_indent + 1] = " "; - print_raw(ctx, spacing, ctx._M_indent); + const char spacing[PrintContext::_S_indent + 1] = " "; + print_raw(ctx, spacing, PrintContext::_S_indent); } int written = fprintf(stderr, "%.*s", (int)length, word); |