Skip to content

Commit

Permalink
Merge branch 'pull-request/#1021-Some-minor-cleanup-changes' into dev…
Browse files Browse the repository at this point in the history
…elopment
  • Loading branch information
jwellbelove committed Feb 1, 2025
2 parents 00d020b + 96cdb2c commit d26c1a1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 31 deletions.
30 changes: 2 additions & 28 deletions include/etl/ipool.h
Original file line number Diff line number Diff line change
Expand Up @@ -385,39 +385,13 @@ namespace etl
//*************************************************************************
void release_item(char* p_value)
{
//// Does it belong to us?
//ETL_ASSERT(is_item_in_pool(p_value), ETL_ERROR(pool_object_not_in_pool));

//if (p_next != ETL_NULLPTR)
//{
// // Point it to the current free item.
// *(uintptr_t*)p_value = reinterpret_cast<uintptr_t>(p_next);
//}
//else
//{
// // This is the only free item.
// *((uintptr_t*)p_value) = 0;
//}

//p_next = p_value;

//--items_allocated;

// Does it belong to us?
ETL_ASSERT(is_item_in_pool(p_value), ETL_ERROR(pool_object_not_in_pool));

if (items_allocated > 0)
{
if (p_next != ETL_NULLPTR)
{
// Point it to the current free item.
*(uintptr_t*)p_value = reinterpret_cast<uintptr_t>(p_next);
}
else
{
// This is the only free item.
*((uintptr_t*)p_value) = 0;
}
// Point it to the current free item.
*(uintptr_t*)p_value = reinterpret_cast<uintptr_t>(p_next);

p_next = p_value;

Expand Down
6 changes: 3 additions & 3 deletions include/etl/memory.h
Original file line number Diff line number Diff line change
Expand Up @@ -2366,9 +2366,9 @@ namespace etl

//***************************************************************************
/// Template wrapper for memcmp.
/// \param source begin
/// \param source end
/// \param destination begin
/// \param sb Source begin
/// \param se Source end
/// \param db Destination begin
/// \return < 0 The first byte that does not match in both memory blocks has a lower value in 'sb' than in 'db' when evaluated as unsigned char values.
/// 0 The contents of both memory blocks are equal
/// > 0 The first byte that does not match in both memory blocks has a greater value in 'sb' than in 'db' when evaluated as unsigned char values.
Expand Down

0 comments on commit d26c1a1

Please sign in to comment.