From: "Pekka Seppänen" <pexu@gcc.mail.kapsi.fi>
To: gcc-patches@gcc.gnu.org
Cc: libstdc++@gcc.gnu.org
Subject: [PATCH v2] libstdc++: Fix -Wunused-parameter warnings
Date: Thu, 7 Sep 2023 22:30:00 +0300 [thread overview]
Message-ID: <93b18ce6-aef3-4d0b-becc-a301aa8bb84d@gcc.mail.kapsi.fi> (raw)
In-Reply-To: <ZPn8+tYliELnxonI@redhat.com>
On 7.9.2023 19:40, Jonathan Wakely wrote:
> On 29/08/23 15:04 +0300, Pekka Seppänen wrote:
>> libstdc++: Fix -Wunused-parameter warnings when _GLIBCXX_USE_WCHAR_T is
>> not defined.
>>
>> libstdc++-v3/ChangeLog:
>>
>> * src/c++11/cow-locale_init.cc: Add [[maybe_unused]] attribute.
>> * src/c++17/fs_path.cc (path::_S_convert_loc): Likewise.
>> * src/filesystem/path.cc (path::_S_convert_loc): Likewise.
>> ---
>> libstdc++-v3/src/c++11/cow-locale_init.cc | 4 ++--
>> libstdc++-v3/src/c++17/fs_path.cc | 2 +-
>> libstdc++-v3/src/filesystem/path.cc | 2 +-
>> 3 files changed, 4 insertions(+), 4 deletions(-)
>>
>> mbstate_t>>(__loc);
>>
>> diff --git a/libstdc++-v3/src/c++11/cow-locale_init.cc
>> b/libstdc++-v3/src/c++11/cow-locale_init.cc
>> index 85277763427..9554ed1ebf9 100644
>> --- a/libstdc++-v3/src/c++11/cow-locale_init.cc
>> +++ b/libstdc++-v3/src/c++11/cow-locale_init.cc
>> @@ -137,8 +137,8 @@ namespace
>> }
>>
>> void
>> - locale::_Impl::_M_init_extra(void* cloc, void* clocm,
>> - const char* __s, const char* __smon)
>> + locale::_Impl::_M_init_extra(void* cloc, [[maybe_unused]] void*
>> clocm,
>> + const char* __s, [[maybe_unused]] const char* __smon)
>
> This line should be split to keepo it below 80 columns.
>
Done, v2 follows.
> Otherwise the patch looks good, but please CC the libstdc++ list for
> libstdc++ patches. Otherwise I won't see them, and they won't be
> reviewed.
>
My bad, I wasn't aware of this.
> Do you have a GCC copyright assignment on file? If not, please add a
> sign-off to confirm you can submit this under the DCO terms:
> https://gcc.gnu.org/dco.html
>
Will add.
>
>> {
>> auto& __cloc = *static_cast<__c_locale*>(cloc);
>>
>> diff --git a/libstdc++-v3/src/c++17/fs_path.cc
>> b/libstdc++-v3/src/c++17/fs_path.cc
>> index aaea7d2725d..d65b5482e8b 100644
>> --- a/libstdc++-v3/src/c++17/fs_path.cc
>> +++ b/libstdc++-v3/src/c++17/fs_path.cc
>> @@ -1947,7 +1947,7 @@ path::_M_split_cmpts()
>>
>> path::string_type
>> path::_S_convert_loc(const char* __first, const char* __last,
>> - const std::locale& __loc)
>> + [[maybe_unused]] const std::locale& __loc)
>> {
>> #if _GLIBCXX_USE_WCHAR_T
>> auto& __cvt = std::use_facet<codecvt<wchar_t, char,
>> mbstate_t>>(__loc);
>> diff --git a/libstdc++-v3/src/filesystem/path.cc
>> b/libstdc++-v3/src/filesystem/path.cc
>> index 4c218bdae49..d04ba6d465d 100644
>> --- a/libstdc++-v3/src/filesystem/path.cc
>> +++ b/libstdc++-v3/src/filesystem/path.cc
>> @@ -498,7 +498,7 @@ path::_M_trim()
>>
>> path::string_type
>> path::_S_convert_loc(const char* __first, const char* __last,
>> - const std::locale& __loc)
>> + [[maybe_unused]] const std::locale& __loc)
>> {
>> #if _GLIBCXX_USE_WCHAR_T
>> auto& __cvt = std::use_facet<codecvt<wchar_t, char,
>
>
-- >8 --
libstdc++: Fix -Wunused-parameter warnings when _GLIBCXX_USE_WCHAR_T is
not defined.
libstdc++-v3/ChangeLog:
* src/c++11/cow-locale_init.cc: Add [[maybe_unused]] attribute.
* src/c++17/fs_path.cc (path::_S_convert_loc): Likewise.
* src/filesystem/path.cc (path::_S_convert_loc): Likewise.
Signed-off-by: Pekka Seppänen <pexu@gcc.mail.kapsi.fi>
---
libstdc++-v3/src/c++11/cow-locale_init.cc | 5 +++--
libstdc++-v3/src/c++17/fs_path.cc | 2 +-
libstdc++-v3/src/filesystem/path.cc | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/libstdc++-v3/src/c++11/cow-locale_init.cc b/libstdc++-v3/src/c++11/cow-locale_init.cc
index 85277763427..f48561f5b12 100644
--- a/libstdc++-v3/src/c++11/cow-locale_init.cc
+++ b/libstdc++-v3/src/c++11/cow-locale_init.cc
@@ -137,8 +137,9 @@ namespace
}
void
- locale::_Impl::_M_init_extra(void* cloc, void* clocm,
- const char* __s, const char* __smon)
+ locale::_Impl::_M_init_extra(void* cloc, [[maybe_unused]] void* clocm,
+ const char* __s,
+ [[maybe_unused]] const char* __smon)
{
auto& __cloc = *static_cast<__c_locale*>(cloc);
diff --git a/libstdc++-v3/src/c++17/fs_path.cc b/libstdc++-v3/src/c++17/fs_path.cc
index aaea7d2725d..d65b5482e8b 100644
--- a/libstdc++-v3/src/c++17/fs_path.cc
+++ b/libstdc++-v3/src/c++17/fs_path.cc
@@ -1947,7 +1947,7 @@ path::_M_split_cmpts()
path::string_type
path::_S_convert_loc(const char* __first, const char* __last,
- const std::locale& __loc)
+ [[maybe_unused]] const std::locale& __loc)
{
#if _GLIBCXX_USE_WCHAR_T
auto& __cvt = std::use_facet<codecvt<wchar_t, char, mbstate_t>>(__loc);
diff --git a/libstdc++-v3/src/filesystem/path.cc b/libstdc++-v3/src/filesystem/path.cc
index 4c218bdae49..d04ba6d465d 100644
--- a/libstdc++-v3/src/filesystem/path.cc
+++ b/libstdc++-v3/src/filesystem/path.cc
@@ -498,7 +498,7 @@ path::_M_trim()
path::string_type
path::_S_convert_loc(const char* __first, const char* __last,
- const std::locale& __loc)
+ [[maybe_unused]] const std::locale& __loc)
{
#if _GLIBCXX_USE_WCHAR_T
auto& __cvt = std::use_facet<codecvt<wchar_t, char, mbstate_t>>(__loc);
--
2.42.0
next prev parent reply other threads:[~2023-09-07 19:30 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <a84c14b1b71f6976614db5d92d2dfadb@gcc.mail.kapsi.fi>
2023-09-07 16:40 ` [PATCH] " Jonathan Wakely
2023-09-07 19:30 ` Pekka Seppänen [this message]
2023-09-08 17:12 ` [PATCH v2] " Jonathan Wakely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=93b18ce6-aef3-4d0b-becc-a301aa8bb84d@gcc.mail.kapsi.fi \
--to=pexu@gcc.mail.kapsi.fi \
--cc=gcc-patches@gcc.gnu.org \
--cc=libstdc++@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).