diff options
| author | Michael Bruning <michael.bruning@qt.io> | 2019-10-15 18:08:23 +0200 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@qt.io> | 2019-10-16 14:44:58 +0000 |
| commit | a42666a17663f7fdad5be9640527b60d6018cea5 (patch) | |
| tree | 0b08fffd491242f30999d16f8b6b0c0ece592e77 /chromium/extensions/common/manifest_handlers/shared_module_info.cc | |
| parent | 3d7a96629b790ee12d9be864e284c14606da649d (diff) | |
| download | qtwebengine-chromium-a42666a17663f7fdad5be9640527b60d6018cea5.tar.gz | |
Apply workarounds to build extensions with gcc 5.3.1
Add workaround to generators and manifest handlers to make
the extensions code build with GCC 5.3.1, which is missing a
couple of C++14 features and has bugs with some C++11 features.
Reverts some of the previous workarounds.
Task-number: QTBUG-76329
Change-Id: I2e6a268babbbb64ccdf8f703abf1afd1ee5e8857
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/extensions/common/manifest_handlers/shared_module_info.cc')
| -rw-r--r-- | chromium/extensions/common/manifest_handlers/shared_module_info.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chromium/extensions/common/manifest_handlers/shared_module_info.cc b/chromium/extensions/common/manifest_handlers/shared_module_info.cc index e5f3341d5d4..34000286ace 100644 --- a/chromium/extensions/common/manifest_handlers/shared_module_info.cc +++ b/chromium/extensions/common/manifest_handlers/shared_module_info.cc @@ -246,7 +246,11 @@ bool SharedModuleHandler::Validate( base::span<const char* const> SharedModuleHandler::Keys() const { static constexpr const char* kKeys[] = {keys::kExport, keys::kImport}; +#if !defined(__GNUC__) || __GNUC__ > 5 return kKeys; +#else + return base::make_span(kKeys, 1); +#endif } } // namespace extensions |