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

clang is also on board (reverted from commit 0c95eb14d6)

Browse Source
This commit is contained in:
Rich Geldreich
2017-01-09 14:12:47 -08:00
parent d64212091e 0c95eb14d6
commit 7ae16dda71
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crnlib/crn_sparse_array.h
+6 -6
View File
@@ -355,7 +355,7 @@ namespace crnlib
inline T* alloc_group(bool nofail = false) inline T* alloc_group(bool nofail = false)
{ {
T* p = static_cast<T*>(this->alloc_space(N * sizeof(T))); T* p = static_cast<T*>(sparse_array_traits<T, Log2N>::alloc_space(N * sizeof(T)));
if (!p) if (!p)
{ {
@@ -365,7 +365,7 @@ namespace crnlib
CRNLIB_FAIL("Out of memory"); CRNLIB_FAIL("Out of memory");
} }
this->construct_group(p); sparse_array_traits<T, Log2N>::construct_group(p);
m_num_active_groups++; m_num_active_groups++;
@@ -379,20 +379,20 @@ namespace crnlib
CRNLIB_ASSERT(m_num_active_groups); CRNLIB_ASSERT(m_num_active_groups);
m_num_active_groups--; m_num_active_groups--;
this->destruct_group(p); sparse_array_traits<T, Log2N>::destruct_group(p);
this->free_space(p); sparse_array_traits<T, Log2N>::free_space(p);
} }
} }
inline void init_default() inline void init_default()
{ {
this->construct_element(reinterpret_cast<T*>(m_default)); sparse_array_traits<T, Log2N>::construct_element(reinterpret_cast<T*>(m_default));
} }
inline void deinit_default() inline void deinit_default()
{ {
this->destruct_element(reinterpret_cast<T*>(m_default)); sparse_array_traits<T, Log2N>::destruct_element(reinterpret_cast<T*>(m_default));
} }
}; };