Avoid unnecessary uses of make_optional

3 files changed, 3 insertions, 3 deletions

diff --git a/core/ambdec.cpp b/core/ambdec.cpp
index 83c521c0..52a1df05 100644
--- a/core/ambdec.cpp
+++ b/core/ambdec.cpp
@@ -81,7 +81,7 @@ al::optional<std::string> AmbDecConf::load(const char *fname) noexcept
 {
     al::ifstream f{fname};
     if(!f.is_open())
-        return al::make_optional(std::string("Failed to open file \"")+fname+"\"");
+        return std::string("Failed to open file \"")+fname+"\"";
 
     ReaderScope scope{ReaderScope::Global};
     size_t speaker_pos{0};
diff --git a/core/cpu_caps.cpp b/core/cpu_caps.cpp
index 0325cd49..103d2437 100644
--- a/core/cpu_caps.cpp
+++ b/core/cpu_caps.cpp
@@ -137,5 +137,5 @@ al::optional<CPUInfo> GetCPUInfo()
 #endif
 #endif
 
-    return al::make_optional(ret);
+    return ret;
 }
diff --git a/core/helpers.cpp b/core/helpers.cpp
index 1670561a..99cf009c 100644
--- a/core/helpers.cpp
+++ b/core/helpers.cpp
@@ -51,7 +51,7 @@ const PathNamePair &GetProcBinary()
     if(len == 0)
     {
         ERR("Failed to get process name: error %lu\n", GetLastError());
-        procbin = al::make_optional<PathNamePair>();
+        procbin.emplace();
         return *procbin;
     }