boost_mirror/utility
1
0
Fork 0
mirror of https://github.com/boostorg/utility.git synced 2025-05-09 15:04:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix compile error on basic_string_view::to_string when Allocator is user-defined

Browse Source
This commit is contained in:
gnaggnoyil 2016-08-26 02:15:11 +00:00 committed by Andrey Semashev
parent 39577f86d1
commit e5932ebb08
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/utility/string_view.hpp
View File

@ -157,7 +157,7 @@ namespace boost {
#ifndef BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
template<typename Allocator = std::allocator<charT> >
std::basic_string<charT, traits> to_string(const Allocator& a = Allocator()) const {
std::basic_string<charT, traits, Allocator> to_string(const Allocator& a = Allocator()) const {
return std::basic_string<charT, traits, Allocator>(begin(), end(), a);
}
#else

28
test/string_view_test2.cpp
View File

@ -9,6 +9,9 @@
#include <iostream>
#include <cstring> // for std::strchr
#ifndef BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
#include <cstdlib> // for std::malloc and std::free
#endif
#include <boost/utility/string_view.hpp>
@ -241,6 +244,29 @@ void find ( const char *arg ) {
}
#ifndef BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
template <typename T>
class alloc_holder{
public:
typedef T value_type;
explicit alloc_holder(){}
T *allocate(std::size_t n){
return reinterpret_cast<T *>(std::malloc(sizeof(T) * n));
}
void deallocate(T *p, std::size_t n){
std::free(p);
}
};
template <typename T, typename U>
bool operator==(const alloc_holder<T> &, const alloc_holder<U> &){
return true;
}
template <typename T, typename U>
bool operator!=(const alloc_holder<T> &, const alloc_holder<U> &){
return false;
}
#endif
void to_string ( const char *arg ) {
string_view sr1;
@ -256,6 +282,8 @@ void to_string ( const char *arg ) {
#ifndef BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
std::string str3 = static_cast<std::string> ( sr1 );
BOOST_CHECK ( str1 == str3 );
std::basic_string<char, std::char_traits<char>, alloc_holder<char>> alloc_str = sr1.to_string(alloc_holder<char>());
#endif
}