apio/Luna
1
1
Fork 0
Code Issues Pull Requests Actions Projects Releases 8 Wiki Activity

Option: Simplify release_value

Browse Source 
This avoids copying + we don't need to destroy the item if we move it, since it either gets emptied by moving it or doesn't have anything to destroy.
This commit is contained in:
apio 2022-12-16 18:13:40 +01:00
parent 19a4e2ab58
commit 32c8869973
Signed by: apio
GPG Key ID: B8A7D06E42258954
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
luna/include/luna/Option.h
View File

@ -50,10 +50,8 @@ template <typename T> class Option
T release_value() T release_value()
{ {
expect(has_value(), "Option::release_value called on an empty Option"); expect(has_value(), "Option::release_value called on an empty Option");
T item = m_storage.fetch_reference();
m_has_value = false; m_has_value = false;
m_storage.destroy(); return move(m_storage.fetch_reference());
return move(item);
} }
T value_or(const T& other) const T value_or(const T& other) const