public inbox for libstdc++-cvs@sourceware.org help / color / mirror / Atom feed
From: Jonathan Wakely <redi@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-5245] libstdc++: testsuite: Simplify codecvt_unicode Date: Wed, 18 Jan 2023 18:53:26 +0000 (GMT) [thread overview] Message-ID: <20230118185326.2E2B33858D28@sourceware.org> (raw) https://gcc.gnu.org/g:7d0cdbbcdd1c9e5e709d0be7d1843e8c1045fd16 commit r13-5245-g7d0cdbbcdd1c9e5e709d0be7d1843e8c1045fd16 Author: Dimitrij Mijoski <dmjpp@hotmail.com> Date: Tue Jan 17 22:12:12 2023 +0100 libstdc++: testsuite: Simplify codecvt_unicode Stop using unique_ptr, create some objects directly. libstdc++-v3/ChangeLog: * testsuite/22_locale/codecvt/codecvt_unicode.cc: Simplify. * testsuite/22_locale/codecvt/codecvt_unicode.h: Simplify. * testsuite/22_locale/codecvt/codecvt_unicode_wchar_t.cc: Simplify. Diff: --- .../testsuite/22_locale/codecvt/codecvt_unicode.cc | 18 ++++++++++-------- .../testsuite/22_locale/codecvt/codecvt_unicode.h | 9 +-------- .../22_locale/codecvt/codecvt_unicode_wchar_t.cc | 12 ++++++------ 3 files changed, 17 insertions(+), 22 deletions(-) diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_unicode.cc b/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_unicode.cc index ae4b6c8968f..df1a2b4cc51 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_unicode.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_unicode.cc @@ -29,11 +29,12 @@ test_utf8_utf32_codecvts () using codecvt_c32 = codecvt<char32_t, char, mbstate_t>; auto loc_c = locale::classic (); VERIFY (has_facet<codecvt_c32> (loc_c)); + auto &cvt = use_facet<codecvt_c32> (loc_c); test_utf8_utf32_codecvts (cvt); - auto cvt_ptr = to_unique_ptr (new codecvt_utf8<char32_t> ()); - test_utf8_utf32_codecvts (*cvt_ptr); + codecvt_utf8<char32_t> cvt2; + test_utf8_utf32_codecvts (cvt2); } void @@ -42,21 +43,22 @@ test_utf8_utf16_codecvts () using codecvt_c16 = codecvt<char16_t, char, mbstate_t>; auto loc_c = locale::classic (); VERIFY (has_facet<codecvt_c16> (loc_c)); + auto &cvt = use_facet<codecvt_c16> (loc_c); test_utf8_utf16_cvts (cvt); - auto cvt_ptr = to_unique_ptr (new codecvt_utf8_utf16<char16_t> ()); - test_utf8_utf16_cvts (*cvt_ptr); + codecvt_utf8_utf16<char16_t> cvt2; + test_utf8_utf16_cvts (cvt2); - auto cvt_ptr2 = to_unique_ptr (new codecvt_utf8_utf16<char32_t> ()); - test_utf8_utf16_cvts (*cvt_ptr2); + codecvt_utf8_utf16<char32_t> cvt3; + test_utf8_utf16_cvts (cvt3); } void test_utf8_ucs2_codecvts () { - auto cvt_ptr = to_unique_ptr (new codecvt_utf8<char16_t> ()); - test_utf8_ucs2_cvts (*cvt_ptr); + codecvt_utf8<char16_t> cvt; + test_utf8_ucs2_cvts (cvt); } int diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_unicode.h b/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_unicode.h index 99d1a46840e..fbdc7a35b28 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_unicode.h +++ b/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_unicode.h @@ -15,18 +15,11 @@ // with this library; see the file COPYING3. If not see // <http://www.gnu.org/licenses/>. +#include <algorithm> #include <locale> #include <string> -#include <memory> #include <testsuite_hooks.h> -template <typename T> -std::unique_ptr<T> -to_unique_ptr (T *ptr) -{ - return std::unique_ptr<T> (ptr); -} - struct test_offsets_ok { size_t in_size, out_size; diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_unicode_wchar_t.cc b/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_unicode_wchar_t.cc index 169504939a2..4fd1bfec63a 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_unicode_wchar_t.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_unicode_wchar_t.cc @@ -27,8 +27,8 @@ void test_utf8_utf32_codecvts () { #if __SIZEOF_WCHAR_T__ == 4 - auto cvt_ptr = to_unique_ptr (new codecvt_utf8<wchar_t> ()); - test_utf8_utf32_codecvts (*cvt_ptr); + codecvt_utf8<wchar_t> cvt; + test_utf8_utf32_codecvts (cvt); #endif } @@ -36,8 +36,8 @@ void test_utf8_utf16_codecvts () { #if __SIZEOF_WCHAR_T__ >= 2 - auto cvt_ptr = to_unique_ptr (new codecvt_utf8_utf16<wchar_t> ()); - test_utf8_utf16_cvts (*cvt_ptr); + codecvt_utf8_utf16<wchar_t> cvt; + test_utf8_utf16_cvts (cvt); #endif } @@ -45,8 +45,8 @@ void test_utf8_ucs2_codecvts () { #if __SIZEOF_WCHAR_T__ == 2 - auto cvt_ptr = to_unique_ptr (new codecvt_utf8<wchar_t> ()); - test_utf8_ucs2_cvts (*cvt_ptr); + codecvt_utf8<wchar_t> cvt; + test_utf8_ucs2_cvts (cvt); #endif }
reply other threads:[~2023-01-18 18:53 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20230118185326.2E2B33858D28@sourceware.org \ --to=redi@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ --cc=libstdc++-cvs@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: linkBe 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).