From: Marcus Fritzsch <marcus_fritzsch@mentor.com>
Date: Fri, 28 Jul 2017 13:05:53 +0000 (+0200)
Subject: result: return nullopt if error is actuall nullptr
X-Git-Tag: 4.99.1~213
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=bd3363946030c35ed5b795d5b30d5d2a34aaad84;p=staging%2Fwindowmanager.git

result: return nullopt if error is actuall nullptr

Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
---

diff --git a/src/result.hpp b/src/result.hpp
index b740a0c..5701f24 100644
--- a/src/result.hpp
+++ b/src/result.hpp
@@ -30,14 +30,14 @@ struct result {
       return this->t.value();
    }
 
-   operator T() {
-      return this->unwrap();
-   }
+   operator T() { return this->unwrap(); }
 
    char const *unwrap_err() { return this->e; }
 
-   optional<T> ok() const { return this->t; }
-   optional<char const *> err() const { return optional<char const *>(this->e); }
+   optional<T> const &ok() const { return this->t; }
+   optional<char const *> err() const {
+      return this->e ? optional<char const *>(this->e) : nullopt;
+   }
 
    result<T> map_err(std::function<char const *(char const *)> f);
 };