AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #112 from lioncash/emplace 

rstl: Return reference to emplaced element in emplace_back()
This commit is contained in:
Phillip Stephens 2019-10-20 18:33:06 -07:00 committed by GitHub
parent ce45cd279c 18f64dac8d
commit 18382e5bb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Runtime/rstl.hpp
View File

@ -267,15 +267,13 @@ private:
} }
template <typename Tp> template <typename Tp>
static void static void
destroy(Tp& t, std::enable_if_t<!std::is_destructible_v<Tp> || std::is_trivially_destructible_v<Tp>>* = nullptr) { destroy(Tp& t, std::enable_if_t<!std::is_destructible_v<Tp> || std::is_trivially_destructible_v<Tp>>* = nullptr) {}
}
public: public:
reserved_vector() noexcept(std::is_nothrow_constructible_v<T>) : x0_size(0) {} reserved_vector() noexcept(std::is_nothrow_constructible_v<T>) : x0_size(0) {}
template <size_t LN> template <size_t LN>
reserved_vector(const T (&l)[LN]) noexcept(std::is_nothrow_copy_constructible_v<T>) reserved_vector(const T (&l)[LN]) noexcept(std::is_nothrow_copy_constructible_v<T>) : x0_size(LN) {
: x0_size(LN) {
static_assert(LN <= N, "initializer array too large for reserved_vector"); static_assert(LN <= N, "initializer array too large for reserved_vector");
for (size_t i = 0; i < LN; ++i) { for (size_t i = 0; i < LN; ++i) {
::new (static_cast<void*>(std::addressof(_value(i)))) T(l[i]); ::new (static_cast<void*>(std::addressof(_value(i)))) T(l[i]);
@ -385,15 +383,18 @@ public:
} }
template <class... _Args> template <class... _Args>
void emplace_back(_Args&&... args) { T& emplace_back(_Args&&... args) {
#ifndef NDEBUG #ifndef NDEBUG
if (x0_size == N) { if (x0_size == N) {
Log.report(logvisor::Fatal, fmt("emplace_back() called on full rstl::reserved_vector.")); Log.report(logvisor::Fatal, fmt("emplace_back() called on full rstl::reserved_vector."));
} }
#endif #endif
::new (static_cast<void*>(std::addressof(_value(x0_size)))) T(std::forward<_Args>(args)...); T& element = _value(x0_size);
::new (static_cast<void*>(std::addressof(element))) T(std::forward<_Args>(args)...);
++x0_size; ++x0_size;
return element;
} }
void pop_back() { void pop_back() {