[Libreoffice-commits] core.git: comphelper/source

[Mike Kaganski (via logerrit)]

 comphelper/source/misc/string.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 38ddeebce90f94b9211091f46dcd09ce679cb475
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Wed Apr 21 14:39:44 2021 +0200
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Wed Apr 21 18:32:17 2021 +0200

    Fix templates to use correct typedefs
    
    ... even if they happen to be the same underlying type
    
    Change-Id: Ie048479316c67d8f45c5b2b51bb1e3ea5d16aac8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114412
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/comphelper/source/misc/string.cxx b/comphelper/source/misc/string.cxx
index 1867728381b6..e1217dc5560f 100644
--- a/comphelper/source/misc/string.cxx
+++ b/comphelper/source/misc/string.cxx
@@ -50,7 +50,7 @@ namespace
         if (rIn.empty())
             return rIn;
 
-        std::string_view::size_type i = 0;
+        typename T::size_type i = 0;
 
         while (i < rIn.size())
         {
@@ -81,7 +81,7 @@ namespace
         if (rIn.empty())
             return rIn;
 
-        std::u16string_view::size_type i = rIn.size();
+        typename T::size_type i = rIn.size();
 
         while (i > 0)
         {
@@ -126,7 +126,7 @@ namespace
             return 0;
 
         sal_Int32 nTokCount = 1;
-        for (std::u16string_view::size_type i = 0; i < rIn.size(); ++i)
+        for (typename T::size_type i = 0; i < rIn.size(); ++i)
         {
             if (rIn[i] == cTok)
                 ++nTokCount;
@@ -393,7 +393,7 @@ namespace
         if (rIn.empty())
             return T();
 
-        std::u16string_view::size_type i = rIn.size();
+        typename I::size_type i = rIn.size();
         O sBuf(static_cast<sal_Int32>(i));
         while (i)
             sBuf.append(rIn[--i]);