feedc0de/boost_static_string
1
0
Fork 0
forked from boostorg/static_string
Code Pull Requests Activity

Update meta, remove redundant exception check

Browse Source
This commit is contained in:
Krystian Stasiowski
2020-03-15 13:46:48 -04:00
parent 3784d039cd
commit 0b231586ed
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6297,9 +6297,6 @@ replace(
const std::size_t n1 = detail::distance(i1, i2); const std::size_t n1 = detail::distance(i1, i2);
const std::size_t n2 = read_back(false, j1, j2); const std::size_t n2 = read_back(false, j1, j2);
const std::size_t pos = i1 - curr_data; const std::size_t pos = i1 - curr_data;
if (n2 > max_size() || curr_size - (std::min)(n1, curr_size - pos) >= max_size() - n2)
detail::throw_exception<std::length_error>(
"replaced string exceeds max_size()");
// Rotate to the correct order. [i2, end] will now start with the replaced string, // Rotate to the correct order. [i2, end] will now start with the replaced string,
// continue to the existing string not being replaced, and end with a null terminator // continue to the existing string not being replaced, and end with a null terminator
std::rotate(&curr_data[pos], &curr_data[curr_size + 1], &curr_data[curr_size + n2 + 1]); std::rotate(&curr_data[pos], &curr_data[curr_size + 1], &curr_data[curr_size + n2 + 1]);
@ -6446,6 +6443,8 @@ read_back(
{ {
if (new_size >= max_size()) if (new_size >= max_size())
{ {
// if we overwrote the null terminator,
// put it back
if (overwrite_null) if (overwrite_null)
term(); term();
detail::throw_exception<std::length_error>( detail::throw_exception<std::length_error>(

4
meta/libraries.json
View File

@ -1,8 +1,8 @@
{ {
"key": "static_string", "key": "static_string",
"name": "StaticString", "name": "Static String",
"authors": [ "authors": [
"Krystian Stasiowski", "Krystian Stasiowski",
"Vinnie Falco" "Vinnie Falco"
], ],
"description": "A fixed capacity dynamically sized string.", "description": "A fixed capacity dynamically sized string.",