system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-07 00:19:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

AK: Fix -Wconsumed warnings in Optional move-ctor and move-assign

Browse source 
Our protocol says we have to call has_value() before release_value().
The code was already safe, but the compiler had no way of knowing that.
This commit is contained in:
Andreas Kling 2019-08-07 07:17:52 +02:00
parent 0f7eece141
commit 60c25228ee
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
AK/Optional.h
View file

@ -28,7 +28,7 @@ public:
Optional(Optional&& other)
: m_has_value(other.m_has_value)
{
if (m_has_value) {
if (other.has_value()) {
new (&m_storage) T(other.release_value());
other.m_has_value = false;
}
@ -62,9 +62,8 @@ public:
if (this != &other) {
clear();
m_has_value = other.m_has_value;
if (m_has_value) {
if (other.has_value())
new (&m_storage) T(other.release_value());
}
}
return *this;
}