commit 0a9793458e9ddd5c7742d3ceb250125c52e8bf86 Author: Georg Koppen <gk@torproject.org> Date: Fri Sep 22 09:45:57 2017 +0000 fixup! Bug 16010: Fixing sandbox compile issues --- .../sandbox/chromium/base/strings/utf_string_conversion_utils.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/security/sandbox/chromium/base/strings/utf_string_conversion_utils.cc b/security/sandbox/chromium/base/strings/utf_string_conversion_utils.cc index 710fbd83a358..3942728adafa 100644 --- a/security/sandbox/chromium/base/strings/utf_string_conversion_utils.cc +++ b/security/sandbox/chromium/base/strings/utf_string_conversion_utils.cc @@ -122,7 +122,9 @@ void PrepareForUTF8Output(const CHAR* src, // Instantiate versions we know callers will need. template void PrepareForUTF8Output(const wchar_t*, size_t, std::string*); -//template void PrepareForUTF8Output(const char16*, size_t, std::string*); +#if !defined(__MINGW32__) +template void PrepareForUTF8Output(const char16*, size_t, std::string*); +#endif template<typename STRING> void PrepareForUTF16Or32Output(const char* src, @@ -143,6 +145,8 @@ void PrepareForUTF16Or32Output(const char* src, // Instantiate versions we know callers will need. template void PrepareForUTF16Or32Output(const char*, size_t, std::wstring*); -//template void PrepareForUTF16Or32Output(const char*, size_t, string16*); +#if !defined(__MINGW32__) +template void PrepareForUTF16Or32Output(const char*, size_t, string16*); +#endif } // namespace base