Remove unnecessary use of optional

2 files changed, 11 insertions, 18 deletions

diff --git a/test/fixtures/fixture_log_observer.cpp b/test/fixtures/fixture_log_observer.cpp
index b3b8e56fdb..1d3517ac67 100644
--- a/test/fixtures/fixture_log_observer.cpp
+++ b/test/fixtures/fixture_log_observer.cpp
@@ -8,14 +8,11 @@ FixtureLogObserver::LogMessage::LogMessage(EventSeverity severity_, Event event_
     : severity(severity_), event(event_), code(code_), msg(msg_) {
 }
 
-FixtureLogObserver::LogMessage::LogMessage() : severity(), event(), code(), msg() {
-}
-
 bool FixtureLogObserver::LogMessage::operator==(const LogMessage &rhs) const {
-    return (!severity || !rhs.severity || severity.get() == rhs.severity.get()) &&
-           (!event || !rhs.event || event.get() == rhs.event.get()) &&
-           (!code || !rhs.code || code.get() == rhs.code.get()) &&
-           (!msg || !rhs.msg || msg.get() == rhs.msg.get());
+    return severity == rhs.severity &&
+           event == rhs.event &&
+           code == rhs.code &&
+           msg == rhs.msg;
 }
 
 FixtureLogObserver::~FixtureLogObserver() {
@@ -60,11 +57,9 @@ std::vector<FixtureLogObserver::LogMessage> FixtureLogObserver::unchecked() cons
 }
 
 ::std::ostream &operator<<(::std::ostream &os, const FixtureLogObserver::LogMessage &message) {
-    os << "[\"" << message.severity.get() << "\", \"" << message.event.get() << "\"";
-    if (message.code)
-        os << ", " << message.code.get();
-    if (message.msg)
-        os << ", \"" << message.msg.get() << "\"";
+    os << "[\"" << message.severity << "\", \"" << message.event << "\"";
+    os << ", " << message.code;
+    os << ", \"" << message.msg << "\"";
     return os << "]" << std::endl;
 }
 
diff --git a/test/fixtures/fixture_log_observer.hpp b/test/fixtures/fixture_log_observer.hpp
index 7e419a617f..cadff84d31 100644
--- a/test/fixtures/fixture_log_observer.hpp
+++ b/test/fixtures/fixture_log_observer.hpp
@@ -2,7 +2,6 @@
 #define MBGL_TEST_FIXTURE_LOG_OBSERVER
 
 #include <mbgl/platform/log.hpp>
-#include <mbgl/util/optional.hpp>
 
 #include <vector>
 #include <cstdarg>
@@ -14,14 +13,13 @@ class FixtureLogObserver : public Log::Observer {
 public:
     struct LogMessage {
         LogMessage(EventSeverity severity_, Event event_, int64_t code_, const std::string &msg_);
-        LogMessage();
 
         bool operator==(const LogMessage &rhs) const;
 
-        const mapbox::util::optional<EventSeverity> severity;
-        const mapbox::util::optional<Event> event;
-        const mapbox::util::optional<int64_t> code;
-        const mapbox::util::optional<std::string> msg;
+        const EventSeverity severity;
+        const Event event;
+        const int64_t code;
+        const std::string msg;
 
         mutable bool checked = false;
     };