From 361fc7b877dfd14bd1d4e10cb51b3ab7eb05ca82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Mon, 16 Sep 2013 19:17:17 +0200
Subject: [PATCH] Windows build fixes (working around std::u32string bugs).

---
 src/Plugins/MagnumFontConverter/MagnumFontConverter.cpp | 7 ++++++-
 src/Plugins/MagnumFontConverter/MagnumFontConverter.h   | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Plugins/MagnumFontConverter/MagnumFontConverter.cpp b/src/Plugins/MagnumFontConverter/MagnumFontConverter.cpp
index 364f4745d..d54036b20 100644
--- a/src/Plugins/MagnumFontConverter/MagnumFontConverter.cpp
+++ b/src/Plugins/MagnumFontConverter/MagnumFontConverter.cpp
@@ -43,7 +43,12 @@ auto MagnumFontConverter::doFeatures() const -> Features {
     return Feature::ExportFont|Feature::ConvertData|Feature::MultiFile;
 }
 
-std::vector<std::pair<std::string, Containers::Array<unsigned char>>> MagnumFontConverter::doExportFontToData(AbstractFont& font, GlyphCache& cache, const std::string& filename, const std::u32string& characters) const {
+#ifndef _WIN32
+std::vector<std::pair<std::string, Containers::Array<unsigned char>>> MagnumFontConverter::doExportFontToData(AbstractFont& font, GlyphCache& cache, const std::string& filename, const std::u32string& characters) const
+#else
+std::vector<std::pair<std::string, Containers::Array<unsigned char>>> MagnumFontConverter::doExportFontToData(AbstractFont& font, GlyphCache& cache, const std::string& filename, const std::vector<char32_t>& characters) const
+#endif
+{
     Utility::Configuration configuration;
 
     configuration.setValue("version", 1);
diff --git a/src/Plugins/MagnumFontConverter/MagnumFontConverter.h b/src/Plugins/MagnumFontConverter/MagnumFontConverter.h
index 7b1be2ad2..c6ad3fbca 100644
--- a/src/Plugins/MagnumFontConverter/MagnumFontConverter.h
+++ b/src/Plugins/MagnumFontConverter/MagnumFontConverter.h
@@ -48,7 +48,11 @@ class MagnumFontConverter: public Text::AbstractFontConverter {
 
     private:
         Features doFeatures() const override;
+        #ifndef _WIN32
         std::vector<std::pair<std::string, Containers::Array<unsigned char>>> doExportFontToData(AbstractFont& font, GlyphCache& cache, const std::string& filename, const std::u32string& characters) const override;
+        #else
+        std::vector<std::pair<std::string, Containers::Array<unsigned char>>> doExportFontToData(AbstractFont& font, GlyphCache& cache, const std::string& filename, const std::vector<char32_t>& characters) const override;
+        #endif
 };
 
 }}