Skip to content

Update boost::container::basic_string template parameters in path_traits #343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
igaztanaga wants to merge 1 commit into from
Closed

Update boost::container::basic_string template parameters in path_traits #343

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions include/boost/filesystem/detail/path_traits.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ namespace boost {
template< typename, typename > class basic_string_view;

namespace container {
template< typename, typename, typename > class basic_string;
template< typename, typename, typename, typename> class basic_string;
} // namespace container

namespace filesystem {
Expand Down Expand Up @@ -204,15 +204,15 @@ struct path_source_traits< std::wstring >
};

template< >
struct path_source_traits< boost::container::basic_string< char, std::char_traits< char >, void > >
struct path_source_traits< boost::container::basic_string< char, std::char_traits< char >, void, void > >
{
typedef boost_container_string_tag tag_type;
typedef char char_type;
static BOOST_CONSTEXPR_OR_CONST bool is_native = false;
};

template< >
struct path_source_traits< boost::container::basic_string< wchar_t, std::char_traits< wchar_t >, void > >
struct path_source_traits< boost::container::basic_string< wchar_t, std::char_traits< wchar_t >, void, void > >
{
typedef boost_container_string_tag tag_type;
typedef wchar_t char_type;
Expand Down Expand Up @@ -490,8 +490,8 @@ yes_type check_convertible(const char*);
yes_type check_convertible(const wchar_t*);
yes_type check_convertible(std::string const&);
yes_type check_convertible(std::wstring const&);
yes_type check_convertible(boost::container::basic_string< char, std::char_traits< char >, void > const&);
yes_type check_convertible(boost::container::basic_string< wchar_t, std::char_traits< wchar_t >, void > const&);
yes_type check_convertible(boost::container::basic_string< char, std::char_traits< char >, void, void > const&);
yes_type check_convertible(boost::container::basic_string< wchar_t, std::char_traits< wchar_t >, void, void > const&);
#if !defined(BOOST_NO_CXX17_HDR_STRING_VIEW)
yes_type check_convertible(std::string_view const&);
yes_type check_convertible(std::wstring_view const&);
Expand Down Expand Up @@ -563,8 +563,8 @@ yes_type check_convertible(const char*);
yes_type check_convertible(const wchar_t*);
yes_type check_convertible(std::string const&);
yes_type check_convertible(std::wstring const&);
yes_type check_convertible(boost::container::basic_string< char, std::char_traits< char >, void > const&);
yes_type check_convertible(boost::container::basic_string< wchar_t, std::char_traits< wchar_t >, void > const&);
yes_type check_convertible(boost::container::basic_string< char, std::char_traits< char >, void, void > const&);
yes_type check_convertible(boost::container::basic_string< wchar_t, std::char_traits< wchar_t >, void, void > const&);
yes_type check_convertible(boost::basic_string_view< char, std::char_traits< char > > const&);
yes_type check_convertible(boost::basic_string_view< wchar_t, std::char_traits< wchar_t > > const&);
no_type check_convertible(std::nullptr_t);
Expand Down Expand Up @@ -643,24 +643,24 @@ BOOST_FORCEINLINE typename Callback::result_type dispatch_convertible_impl(std::
template< typename Source, typename Callback >
BOOST_FORCEINLINE typename Callback::result_type dispatch_convertible_impl
(
boost::container::basic_string< char, std::char_traits< char >, void > const& source,
boost::container::basic_string< char, std::char_traits< char >, void, void > const& source,
Callback cb,
const codecvt_type* cvt
)
{
typedef typename path_traits::make_dependent< boost::container::basic_string< char, std::char_traits< char >, void >, Source >::type source_t;
typedef typename path_traits::make_dependent< boost::container::basic_string< char, std::char_traits< char >, void, void >, Source >::type source_t;
return path_traits::dispatch(static_cast< source_t const& >(source), cb, cvt);
}

template< typename Source, typename Callback >
BOOST_FORCEINLINE typename Callback::result_type dispatch_convertible_impl
(
boost::container::basic_string< wchar_t, std::char_traits< wchar_t >, void > const& source,
boost::container::basic_string< wchar_t, std::char_traits< wchar_t >, void, void > const& source,
Callback cb,
const codecvt_type* cvt
)
{
typedef typename path_traits::make_dependent< boost::container::basic_string< wchar_t, std::char_traits< wchar_t >, void >, Source >::type source_t;
typedef typename path_traits::make_dependent< boost::container::basic_string< wchar_t, std::char_traits< wchar_t >, void, void >, Source >::type source_t;
return path_traits::dispatch(static_cast< source_t const& >(source), cb, cvt);
}

Expand Down