From 2e21240f23ac2191a3535d697a7308b29303c67c Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 28 Aug 2020 17:14:50 +0200 Subject: Goodbye O[U]StringView, welcome O[U]String::Concat O[U]StringView had an odd mixture of uses. For one, it was used like std::[u16]string_view, for which directly using the latter std types is clearly the better alternative. For another, it was used in concatenation sequences, when neither of the two leading terms were of our rtl string-related types. For that second use case introduce O[U]String::Concat (as std::[u16]string_view can obviously not be used, those not being one of our rtl string-related types). Also, O[U]StringLiteral is occasionally used for this, but the planned changes outlined in the 33ecd0d5c4fff9511a8436513936a3f7044a775a "Change OUStringLiteral from char[] to char16_t[]" commit message will make that no longer work, so O[U]String::Concat will be the preferred solution in such use cases going forward, too. O[U]StringView was also occasionally used to include O[U]StringBuffer values in concatenation sequences, for which a more obvious alternative is to make O[U]StringBuffer participate directly in the ToStringHelper/O[U]StringConcat machinery. Change-Id: I1f0e8d836796c9ae01c45f32c518be5f52976622 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101586 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- opencl/source/openclwrapper.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'opencl') diff --git a/opencl/source/openclwrapper.cxx b/opencl/source/openclwrapper.cxx index aea040c73036..c7ac9525d620 100644 --- a/opencl/source/openclwrapper.cxx +++ b/opencl/source/openclwrapper.cxx @@ -185,7 +185,7 @@ OString createFileName(cl_device_id deviceId, const char* clFileName) platformVersion, nullptr); // create hash for deviceName + driver version + platform version - OString aString = rtl::OStringView(deviceName) + driverVersion + platformVersion; + OString aString = OString::Concat(deviceName) + driverVersion + platformVersion; OString aHash = generateMD5(aString.getStr(), aString.getLength()); return getCacheFolder() + fileName + "-" + aHash + ".bin"; -- cgit