boostorg/static_string
1
0
Fork 1
mirror of https://github.com/boostorg/static_string.git synced 2025-07-28 11:37:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix test and standalone support

Browse Source
This commit is contained in:
Krystian Stasiowski
2019-12-16 18:19:01 -05:00
parent 41bb1a550d
commit 0f4d2db416
2 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
include/boost/static_string/static_string.hpp
View File

@ -81,7 +81,7 @@ public:
/// The type of `string_view` returned by the interface /// The type of `string_view` returned by the interface
using string_view_type = using string_view_type =
string_view; basic_string_view<CharT, Traits>;
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// //
@ -957,14 +957,14 @@ public:
/** Insert into the string. /** Insert into the string.
Inserts elements from `string_view{t}` at the position `index` Inserts elements from `string_view_type{t}` at the position `index`
The inserted string can contain null characters. The inserted string can contain null characters.
This function participates in overload resolution if This function participates in overload resolution if
`T` is convertible to `string_view` and `T` is not `T` is convertible to `string_view` and `T` is not
convertible to `CharT const*`. convertible to `CharT const*`.
@throw std::length_error if `string_view{t}.substr(index_str, count).size() > max_size() - size()` @throw std::length_error if `string_view_type{t}.substr(index_str, count).size() > max_size() - size()`
@return `*this` @return `*this`
*/ */
template<typename T> template<typename T>
@ -985,15 +985,15 @@ public:
/** Insert into the string. /** Insert into the string.
Inserts elements from `string_view{t}.substr(index_str, count)` at the position `index` Inserts elements from `string_view_type{t}.substr(index_str, count)` at the position `index`
The inserted string can contain null characters. The inserted string can contain null characters.
This function participates in overload resolution if This function participates in overload resolution if
`T` is convertible to `string_view` and `T` is not `T` is convertible to `string_view` and `T` is not
convertible to `CharT const*`. convertible to `CharT const*`.
@throw std::out_of_range if `index_str > string_view{t}.size()` @throw std::out_of_range if `index_str > string_view_type{t}.size()`
@throw std::length_error if `string_view{t}.substr(index_str, count).size() > max_size() - size()` @throw std::length_error if `string_view_type{t}.substr(index_str, count).size() > max_size() - size()`
@return `*this` @return `*this`
*/ */
template<typename T> template<typename T>
@ -1198,14 +1198,14 @@ public:
/** Append to the string. /** Append to the string.
Appends characters from `string_view{t}` Appends characters from `string_view_type{t}`
The appended string can contain null characters. The appended string can contain null characters.
This function participates in overload resolution if This function participates in overload resolution if
`T` is convertible to `string_view` and `T` is not `T` is convertible to `string_view` and `T` is not
convertible to `CharT const*`. convertible to `CharT const*`.
@throw std::length_error if `string_view{t}.size() > max_size() - size()` @throw std::length_error if `string_view_type{t}.size() > max_size() - size()`
@return `*this` @return `*this`
*/ */
template<typename T> template<typename T>
@ -1223,20 +1223,20 @@ public:
append( append(
T const& t) T const& t)
{ {
return append(string_view{t}); return append(string_view_type{t});
} }
/** Append to the string. /** Append to the string.
Appends characters from `string_view{t}.substr{pos, count}` Appends characters from `string_view_type{t}.substr{pos, count}`
The appended string can contain null characters. The appended string can contain null characters.
This function participates in overload resolution if This function participates in overload resolution if
`T` is convertible to `string_view` and `T` is not `T` is convertible to `string_view_type` and `T` is not
convertible to `CharT const*`. convertible to `CharT const*`.
@throw std::out_of_range if `pos > string_view{t}.size()` @throw std::out_of_range if `pos > string_view_type{t}.size()`
@throw std::length_error if `string_view{t}.substr(pos, count).size() > max_size() - size()` @throw std::length_error if `string_view_type{t}.substr(pos, count).size() > max_size() - size()`
@return `*this` @return `*this`
*/ */
template<typename T> template<typename T>
@ -1256,7 +1256,7 @@ public:
size_type pos, size_type pos,
size_type count = npos) size_type count = npos)
{ {
return append(string_view{t}.substr(pos, count)); return append(string_view_type{t}.substr(pos, count));
} }
/** Append to the string. /** Append to the string.
@ -1328,7 +1328,7 @@ public:
The appended string can contain null characters. The appended string can contain null characters.
This function participates in overload resolution if This function participates in overload resolution if
`T` is convertible to `string_view` and `T` is not `T` is convertible to `string_view_type` and `T` is not
convertible to `CharT const*`. convertible to `CharT const*`.
@throw std::length_error if `string_view_type{t}.size() > max_size()` @throw std::length_error if `string_view_type{t}.size() > max_size()`
@ -2770,7 +2770,7 @@ std::basic_ostream<CharT, Traits>&
operator<<(std::basic_ostream<CharT, Traits>& os, operator<<(std::basic_ostream<CharT, Traits>& os,
basic_static_string<N, CharT, Traits> const& s) basic_static_string<N, CharT, Traits> const& s)
{ {
return os << string_view(s.data(), s.size()); return os << basic_string_view<CharT, Traits>(s.data(), s.size());
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

7
test/static_string.cpp
View File

@ -16,6 +16,7 @@
namespace boost { namespace boost {
namespace static_string { namespace static_string {
using string_view = basic_string_view<char, std::char_traits<char>>;
template <class S> template <class S>
bool bool
@ -6933,7 +6934,6 @@ constexpr bool testConstexpr()
#elif __cplusplus >= 201402L #elif __cplusplus >= 201402L
// c++14 constexpr tests // c++14 constexpr tests
static_string<4> a;
using S = basic_static_string<16, char, cxper_char_traits>; using S = basic_static_string<16, char, cxper_char_traits>;
@ -6963,7 +6963,7 @@ constexpr bool testConstexpr()
#else __cplusplus >= 201103L #else __cplusplus >= 201103L
// c++11 constexpr tests // c++11 constexpr tests
static_string<4> a; static_string<4, char, cxper_char_traits> a;
auto b = a.size(); auto b = a.size();
auto c = a.empty(); auto c = a.empty();
auto d = a.empty(); auto d = a.empty();
@ -7007,6 +7007,9 @@ runTests()
testHash(); testHash();
static_string<1>() + static_string<3>();
static_string<3>() + "ggggg";
return report_errors(); return report_errors();
} }