public inbox for libstdc++@gcc.gnu.org
 help / color / mirror / Atom feed
From: Jonathan Wakely <jwakely@redhat.com>
To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org
Subject: [committed] libstdc++: Fix error in filesystem::path with Clang
Date: Sat, 16 Oct 2021 00:49:01 +0100	[thread overview]
Message-ID: <YWoTbQJ2GUx8F0Gm@redhat.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 455 bytes --]

THis fixes teh following error seen with Clang:

error: function '_S_convert<std::basic_string_view<char8_t>>' with deduced
return type cannot be used before it is defined
          return string_type(_S_convert(std::u8string_view(__str)));
                             ^

libstdc++-v3/ChangeLog:

	* include/bits/fs_path.h (path::_S_convert(T)): Avoid recursive
	call to function with deduced return type.

Tested powerpc64le-linux. Committed to trunk.


[-- Attachment #2: patch.txt --]
[-- Type: text/plain, Size: 1324 bytes --]

commit e547d1341b1fe90672c9b982c4a98f8197237bb7
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Fri Oct 15 23:27:54 2021

    libstdc++: Fix error in filesystem::path with Clang
    
    THis fixes teh following error seen with Clang:
    
    error: function '_S_convert<std::basic_string_view<char8_t>>' with deduced
    return type cannot be used before it is defined
              return string_type(_S_convert(std::u8string_view(__str)));
                                 ^
    
    libstdc++-v3/ChangeLog:
    
            * include/bits/fs_path.h (path::_S_convert(T)): Avoid recursive
            call to function with deduced return type.

diff --git a/libstdc++-v3/include/bits/fs_path.h b/libstdc++-v3/include/bits/fs_path.h
index d13fb12455c..4bd980952f1 100644
--- a/libstdc++-v3/include/bits/fs_path.h
+++ b/libstdc++-v3/include/bits/fs_path.h
@@ -630,7 +630,8 @@ namespace __detail
 	  // Calling _S_convert<char8_t> will return a u8string_view that
 	  // refers to __str and would dangle after this function returns.
 	  // Return a string_type instead, to avoid dangling.
-	  return string_type(_S_convert(std::u8string_view(__str)));
+	  return string_type(_S_convert(__str.data(),
+					__str.data() + __str.size()));
 #endif
 	else
 	  return _S_convert(__str.data(), __str.data() + __str.size());

                 reply	other threads:[~2021-10-15 23:49 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=YWoTbQJ2GUx8F0Gm@redhat.com \
    --to=jwakely@redhat.com \
    --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).