109 lines
5.6 KiB
Diff
109 lines
5.6 KiB
Diff
|
author: Andres Salomon <dilinger@debian.org>
|
||
|
|
|
||
|
|
../../services/network/shared_dictionary/simple_url_pattern_matcher.cc:31:34: error: constexpr variable 'kDefaultOptions' must be initialized by a constant expression
|
||
|
|
31 | constexpr liburlpattern::Options kDefaultOptions = {.delimiter_list = "",
|
||
|
|
| ^ ~~~~~~~~~~~~~~~~~~~~~~
|
||
|
|
32 | .prefix_list = "",
|
||
|
|
| ~~~~~~~~~~~~~~~~~~
|
||
|
|
33 | .sensitive = true,
|
||
|
|
| ~~~~~~~~~~~~~~~~~~
|
||
|
|
34 | .strict = true};
|
||
|
|
| ~~~~~~~~~~~~~~~
|
||
|
|
|
||
|
|
--- a/services/network/shared_dictionary/simple_url_pattern_matcher.cc
|
||
|
|
+++ b/services/network/shared_dictionary/simple_url_pattern_matcher.cc
|
||
|
|
@@ -28,17 +28,17 @@ namespace network {
|
||
|
|
namespace {
|
||
|
|
|
||
|
|
// https://urlpattern.spec.whatwg.org/#default-options
|
||
|
|
-constexpr liburlpattern::Options kDefaultOptions = {.delimiter_list = "",
|
||
|
|
+const liburlpattern::Options kDefaultOptions = {.delimiter_list = "",
|
||
|
|
.prefix_list = "",
|
||
|
|
.sensitive = true,
|
||
|
|
.strict = true};
|
||
|
|
// https://urlpattern.spec.whatwg.org/#hostname-options
|
||
|
|
-constexpr liburlpattern::Options kHostnameOptions = {.delimiter_list = ".",
|
||
|
|
+const liburlpattern::Options kHostnameOptions = {.delimiter_list = ".",
|
||
|
|
.prefix_list = "",
|
||
|
|
.sensitive = true,
|
||
|
|
.strict = true};
|
||
|
|
// https://urlpattern.spec.whatwg.org/#pathname-options
|
||
|
|
-constexpr liburlpattern::Options kPathnameOptions = {.delimiter_list = "/",
|
||
|
|
+const liburlpattern::Options kPathnameOptions = {.delimiter_list = "/",
|
||
|
|
.prefix_list = "/",
|
||
|
|
.sensitive = true,
|
||
|
|
.strict = true};
|
||
|
|
--- a/components/autofill/core/browser/data_model/addresses/autofill_i18n_api.h
|
||
|
|
+++ b/components/autofill/core/browser/data_model/addresses/autofill_i18n_api.h
|
||
|
|
@@ -16,8 +16,8 @@ namespace autofill::i18n_model_definitio
|
||
|
|
// Country code that represents autofill's legacy address hierarchy model as
|
||
|
|
// stored `kAutofillModelRules`. As a workaround for GCC we declare the
|
||
|
|
// std::string constexpr first.
|
||
|
|
-constexpr inline std::string kLegacyHierarchyCountryCodeString{"XX"};
|
||
|
|
-constexpr AddressCountryCode kLegacyHierarchyCountryCode =
|
||
|
|
+[[clang::no_destroy]] const inline std::string kLegacyHierarchyCountryCodeString{"XX"};
|
||
|
|
+[[clang::no_destroy]] const AddressCountryCode kLegacyHierarchyCountryCode =
|
||
|
|
AddressCountryCode(kLegacyHierarchyCountryCodeString);
|
||
|
|
|
||
|
|
// Creates an instance of the address hierarchy model corresponding to the
|
||
|
|
--- a/components/omnibox/browser/on_device_tail_model_service.cc
|
||
|
|
+++ b/components/omnibox/browser/on_device_tail_model_service.cc
|
||
|
|
@@ -26,7 +26,7 @@
|
||
|
|
|
||
|
|
namespace {
|
||
|
|
// Constants for TFlite model validation.
|
||
|
|
-constexpr std::string kTestPrefix = "google m";
|
||
|
|
+const std::string kTestPrefix = "google m";
|
||
|
|
constexpr std::string_view kModelValidationSwitchName =
|
||
|
|
"omnibox-on-device-tail-model-validation";
|
||
|
|
|
||
|
|
--- a/chrome/browser/ui/lens/lens_overlay_url_builder.cc
|
||
|
|
+++ b/chrome/browser/ui/lens/lens_overlay_url_builder.cc
|
||
|
|
@@ -80,7 +80,7 @@
|
||
|
|
inline constexpr char kSecActQueryParamKey[] = "sec_act";
|
||
|
|
|
||
|
|
// The list of query parameters to ignore when comparing search URLs.
|
||
|
|
-inline constexpr std::string kIgnoredSearchUrlQueryParameters[] = {
|
||
|
|
+inline const std::string kIgnoredSearchUrlQueryParameters[] = {
|
||
|
|
kViewportWidthQueryParamKey, kViewportHeightQueryParamKey,
|
||
|
|
kXSRFTokenQueryParamKey, kSecActQueryParamKey,
|
||
|
|
kModeParameterKey, kToolbeltModeParameterKey};
|
||
|
|
--- a/content/public/test/prefetch_test_util.h
|
||
|
|
+++ b/content/public/test/prefetch_test_util.h
|
||
|
|
@@ -15,7 +15,7 @@ namespace content::test {
|
||
|
|
|
||
|
|
using PrefetchContainerIdForTesting =
|
||
|
|
base::StrongAlias<class PrefetchContainerIdForTestingTag, std::string>;
|
||
|
|
-inline constexpr PrefetchContainerIdForTesting
|
||
|
|
+inline const PrefetchContainerIdForTesting
|
||
|
|
InvalidPrefetchContainerIdForTesting = PrefetchContainerIdForTesting("");
|
||
|
|
|
||
|
|
class TestPrefetchWatcherImpl;
|
||
|
|
--- a/components/history_embeddings/ml_answerer.cc
|
||
|
|
+++ b/components/history_embeddings/ml_answerer.cc
|
||
|
|
@@ -24,7 +24,7 @@ using optimization_guide::proto::Passage
|
||
|
|
|
||
|
|
namespace {
|
||
|
|
|
||
|
|
-static constexpr std::string kPassageIdToken = "ID";
|
||
|
|
+static const std::string kPassageIdToken = "ID";
|
||
|
|
// Estimated token count of the preamble text in prompt.
|
||
|
|
static constexpr size_t kPreambleTokenBufferSize = 100u;
|
||
|
|
// Estimated token count of overhead text per passage.
|
||
|
|
--- a/components/compose/core/browser/config.cc
|
||
|
|
+++ b/components/compose/core/browser/config.cc
|
||
|
|
@@ -46,11 +46,11 @@
|
||
|
|
}
|
||
|
|
|
||
|
|
constexpr auto DEFAULT_COMPOSE_ENABLED_COUNTRIES =
|
||
|
|
- base::MakeFixedFlatSet<std::string>({"bd", "ca", "gh", "in", "ke", "my",
|
||
|
|
+ base::MakeFixedFlatSet<std::string_view>({"bd", "ca", "gh", "in", "ke", "my",
|
||
|
|
"ng", "ph", "pk", "sg", "tz", "ug",
|
||
|
|
"us", "zm", "zw"});
|
||
|
|
constexpr auto DEFAULT_PROACTIVE_NUDGE_ENABLED_COUNTRIES =
|
||
|
|
- base::MakeFixedFlatSet<std::string>({"us"});
|
||
|
|
+ base::MakeFixedFlatSet<std::string_view>({"us"});
|
||
|
|
|
||
|
|
} // namespace
|
||
|
|
|