OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.

From-SVN: r231107
This commit is contained in:
Jonathan Wakely 2015-12-01 11:33:17 +00:00 committed by Jonathan Wakely
parent 5a308cf1c6
commit 22f5095f31
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,8 @@
2015-12-01 Jonathan Wakely <jwakely@redhat.com>
* include/experimental/bits/fs_path.h (path::_Cmpt): Move definition
after __is_encoded_char explicit specializations.
2015-11-26 Jonathan Wakely <jwakely@redhat.com>
* testsuite/libstdc++-prettyprinters/debug.cc: Add -std=gnu++98 to

20
libstdc++-v3/include/experimental/bits/fs_path.h
View File

@ -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>