From 4c0f77c13e5e38b6fb4c4e2746a6f1adf373f290 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Sun, 27 Dec 2020 06:43:59 -0800
Subject: Remove some unnecessary constructors

---
 common/strutils.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'common/strutils.cpp')

diff --git a/common/strutils.cpp b/common/strutils.cpp
index 870a0ed3..18c4947a 100644
--- a/common/strutils.cpp
+++ b/common/strutils.cpp
@@ -46,7 +46,8 @@ namespace al {
 al::optional<std::string> getenv(const char *envname)
 {
     const char *str{std::getenv(envname)};
-    if(str && str[0] != '\0') return str;
+    if(str && str[0] != '\0')
+        return al::make_optional<std::string>(str);
     return al::nullopt;
 }
 
@@ -54,7 +55,8 @@ al::optional<std::string> getenv(const char *envname)
 al::optional<std::wstring> getenv(const WCHAR *envname)
 {
     const WCHAR *str{_wgetenv(envname)};
-    if(str && str[0] != L'\0') return str;
+    if(str && str[0] != L'\0')
+        return al::make_optional<std::wstring>(str);
     return al::nullopt;
 }
 #endif
-- 
cgit v1.2.3