feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Fix long small string

Browse Source 
We used only 6 bit to save the short size but for SmallString with a size
over 64 it is not enough. So we have now to use a uint16 instead of a
uint8 if the size if over 64.

Change-Id: I53558e492b6cb40b739b23a8af83d192a2e11bd2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Marco Bubke
2017-01-31 12:18:08 +01:00
parent 729c535376
commit a0c69c517c
7 changed files with 61 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libs/utils/smallstring.h
View File

@@ -65,6 +65,11 @@ public:
using const_reverse_iterator = std::reverse_iterator<const_iterator>;
using size_type = std::size_t;
static_assert(Size < 64
? sizeof(Internal::StringDataLayout<Size>) == Size + 1
: sizeof(Internal::StringDataLayout<Size>) == Size + 2,
"Size is wrong");
BasicSmallString() noexcept
: m_data(Internal::StringDataLayout<Size>())
{
@@ -498,7 +503,7 @@ public:
constexpr static
size_type shortStringCapacity() noexcept
{
return BasicSmallStringLiteral<Size>::shortStringCapacity();
return Internal::StringDataLayout<Size>::shortStringCapacity();
}
size_type optimalCapacity(const size_type size)
@@ -897,6 +902,6 @@ std::vector<Type> clone(const std::vector<Type> &vector)
}
using SmallString = BasicSmallString<31>;
using PathString = BasicSmallString<191>;
using PathString = BasicSmallString<190>;
} // namespace Utils