opencl/source/openclconfig.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8790243df458250b00de67bf6fc892b3fa5660ad
Author: Eike Rathke <er...@redhat.com>
Date: Mon Dec 18 20:41:30 2017 +0100
Explicitly qualify ICU types with icu:: namespace
It will be required by ICU 61 anyway, see
https://ssl.icu-project.org/repos/icu/trunk/icu4c/readme.html#RecBuild
Change-Id: Ib7accd75a6e35932048d779cf7bf0a5a33f8ed0d
Reviewed-on: https://gerrit.libreoffice.org/46741
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Eike Rathke <er...@redhat.com>
(cherry picked from commit 8960ecc689ce41cfaa40b65d75830d7491b06463)
Reviewed-on: https://gerrit.libreoffice.org/56680
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/opencl/source/openclconfig.cxx b/opencl/source/openclconfig.cxx
index b81ffed22937..0ec2347fb332 100644
--- a/opencl/source/openclconfig.cxx
+++ b/opencl/source/openclconfig.cxx
@@ -119,7 +119,7 @@ bool match(const OUString& rPattern, const OUString& rInput)
UErrorCode nIcuError(U_ZERO_ERROR);
icu::UnicodeString sIcuPattern(reinterpret_cast<const
UChar*>(rPattern.getStr()), rPattern.getLength());
icu::UnicodeString sIcuInput(reinterpret_cast<const
UChar*>(rInput.getStr()), rInput.getLength());
- RegexMatcher aMatcher(sIcuPattern, sIcuInput, 0, nIcuError);
+ icu::RegexMatcher aMatcher(sIcuPattern, sIcuInput, 0, nIcuError);
return U_SUCCESS(nIcuError) && aMatcher.matches(nIcuError) &&
U_SUCCESS(nIcuError);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
