blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

BLI: rename Vector.empty to Vector.is_empty

This commit is contained in:
Jacques Lucke 2020-04-28 17:04:07 +02:00
parent c05ef1459c
commit a72eed7dd5
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenlib/BLI_vector.hh
View File

@ -427,7 +427,7 @@ class Vector {
/**
* Returns true when the vector contains no elements, otherwise false.
*/
bool empty() const
bool is_empty() const
{
return m_begin == m_end;
}
@ -438,7 +438,7 @@ class Vector {
*/
void remove_last()
{
BLI_assert(!this->empty());
BLI_assert(!this->is_empty());
m_end--;
destruct(m_end);
UPDATE_VECTOR_SIZE(this);
@ -449,7 +449,7 @@ class Vector {
*/
T pop_last()
{
BLI_assert(!this->empty());
BLI_assert(!this->is_empty());
m_end--;
T value = std::move(*m_end);
destruct(m_end);

10
tests/gtests/blenlib/BLI_vector_test.cc
View File

@ -345,14 +345,14 @@ TEST(vector, RemoveLast)
EXPECT_EQ(vec.size(), 0);
}
TEST(vector, Empty)
TEST(vector, IsEmpty)
{
IntVector vec;
EXPECT_TRUE(vec.empty());
EXPECT_TRUE(vec.is_empty());
vec.append(1);
EXPECT_FALSE(vec.empty());
EXPECT_FALSE(vec.is_empty());
vec.remove_last();
EXPECT_TRUE(vec.empty());
EXPECT_TRUE(vec.is_empty());
}
TEST(vector, RemoveReorder)
@ -368,7 +368,7 @@ TEST(vector, RemoveReorder)
vec.remove_and_reorder(0);
EXPECT_EQ(vec[0], 7);
vec.remove_and_reorder(0);
EXPECT_TRUE(vec.empty());
EXPECT_TRUE(vec.is_empty());
}
TEST(vector, RemoveFirstOccurrenceAndReorder)