From 179b29252d8bb28e11686a1852c8e8ffcd98ecc0 Mon Sep 17 00:00:00 2001
From: Rye <rye@lindenlab.com>
Date: Tue, 11 Feb 2025 05:02:45 -0500
Subject: Rework windows to use zc:wchar_t for better c++ conformance and
 compatibility with modern libraries

---
 indra/llfilesystem/lldiriterator.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llfilesystem/lldiriterator.cpp')

diff --git a/indra/llfilesystem/lldiriterator.cpp b/indra/llfilesystem/lldiriterator.cpp
index 61f768c512..e8c37389d2 100644
--- a/indra/llfilesystem/lldiriterator.cpp
+++ b/indra/llfilesystem/lldiriterator.cpp
@@ -52,7 +52,7 @@ LLDirIterator::Impl::Impl(const std::string &dirname, const std::string &mask)
     : mIsValid(false)
 {
 #ifdef LL_WINDOWS // or BOOST_WINDOWS_API
-    fs::path dir_path(utf8str_to_utf16str(dirname));
+    fs::path dir_path(ll_convert<std::wstring>(dirname));
 #else
     fs::path dir_path(dirname);
 #endif
-- 
cgit v1.2.3


From 94e45ca2e60b4013a4e38d8f2c1fe8dad4207c3a Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 5 Sep 2025 15:09:11 +0300
Subject: Replace boost filesystem with std filesystem

Build fixes, instead of resolving unclear boost filesystem errors just
updated to std in affected places.
---
 indra/llfilesystem/lldiriterator.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/llfilesystem/lldiriterator.cpp')

diff --git a/indra/llfilesystem/lldiriterator.cpp b/indra/llfilesystem/lldiriterator.cpp
index e8c37389d2..28a93f1446 100644
--- a/indra/llfilesystem/lldiriterator.cpp
+++ b/indra/llfilesystem/lldiriterator.cpp
@@ -28,9 +28,9 @@
 
 #include "fix_macros.h"
 #include "llregex.h"
-#include <boost/filesystem.hpp>
+#include <filesystem>
 
-namespace fs = boost::filesystem;
+namespace fs = std::filesystem;
 
 static std::string glob_to_regex(const std::string& glob);
 
-- 
cgit v1.2.3


From 94cfce4a4d2dbc799e5e8a3495a628ae85d4cffe Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@gmail.com>
Date: Fri, 5 Sep 2025 13:44:57 -0700
Subject: Revert "Replace boost filesystem with std filesystem"

This reverts commit 94e45ca2e60b4013a4e38d8f2c1fe8dad4207c3a.
---
 indra/llfilesystem/lldiriterator.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/llfilesystem/lldiriterator.cpp')

diff --git a/indra/llfilesystem/lldiriterator.cpp b/indra/llfilesystem/lldiriterator.cpp
index 28a93f1446..e8c37389d2 100644
--- a/indra/llfilesystem/lldiriterator.cpp
+++ b/indra/llfilesystem/lldiriterator.cpp
@@ -28,9 +28,9 @@
 
 #include "fix_macros.h"
 #include "llregex.h"
-#include <filesystem>
+#include <boost/filesystem.hpp>
 
-namespace fs = std::filesystem;
+namespace fs = boost::filesystem;
 
 static std::string glob_to_regex(const std::string& glob);
 
-- 
cgit v1.2.3