|
 |
4f31ec8 |
From df982a547c5e88777a6134e5d18a1482d933f1cf Mon Sep 17 00:00:00 2001
|
|
|
4f31ec8 |
From: Stephan Hartmann <stha09@googlemail.com>
|
|
|
4f31ec8 |
Date: Wed, 27 May 2020 10:38:26 +0000
|
|
|
4f31ec8 |
Subject: [PATCH] libstdc++: std::vector must have non-const value_type
|
|
|
4f31ec8 |
|
|
|
4f31ec8 |
Bug: 957519
|
|
|
4f31ec8 |
Change-Id: I535b3bcf318f98cecbf4be1520ffe4126abcacd8
|
|
|
4f31ec8 |
---
|
|
|
4f31ec8 |
|
|
|
4f31ec8 |
diff --git a/extensions/common/features/feature_flags.cc b/extensions/common/features/feature_flags.cc
|
|
|
4f31ec8 |
index 5b63764..7efa308 100644
|
|
|
4f31ec8 |
--- a/extensions/common/features/feature_flags.cc
|
|
|
4f31ec8 |
+++ b/extensions/common/features/feature_flags.cc
|
|
|
4f31ec8 |
@@ -19,7 +19,7 @@
|
|
|
4f31ec8 |
constexpr base::Feature kFeatureFlags[] = {
|
|
|
4f31ec8 |
{"DeclarativeNetRequest", base::FEATURE_ENABLED_BY_DEFAULT}};
|
|
|
4f31ec8 |
|
|
|
4f31ec8 |
-const std::vector<const base::Feature>* g_feature_flags_test_override = nullptr;
|
|
|
4f31ec8 |
+const std::vector<base::Feature>* g_feature_flags_test_override = nullptr;
|
|
|
4f31ec8 |
|
|
|
4f31ec8 |
template <typename T>
|
|
|
4f31ec8 |
const base::Feature* GetFeature(T begin,
|
|
|
4f31ec8 |
@@ -52,8 +52,8 @@
|
|
|
4f31ec8 |
}
|
|
|
4f31ec8 |
|
|
|
4f31ec8 |
ScopedFeatureFlagsOverride CreateScopedFeatureFlagsOverrideForTesting(
|
|
|
4f31ec8 |
- const std::vector<const base::Feature>* features) {
|
|
|
4f31ec8 |
- return base::AutoReset<const std::vector<const base::Feature>*>(
|
|
|
4f31ec8 |
+ const std::vector<base::Feature>* features) {
|
|
|
4f31ec8 |
+ return base::AutoReset<const std::vector<base::Feature>*>(
|
|
|
4f31ec8 |
&g_feature_flags_test_override, features);
|
|
|
4f31ec8 |
}
|
|
|
4f31ec8 |
|
|
|
4f31ec8 |
diff --git a/extensions/common/features/feature_flags.h b/extensions/common/features/feature_flags.h
|
|
|
4f31ec8 |
index d1a5dd3..b57740b 100644
|
|
|
4f31ec8 |
--- a/extensions/common/features/feature_flags.h
|
|
|
4f31ec8 |
+++ b/extensions/common/features/feature_flags.h
|
|
|
4f31ec8 |
@@ -25,9 +25,9 @@
|
|
|
4f31ec8 |
// in scope. Clients must ensure that |features| remains alive (non-dangling)
|
|
|
4f31ec8 |
// while the returned value is in scope.
|
|
|
4f31ec8 |
using ScopedFeatureFlagsOverride =
|
|
|
4f31ec8 |
- base::AutoReset<const std::vector<const base::Feature>*>;
|
|
|
4f31ec8 |
+ base::AutoReset<const std::vector<base::Feature>*>;
|
|
|
4f31ec8 |
ScopedFeatureFlagsOverride CreateScopedFeatureFlagsOverrideForTesting(
|
|
|
4f31ec8 |
- const std::vector<const base::Feature>* features);
|
|
|
4f31ec8 |
+ const std::vector<base::Feature>* features);
|
|
|
4f31ec8 |
|
|
|
4f31ec8 |
} // namespace extensions
|
|
|
4f31ec8 |
|