From b817359bcf5f3d0de7bf7c20da73fc39d013d0e8 Mon Sep 17 00:00:00 2001 From: Project579 Date: Tue, 28 Jun 2022 22:08:30 +0200 Subject: [PATCH] Revert "Fix regression from https://gitlab.com/OpenMW/openmw/-/merge_requests/1776" This reverts commit 6a5ad4ca43876e13f3a6fcf499c4b5b4c1335687. --- components/files/openfile.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/components/files/openfile.cpp b/components/files/openfile.cpp index 2ab4409017..6eb0ee51c8 100644 --- a/components/files/openfile.cpp +++ b/components/files/openfile.cpp @@ -3,20 +3,11 @@ #include #include -#if defined(_WIN32) || defined(__WINDOWS__) -#include -#endif - namespace Files { std::unique_ptr openBinaryInputFileStream(const std::filesystem::path &path) { -#if defined(_WIN32) || defined(__WINDOWS__) - std::wstring wpath = boost::locale::conv::utf_to_utf(path); - auto stream = std::make_unique(wpath, std::ios::binary); -#else auto stream = std::make_unique(path, std::ios::binary); -#endif if (!stream->is_open()) throw std::runtime_error("Failed to open '" + path.string() + "' for reading: " + std::strerror(errno)); //TODO(Project579): This will probably break in windows with unicode paths stream->exceptions(std::ios::badbit);