From eb5d3e5df99de2c3d8da2e8bc7b12ed427465dba Mon Sep 17 00:00:00 2001
From: B Stack <bgstack15@gmail.com>
Date: Sun, 9 Sep 2018 18:53:23 -0400
Subject: pull in latest 10.4 from upstream

---
 zen/recycler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'zen/recycler.cpp')

diff --git a/zen/recycler.cpp b/zen/recycler.cpp
index 30b37cb2..8b4389a7 100755
--- a/zen/recycler.cpp
+++ b/zen/recycler.cpp
@@ -27,7 +27,7 @@ bool zen::recycleOrDeleteIfExists(const Zstring& itemPath) //throw FileError
 
     if (!::g_file_trash(file, nullptr, &error))
     {
-        const Opt<ItemType> type = getItemTypeIfExists(itemPath); //throw FileError
+        const std::optional<ItemType> type = getItemTypeIfExists(itemPath); //throw FileError
         if (!type)
             return false;
 
-- 
cgit