Use ifstream's wchar_t constructors on Windows

MinGW seems to have added them a while ago, so that greatly simplifies things.

1 files changed, 12 insertions, 41 deletions

diff --git a/common/alfstream.h b/common/alfstream.h
index 353fd2de..62b2e12c 100644
--- a/common/alfstream.h
+++ b/common/alfstream.h
@@ -3,57 +3,29 @@
 
 #ifdef _WIN32
 
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-#include <array>
 #include <string>
 #include <fstream>
 
 
 namespace al {
 
-// Windows' std::ifstream fails with non-ANSI paths since the standard only
-// specifies names using const char* (or std::string). MSVC has a non-standard
-// extension using const wchar_t* (or std::wstring?) to handle Unicode paths,
-// but not all Windows compilers support it. So we have to make our own istream
-// that accepts UTF-8 paths and forwards to Unicode-aware I/O functions.
-class filebuf final : public std::streambuf {
-    std::array<char_type,4096> mBuffer;
-    HANDLE mFile{INVALID_HANDLE_VALUE};
-
-    int_type underflow() override;
-    pos_type seekoff(off_type offset, std::ios_base::seekdir whence, std::ios_base::openmode mode) override;
-    pos_type seekpos(pos_type pos, std::ios_base::openmode mode) override;
-
+// Inherit from std::ifstream to accept UTF-8 filenames
+class ifstream final : public std::ifstream {
 public:
-    filebuf() = default;
-    ~filebuf() override;
+    explicit ifstream(const char *filename, std::ios_base::openmode mode=std::ios_base::in);
+    explicit ifstream(const std::string &filename, std::ios_base::openmode mode=std::ios_base::in)
+        : ifstream{filename.c_str(), mode} { }
 
-    bool open(const wchar_t *filename, std::ios_base::openmode mode);
-    bool open(const char *filename, std::ios_base::openmode mode);
+    explicit ifstream(const wchar_t *filename, std::ios_base::openmode mode=std::ios_base::in)
+        : std::ifstream{filename, mode} { }
+    explicit ifstream(const std::wstring &filename, std::ios_base::openmode mode=std::ios_base::in)
+        : ifstream{filename.c_str(), mode} { }
 
-    bool is_open() const noexcept { return mFile != INVALID_HANDLE_VALUE; }
-
-    void close();
-};
+    void open(const char *filename, std::ios_base::openmode mode=std::ios_base::in);
+    void open(const std::string &filename, std::ios_base::openmode mode=std::ios_base::in)
+    { open(filename.c_str(), mode); }
 
-// Inherit from std::istream to use our custom streambuf
-class ifstream final : public std::istream {
-    filebuf mStreamBuf;
-
-public:
-    ifstream(const wchar_t *filename, std::ios_base::openmode mode = std::ios_base::in);
-    ifstream(const std::wstring &filename, std::ios_base::openmode mode = std::ios_base::in)
-      : ifstream(filename.c_str(), mode) { }
-    ifstream(const char *filename, std::ios_base::openmode mode = std::ios_base::in);
-    ifstream(const std::string &filename, std::ios_base::openmode mode = std::ios_base::in)
-      : ifstream(filename.c_str(), mode) { }
     ~ifstream() override;
-
-    bool is_open() const noexcept { return mStreamBuf.is_open(); }
-
-    void close() { mStreamBuf.close(); }
 };
 
 } // namespace al
@@ -64,7 +36,6 @@ public:
 
 namespace al {
 
-using filebuf = std::filebuf;
 using ifstream = std::ifstream;
 
 } // namespace al