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

Add external include guard

Browse Source
This commit is contained in:
Krystian Stasiowski
2020-02-28 14:52:07 -05:00
parent 18f89ef078
commit e28a70f281
1 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,10 @@
#ifndef BOOST_STATIC_STRING_STATIC_STRING_HPP #ifndef BOOST_STATIC_STRING_STATIC_STRING_HPP
#define BOOST_STATIC_STRING_STATIC_STRING_HPP #define BOOST_STATIC_STRING_STATIC_STRING_HPP
// External include guard
#ifndef BOOST_STATIC_STRING_CONFIG_HPP
#include <boost/static_string/config.hpp> #include <boost/static_string/config.hpp>
#endif
#include <algorithm> #include <algorithm>
#include <cstdint> #include <cstdint>
@ -5038,37 +5041,31 @@ insert(
const std::size_t count = detail::distance(first, last); const std::size_t count = detail::distance(first, last);
const std::size_t index = pos - curr_data; const std::size_t index = pos - curr_data;
const auto first_addr = &*first; const auto first_addr = &*first;
// gcc's static analyzer does not recognize exit via BOOST_STATIC_STRING_THROW_IF(
// exception as non-evaluation count > max_size() - curr_size, std::length_error("count > max_size() - size()"));
if (count > max_size() - curr_size) const bool inside = detail::ptr_in_range(curr_data, curr_data + curr_size, first_addr);
BOOST_STATIC_STRING_THROW( if (!inside || (inside && (first_addr + count <= pos)))
std::length_error("count > max_size() - size()")); {
traits_type::move(&curr_data[index + count], &curr_data[index], curr_size - index + 1);
detail::copy_with_traits<Traits>(first, last, &curr_data[index]);
}
else else
{ {
const bool inside = detail::ptr_in_range(curr_data, curr_data + curr_size, first_addr); const size_type offset = first_addr - curr_data;
if (!inside || (inside && (first_addr + count <= pos))) traits_type::move(&curr_data[index + count], &curr_data[index], curr_size - index + 1);
if (offset < index)
{ {
traits_type::move(&curr_data[index + count], &curr_data[index], curr_size - index + 1); const size_type diff = index - offset;
detail::copy_with_traits<Traits>(first, last, &curr_data[index]); traits_type::copy(&curr_data[index], &curr_data[offset], diff);
traits_type::copy(&curr_data[index + diff], &curr_data[index + count], count - diff);
} }
else else
{ {
const size_type offset = first_addr - curr_data; traits_type::copy(&curr_data[index], &curr_data[offset + count], count);
traits_type::move(&curr_data[index + count], &curr_data[index], curr_size - index + 1);
if (offset < index)
{
const size_type diff = index - offset;
traits_type::copy(&curr_data[index], &curr_data[offset], diff);
traits_type::copy(&curr_data[index + diff], &curr_data[index + count], count - diff);
}
else
{
traits_type::copy(&curr_data[index], &curr_data[offset + count], count);
}
} }
this->set_size(curr_size + count);
return curr_data + index;
} }
this->set_size(curr_size + count);
return curr_data + index;
} }
template<std::size_t N, typename CharT, typename Traits> template<std::size_t N, typename CharT, typename Traits>