From ca7f647562ceb0d209def169b8743c24f202c2c6 Mon Sep 17 00:00:00 2001
From: Maxime Coste <frrrwww@gmail.com>
Date: Mon, 4 Jul 2016 19:19:40 +0100
Subject: [PATCH] Refactor Optional::operator==

---
 src/optional.hh | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/optional.hh b/src/optional.hh
index a4d15ff5..5aecf3b3 100644
--- a/src/optional.hh
+++ b/src/optional.hh
@@ -51,13 +51,8 @@ public:
 
     bool operator==(const Optional& other) const
     {
-        if (m_valid == other.m_valid)
-        {
-            if (m_valid)
-                return m_value == other.m_value;
-            return true;
-        }
-        return false;
+        return m_valid == other.m_valid and
+               (not m_valid or m_value == other.m_value);
     }
 
     template<typename... Args>