diff options
author | Jonathan Wakely <jwakely@redhat.com> | 2022-04-01 12:02:13 +0100 |
---|---|---|
committer | Jonathan Wakely <jwakely@redhat.com> | 2022-04-11 15:53:22 +0100 |
commit | 0df39b08037f78dfc53c3c4e6c09b3babe6ee0f8 (patch) | |
tree | 58ef8d954bf9f3f8618aac126e84d43b294f4b54 | |
parent | 7d25f9b6f1e3c72149868fd66d5a3aac429ecb83 (diff) | |
download | gcc-0df39b08037f78dfc53c3c4e6c09b3babe6ee0f8.zip gcc-0df39b08037f78dfc53c3c4e6c09b3babe6ee0f8.tar.gz gcc-0df39b08037f78dfc53c3c4e6c09b3babe6ee0f8.tar.bz2 |
libstdc++: Move Filesystem TS path definitions out of class body
This fixes some errors with clang caused by instantiating vector<_Cmpt>
before the _Cmpt type is complete.
libstdc++-v3/ChangeLog:
* include/experimental/bits/fs_path.h (path): Define special
members after path::_Cmpt is complete.
-rw-r--r-- | libstdc++-v3/include/experimental/bits/fs_path.h | 59 |
1 files changed, 38 insertions, 21 deletions
diff --git a/libstdc++-v3/include/experimental/bits/fs_path.h b/libstdc++-v3/include/experimental/bits/fs_path.h index 803df42..b0825ba 100644 --- a/libstdc++-v3/include/experimental/bits/fs_path.h +++ b/libstdc++-v3/include/experimental/bits/fs_path.h @@ -212,21 +212,11 @@ namespace __detail // constructors and destructor - path() noexcept { } + path() noexcept; + path(const path& __p); + path(path&& __p) noexcept; - path(const path& __p) = default; - - path(path&& __p) noexcept - : _M_pathname(std::move(__p._M_pathname)), _M_type(__p._M_type) - { - if (_M_type == _Type::_Multi) - _M_split_cmpts(); - __p.clear(); - } - - path(string_type&& __source) - : _M_pathname(std::move(__source)) - { _M_split_cmpts(); } + path(string_type&& __source); template<typename _Source, typename _Require = __detail::_Path<_Source>> @@ -256,11 +246,11 @@ namespace __detail : _M_pathname(_S_convert_loc(__first, __last, __loc)) { _M_split_cmpts(); } - ~path() = default; + ~path(); // assignments - path& operator=(const path& __p) = default; + path& operator=(const path& __p); path& operator=(path&& __p) noexcept; path& operator=(string_type&& __source); path& assign(string_type&& __source); @@ -449,11 +439,7 @@ namespace __detail _Multi, _Root_name, _Root_dir, _Filename }; - path(string_type __str, _Type __type) : _M_pathname(__str), _M_type(__type) - { - __glibcxx_assert(!empty()); - __glibcxx_assert(_M_type != _Type::_Multi); - } + path(string_type __str, _Type __type); enum class _Split { _Stem, _Extension }; @@ -908,6 +894,37 @@ namespace __detail bool _M_at_end; // only used when type != _Multi }; + inline + path::path() noexcept = default; + + inline + path::path(const path&) = default; + + inline + path::path(path&& __p) noexcept + : _M_pathname(std::move(__p._M_pathname)), + _M_cmpts(__p._M_cmpts), + _M_type(__p._M_type) + { __p.clear(); } + + inline + path::path(string_type&& __source) + : _M_pathname(std::move(__source)) + { _M_split_cmpts(); } + + inline + path::path(string_type __str, _Type __type) + : _M_pathname(__str), _M_type(__type) + { + __glibcxx_assert(!empty()); + __glibcxx_assert(_M_type != _Type::_Multi); + } + + inline + path::~path() = default; + + inline path& + path::operator=(const path& __p) = default; inline path& path::operator=(path&& __p) noexcept |