mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: add patch to fix MSVC++ incompatibilty on Windows

Browse source
This commit is contained in:
Samuel Attard 2019-04-02 14:42:16 -07:00
parent d1a7b42906
commit 63d6be0480
2 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
patches/common/chromium/.patches
View file

@ -71,3 +71,4 @@ fix_disable_usage_of_abort_report_np_in_mas_builds.patch
fix_disable_usage_of_pthread_fchdir_np_and_pthread_chdir_np_in_mas.patch fix_disable_usage_of_pthread_fchdir_np_and_pthread_chdir_np_in_mas.patch
fix_disable_usage_of_setapplicationisdaemon_and.patch fix_disable_usage_of_setapplicationisdaemon_and.patch
disable_custom_libcxx_on_windows.patch disable_custom_libcxx_on_windows.patch
fix_retain_compatibility_with_msvc.patch

25
patches/common/chromium/fix_retain_compatibility_with_msvc.patch Normal file
View file

@ -0,0 +1,25 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Samuel Attard <sattard@slack-corp.com>
Date: Tue, 2 Apr 2019 14:38:43 -0700
Subject: fix: retain compatibility with MSVC++
The C++ standard has always forbidden containers of const elements such
as std::set<const T>. In order to retain compability with MSVC++ this
code can not exist in Chromium.
This should probably also be fixed in libc++ to prevent this occurring
again but this fixes the build for now.
diff --git a/components/language/core/browser/language_prefs.cc b/components/language/core/browser/language_prefs.cc
index 317aa1d8298cd697c5388ddeb9680b39e562e9ab..df258ca62acfa8a198bcb7c4be31746a491d938b 100644
--- a/components/language/core/browser/language_prefs.cc
+++ b/components/language/core/browser/language_prefs.cc
@@ -85,7 +85,7 @@ void LanguagePrefs::ResetEmptyFluentLanguagesToDefault() {
}
base::Value LanguagePrefs::GetDefaultFluentLanguages() {
- std::set<const std::string> languages;
+ std::set<std::string> languages;
#if defined(OS_CHROMEOS)
// Preferred languages.
std::string language = language::kFallbackInputMethodLocale;