AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-05-13 21:11:21 +00:00
Code Issues Projects Releases Wiki Activity

SFINAE attempt to make MSVC happy

Browse Source
This commit is contained in:
Jack Andersen 2017-09-17 18:45:41 -10:00
parent 285669db05
commit ec8fdeef14
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Runtime/rstl.hpp
View File

@ -30,6 +30,12 @@ protected:
uint8_t x4_data[N][sizeof(T)]; uint8_t x4_data[N][sizeof(T)];
T& _value(std::ptrdiff_t idx) { return reinterpret_cast<T&>(x4_data[idx]); } T& _value(std::ptrdiff_t idx) { return reinterpret_cast<T&>(x4_data[idx]); }
const T& _value(std::ptrdiff_t idx) const { return reinterpret_cast<const T&>(x4_data[idx]); } const T& _value(std::ptrdiff_t idx) const { return reinterpret_cast<const T&>(x4_data[idx]); }
template <typename Tp>
static void destroy(Tp& t, std::enable_if_t<std::is_destructible<Tp>::value &&
!std::is_trivially_destructible<Tp>::value>* = 0) { t.~Tp(); }
template <typename Tp>
static void destroy(Tp& t, std::enable_if_t<!std::is_destructible<Tp>::value ||
std::is_trivially_destructible<Tp>::value>* = 0) {}
public: public:
class const_iterator class const_iterator
@ -185,7 +191,7 @@ public:
{ {
if (std::is_destructible<T>::value && !std::is_trivially_destructible<T>::value) if (std::is_destructible<T>::value && !std::is_trivially_destructible<T>::value)
for (size_t i=0 ; i<base::x0_size ; ++i) for (size_t i=0 ; i<base::x0_size ; ++i)
base::_value(i).~T(); base::destroy(base::_value(i));
} }
void push_back(const T& d) void push_back(const T& d)
@ -226,8 +232,7 @@ public:
Log.report(logvisor::Fatal, "pop_back() called on empty rstl::reserved_vector."); Log.report(logvisor::Fatal, "pop_back() called on empty rstl::reserved_vector.");
#endif #endif
--base::x0_size; --base::x0_size;
if (std::is_destructible<T>::value && !std::is_trivially_destructible<T>::value) base::destroy(base::_value(base::x0_size));
base::_value(base::x0_size).~T();
} }
iterator insert(const_iterator pos, const T& value) iterator insert(const_iterator pos, const T& value)
@ -292,7 +297,7 @@ public:
{ {
if (std::is_destructible<T>::value && !std::is_trivially_destructible<T>::value) if (std::is_destructible<T>::value && !std::is_trivially_destructible<T>::value)
for (size_t i = size; i < base::x0_size; ++i) for (size_t i = size; i < base::x0_size; ++i)
base::_value(i).~T(); base::destroy(base::_value(i));
base::x0_size = size; base::x0_size = size;
} }
} }
@ -313,7 +318,7 @@ public:
{ {
if (std::is_destructible<T>::value && !std::is_trivially_destructible<T>::value) if (std::is_destructible<T>::value && !std::is_trivially_destructible<T>::value)
for (size_t i = size; i < base::x0_size; ++i) for (size_t i = size; i < base::x0_size; ++i)
base::_value(i).~T(); base::destroy(base::_value(i));
base::x0_size = size; base::x0_size = size;
} }
} }
@ -327,8 +332,7 @@ public:
for (auto it = base::_const_cast_iterator(pos) + 1; it != base::end(); ++it) for (auto it = base::_const_cast_iterator(pos) + 1; it != base::end(); ++it)
*(it - 1) = std::forward<T>(*it); *(it - 1) = std::forward<T>(*it);
--base::x0_size; --base::x0_size;
if (std::is_destructible<T>::value && !std::is_trivially_destructible<T>::value) base::destroy(base::_value(base::x0_size));
base::_value(base::x0_size).~T();
return base::_const_cast_iterator(pos); return base::_const_cast_iterator(pos);
} }
@ -336,7 +340,7 @@ public:
{ {
if (std::is_destructible<T>::value && !std::is_trivially_destructible<T>::value) if (std::is_destructible<T>::value && !std::is_trivially_destructible<T>::value)
for (auto it = base::begin(); it != base::end(); ++it) for (auto it = base::begin(); it != base::end(); ++it)
it->~T(); base::destroy(*it);
base::x0_size = 0; base::x0_size = 0;
} }
}; };
@ -356,7 +360,7 @@ class prereserved_vector : public _reserved_vector_base<T, N>
{ {
if (std::is_destructible<T>::value && !std::is_trivially_destructible<T>::value) if (std::is_destructible<T>::value && !std::is_trivially_destructible<T>::value)
for (auto& i : base::x4_data) for (auto& i : base::x4_data)
reinterpret_cast<T*>(std::addressof(i))->~T(); base::destroy(reinterpret_cast<T&>(i));
} }
public: public:
using base = _reserved_vector_base<T, N>; using base = _reserved_vector_base<T, N>;