Remove Size, Empty and Data usages from library

commit_hash:ef5ad4cfa9e68bbfc586492e8c376c732d0a48af

2 files changed, 10 insertions, 10 deletions

diff --git a/library/cpp/regex/pcre/benchmark/main.cpp b/library/cpp/regex/pcre/benchmark/main.cpp
index 3c11ef4f29..4899dcc8f5 100644
--- a/library/cpp/regex/pcre/benchmark/main.cpp
+++ b/library/cpp/regex/pcre/benchmark/main.cpp
@@ -17,19 +17,19 @@ static TVector<TString> GenerateHaystacks() {
     // Generate long randomized haystacks to prevent cache hit
     TVector<TString> result(Reserve(HaystacksCount));
     for (size_t i = 0; i < HaystacksCount; ++i) {
-        result.push_back(TString::Join(ComplexPattern.SubString(MinPrefix + i, ComplexPattern.Size() - MinPrefix - i), ComplexPattern.SubString(0, MinPrefix + i)));
+        result.push_back(TString::Join(ComplexPattern.SubString(MinPrefix + i, ComplexPattern.size() - MinPrefix - i), ComplexPattern.SubString(0, MinPrefix + i)));
     }
     return result;
 }
 
 static const TVector<TString> Haystacks{GenerateHaystacks()};
 
-static const NPcre::TPcre<char> Simple{SimplePattern.Data()};
-static const NPcre::TPcre<char> SimpleStudy{SimplePattern.Data(), NPcre::EOptimize::Study};
-static const NPcre::TPcre<char> SimpleJIT{SimplePattern.Data(), NPcre::EOptimize::JIT};
-static const NPcre::TPcre<char> Complex{ComplexPattern.Data()};
-static const NPcre::TPcre<char> ComplexStudy{ComplexPattern.Data(), NPcre::EOptimize::Study};
-static const NPcre::TPcre<char> ComplexJIT{ComplexPattern.Data(), NPcre::EOptimize::JIT};
+static const NPcre::TPcre<char> Simple{SimplePattern.data()};
+static const NPcre::TPcre<char> SimpleStudy{SimplePattern.data(), NPcre::EOptimize::Study};
+static const NPcre::TPcre<char> SimpleJIT{SimplePattern.data(), NPcre::EOptimize::JIT};
+static const NPcre::TPcre<char> Complex{ComplexPattern.data()};
+static const NPcre::TPcre<char> ComplexStudy{ComplexPattern.data(), NPcre::EOptimize::Study};
+static const NPcre::TPcre<char> ComplexJIT{ComplexPattern.data(), NPcre::EOptimize::JIT};
 
 static void Benchmark(benchmark::State& state, const NPcre::TPcre<char>& pattern) {
     for (auto _ : state) {
diff --git a/library/cpp/regex/pcre/pcre.h b/library/cpp/regex/pcre/pcre.h
index 82a9774f00..15a25689db 100644
--- a/library/cpp/regex/pcre/pcre.h
+++ b/library/cpp/regex/pcre/pcre.h
@@ -102,7 +102,7 @@ namespace NPcre {
             Y_ASSERT(workspaceSize >= 0);
             size_t ovecsize = workspaceSize * 3;
             NStackArray::TStackArray<int> ovector(ALLOC_ON_STACK(int, ovecsize));
-            return ConvertReturnCode(TTraits::Exec(Code.Get(), Extra.Get(), (TStringType) string.Data(), string.Size(), 0, executeFlags, ovector.data(), ovecsize));
+            return ConvertReturnCode(TTraits::Exec(Code.Get(), Extra.Get(), (TStringType) string.data(), string.size(), 0, executeFlags, ovector.data(), ovecsize));
         }
 
         //! Find compiled pattern in string.
@@ -123,7 +123,7 @@ namespace NPcre {
             for (size_t i = 0; i < ovecsize; ++i) {
                 ovector[i] = -4;
             }
-            int rc = TTraits::Exec(Code.Get(), Extra.Get(), (TStringType) string.Data(), string.Size(), 0, executeFlags, ovector.data(), ovecsize);
+            int rc = TTraits::Exec(Code.Get(), Extra.Get(), (TStringType) string.data(), string.size(), 0, executeFlags, ovector.data(), ovecsize);
             if (ConvertReturnCode(rc)) {
                 return MakeMaybe<TPcreMatch>(ovector[0], ovector[1]);
             } else {
@@ -153,7 +153,7 @@ namespace NPcre {
             size_t ovecsize = (initialWorkspaceSize + 1) * 3;
             while (true) {
                 NStackArray::TStackArray<int> ovector(ALLOC_ON_STACK(int, ovecsize));
-                int rc = TTraits::Exec(Code.Get(), Extra.Get(), (TStringType) string.Data(), string.Size(), 0, executeFlags, ovector.data(), ovecsize);
+                int rc = TTraits::Exec(Code.Get(), Extra.Get(), (TStringType) string.data(), string.size(), 0, executeFlags, ovector.data(), ovecsize);
                 if (rc > 0) {
                     TPcreMatches result(Reserve(rc >> 1));
                     for (int i = 0, pos = 0; i < rc; ++i) {