diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2015-12-04 20:44:13 +0000 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2015-12-04 20:44:13 +0000 |
| commit | 8097a595753910d6ba6c2e79b0639cc6b8962ce5 (patch) | |
| tree | 36cafbf6366db3a07b28fc8c6ff1a346c1f92272 | |
| parent | 72e998919196826b80c74f6b01b0e8e075113a23 (diff) | |
Define path::_Cmpt after specializing path::__is_encoded_char
* include/experimental/bits/fs_path.h (path::_Cmpt): Move definition
after path::__is_encoded_char explicit specializations.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@231307 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/experimental/fs_path.h | 20 |
2 files changed, 15 insertions, 10 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 23c2a40af98..37054122fe5 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2015-12-04 Jonathan Wakely <jwakely@redhat.com> + + * include/experimental/bits/fs_path.h (path::_Cmpt): Move definition + after __is_encoded_char explicit specializations. + 2015-12-04 Jason Merrill <jason@redhat.com> * include/bits/c++config: Fix abi_tag in special modes. diff --git a/libstdc++-v3/include/experimental/fs_path.h b/libstdc++-v3/include/experimental/fs_path.h index 1632a7e992d..176918a394b 100644 --- a/libstdc++-v3/include/experimental/fs_path.h +++ b/libstdc++-v3/include/experimental/fs_path.h @@ -549,16 +549,6 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 std::string _M_what = _M_gen_what(); }; - struct path::_Cmpt : path - { - _Cmpt(string_type __s, _Type __t, size_t __pos) - : path(std::move(__s), __t), _M_pos(__pos) { } - - _Cmpt() : _M_pos(-1) { } - - size_t _M_pos; - }; - template<> struct path::__is_encoded_char<char> : std::true_type { using value_type = char; }; @@ -575,6 +565,16 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 struct path::__is_encoded_char<char32_t> : std::true_type { using value_type = char32_t; }; + struct path::_Cmpt : path + { + _Cmpt(string_type __s, _Type __t, size_t __pos) + : path(std::move(__s), __t), _M_pos(__pos) { } + + _Cmpt() : _M_pos(-1) { } + + size_t _M_pos; + }; + // specialize _Cvt for degenerate 'noconv' case template<> struct path::_Cvt<path::value_type> |