jessikitty/unity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reformat the source files.

Browse Source
This commit is contained in:
Alexander Suvorov
2017-04-26 11:41:07 +02:00
parent 41d7b962b0
commit 7c02055d05
197 changed files with 66650 additions and 70743 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crnlib/crn_vector.cpp
+46 -53
View File
@@ -7,77 +7,70 @@
#include "crn_color.h"
#include "crn_vec.h"
namespace crnlib
{
bool elemental_vector::increase_capacity(uint min_new_capacity, bool grow_hint, uint element_size, object_mover pMover, bool nofail)
{
CRNLIB_ASSERT(m_size <= m_capacity);
namespace crnlib {
bool elemental_vector::increase_capacity(uint min_new_capacity, bool grow_hint, uint element_size, object_mover pMover, bool nofail) {
CRNLIB_ASSERT(m_size <= m_capacity);
#ifdef CRNLIB_64BIT_POINTERS
CRNLIB_ASSERT(min_new_capacity < (0x400000000ULL / element_size));
CRNLIB_ASSERT(min_new_capacity < (0x400000000ULL / element_size));
#else
CRNLIB_ASSERT(min_new_capacity < (0x7FFF0000U / element_size));
CRNLIB_ASSERT(min_new_capacity < (0x7FFF0000U / element_size));
#endif
if (m_capacity >= min_new_capacity)
return true;
if (m_capacity >= min_new_capacity)
return true;
size_t new_capacity = min_new_capacity;
if ((grow_hint) && (!math::is_power_of_2(new_capacity)))
new_capacity = math::next_pow2(new_capacity);
size_t new_capacity = min_new_capacity;
if ((grow_hint) && (!math::is_power_of_2(new_capacity)))
new_capacity = math::next_pow2(new_capacity);
CRNLIB_ASSERT(new_capacity && (new_capacity > m_capacity));
CRNLIB_ASSERT(new_capacity && (new_capacity > m_capacity));
const size_t desired_size = element_size * new_capacity;
size_t actual_size;
if (!pMover)
{
void* new_p = crnlib_realloc(m_p, desired_size, &actual_size, true);
if (!new_p)
{
if (nofail)
return false;
const size_t desired_size = element_size * new_capacity;
size_t actual_size;
if (!pMover) {
void* new_p = crnlib_realloc(m_p, desired_size, &actual_size, true);
if (!new_p) {
if (nofail)
return false;
char buf[256];
char buf[256];
#ifdef _MSC_VER
sprintf_s(buf, sizeof(buf), "vector: crnlib_realloc() failed allocating %u bytes", (uint)desired_size);
sprintf_s(buf, sizeof(buf), "vector: crnlib_realloc() failed allocating %u bytes", (uint)desired_size);
#else
sprintf(buf, "vector: crnlib_realloc() failed allocating %u bytes", (uint)desired_size);
sprintf(buf, "vector: crnlib_realloc() failed allocating %u bytes", (uint)desired_size);
#endif
CRNLIB_FAIL(buf);
}
m_p = new_p;
}
else
{
void* new_p = crnlib_malloc(desired_size, &actual_size);
if (!new_p)
{
if (nofail)
return false;
CRNLIB_FAIL(buf);
}
m_p = new_p;
} else {
void* new_p = crnlib_malloc(desired_size, &actual_size);
if (!new_p) {
if (nofail)
return false;
char buf[256];
char buf[256];
#ifdef _MSC_VER
sprintf_s(buf, sizeof(buf), "vector: crnlib_malloc() failed allocating %u bytes", (uint)desired_size);
sprintf_s(buf, sizeof(buf), "vector: crnlib_malloc() failed allocating %u bytes", (uint)desired_size);
#else
sprintf(buf, "vector: crnlib_malloc() failed allocating %u bytes", (uint)desired_size);
sprintf(buf, "vector: crnlib_malloc() failed allocating %u bytes", (uint)desired_size);
#endif
CRNLIB_FAIL(buf);
}
CRNLIB_FAIL(buf);
}
(*pMover)(new_p, m_p, m_size);
(*pMover)(new_p, m_p, m_size);
if (m_p)
crnlib_free(m_p);
if (m_p)
crnlib_free(m_p);
m_p = new_p;
}
m_p = new_p;
}
if (actual_size > desired_size)
m_capacity = static_cast<uint>(actual_size / element_size);
else
m_capacity = static_cast<uint>(new_capacity);
if (actual_size > desired_size)
m_capacity = static_cast<uint>(actual_size / element_size);
else
m_capacity = static_cast<uint>(new_capacity);
return true;
}
return true;
}
} // namespace crnlib
} // namespace crnlib