diff options
Diffstat (limited to 'opencl')
| -rw-r--r-- | opencl/source/openclconfig.cxx | 10 | ||||
| -rw-r--r-- | opencl/source/openclwrapper.cxx | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/opencl/source/openclconfig.cxx b/opencl/source/openclconfig.cxx index a2b69c175cbf..2c011eedd5ce 100644 --- a/opencl/source/openclconfig.cxx +++ b/opencl/source/openclconfig.cxx @@ -27,14 +27,14 @@ OpenCLConfig::OpenCLConfig() : // This entry we have had for some time (when denylisting was // done elsewhere in the code), so presumably there is a known // good reason for it. - maDenyList.insert(ImplMatcher("Windows", "", "Intel\\(R\\) Corporation", "", "9\\.17\\.10\\.2884")); + maDenyList.insert(ImplMatcher(u"Windows"_ustr, u""_ustr, u"Intel\\(R\\) Corporation"_ustr, u""_ustr, u"9\\.17\\.10\\.2884"_ustr)); // This was reported to produce bogus values in unit tests - maDenyList.insert(ImplMatcher("Windows", "", "Intel\\(R\\) Corporation", "", "27\\.20\\.100\\.8681")); + maDenyList.insert(ImplMatcher(u"Windows"_ustr, u""_ustr, u"Intel\\(R\\) Corporation"_ustr, u""_ustr, u"27\\.20\\.100\\.8681"_ustr)); // For now, assume that AMD, Intel and NVIDIA drivers are good - maAllowList.insert(ImplMatcher("", "", "Advanced Micro Devices, Inc\\.", "", "")); - maAllowList.insert(ImplMatcher("", "", "Intel\\(R\\) Corporation", "", "")); - maAllowList.insert(ImplMatcher("", "", "NVIDIA Corporation", "", "")); + maAllowList.insert(ImplMatcher(u""_ustr, u""_ustr, u"Advanced Micro Devices, Inc\\."_ustr, u""_ustr, u""_ustr)); + maAllowList.insert(ImplMatcher(u""_ustr, u""_ustr, u"Intel\\(R\\) Corporation"_ustr, u""_ustr, u""_ustr)); + maAllowList.insert(ImplMatcher(u""_ustr, u""_ustr, u"NVIDIA Corporation"_ustr, u""_ustr, u""_ustr)); } bool OpenCLConfig::operator== (const OpenCLConfig& r) const diff --git a/opencl/source/openclwrapper.cxx b/opencl/source/openclwrapper.cxx index 8d840d65c181..16109971c0a9 100644 --- a/opencl/source/openclwrapper.cxx +++ b/opencl/source/openclwrapper.cxx @@ -90,7 +90,7 @@ OString const & getCacheFolder() { static OString const aCacheFolder = []() { - OUString url("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}/cache/"); + OUString url(u"${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}/cache/"_ustr); rtl::Bootstrap::expandMacros(url); osl::Directory::create(url); |